From f7e73688782998513d9fb6d7e8f0765e9beb28d1 Mon Sep 17 00:00:00 2001
From: Tiago Costa <tiagoffcc@hotmail.com>
Date: Wed, 24 Jun 2020 03:26:02 +0100
Subject: [PATCH] Revert "chore(NA): upgrade usage_collection, ui_actions,
 tile_map, telemtry, share, saved_objects, saved_objects_management,
 region_map and navigation to lodash4"

This reverts commit 137055c5fed2fc52bb26547e0bc1ad2e3d4fe309.
---
 .../navigation/public/top_nav_menu/top_nav_menu_item.tsx    | 6 +++---
 .../region_map/public/__tests__/region_map_visualization.js | 2 +-
 src/plugins/region_map/public/choropleth_layer.js           | 2 +-
 .../public/finder/saved_object_finder.test.tsx              | 2 +-
 .../saved_objects/public/finder/saved_object_finder.tsx     | 2 +-
 .../public/saved_object/helpers/apply_es_resp.ts            | 2 +-
 .../public/saved_object/helpers/build_saved_object.ts       | 2 +-
 .../public/saved_object/helpers/create_source.ts            | 2 +-
 .../public/saved_object/helpers/initialize_saved_object.ts  | 2 +-
 .../public/saved_object/helpers/save_with_confirmation.ts   | 2 +-
 .../public/saved_object/helpers/serialize_saved_object.ts   | 2 +-
 .../saved_objects_management/public/lib/case_conversion.ts  | 2 +-
 .../public/lib/create_field_list.ts                         | 6 +++---
 .../public/lib/get_relationships.ts                         | 2 +-
 src/plugins/saved_objects_management/public/lib/numeric.ts  | 2 +-
 .../public/lib/resolve_saved_objects.ts                     | 2 +-
 .../management_section/object_view/components/form.tsx      | 2 +-
 .../management_section/objects_table/components/flyout.tsx  | 2 +-
 .../objects_table/saved_objects_table.test.mocks.ts         | 4 ++--
 .../objects_table/saved_objects_table.tsx                   | 2 +-
 .../public/management_section/saved_objects_table_page.tsx  | 4 ++--
 .../saved_objects_management/server/lib/find_all.test.ts    | 2 +-
 .../share/server/routes/lib/short_url_assert_valid.ts       | 2 +-
 src/plugins/share/server/routes/lib/short_url_lookup.ts     | 2 +-
 src/plugins/share/server/saved_objects/url.ts               | 6 +++---
 .../telemetry_collection/__tests__/get_local_stats.js       | 2 +-
 .../telemetry/server/telemetry_collection/get_kibana.ts     | 2 +-
 src/plugins/tile_map/public/css_filters.js                  | 2 +-
 src/plugins/tile_map/public/geohash_layer.js                | 2 +-
 src/plugins/tile_map/public/markers/heatmap.js              | 2 +-
 src/plugins/tile_map/public/markers/scaled_circles.js       | 2 +-
 src/plugins/tile_map/public/markers/shaded_circles.js       | 2 +-
 src/plugins/tile_map/public/tile_map_visualization.js       | 2 +-
 .../public/context_menu/build_eui_context_menu_panels.tsx   | 2 +-
 .../usage_collection/server/collector/collector_set.test.ts | 2 +-
 .../usage_collection/server/collector/collector_set.ts      | 2 +-
 36 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/src/plugins/navigation/public/top_nav_menu/top_nav_menu_item.tsx b/src/plugins/navigation/public/top_nav_menu/top_nav_menu_item.tsx
index 5f1f8331a99a37b..3a05ce59f5d1347 100644
--- a/src/plugins/navigation/public/top_nav_menu/top_nav_menu_item.tsx
+++ b/src/plugins/navigation/public/top_nav_menu/top_nav_menu_item.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { upperFirst, isFunction } from 'lodash4';
+import { capitalize, isFunction } from 'lodash';
 import React, { MouseEvent } from 'react';
 import { EuiButtonEmpty, EuiToolTip } from '@elastic/eui';
 
