From 137055c5fed2fc52bb26547e0bc1ad2e3d4fe309 Mon Sep 17 00:00:00 2001 From: Tiago Costa Date: Wed, 24 Jun 2020 02:01:30 +0100 Subject: [PATCH] chore(NA): upgrade usage_collection, ui_actions, tile_map, telemtry, share, saved_objects, saved_objects_management, region_map and navigation to lodash4 --- .../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 3a05ce59f5d1347..5f1f8331a99a37b 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 { capitalize, isFunction } from 'lodash'; +import { upperFirst, isFunction } from 'lodash4'; import React, { MouseEvent } from 'react'; import { EuiButtonEmpty, EuiToolTip } from '@elastic/eui'; @@ -50,11 +50,11 @@ export function TopNavMenuItem(props: TopNavMenuData) { const btn = props.emphasize ? ( - {capitalize(props.label || props.id!)} + {upperFirst(props.label || props.id!)} ) : ( - {capitalize(props.label || props.id!)} + {upperFirst(props.label || props.id!)} ); 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 3dcfc7c2fc6fae1..d694b045aac1d9e 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 'lodash'; +import _ from 'lodash4'; 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 30fa8b544cdec3c..3fd9e246e9d37fc 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 'lodash'; +import _ from 'lodash4'; 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 8a644a718c9d309..8f624c627217447 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('lodash', () => ({ +jest.mock('lodash4', () => ({ 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 9ef4f2fbe7c55ae..28b552604b06658 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 'lodash'; +import _ from 'lodash4'; 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 47390c7dc9104a6..0b9d973dc9f24aa 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 'lodash'; +import _ from 'lodash4'; 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 fdc8d79c9428aac..b604f2e8b5f89c4 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 'lodash'; +import { once } from 'lodash4'; 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 25ed4d527b83395..4d6da734fd0a8b3 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 'lodash'; +import _ from 'lodash4'; 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 ae8d7ac8a6526d6..efd772edce292a6 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 'lodash'; +import _ from 'lodash4'; 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 b413ea19a932d74..255bb6786786a47 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 'lodash'; +import { get } from 'lodash4'; 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 24e467ad18ac4bd..0afb985425b81e4 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 'lodash'; +import _ from 'lodash4'; 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 718530eb3b60222..654cbffee28c875 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 'lodash'; +import { mapKeys, camelCase } from 'lodash4'; export function keysToCamelCaseShallow(object: Record) { 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 5f424751dd58eaf..902f077761d18a0 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, indexBy, isNumber, isBoolean, isPlainObject, isString } from 'lodash'; +import { forOwn, keyBy, isNumber, isBoolean, isPlainObject, isString } from 'lodash4'; 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; searchSource: any }, fields: ObjectField[] ) { - const fieldMap = indexBy(fields, 'name'); + const fieldMap = keyBy(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 bf2e651aa6593cb..a2ba11ce0bc84b1 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 'lodash'; +import { get } from 'lodash4'; 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 c7bc6c26a378ff4..525e5c1845ea2f1 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 'lodash'; +import { isNaN } from 'lodash4'; 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 79b8c33b84cfeea..7fb86afede6997f 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 'lodash'; +import { cloneDeep } from 'lodash4'; 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 d273ffb4c1052cb..769d1d69a06c31b 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 'lodash'; +import { cloneDeep, set } from 'lodash4'; 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 6e7397d1058bf85..8884f23e5035a3d 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 'lodash'; +import { take, get as getField } from 'lodash4'; 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 6b4659a6b5a13e0..7bdc65b1e73dd02 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('lodash', () => ({ - ...jest.requireActual('lodash'), +jest.doMock('lodash4', () => ({ + ...jest.requireActual('lodash4'), 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 54bc649c33b60b8..ba02aa9c50236d8 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 'lodash'; +import { debounce } from 'lodash4'; // @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 75692777f08bbb5..5ba73bd32b8f777 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 'lodash'; +import { get } from 'lodash4'; 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) : false; + return inAppUrl ? (get(capabilities, inAppUrl.uiCapabilitiesPath) as any) : 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 2515d11f6d4bbdb..04d7c3ca7934a30 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 'lodash'; +import { times } from 'lodash4'; 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 2f120bbc03cd73c..fe61855f97ce6e7 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 'lodash'; +import { trim } from 'lodash4'; 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 a858b7c54ac4faa..0a3983972fee7e9 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 'lodash'; +import { get } from 'lodash4'; 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 3103777179741d4..7f2f8fa1d3ff44f 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 { SavedObjectMigrationFn, SavedObjectsType } from 'kibana/server'; -import { flow } from 'lodash'; +import { SavedObjectsType } from 'kibana/server'; +import { flow } from 'lodash4'; 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(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 29076537e9ae88e..d44bd16b1b43c63 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 'lodash'; +import { omit } from 'lodash4'; 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 645c5a4be8a6cbb..a8681c987f99447 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 'lodash'; +import { omit } from 'lodash4'; 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 b41ea6955663bed..157c5488383236b 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 'lodash'; +import _ from 'lodash4'; /** * 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 ca2f49a1f31e00e..b6cdbd988fc2b0d 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 'lodash'; +import { min, isEqual } from 'lodash4'; 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 f2d014797bce033..43379fa53470c73 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 'lodash'; +import _ from 'lodash4'; 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 cb111107f6fe3be..6bd1f5b06743806 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 'lodash'; +import _ from 'lodash4'; 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 745d0422856c687..24020cb1ecdf63f 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 'lodash'; +import _ from 'lodash4'; 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 1f4e5f09a9aa452..84104b52b82bd3d 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 'lodash'; +import { get } from 'lodash4'; 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 74e9ef96b575b97..82cceb04a687f1e 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 'lodash'; +import _ from 'lodash4'; 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 ced5206cee318db..4cf1601713fee97 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 'lodash'; +import { noop } from 'lodash4'; 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 e8791138c5e2659..12f354509b76434 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 'lodash'; +import { snakeCase } from 'lodash4'; import { Logger, APICaller } from 'kibana/server'; import { Collector, CollectorOptions } from './collector'; import { UsageCollector } from './usage_collector';