@@ -50,11 +50,11 @@ export function TopNavMenuItem(props: TopNavMenuData) {
 
   const btn = props.emphasize ? (
     <EuiButton {...commonButtonProps} size="s" fill>
-      {upperFirst(props.label || props.id!)}
+      {capitalize(props.label || props.id!)}
     </EuiButton>
   ) : (
     <EuiButtonEmpty {...commonButtonProps} size="xs">
-      {upperFirst(props.label || props.id!)}
+      {capitalize(props.label || props.id!)}
     </EuiButtonEmpty>
   );
 
diff --git a/src/plugins/region_map/public/__tests__/region_map_visualization.js b/src/plugins/region_map/public/__tests__/region_map_visualization.js
index d694b045aac1d9e..3dcfc7c2fc6fae1 100644
--- a/src/plugins/region_map/public/__tests__/region_map_visualization.js
+++ b/src/plugins/region_map/public/__tests__/region_map_visualization.js
@@ -19,7 +19,7 @@
 
 import expect from '@kbn/expect';
 import ngMock from 'ng_mock';
-import _ from 'lodash4';
+import _ from 'lodash';
 
 import ChoroplethLayer from '../choropleth_layer';
 import { ImageComparator } from 'test_utils/image_comparator';
diff --git a/src/plugins/region_map/public/choropleth_layer.js b/src/plugins/region_map/public/choropleth_layer.js
index 3fd9e246e9d37fc..30fa8b544cdec3c 100644
--- a/src/plugins/region_map/public/choropleth_layer.js
+++ b/src/plugins/region_map/public/choropleth_layer.js
@@ -18,7 +18,7 @@
  */
 
 import $ from 'jquery';
-import _ from 'lodash4';
+import _ from 'lodash';
 import d3 from 'd3';
 import { i18n } from '@kbn/i18n';
 import * as topojson from 'topojson-client';
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 8f624c627217447..8a644a718c9d309 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
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-jest.mock('lodash4', () => ({
+jest.mock('lodash', () => ({
   debounce: (fn: any) => fn,
 }));
 
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 28b552604b06658..9ef4f2fbe7c55ae 100644
--- a/src/plugins/saved_objects/public/finder/saved_object_finder.tsx
+++ b/src/plugins/saved_objects/public/finder/saved_object_finder.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import _ from 'lodash4';
+import _ from 'lodash';
 import PropTypes from 'prop-types';
 import React from 'react';
 
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 0b9d973dc9f24aa..47390c7dc9104a6 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
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import _ from 'lodash4';
+import _ from 'lodash';
 import { EsResponse, SavedObject, SavedObjectConfig, SavedObjectKibanaServices } from '../../types';
 import { SavedObjectNotFound } from '../../../../kibana_utils/public';
 import {
diff --git a/src/plugins/saved_objects/public/saved_object/helpers/build_saved_object.ts b/src/plugins/saved_objects/public/saved_object/helpers/build_saved_object.ts
index b604f2e8b5f89c4..fdc8d79c9428aac 100644
--- a/src/plugins/saved_objects/public/saved_object/helpers/build_saved_object.ts
+++ b/src/plugins/saved_objects/public/saved_object/helpers/build_saved_object.ts
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { once } from 'lodash4';
+import { once } from 'lodash';
 import { hydrateIndexPattern } from './hydrate_index_pattern';
 import { intializeSavedObject } from './initialize_saved_object';
 import { serializeSavedObject } from './serialize_saved_object';
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 4d6da734fd0a8b3..25ed4d527b83395 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
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import _ from 'lodash4';
+import _ from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { SavedObjectAttributes } from 'kibana/public';
 import { SavedObject, SavedObjectKibanaServices } from '../../types';
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 efd772edce292a6..ae8d7ac8a6526d6 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
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import _ from 'lodash4';
+import _ from 'lodash';
 import { SavedObjectsClientContract } from 'kibana/public';
 import { SavedObject, SavedObjectConfig } from '../../types';
 
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 255bb6786786a47..b413ea19a932d74 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
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { get } from 'lodash4';
+import { get } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import {
   SavedObjectAttributes,
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 0afb985425b81e4..24e467ad18ac4bd 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
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import _ from 'lodash4';
+import _ from 'lodash';
 import { SavedObject, SavedObjectConfig } from '../../types';
 import { extractSearchSourceReferences, expandShorthand } from '../../../../data/public';
 
diff --git a/src/plugins/saved_objects_management/public/lib/case_conversion.ts b/src/plugins/saved_objects_management/public/lib/case_conversion.ts
index 654cbffee28c875..718530eb3b60222 100644
--- a/src/plugins/saved_objects_management/public/lib/case_conversion.ts
+++ b/src/plugins/saved_objects_management/public/lib/case_conversion.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { mapKeys, camelCase } from 'lodash4';
+import { mapKeys, camelCase } from 'lodash';
 
 export function keysToCamelCaseShallow(object: Record<string, any>) {
   return mapKeys(object, (value, key) => camelCase(key));
diff --git a/src/plugins/saved_objects_management/public/lib/create_field_list.ts b/src/plugins/saved_objects_management/public/lib/create_field_list.ts
index 902f077761d18a0..5f424751dd58eaf 100644
--- a/src/plugins/saved_objects_management/public/lib/create_field_list.ts
+++ b/src/plugins/saved_objects_management/public/lib/create_field_list.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { forOwn, keyBy, isNumber, isBoolean, isPlainObject, isString } from 'lodash4';
+import { forOwn, indexBy, isNumber, isBoolean, isPlainObject, isString } from 'lodash';
 import { SimpleSavedObject } from '../../../../core/public';
 import { castEsToKbnFieldTypeName } from '../../../data/public';
 import { ObjectField } from '../management_section/types';
@@ -93,9 +93,9 @@ const addFieldsFromClass = function (
   Class: { mapping: Record<string, string>; searchSource: any },
   fields: ObjectField[]
 ) {
-  const fieldMap = keyBy(fields, 'name');
+  const fieldMap = indexBy(fields, 'name');
 
-  forOwn(Class.mapping, (esType, name) => {
+  _.forOwn(Class.mapping, (esType, name) => {
     if (!name || fieldMap[name]) {
       return;
     }
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 a2ba11ce0bc84b1..bf2e651aa6593cb 100644
--- a/src/plugins/saved_objects_management/public/lib/get_relationships.ts
+++ b/src/plugins/saved_objects_management/public/lib/get_relationships.ts
@@ -18,7 +18,7 @@
  */
 
 import { HttpStart } from 'src/core/public';
-import { get } from 'lodash4';
+import { get } from 'lodash';
 import { SavedObjectRelation } from '../types';
 
 export async function getRelationships(
diff --git a/src/plugins/saved_objects_management/public/lib/numeric.ts b/src/plugins/saved_objects_management/public/lib/numeric.ts
index 525e5c1845ea2f1..c7bc6c26a378ff4 100644
--- a/src/plugins/saved_objects_management/public/lib/numeric.ts
+++ b/src/plugins/saved_objects_management/public/lib/numeric.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { isNaN } from 'lodash4';
+import { isNaN } from 'lodash';
 
 export function isNumeric(v: any): boolean {
   return !isNaN(v) && (typeof v === 'number' || (!Array.isArray(v) && !isNaN(parseFloat(v))));
diff --git a/src/plugins/saved_objects_management/public/lib/resolve_saved_objects.ts b/src/plugins/saved_objects_management/public/lib/resolve_saved_objects.ts
index 7fb86afede6997f..79b8c33b84cfeea 100644
--- a/src/plugins/saved_objects_management/public/lib/resolve_saved_objects.ts
+++ b/src/plugins/saved_objects_management/public/lib/resolve_saved_objects.ts
@@ -18,7 +18,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { cloneDeep } from 'lodash4';
+import { cloneDeep } from 'lodash';
 import { OverlayStart, SavedObjectReference } from 'src/core/public';
 import { SavedObject, SavedObjectLoader } from '../../../saved_objects/public';
 import {
diff --git a/src/plugins/saved_objects_management/public/management_section/object_view/components/form.tsx b/src/plugins/saved_objects_management/public/management_section/object_view/components/form.tsx
index 769d1d69a06c31b..d273ffb4c1052cb 100644
--- a/src/plugins/saved_objects_management/public/management_section/object_view/components/form.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/object_view/components/form.tsx
@@ -26,7 +26,7 @@ import {
   EuiButtonEmpty,
   EuiSpacer,
 } from '@elastic/eui';
-import { cloneDeep, set } from 'lodash4';
+import { cloneDeep, set } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { SimpleSavedObject, SavedObjectsClientContract } from '../../../../../../core/public';
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 8884f23e5035a3d..6e7397d1058bf85 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
@@ -18,7 +18,7 @@
  */
 
 import React, { Component, Fragment } from 'react';
-import { take, get as getField } from 'lodash4';
+import { take, get as getField } from 'lodash';
 import {
   EuiFlyout,
   EuiFlyoutBody,
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.test.mocks.ts b/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.test.mocks.ts
index 7bdc65b1e73dd02..6b4659a6b5a13e0 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.test.mocks.ts
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.test.mocks.ts
@@ -22,8 +22,8 @@ jest.doMock('@elastic/filesaver', () => ({
   saveAs: saveAsMock,
 }));
 
-jest.doMock('lodash4', () => ({
-  ...jest.requireActual('lodash4'),
+jest.doMock('lodash', () => ({
+  ...jest.requireActual('lodash'),
   debounce: (func: Function) => {
     function debounced(this: any, ...args: any[]) {
       return func.apply(this, args);
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 ba02aa9c50236d8..54bc649c33b60b8 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
@@ -18,7 +18,7 @@
  */
 
 import React, { Component } from 'react';
-import { debounce } from 'lodash4';
+import { debounce } from 'lodash';
 // @ts-ignore
 import { saveAs } from '@elastic/filesaver';
 import {
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 5ba73bd32b8f777..75692777f08bbb5 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
@@ -18,7 +18,7 @@
  */
 
 import React, { useEffect } from 'react';
-import { get } from 'lodash4';
+import { get } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { CoreStart, ChromeBreadcrumb } from 'src/core/public';
 import { DataPublicPluginStart } from '../../../data/public';
@@ -78,7 +78,7 @@ const SavedObjectsTablePage = ({
       }}
       canGoInApp={(savedObject) => {
         const { inAppUrl } = savedObject.meta;
-        return inAppUrl ? (get(capabilities, inAppUrl.uiCapabilitiesPath) as any) : false;
+        return inAppUrl ? get(capabilities, inAppUrl.uiCapabilitiesPath) : false;
       }}
     />
   );
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 04d7c3ca7934a30..2515d11f6d4bbdb 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
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { times } from 'lodash4';
+import { times } from 'lodash';
 import { SavedObjectsFindOptions, SavedObject } from 'src/core/server';
 import { savedObjectsClientMock } from '../../../../core/server/mocks';
 import { findAll } from './find_all';
diff --git a/src/plugins/share/server/routes/lib/short_url_assert_valid.ts b/src/plugins/share/server/routes/lib/short_url_assert_valid.ts
index fe61855f97ce6e7..2f120bbc03cd73c 100644
--- a/src/plugins/share/server/routes/lib/short_url_assert_valid.ts
+++ b/src/plugins/share/server/routes/lib/short_url_assert_valid.ts
@@ -18,7 +18,7 @@
  */
 
 import { parse } from 'url';
-import { trim } from 'lodash4';
+import { trim } from 'lodash';
 import Boom from 'boom';
 
 export function shortUrlAssertValid(url: string) {
diff --git a/src/plugins/share/server/routes/lib/short_url_lookup.ts b/src/plugins/share/server/routes/lib/short_url_lookup.ts
index 0a3983972fee7e9..a858b7c54ac4faa 100644
--- a/src/plugins/share/server/routes/lib/short_url_lookup.ts
+++ b/src/plugins/share/server/routes/lib/short_url_lookup.ts
@@ -18,7 +18,7 @@
  */
 
 import crypto from 'crypto';
-import { get } from 'lodash4';
+import { get } from 'lodash';
 
 import { Logger, SavedObject, SavedObjectsClientContract } from 'kibana/server';
 
diff --git a/src/plugins/share/server/saved_objects/url.ts b/src/plugins/share/server/saved_objects/url.ts
index 7f2f8fa1d3ff44f..3103777179741d4 100644
--- a/src/plugins/share/server/saved_objects/url.ts
+++ b/src/plugins/share/server/saved_objects/url.ts
@@ -16,8 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { SavedObjectsType } from 'kibana/server';
-import { flow } from 'lodash4';
+import { SavedObjectMigrationFn, SavedObjectsType } from 'kibana/server';
+import { flow } from 'lodash';
 import { migrateLegacyKibanaAppShortUrls } from './kibana_app_migration';
 
 export const url: SavedObjectsType = {
@@ -33,7 +33,7 @@ export const url: SavedObjectsType = {
     },
   },
   migrations: {
-    '7.9.0': flow(migrateLegacyKibanaAppShortUrls),
+    '7.9.0': flow<SavedObjectMigrationFn>(migrateLegacyKibanaAppShortUrls),
   },
   mappings: {
     properties: {
diff --git a/src/plugins/telemetry/server/telemetry_collection/__tests__/get_local_stats.js b/src/plugins/telemetry/server/telemetry_collection/__tests__/get_local_stats.js
index d44bd16b1b43c63..29076537e9ae88e 100644
--- a/src/plugins/telemetry/server/telemetry_collection/__tests__/get_local_stats.js
+++ b/src/plugins/telemetry/server/telemetry_collection/__tests__/get_local_stats.js
@@ -23,7 +23,7 @@ import sinon from 'sinon';
 import { mockGetClusterInfo } from './get_cluster_info';
 import { mockGetClusterStats } from './get_cluster_stats';
 
-import { omit } from 'lodash4';
+import { omit } from 'lodash';
 import { getLocalStats, handleLocalStats } from '../get_local_stats';
 
 const mockUsageCollection = (kibanaUsage = {}) => ({
diff --git a/src/plugins/telemetry/server/telemetry_collection/get_kibana.ts b/src/plugins/telemetry/server/telemetry_collection/get_kibana.ts
index a8681c987f99447..645c5a4be8a6cbb 100644
--- a/src/plugins/telemetry/server/telemetry_collection/get_kibana.ts
+++ b/src/plugins/telemetry/server/telemetry_collection/get_kibana.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { omit } from 'lodash4';
+import { omit } from 'lodash';
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
 import { APICaller } from 'kibana/server';
 import { StatsCollectionContext } from 'src/plugins/telemetry_collection_manager/server';
diff --git a/src/plugins/tile_map/public/css_filters.js b/src/plugins/tile_map/public/css_filters.js
index 157c5488383236b..b41ea6955663bed 100644
--- a/src/plugins/tile_map/public/css_filters.js
+++ b/src/plugins/tile_map/public/css_filters.js
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import _ from 'lodash4';
+import _ from 'lodash';
 
 /**
  * just a place to put feature detection checks
diff --git a/src/plugins/tile_map/public/geohash_layer.js b/src/plugins/tile_map/public/geohash_layer.js
index b6cdbd988fc2b0d..ca2f49a1f31e00e 100644
--- a/src/plugins/tile_map/public/geohash_layer.js
+++ b/src/plugins/tile_map/public/geohash_layer.js
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { min, isEqual } from 'lodash4';
+import { min, isEqual } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { L, KibanaMapLayer, MapTypes } from '../../maps_legacy/public';
 import { HeatmapMarkers } from './markers/heatmap';
diff --git a/src/plugins/tile_map/public/markers/heatmap.js b/src/plugins/tile_map/public/markers/heatmap.js
index 43379fa53470c73..f2d014797bce033 100644
--- a/src/plugins/tile_map/public/markers/heatmap.js
+++ b/src/plugins/tile_map/public/markers/heatmap.js
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import _ from 'lodash4';
+import _ from 'lodash';
 import d3 from 'd3';
 import { EventEmitter } from 'events';
 import { L } from '../../../maps_legacy/public';
diff --git a/src/plugins/tile_map/public/markers/scaled_circles.js b/src/plugins/tile_map/public/markers/scaled_circles.js
index 6bd1f5b06743806..cb111107f6fe3be 100644
--- a/src/plugins/tile_map/public/markers/scaled_circles.js
+++ b/src/plugins/tile_map/public/markers/scaled_circles.js
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import _ from 'lodash4';
+import _ from 'lodash';
 import d3 from 'd3';
 import $ from 'jquery';
 import { EventEmitter } from 'events';
diff --git a/src/plugins/tile_map/public/markers/shaded_circles.js b/src/plugins/tile_map/public/markers/shaded_circles.js
index 24020cb1ecdf63f..745d0422856c687 100644
--- a/src/plugins/tile_map/public/markers/shaded_circles.js
+++ b/src/plugins/tile_map/public/markers/shaded_circles.js
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import _ from 'lodash4';
+import _ from 'lodash';
 import { ScaledCirclesMarkers } from './scaled_circles';
 import { L } from '../../../maps_legacy/public';
 
diff --git a/src/plugins/tile_map/public/tile_map_visualization.js b/src/plugins/tile_map/public/tile_map_visualization.js
index 84104b52b82bd3d..1f4e5f09a9aa452 100644
--- a/src/plugins/tile_map/public/tile_map_visualization.js
+++ b/src/plugins/tile_map/public/tile_map_visualization.js
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { get } from 'lodash4';
+import { get } from 'lodash';
 import { GeohashLayer } from './geohash_layer';
 import { getFormatService, getQueryService } from './services';
 import { scaleBounds, geoContains, mapTooltipProvider } from '../../maps_legacy/public';
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 82cceb04a687f1e..74e9ef96b575b97 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
@@ -19,7 +19,7 @@
 
 import * as React from 'react';
 import { EuiContextMenuPanelDescriptor, EuiContextMenuPanelItemDescriptor } from '@elastic/eui';
-import _ from 'lodash4';
+import _ from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { uiToReactComponent } from '../../../kibana_react/public';
 import { Action } from '../actions';
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 4cf1601713fee97..ced5206cee318db 100644
--- a/src/plugins/usage_collection/server/collector/collector_set.test.ts
+++ b/src/plugins/usage_collection/server/collector/collector_set.test.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { noop } from 'lodash4';
+import { noop } from 'lodash';
 import { Collector } from './collector';
 import { CollectorSet } from './collector_set';
 import { UsageCollector } from './usage_collector';
diff --git a/src/plugins/usage_collection/server/collector/collector_set.ts b/src/plugins/usage_collection/server/collector/collector_set.ts
index 12f354509b76434..e8791138c5e2659 100644
--- a/src/plugins/usage_collection/server/collector/collector_set.ts
+++ b/src/plugins/usage_collection/server/collector/collector_set.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { snakeCase } from 'lodash4';
+import { snakeCase } from 'lodash';
 import { Logger, APICaller } from 'kibana/server';
 import { Collector, CollectorOptions } from './collector';
 import { UsageCollector } from './usage_collector';