Kepler.gl is a powerful open source geospatial analysis tool for large-scale data sets.
[Chore] drop lodash per-method packages in favor of the main lodash (#3065)
Wu Ying Yinga6104eafe2bc
diff --git a/examples/demo-app/src/app.tsx b/examples/demo-app/src/app.tsxindex d48e89a1c..a94ae069a 100644--- a/examples/demo-app/src/app.tsx+++ b/examples/demo-app/src/app.tsx@@ -6,8 +6,8 @@ import AutoSizer from 'react-virtualized/dist/commonjs/AutoSizer';import styled, {ThemeProvider, StyleSheetManager} from 'styled-components';import Window from 'global/window';import {connect, useDispatch} from 'react-redux';-import cloneDeep from 'lodash.clonedeep';-import isEqual from 'lodash.isequal';+import cloneDeep from 'lodash/cloneDeep';+import isEqual from 'lodash/isEqual';import isPropValid from '@emotion/is-prop-valid';import {ScreenshotWrapper} from '@openassistant/ui';diff --git a/src/actions/package.json b/src/actions/package.jsonindex 9638ec067..9977672c6 100644--- a/src/actions/package.json+++ b/src/actions/package.json@@ -39,10 +39,10 @@"@kepler.gl/types": "3.1.3","@kepler.gl/utils": "3.1.3","@reduxjs/toolkit": "^1.7.2",- "@types/lodash.curry": "^4.1.7",+ "@types/lodash": "4.17.5","@types/react-redux": "^7.1.23","@types/redux-actions": "^2.6.2",- "lodash.curry": "^4.1.1",+ "lodash": "4.17.21","react-palm": "^3.3.8","react-redux": "^8.0.5","redux": "^4.2.1",diff --git a/src/actions/src/action-wrapper.ts b/src/actions/src/action-wrapper.tsindex 0eacd6695..f571838c5 100644--- a/src/actions/src/action-wrapper.ts+++ b/src/actions/src/action-wrapper.ts@@ -6,7 +6,7 @@ export const ADDRESS_PREFIX = '@@KG_';import {Dispatch} from 'redux';import {ActionTypes} from './action-types';-import curry from 'lodash.curry';+import curry from 'lodash/curry';interface IKeplerGlAction {type: (typeof ActionTypes)[keyof typeof ActionTypes];diff --git a/src/components/package.json b/src/components/package.jsonindex a0d67904a..a27104287 100644--- a/src/components/package.json+++ b/src/components/package.json@@ -63,14 +63,7 @@"@types/d3-scale": "^3.2.2","@types/d3-selection": "^3.0.2","@types/exenv": "^1.2.0",- "@types/lodash.debounce": "^4.0.7",- "@types/lodash.get": "^4.4.6",- "@types/lodash.isequal": "^4.5.5",- "@types/lodash.memoize": "^4.1.7",- "@types/lodash.pick": "^4.4.6",- "@types/lodash.throttle": "^4.1.7",- "@types/lodash.uniq": "^4.5.7",- "@types/lodash.uniqby": "^4.7.7",+ "@types/lodash": "4.17.5","@types/react": "^18.0.28","@types/react-copy-to-clipboard": "^5.0.2","@types/react-dom": "^18.0.11",@@ -93,14 +86,7 @@"exenv": "^1.2.2","fuzzy": "^0.1.3","global": "^4.3.0",- "lodash.debounce": "^4.0.8",- "lodash.get": "^4.4.2",- "lodash.isequal": "^4.5.0",- "lodash.memoize": "^4.1.2",- "lodash.pick": "^4.4.0",- "lodash.throttle": "^4.1.1",- "lodash.uniq": "^4.0.1",- "lodash.uniqby": "^4.7.0",+ "lodash": "4.17.21","mapbox-gl": "1.13.1","maplibre-gl": "^3.6.2","markdown-to-jsx": "^7.7.6",diff --git a/src/components/src/common/checkbox.tsx b/src/components/src/common/checkbox.tsxindex fcfa00c27..fd46ee329 100644--- a/src/components/src/common/checkbox.tsx+++ b/src/components/src/common/checkbox.tsx@@ -2,7 +2,7 @@// Copyright contributors to the kepler.gl projectimport classnames from 'classnames';-import pick from 'lodash.pick';+import pick from 'lodash/pick';import React, {ChangeEventHandler, Component, FocusEventHandler, ReactNode} from 'react';import styled from 'styled-components';import {shouldForwardProp} from './styled-components';diff --git a/src/components/src/common/data-table/grid.tsx b/src/components/src/common/data-table/grid.tsxindex 37b928d02..82bf6fb7f 100644--- a/src/components/src/common/data-table/grid.tsx+++ b/src/components/src/common/data-table/grid.tsx@@ -3,7 +3,7 @@import React, {PureComponent} from 'react';import {Grid, GridProps} from 'react-virtualized';-import isEqual from 'lodash.isequal';+import isEqual from 'lodash/isEqual';export default class GridHack extends PureComponent<GridProps> {grid: Grid | null = null;diff --git a/src/components/src/common/data-table/index.tsx b/src/components/src/common/data-table/index.tsxindex 4a034cb0d..1c1be0957 100644--- a/src/components/src/common/data-table/index.tsx+++ b/src/components/src/common/data-table/index.tsx@@ -6,8 +6,8 @@ import {ScrollSync, AutoSizer, OnScrollParams, GridProps, Index} from 'react-virimport styled, {withTheme} from 'styled-components';import classnames from 'classnames';import {createSelector} from 'reselect';-import get from 'lodash.get';-import debounce from 'lodash.debounce';+import get from 'lodash/get';+import debounce from 'lodash/debounce';import {ArrowDown} from '../icons';import {CellSizeCache} from './cell-size';diff --git a/src/components/src/common/item-selector/item-selector.tsx b/src/components/src/common/item-selector/item-selector.tsxindex c6d9ebaea..16d5907b1 100644--- a/src/components/src/common/item-selector/item-selector.tsx+++ b/src/components/src/common/item-selector/item-selector.tsx@@ -3,7 +3,7 @@import React, {Component, createRef, ComponentType, MouseEventHandler, RefObject} from 'react';import classnames from 'classnames';-import uniqBy from 'lodash.uniqby';+import uniqBy from 'lodash/uniqBy';import styled, {IStyledComponent} from 'styled-components';import Accessor from './accessor';diff --git a/src/components/src/common/portaled.tsx b/src/components/src/common/portaled.tsxindex 6d00febf2..3b0352c1a 100644--- a/src/components/src/common/portaled.tsx+++ b/src/components/src/common/portaled.tsx@@ -2,8 +2,8 @@// Copyright contributors to the kepler.gl projectimport React, {Component, createRef, PropsWithChildren} from 'react';-import debounce from 'lodash.debounce';-import isEqual from 'lodash.isequal';+import debounce from 'lodash/debounce';+import isEqual from 'lodash/isEqual';import {canUseDOM} from 'exenv';import {withTheme} from 'styled-components';diff --git a/src/components/src/common/time-range-slider.tsx b/src/components/src/common/time-range-slider.tsxindex da7eb3dc0..140eadad5 100644--- a/src/components/src/common/time-range-slider.tsx+++ b/src/components/src/common/time-range-slider.tsx@@ -2,7 +2,7 @@// Copyright contributors to the kepler.gl projectimport React, {useMemo} from 'react';-import throttle from 'lodash.throttle';+import throttle from 'lodash/throttle';import styled, {IStyledComponent} from 'styled-components';import RangeSliderFactory from './range-slider';diff --git a/src/components/src/common/timeline-slider.tsx b/src/components/src/common/timeline-slider.tsxindex 16de3b6b7..3febc95d0 100644--- a/src/components/src/common/timeline-slider.tsx+++ b/src/components/src/common/timeline-slider.tsx@@ -3,7 +3,7 @@import React, {useMemo} from 'react';import styled, {IStyledComponent} from 'styled-components';-import throttle from 'lodash.throttle';+import throttle from 'lodash/throttle';import classnames from 'classnames';import {clamp, datetimeFormatter} from '@kepler.gl/utils';import {media} from '@kepler.gl/styles';diff --git a/src/components/src/editor/editor.tsx b/src/components/src/editor/editor.tsxindex cfb7ce2ec..7ea295dd0 100644--- a/src/components/src/editor/editor.tsx+++ b/src/components/src/editor/editor.tsx@@ -6,7 +6,7 @@ import {createPortal} from 'react-dom';import styled from 'styled-components';import Window from 'global/window';import classnames from 'classnames';-import get from 'lodash.get';+import get from 'lodash/get';import {createSelector} from 'reselect';import FeatureActionPanelFactory, {FeatureActionPanelProps} from './feature-action-panel';import {diff --git a/src/components/src/filters/filter-panels/polygon-filter-panel.tsx b/src/components/src/filters/filter-panels/polygon-filter-panel.tsxindex 7d7328b0f..96544795b 100644--- a/src/components/src/filters/filter-panels/polygon-filter-panel.tsx+++ b/src/components/src/filters/filter-panels/polygon-filter-panel.tsx@@ -10,7 +10,7 @@ import {EyeSeen, EyeUnseen} from '../../common/icons';import FilterPanelHeaderFactory from '../../side-panel/filter-panel/filter-panel-header';import {StyledFilterPanel} from '../components';-import get from 'lodash.get';+import get from 'lodash/get';import {PolygonFilterPanelComponent} from './types';import {KeplerTable} from '@kepler.gl/table';diff --git a/src/components/src/map-container.tsx b/src/components/src/map-container.tsxindex 518d708b1..a3b2a16c6 100644--- a/src/components/src/map-container.tsx+++ b/src/components/src/map-container.tsx@@ -9,7 +9,7 @@ import {PickInfo} from '@deck.gl/core/lib/deck';import DeckGL from '@deck.gl/react';import {createSelector, Selector} from 'reselect';import {useDroppable} from '@dnd-kit/core';-import debounce from 'lodash.debounce';+import debounce from 'lodash/debounce';import {VisStateActions, MapStateActions, UIStateActions} from '@kepler.gl/actions';diff --git a/src/components/src/map-view-state-context.tsx b/src/components/src/map-view-state-context.tsxindex 77f95e431..da77ec746 100644--- a/src/components/src/map-view-state-context.tsx+++ b/src/components/src/map-view-state-context.tsx@@ -2,8 +2,8 @@// Copyright contributors to the kepler.gl projectimport React, {useState, useEffect, createContext} from 'react';-import isEqual from 'lodash.isequal';-import pick from 'lodash.pick';+import isEqual from 'lodash/isEqual';+import pick from 'lodash/pick';import {MapViewState} from '@deck.gl/core/typed';import {pickViewportPropsFromMapState} from '@kepler.gl/reducers';diff --git a/src/components/src/modal-container.tsx b/src/components/src/modal-container.tsxindex a02e3bec9..9f8643a41 100644--- a/src/components/src/modal-container.tsx+++ b/src/components/src/modal-container.tsx@@ -3,7 +3,7 @@import React, {Component} from 'react';import {css} from 'styled-components';-import get from 'lodash.get';+import get from 'lodash/get';import document from 'global/document';import {ALL_FIELD_TYPES} from '@kepler.gl/constants';diff --git a/src/components/src/modals/image-modal-container.tsx b/src/components/src/modals/image-modal-container.tsxindex 53a2fcac2..2f88ea1c6 100644--- a/src/components/src/modals/image-modal-container.tsx+++ b/src/components/src/modals/image-modal-container.tsx@@ -2,7 +2,7 @@// Copyright contributors to the kepler.gl projectimport React, {useEffect} from 'react';-import get from 'lodash.get';+import get from 'lodash/get';import {MAP_THUMBNAIL_DIMENSION, EXPORT_IMG_RATIOS} from '@kepler.gl/constants';import {SetExportImageSettingUpdaterAction} from '@kepler.gl/actions';diff --git a/src/components/src/modals/load-data-modal.tsx b/src/components/src/modals/load-data-modal.tsxindex 7fb9148a2..4ba123417 100644--- a/src/components/src/modals/load-data-modal.tsx+++ b/src/components/src/modals/load-data-modal.tsx@@ -3,7 +3,7 @@import React, {useState} from 'react';import styled from 'styled-components';-import get from 'lodash.get';+import get from 'lodash/get';import {IntlShape, useIntl} from 'react-intl';import FileUploadFactory from '../common/file-uploader/file-upload';diff --git a/src/components/src/plot-container.tsx b/src/components/src/plot-container.tsxindex ce6591087..4d519ff04 100644--- a/src/components/src/plot-container.tsx+++ b/src/components/src/plot-container.tsx@@ -6,7 +6,7 @@ import React, {Component, createRef} from 'react';import {createSelector} from 'reselect';import styled from 'styled-components';import {Map} from 'react-map-gl';-import debounce from 'lodash.debounce';+import debounce from 'lodash/debounce';import {exportImageError,scaleMapStyleByResolution,diff --git a/src/components/src/side-panel/filter-panel/filter-panel.tsx b/src/components/src/side-panel/filter-panel/filter-panel.tsxindex 9505e55c7..703749a0a 100644--- a/src/components/src/side-panel/filter-panel/filter-panel.tsx+++ b/src/components/src/side-panel/filter-panel/filter-panel.tsx@@ -4,7 +4,7 @@import React, {Component} from 'react';import {createSelector} from 'reselect';import styled from 'styled-components';-import get from 'lodash.get';+import get from 'lodash/get';import {ALL_FIELD_TYPES, FILTER_TYPES} from '@kepler.gl/constants';import NewFilterPanelFactory from '../../filters/filter-panels/new-filter-panel';diff --git a/src/components/src/side-panel/layer-panel/custom-palette.tsx b/src/components/src/side-panel/layer-panel/custom-palette.tsxindex e08200676..1792ae2c6 100644--- a/src/components/src/side-panel/layer-panel/custom-palette.tsx+++ b/src/components/src/side-panel/layer-panel/custom-palette.tsx@@ -11,7 +11,7 @@ import React, {useRef,useState} from 'react';-import uniq from 'lodash.uniq';+import uniq from 'lodash/uniq';import {SortableContainer,SortableContainerProps,diff --git a/src/deckgl-layers/package.json b/src/deckgl-layers/package.jsonindex 3e45f3e7f..a08b0416f 100644--- a/src/deckgl-layers/package.json+++ b/src/deckgl-layers/package.json@@ -44,12 +44,11 @@"@mapbox/vector-tile": "^1.3.1","@types/d3-array": "^2.8.0","@types/geojson": "^7946.0.8",- "@types/lodash.memoize": "^4.1.7",+ "@types/lodash": "4.17.5","@types/supercluster": "^7.1.0","d3-array": "^2.8.0","global": "^4.3.0","lodash": "4.17.21",- "lodash.memoize": "^4.1.2","pbf": "^3.1.0","supercluster": "^7.1.0","viewport-mercator-project": "^6.0.0"diff --git a/src/deckgl-layers/src/layer-utils/cluster-utils.ts b/src/deckgl-layers/src/layer-utils/cluster-utils.tsindex d5cef4542..68d9ce46a 100644--- a/src/deckgl-layers/src/layer-utils/cluster-utils.ts+++ b/src/deckgl-layers/src/layer-utils/cluster-utils.ts@@ -2,7 +2,7 @@// Copyright contributors to the kepler.gl projectimport Supercluster from 'supercluster';-import memoize from 'lodash.memoize';+import memoize from 'lodash/memoize';import {MemoizedFunction} from 'lodash';import {BBox, Position} from 'geojson';diff --git a/src/duckdb/src/components/monaco-editor.tsx b/src/duckdb/src/components/monaco-editor.tsxindex b2367d800..eccbb65a2 100644--- a/src/duckdb/src/components/monaco-editor.tsx+++ b/src/duckdb/src/components/monaco-editor.tsx@@ -5,8 +5,8 @@ import React, {useCallback, useMemo, useRef} from 'react';import Editor, {OnChange, OnMount} from '@monaco-editor/react';import * as monaco from 'monaco-editor';// import {tableSchema as DEFAULT_SCHEMA} from './table-schema';-import uniq from 'lodash.uniq';-import uniqBy from 'lodash.uniqby';+import uniq from 'lodash/uniq';+import uniqBy from 'lodash/uniqBy';const MONACO_OPTIONS: monaco.editor.IStandaloneEditorConstructionOptions = {minimap: {enabled: false},diff --git a/src/layers/package.json b/src/layers/package.jsonindex 1bd7335d0..1e7d76ab2 100644--- a/src/layers/package.json+++ b/src/layers/package.json@@ -63,8 +63,7 @@"@turf/helpers": "^6.1.4","@types/geojson": "^7946.0.8","@types/keymirror": "^0.1.1",- "@types/lodash.memoize": "^4.1.7",- "@types/lodash.uniq": "^4.5.7",+ "@types/lodash": "4.17.5","@types/styled-components": "^5.1.32","apache-arrow": ">=15.0.0","buffer": "6.0.3",@@ -72,9 +71,7 @@"d3-shape": "^1.2.0","global": "^4.3.0","keymirror": "^0.1.1",- "lodash.memoize": "^4.1.2",- "lodash.throttle": "^4.1.1",- "lodash.uniq": "^4.0.1",+ "lodash": "4.17.21","long": "^4.0.0","markdown-to-jsx": "^7.7.6","prop-types": "^15.6.0",diff --git a/src/layers/src/aggregation-layer.ts b/src/layers/src/aggregation-layer.tsindex d8b757a3c..288b9f00c 100644--- a/src/layers/src/aggregation-layer.ts+++ b/src/layers/src/aggregation-layer.ts@@ -1,7 +1,7 @@// SPDX-License-Identifier: MIT// Copyright contributors to the kepler.gl project-import memoize from 'lodash.memoize';+import memoize from 'lodash/memoize';import Layer, {LayerBaseConfig,LayerBaseConfigPartial,diff --git a/src/layers/src/base-layer.ts b/src/layers/src/base-layer.tsindex 5d555731d..9b8324ab3 100644--- a/src/layers/src/base-layer.ts+++ b/src/layers/src/base-layer.ts@@ -78,7 +78,7 @@ import {getCategoricalColorScale,updateCustomColorRangeByColorUI} from '@kepler.gl/utils';-import memoize from 'lodash.memoize';+import memoize from 'lodash/memoize';import {initializeCustomPalette,isDomainQuantile,diff --git a/src/layers/src/geojson-layer/geojson-layer.ts b/src/layers/src/geojson-layer/geojson-layer.tsindex 478cb23d3..9d5a20a8d 100644--- a/src/layers/src/geojson-layer/geojson-layer.ts+++ b/src/layers/src/geojson-layer/geojson-layer.ts@@ -5,7 +5,7 @@ import * as arrow from 'apache-arrow';import {point as turfPoint} from '@turf/helpers';import booleanWithin from '@turf/boolean-within';import {Feature, Polygon} from 'geojson';-import uniq from 'lodash.uniq';+import uniq from 'lodash/uniq';import {DATA_TYPES} from 'type-analyzer';import Layer, {colorMaker,diff --git a/src/layers/src/layer-text-label.ts b/src/layers/src/layer-text-label.tsindex d9e81a76e..ebbeee7b6 100644--- a/src/layers/src/layer-text-label.ts+++ b/src/layers/src/layer-text-label.ts@@ -5,7 +5,7 @@ import * as arrow from 'apache-arrow';import {getDistanceScales} from 'viewport-mercator-project';import {DataContainerInterface, ArrowDataContainer} from '@kepler.gl/utils';import {notNullorUndefined} from '@kepler.gl/common-utils';-import uniq from 'lodash.uniq';+import uniq from 'lodash/uniq';export const defaultPadding = 20;diff --git a/src/layers/src/trip-layer/trip-layer.ts b/src/layers/src/trip-layer/trip-layer.tsindex b84427934..63ee82f15 100644--- a/src/layers/src/trip-layer/trip-layer.ts+++ b/src/layers/src/trip-layer/trip-layer.ts@@ -1,8 +1,8 @@// SPDX-License-Identifier: MIT// Copyright contributors to the kepler.gl project-import memoize from 'lodash.memoize';-import uniq from 'lodash.uniq';+import memoize from 'lodash/memoize';+import uniq from 'lodash/uniq';import Layer, {LayerBaseConfig, defaultGetFieldValue} from '../base-layer';import {TripsLayer as DeckGLTripsLayer} from '@deck.gl/geo-layers';diff --git a/src/layers/src/vector-tile/abstract-tile-layer.ts b/src/layers/src/vector-tile/abstract-tile-layer.tsindex a975ae1fe..92b969ce0 100644--- a/src/layers/src/vector-tile/abstract-tile-layer.ts+++ b/src/layers/src/vector-tile/abstract-tile-layer.ts@@ -1,7 +1,7 @@// SPDX-License-Identifier: MIT// Copyright contributors to the kepler.gl project-import throttle from 'lodash.throttle';+import throttle from 'lodash/throttle';import {notNullorUndefined} from '@kepler.gl/common-utils';import {SCALE_TYPES, ALL_FIELD_TYPES, LAYER_VIS_CONFIGS} from '@kepler.gl/constants';diff --git a/src/reducers/package.json b/src/reducers/package.jsonindex 5fb861f45..dd9a6f2a6 100644--- a/src/reducers/package.json+++ b/src/reducers/package.json@@ -51,33 +51,19 @@"@turf/bbox": "^6.0.1","@turf/bbox-polygon": "^6.0.1","@turf/boolean-within": "^6.0.1",- "@types/lodash.clonedeep": "^4.5.7",- "@types/lodash.flattendeep": "^4.4.7",- "@types/lodash.get": "^4.4.6",- "@types/lodash.pick": "^4.4.6",- "@types/lodash.uniq": "^4.5.7",- "@types/lodash.xor": "^4.5.7",+ "@types/lodash": "4.17.5","@types/redux-actions": "^2.6.2","copy-to-clipboard": "^3.3.1","d3-color": "^2.0.0","d3-dsv": "^2.0.0","deepmerge": "^4.2.2","global": "^4.3.0",- "lodash.clonedeep": "^4.0.1",- "lodash.flattendeep": "^4.2.0",- "lodash.get": "^4.4.2",- "lodash.isequal": "^4.5.0",- "lodash.pick": "^4.4.0",- "lodash.uniq": "^4.0.1",- "lodash.xor": "^4.5.0",+ "lodash": "4.17.21","react-palm": "^3.3.8","redux": "^4.2.1","redux-actions": "^2.2.1","reselect": "^4.1.0"},- "overrides": {- "@types/lodash": "4.17.5"- },"nyc": {"sourceMap": false,"instrument": falsediff --git a/src/reducers/src/map-state-updaters.ts b/src/reducers/src/map-state-updaters.tsindex 5e0f6511d..5c4dddeaa 100644--- a/src/reducers/src/map-state-updaters.ts+++ b/src/reducers/src/map-state-updaters.ts@@ -6,7 +6,7 @@ import booleanWithin from '@turf/boolean-within';import bboxPolygon from '@turf/bbox-polygon';import {fitBounds} from '@math.gl/web-mercator';import deepmerge from 'deepmerge';-import pick from 'lodash.pick';+import pick from 'lodash/pick';import {getCenterAndZoomFromBounds,diff --git a/src/reducers/src/map-style-updaters.ts b/src/reducers/src/map-style-updaters.tsindex 1e0798f9e..3fa8175de 100644--- a/src/reducers/src/map-style-updaters.ts+++ b/src/reducers/src/map-style-updaters.ts@@ -2,7 +2,7 @@// Copyright contributors to the kepler.gl projectimport Task, {withTask} from 'react-palm/tasks';-import cloneDeep from 'lodash.clonedeep';+import cloneDeep from 'lodash/cloneDeep';import Console from 'global/console';// Utilsdiff --git a/src/reducers/src/vis-state-merger.ts b/src/reducers/src/vis-state-merger.tsindex c5f86f1b3..fe903b38d 100644--- a/src/reducers/src/vis-state-merger.ts+++ b/src/reducers/src/vis-state-merger.ts@@ -1,9 +1,9 @@// SPDX-License-Identifier: MIT// Copyright contributors to the kepler.gl project-import uniq from 'lodash.uniq';-import pick from 'lodash.pick';-import flattenDeep from 'lodash.flattendeep';+import uniq from 'lodash/uniq';+import pick from 'lodash/pick';+import flattenDeep from 'lodash/flattenDeep';import deepmerge from 'deepmerge';import {arrayInsert,diff --git a/src/reducers/src/vis-state-updaters.ts b/src/reducers/src/vis-state-updaters.tsindex 122f400b3..c8e0118f0 100644--- a/src/reducers/src/vis-state-updaters.ts+++ b/src/reducers/src/vis-state-updaters.ts@@ -5,12 +5,12 @@ import bbox from '@turf/bbox';import copy from 'copy-to-clipboard';import deepmerge from 'deepmerge';import {console as Console} from 'global/window';-import cloneDeep from 'lodash.clonedeep';-import get from 'lodash.get';-import isEqual from 'lodash.isequal';-import pick from 'lodash.pick';-import uniq from 'lodash.uniq';-import xor from 'lodash.xor';+import cloneDeep from 'lodash/cloneDeep';+import get from 'lodash/get';+import isEqual from 'lodash/isEqual';+import pick from 'lodash/pick';+import uniq from 'lodash/uniq';+import xor from 'lodash/xor';import Task, {disableStackCapturing, withTask} from 'react-palm/tasks';// Tasksimport {diff --git a/src/schemas/package.json b/src/schemas/package.jsonindex c854a5592..d7a99573b 100644--- a/src/schemas/package.json+++ b/src/schemas/package.json@@ -38,13 +38,11 @@"@kepler.gl/utils": "3.1.3","@loaders.gl/loader-utils": "^4.3.2","@types/keymirror": "^0.1.1",- "@types/lodash.clonedeep": "^4.5.7",- "@types/lodash.pick": "^4.4.6",+ "@types/lodash": "4.17.5","apache-arrow": ">=15.0.0","global": "^4.3.0","keymirror": "^0.1.1",- "lodash.clonedeep": "^4.0.1",- "lodash.pick": "^4.4.0"+ "lodash": "4.17.21"},"nyc": {"sourceMap": false,diff --git a/src/schemas/src/dataset-schema.ts b/src/schemas/src/dataset-schema.tsindex 3dfe9e643..d46b85595 100644--- a/src/schemas/src/dataset-schema.ts+++ b/src/schemas/src/dataset-schema.ts@@ -1,7 +1,7 @@// SPDX-License-Identifier: MIT// Copyright contributors to the kepler.gl project-import pick from 'lodash.pick';+import pick from 'lodash/pick';import {console as globalConsole} from 'global/window';import * as arrow from 'apache-arrow';diff --git a/src/schemas/src/vis-state-schema.ts b/src/schemas/src/vis-state-schema.tsindex f5100925b..f67f819e7 100644--- a/src/schemas/src/vis-state-schema.ts+++ b/src/schemas/src/vis-state-schema.ts@@ -1,13 +1,13 @@// SPDX-License-Identifier: MIT// Copyright contributors to the kepler.gl project-import pick from 'lodash.pick';+import pick from 'lodash/pick';import {VERSIONS} from './versions';import {LAYER_VIS_CONFIGS, FILTER_VIEW_TYPES} from '@kepler.gl/constants';import {colorRangeBackwardCompatibility, isFilterValidToSave, findById} from '@kepler.gl/utils';import {notNullorUndefined} from '@kepler.gl/common-utils';import Schema from './schema';-import cloneDeep from 'lodash.clonedeep';+import cloneDeep from 'lodash/cloneDeep';import {AddDataToMapOptions,AnimationConfig,diff --git a/src/table/package.json b/src/table/package.jsonindex d8316ab48..4da310112 100644--- a/src/table/package.json+++ b/src/table/package.json@@ -37,10 +37,10 @@"@loaders.gl/mvt": "^4.3.2","@loaders.gl/pmtiles": "^4.3.2","@types/d3-array": "^2.8.0",- "@types/lodash.uniq": "^4.5.7",+ "@types/lodash": "4.17.5","d3-array": "^2.8.0","global": "^4.3.0",- "lodash.uniq": "^4.0.1",+ "lodash": "4.17.21","moment": "^2.10.6","react-palm": "^3.3.8","type-analyzer": "0.4.0"diff --git a/src/table/src/dataset-utils.ts b/src/table/src/dataset-utils.tsindex 759566211..c11a9fb30 100644--- a/src/table/src/dataset-utils.ts+++ b/src/table/src/dataset-utils.ts@@ -1,7 +1,7 @@// SPDX-License-Identifier: MIT// Copyright contributors to the kepler.gl project-import uniq from 'lodash.uniq';+import uniq from 'lodash/uniq';import KeplerTable, {Datasets} from './kepler-table';import {ProtoDataset, RGBColor} from '@kepler.gl/types';import Task from 'react-palm/tasks';diff --git a/src/table/src/tileset/vector-tile-utils.ts b/src/table/src/tileset/vector-tile-utils.tsindex e7487d7aa..edc02fe4d 100644--- a/src/table/src/tileset/vector-tile-utils.ts+++ b/src/table/src/tileset/vector-tile-utils.ts@@ -4,7 +4,7 @@import {DATA_TYPES as ANALYZER_DATA_TYPES} from 'type-analyzer';import {ascending} from 'd3-array';import Console from 'global/console';-import uniq from 'lodash.uniq';+import uniq from 'lodash/uniq';import {DATA_TYPES} from 'type-analyzer';import {MVTSource, TileJSON} from '@loaders.gl/mvt';diff --git a/src/utils/package.json b/src/utils/package.jsonindex a04e9c1d3..0f80d4e4e 100644--- a/src/utils/package.json+++ b/src/utils/package.json@@ -42,11 +42,7 @@"@turf/helpers": "^6.1.4","@types/d3-array": "^2.8.0","@types/keymirror": "^0.1.1",- "@types/lodash.clonedeep": "^4.5.7",- "@types/lodash.get": "^4.4.6",- "@types/lodash.isequal": "^4.5.5",- "@types/lodash.memoize": "^4.1.7",- "@types/lodash.throttle": "^4.1.7",+ "@types/lodash": "4.17.5","apache-arrow": ">=15.0.0","d3-array": "^2.8.0","d3-color": "^2.0.0",@@ -56,11 +52,7 @@"global": "^4.3.0","h3-js": "^3.1.0","keymirror": "^0.1.1",- "lodash.clonedeep": "^4.0.1",- "lodash.get": "^4.4.2",- "lodash.isequal": "^4.5.0",- "lodash.memoize": "^4.1.2",- "lodash.throttle": "^4.1.1",+ "lodash": "4.17.21","mapbox-gl": "^1.13.1","maplibre-gl": "^3.6.2","maplibregl-mapbox-request-transformer": "^0.0.2",diff --git a/src/utils/src/data-scale-utils.ts b/src/utils/src/data-scale-utils.tsindex 0c7867c7d..c5e071faf 100644--- a/src/utils/src/data-scale-utils.ts+++ b/src/utils/src/data-scale-utils.ts@@ -2,7 +2,7 @@// Copyright contributors to the kepler.gl projectimport {bisectLeft, quantileSorted as d3Quantile, extent} from 'd3-array';-import uniq from 'lodash.uniq';+import uniq from 'lodash/uniq';import moment from 'moment';import {notNullorUndefined, toArray} from '@kepler.gl/common-utils';diff --git a/src/utils/src/effect-utils.ts b/src/utils/src/effect-utils.tsindex 9834f6329..c0bd7ac31 100644--- a/src/utils/src/effect-utils.ts+++ b/src/utils/src/effect-utils.ts@@ -2,7 +2,7 @@// Copyright contributors to the kepler.gl projectimport SunCalc from 'suncalc';-import cloneDeep from 'lodash.clonedeep';+import cloneDeep from 'lodash/cloneDeep';import {PostProcessEffect} from '@deck.gl/core/typed';diff --git a/src/utils/src/export-utils.ts b/src/utils/src/export-utils.tsindex 453c5cd11..29eb4fa80 100644--- a/src/utils/src/export-utils.ts+++ b/src/utils/src/export-utils.ts@@ -2,7 +2,7 @@// Copyright contributors to the kepler.gl projectimport {Blob, URL, atob, Uint8Array, ArrayBuffer, document} from 'global/window';-import get from 'lodash.get';+import get from 'lodash/get';import {EXPORT_IMG_RESOLUTION_OPTIONS,diff --git a/src/utils/src/filter-utils.ts b/src/utils/src/filter-utils.tsindex 0dda9bd4e..4b9531da3 100644--- a/src/utils/src/filter-utils.ts+++ b/src/utils/src/filter-utils.ts@@ -2,8 +2,8 @@// Copyright contributors to the kepler.gl projectimport keyMirror from 'keymirror';-import get from 'lodash.get';-import isEqual from 'lodash.isequal';+import get from 'lodash/get';+import isEqual from 'lodash/isEqual';import {ascending, extent} from 'd3-array';import booleanWithin from '@turf/boolean-within';diff --git a/src/utils/src/map-style-utils/mapbox-gl-style-editor.ts b/src/utils/src/map-style-utils/mapbox-gl-style-editor.tsindex ead8c7275..9c4c0d52b 100644--- a/src/utils/src/map-style-utils/mapbox-gl-style-editor.ts+++ b/src/utils/src/map-style-utils/mapbox-gl-style-editor.ts@@ -1,8 +1,8 @@// SPDX-License-Identifier: MIT// Copyright contributors to the kepler.gl project-import memoize from 'lodash.memoize';-import clondDeep from 'lodash.clonedeep';+import memoize from 'lodash/memoize';+import clondDeep from 'lodash/cloneDeep';import {DEFAULT_LAYER_GROUPS,DEFAULT_MAPBOX_API_URL,diff --git a/src/utils/src/observe-dimensions.ts b/src/utils/src/observe-dimensions.tsindex be92250f5..2602688f9 100644--- a/src/utils/src/observe-dimensions.ts+++ b/src/utils/src/observe-dimensions.ts@@ -1,7 +1,7 @@// SPDX-License-Identifier: MIT// Copyright contributors to the kepler.gl project-import throttle from 'lodash.throttle';+import throttle from 'lodash/throttle';import {useEffect, useRef, useState, RefObject} from 'react';import ResizeObserver from 'resize-observer-polyfill';diff --git a/src/utils/src/plot.ts b/src/utils/src/plot.tsindex a99c9fcf2..9b2383bab 100644--- a/src/utils/src/plot.ts+++ b/src/utils/src/plot.ts@@ -2,7 +2,7 @@// Copyright contributors to the kepler.gl projectimport {bisectLeft, extent, histogram as d3Histogram, ticks} from 'd3-array';-import isEqual from 'lodash.isequal';+import isEqual from 'lodash/isEqual';import {getFilterMappedValue, getInitialInterval, intervalToFunction} from './time';import moment from 'moment';import {diff --git a/src/utils/src/split-map-utils.ts b/src/utils/src/split-map-utils.tsindex d6dde0150..f9ee34527 100644--- a/src/utils/src/split-map-utils.ts+++ b/src/utils/src/split-map-utils.ts@@ -1,7 +1,7 @@// SPDX-License-Identifier: MIT// Copyright contributors to the kepler.gl project-import cloneDeep from 'lodash.clonedeep';+import cloneDeep from 'lodash/cloneDeep';/*** Add new layers to both existing mapsdiff --git a/test/browser/components/common/column-stats-chart-test.js b/test/browser/components/common/column-stats-chart-test.jsindex 14f98fd5d..12043be68 100644--- a/test/browser/components/common/column-stats-chart-test.js+++ b/test/browser/components/common/column-stats-chart-test.js@@ -16,7 +16,7 @@ import {import {keplerGlReducerCore as coreReducer} from '@kepler.gl/reducers';import {getLayerColorScale, getLegendOfScale} from '@kepler.gl/utils';import {scaleLinear} from 'd3-scale';-import cloneDeep from 'lodash.clonedeep';+import cloneDeep from 'lodash/cloneDeep';import React from 'react';import sinon from 'sinon';import test from 'tape';diff --git a/test/browser/components/map/map-legend-test.js b/test/browser/components/map/map-legend-test.jsindex 591c00d9b..2909bce6d 100644--- a/test/browser/components/map/map-legend-test.js+++ b/test/browser/components/map/map-legend-test.js@@ -5,7 +5,7 @@import React from 'react';import test from 'tape';import {mount} from 'enzyme';-import cloneDeep from 'lodash.clonedeep';+import cloneDeep from 'lodash/cloneDeep';import sinon from 'sinon';import {diff --git a/test/browser/components/modals/data-table-modal-test.js b/test/browser/components/modals/data-table-modal-test.jsindex 24e18991a..65267d8c5 100644--- a/test/browser/components/modals/data-table-modal-test.js+++ b/test/browser/components/modals/data-table-modal-test.js@@ -6,9 +6,9 @@ import {act} from 'react-dom/test-utils';import test from 'tape-catch';import global from 'global';import sinon from 'sinon';-import flatten from 'lodash.flattendeep';+import flatten from 'lodash/flattenDeep';import {IntlWrapper, mountWithTheme} from 'test/helpers/component-utils';-import CloneDeep from 'lodash.clonedeep';+import CloneDeep from 'lodash/cloneDeep';import {VisStateActions} from '@kepler.gl/actions';import {visStateReducer} from '@kepler.gl/reducers';diff --git a/test/browser/components/side-panel/channel-by-value-selctor-test.js b/test/browser/components/side-panel/channel-by-value-selctor-test.jsindex 9d7805ee9..de1b7bd71 100644--- a/test/browser/components/side-panel/channel-by-value-selctor-test.js+++ b/test/browser/components/side-panel/channel-by-value-selctor-test.js@@ -6,7 +6,7 @@import {layerColorUIChange, layerVisualChannelConfigChange} from '@kepler.gl/actions';import {keplerGlReducerCore as coreReducer} from '@kepler.gl/reducers';import {ColorBreaksDisplay} from '@kepler.gl/components';-import cloneDeep from 'lodash.clonedeep';+import cloneDeep from 'lodash/cloneDeep';import React from 'react';import sinon from 'sinon';import test from 'tape';diff --git a/test/browser/components/side-panel/color-selector-test.js b/test/browser/components/side-panel/color-selector-test.jsindex c7daa2e2a..b2c5212ab 100644--- a/test/browser/components/side-panel/color-selector-test.js+++ b/test/browser/components/side-panel/color-selector-test.js@@ -3,7 +3,7 @@/* eslint-disable max-statements, enzyme-deprecation/no-mount */import {mount} from 'enzyme';-import cloneDeep from 'lodash.clonedeep';+import cloneDeep from 'lodash/cloneDeep';import React from 'react';import sinon from 'sinon';import test from 'tape';diff --git a/test/browser/components/side-panel/layer-list.spec.js b/test/browser/components/side-panel/layer-list.spec.jsindex e8baca61b..11cef6c90 100644--- a/test/browser/components/side-panel/layer-list.spec.js+++ b/test/browser/components/side-panel/layer-list.spec.js@@ -2,7 +2,7 @@// Copyright contributors to the kepler.gl projectimport React from 'react';-import cloneDeep from 'lodash.clonedeep';+import cloneDeep from 'lodash/cloneDeep';import {fireEvent, screen} from '@testing-library/react';import {dataTestIds} from '@kepler.gl/constants';diff --git a/test/browser/components/tooltip-config-test.js b/test/browser/components/tooltip-config-test.jsindex f0bc37c77..a5ca810fc 100644--- a/test/browser/components/tooltip-config-test.js+++ b/test/browser/components/tooltip-config-test.js@@ -4,7 +4,7 @@import React from 'react';import sinon from 'sinon';import test from 'tape';-import uniq from 'lodash.uniq';+import uniq from 'lodash/uniq';import {IntlWrapper, mountWithTheme} from 'test/helpers/component-utils';import {diff --git a/test/browser/layer-tests/point-layer-specs.js b/test/browser/layer-tests/point-layer-specs.jsindex 4ad0aaf2c..237241262 100644--- a/test/browser/layer-tests/point-layer-specs.js+++ b/test/browser/layer-tests/point-layer-specs.js@@ -5,7 +5,7 @@ import test from 'tape';import moment from 'moment';import {getDistanceScales} from 'viewport-mercator-project';import {scaleQuantize} from 'd3-scale';-import cloneDeep from 'lodash.clonedeep';+import cloneDeep from 'lodash/cloneDeep';import {DEFAULT_TEXT_LABEL, PROJECTED_PIXEL_SIZE_MULTIPLIER} from '@kepler.gl/constants';import {KeplerGlLayers} from '@kepler.gl/layers';diff --git a/test/browser/layer-tests/trip-layer-specs.js b/test/browser/layer-tests/trip-layer-specs.jsindex 1b4ab9d42..d76affc57 100644--- a/test/browser/layer-tests/trip-layer-specs.js+++ b/test/browser/layer-tests/trip-layer-specs.js@@ -3,7 +3,7 @@/* eslint-disable max-statements */import test from 'tape';-import cloneDeep from 'lodash.clonedeep';+import cloneDeep from 'lodash/cloneDeep';import {tripDefaultLineWidth as defaultLineWidth,diff --git a/test/browser/reducers/index.js b/test/browser/reducers/index.jsindex 0056817eb..ee5ad5f15 100644--- a/test/browser/reducers/index.js+++ b/test/browser/reducers/index.js@@ -2,7 +2,7 @@// Copyright contributors to the kepler.gl projectimport {visStateReducer as reducer} from '@kepler.gl/reducers';-import CloneDeep from 'lodash.clonedeep';+import CloneDeep from 'lodash/cloneDeep';import test from 'tape-catch';import {StateWFiles, testCsvDataId, testGeoJsonDataId} from 'test/helpers/mock-state';import {VisStateActions} from '@kepler.gl/actions';diff --git a/test/fixtures/points-with-polygon-filter-map.js b/test/fixtures/points-with-polygon-filter-map.jsindex 4d8f93c40..1fc71329c 100644--- a/test/fixtures/points-with-polygon-filter-map.js+++ b/test/fixtures/points-with-polygon-filter-map.js@@ -2,7 +2,7 @@// Copyright contributors to the kepler.gl projectimport {processKeplerglJSON} from '@kepler.gl/processors';-import CloneDeep from 'lodash.clonedeep';+import CloneDeep from 'lodash/cloneDeep';import {keplerGlReducerCore as coreReducer} from '@kepler.gl/reducers';import {addDataToMap} from '@kepler.gl/actions';import {InitialState} from '../helpers/mock-state';diff --git a/test/fixtures/synced-filter-with-trip-layer.js b/test/fixtures/synced-filter-with-trip-layer.jsindex 3c70ad21a..8f428423c 100644--- a/test/fixtures/synced-filter-with-trip-layer.js+++ b/test/fixtures/synced-filter-with-trip-layer.js@@ -2,7 +2,7 @@// Copyright contributors to the kepler.gl projectimport {processKeplerglJSON} from '@kepler.gl/processors';-import CloneDeep from 'lodash.clonedeep';+import CloneDeep from 'lodash/cloneDeep';import {keplerGlReducerCore as coreReducer} from '@kepler.gl/reducers';import {addDataToMap} from '@kepler.gl/actions';import {InitialState, applyActions} from '../helpers/mock-state';diff --git a/test/helpers/layer-utils.js b/test/helpers/layer-utils.jsindex 737481def..42d4eb92b 100644--- a/test/helpers/layer-utils.js+++ b/test/helpers/layer-utils.js@@ -8,7 +8,7 @@ import {gl} from '@deck.gl/test-utils';import sinon from 'sinon';import {mount} from 'enzyme';import {console as Console} from 'global/window';-import cloneDeep from 'lodash.clonedeep';+import cloneDeep from 'lodash/cloneDeep';import {INITIAL_MAP_STATE,diff --git a/test/helpers/mock-state.js b/test/helpers/mock-state.jsindex 5b3feef4b..e0255d624 100644--- a/test/helpers/mock-state.js+++ b/test/helpers/mock-state.js@@ -3,7 +3,7 @@// @ts-nocheck-import cloneDeep from 'lodash.clonedeep';+import cloneDeep from 'lodash/cloneDeep';import {colorPaletteToColorRange} from '@kepler.gl/constants';import {getInitialInputStyle,diff --git a/test/helpers/raw-states.js b/test/helpers/raw-states.jsindex c7023bde7..6511b4ea5 100644--- a/test/helpers/raw-states.js+++ b/test/helpers/raw-states.js@@ -1,7 +1,7 @@// SPDX-License-Identifier: MIT// Copyright contributors to the kepler.gl project-import cloneDeep from 'lodash.clonedeep';+import cloneDeep from 'lodash/cloneDeep';import {keplerGlReducer} from '@kepler.gl/reducers';import {addDataToMap} from '@kepler.gl/actions';diff --git a/test/node/reducers/vis-state-merger-test.js b/test/node/reducers/vis-state-merger-test.jsindex db6ce0cd6..14918997b 100644--- a/test/node/reducers/vis-state-merger-test.js+++ b/test/node/reducers/vis-state-merger-test.js@@ -2,9 +2,9 @@// Copyright contributors to the kepler.gl projectimport test from 'tape';-import cloneDeep from 'lodash.clonedeep';+import cloneDeep from 'lodash/cloneDeep';import Task, {withTask, drainTasksForTesting, succeedTaskInTest} from 'react-palm/tasks';-import CloneDeep from 'lodash.clonedeep';+import CloneDeep from 'lodash/cloneDeep';import keplerGlReducer, {mergeFilters,diff --git a/test/node/reducers/vis-state-test.js b/test/node/reducers/vis-state-test.jsindex 9620c9213..7346b8ce6 100644--- a/test/node/reducers/vis-state-test.js+++ b/test/node/reducers/vis-state-test.js@@ -7,7 +7,7 @@ import sinon from 'sinon';import {console as Console} from 'global/window';import {drainTasksForTesting, succeedTaskInTest, errorTaskInTest} from 'react-palm/tasks';-import CloneDeep from 'lodash.clonedeep';+import CloneDeep from 'lodash/cloneDeep';import SchemaManager from '@kepler.gl/schemas';import {VisStateActions, MapStateActions} from '@kepler.gl/actions';diff --git a/test/node/schemas/dataset-schema-test.js b/test/node/schemas/dataset-schema-test.jsindex 7482332b3..aec3e107d 100644--- a/test/node/schemas/dataset-schema-test.js+++ b/test/node/schemas/dataset-schema-test.js@@ -2,7 +2,7 @@// Copyright contributors to the kepler.gl projectimport test from 'tape';-import cloneDeep from 'lodash.clonedeep';+import cloneDeep from 'lodash/cloneDeep';import SchemaManager from '@kepler.gl/schemas';// fixturesdiff --git a/test/node/schemas/map-state-schema-test.js b/test/node/schemas/map-state-schema-test.jsindex 46c76ebe8..2d3ad572c 100644--- a/test/node/schemas/map-state-schema-test.js+++ b/test/node/schemas/map-state-schema-test.js@@ -2,7 +2,7 @@// Copyright contributors to the kepler.gl projectimport test from 'tape';-import cloneDeep from 'lodash.clonedeep';+import cloneDeep from 'lodash/cloneDeep';import SchemaManager from '@kepler.gl/schemas';import {InitialState} from 'test/helpers/mock-state';diff --git a/test/node/schemas/map-style-schema-test.js b/test/node/schemas/map-style-schema-test.jsindex 4c90bda03..e43ae9c7e 100644--- a/test/node/schemas/map-style-schema-test.js+++ b/test/node/schemas/map-style-schema-test.js@@ -2,7 +2,7 @@// Copyright contributors to the kepler.gl projectimport test from 'tape';-import cloneDeep from 'lodash.clonedeep';+import cloneDeep from 'lodash/cloneDeep';import SchemaManager from '@kepler.gl/schemas';import {InitialState,diff --git a/test/node/schemas/vis-state-schema-test.js b/test/node/schemas/vis-state-schema-test.jsindex fcb6e051b..4a4a1d04c 100644--- a/test/node/schemas/vis-state-schema-test.js+++ b/test/node/schemas/vis-state-schema-test.js@@ -2,7 +2,7 @@// Copyright contributors to the kepler.gl projectimport test from 'tape';-import cloneDeep from 'lodash.clonedeep';+import cloneDeep from 'lodash/cloneDeep';import {cmpFilters, cmpSavedLayers} from 'test/helpers/comparison-utils';import SchemaManager, {CURRENT_VERSION, visStateSchema} from '@kepler.gl/schemas';diff --git a/test/node/utils/data-processor-test.js b/test/node/utils/data-processor-test.jsindex fe8121186..599035645 100644--- a/test/node/utils/data-processor-test.js+++ b/test/node/utils/data-processor-test.js@@ -5,7 +5,7 @@ import test from 'tape';import sinon from 'sinon';import {console as Console} from 'global/window';import {DATA_TYPES} from 'type-analyzer';-import cloneDeep from 'lodash.clonedeep';+import cloneDeep from 'lodash/cloneDeep';import testData, {dataWithNulls,diff --git a/test/node/utils/data-scale-utils-test.js b/test/node/utils/data-scale-utils-test.jsindex e3ed76ad0..beb78112f 100644--- a/test/node/utils/data-scale-utils-test.js+++ b/test/node/utils/data-scale-utils-test.js@@ -2,7 +2,7 @@// Copyright contributors to the kepler.gl projectimport test from 'tape';-import cloneDeep from 'lodash.clonedeep';+import cloneDeep from 'lodash/cloneDeep';import {format as d3Format} from 'd3-format';import {diff --git a/test/node/utils/layer-utils-test.js b/test/node/utils/layer-utils-test.jsindex 8d98eedf3..adbbe9677 100644--- a/test/node/utils/layer-utils-test.js+++ b/test/node/utils/layer-utils-test.js@@ -2,7 +2,7 @@// Copyright contributors to the kepler.gl projectimport test from 'tape';-import cloneDeep from 'lodash.clonedeep';+import cloneDeep from 'lodash/cloneDeep';import {processCsvData, processGeojson} from '@kepler.gl/processors';import {LayerClasses, KeplerGlLayers} from '@kepler.gl/layers';import {GEOJSON_FIELDS} from '@kepler.gl/constants';diff --git a/website-gatsby/src/state/analytics.js b/website-gatsby/src/state/analytics.jsindex 9fa12da7a..c82ae296e 100644--- a/website-gatsby/src/state/analytics.js+++ b/website-gatsby/src/state/analytics.js@@ -7,7 +7,7 @@ import {ActionTypes} from 'kepler.gl/actions';import {LOCATION_CHANGE} from 'react-router-redux';import Window from 'global/window';import {ALL_FIELD_TYPES} from 'kepler.gl/constants';-import get from 'lodash.get';+import get from 'lodash/get';const getPayload = action => (action ? action.payload : null);diff --git a/website/package.json b/website/package.jsonindex 29fa00595..a84b7d19d 100644--- a/website/package.json+++ b/website/package.json@@ -19,7 +19,7 @@"dependencies": {"classnames": "^2.2.5","global": "^4.3.2",- "lodash.get": "^4.4.2",+ "lodash": "4.17.21","prop-types": "^15.6.1","react": "^18.2.0","react-dom": "^18.2.0",diff --git a/website/src/reducers/analytics.js b/website/src/reducers/analytics.jsindex 621eeb0a5..38941618e 100644--- a/website/src/reducers/analytics.js+++ b/website/src/reducers/analytics.js@@ -7,7 +7,7 @@ import {ActionTypes} from '@kepler.gl/actions';import {LOCATION_CHANGE} from 'react-router-redux';import Window from 'global/window';import {ALL_FIELD_TYPES} from '@kepler.gl/constants';-import get from 'lodash.get';+import get from 'lodash/get';const getPayload = action => (action ? action.payload : null);diff --git a/website/yarn.lock b/website/yarn.lockindex 052e168ef..143f19691 100644--- a/website/yarn.lock+++ b/website/yarn.lock@@ -5265,7 +5265,7 @@ __metadata:eslint-plugin-react: "npm:^7.13.0"file-loader: "npm:^1.1.11"global: "npm:^4.3.2"- lodash.get: "npm:^4.4.2"+ lodash: "npm:4.17.21"prettier: "npm:1.19.1"prop-types: "npm:^15.6.1"react: "npm:^18.2.0"@@ -5384,14 +5384,7 @@ __metadata:languageName: nodelinkType: hard-"lodash.get@npm:^4.4.2":- version: 4.4.2- resolution: "lodash.get@npm:4.4.2"- checksum: 10c0/48f40d471a1654397ed41685495acb31498d5ed696185ac8973daef424a749ca0c7871bf7b665d5c14f5cc479394479e0307e781f61d5573831769593411be6e- languageName: node- linkType: hard--"lodash@npm:^4.13.1, lodash@npm:^4.17.11, lodash@npm:^4.17.12, lodash@npm:^4.17.14":+"lodash@npm:4.17.21, lodash@npm:^4.13.1, lodash@npm:^4.17.11, lodash@npm:^4.17.12, lodash@npm:^4.17.14":version: 4.17.21resolution: "lodash@npm:4.17.21"checksum: 10c0/d8cbea072bb08655bb4c989da418994b073a608dffa608b09ac04b43a791b12aeae7cd7ad919aa4c925f33b48490b5cfe6c1f71d827956071dae2e7bb3a6b74cdiff --git a/yarn.lock b/yarn.lockindex 218408e1c..d0006322d 100644--- a/yarn.lock+++ b/yarn.lock@@ -3139,10 +3139,10 @@ __metadata:"@kepler.gl/types": "npm:3.1.3""@kepler.gl/utils": "npm:3.1.3""@reduxjs/toolkit": "npm:^1.7.2"- "@types/lodash.curry": "npm:^4.1.7"+ "@types/lodash": "npm:4.17.5""@types/react-redux": "npm:^7.1.23""@types/redux-actions": "npm:^2.6.2"- lodash.curry: "npm:^4.1.1"+ lodash: "npm:4.17.21"react-palm: "npm:^3.3.8"react-redux: "npm:^8.0.5"redux: "npm:^4.2.1"@@ -3231,14 +3231,7 @@ __metadata:"@types/d3-scale": "npm:^3.2.2""@types/d3-selection": "npm:^3.0.2""@types/exenv": "npm:^1.2.0"- "@types/lodash.debounce": "npm:^4.0.7"- "@types/lodash.get": "npm:^4.4.6"- "@types/lodash.isequal": "npm:^4.5.5"- "@types/lodash.memoize": "npm:^4.1.7"- "@types/lodash.pick": "npm:^4.4.6"- "@types/lodash.throttle": "npm:^4.1.7"- "@types/lodash.uniq": "npm:^4.5.7"- "@types/lodash.uniqby": "npm:^4.7.7"+ "@types/lodash": "npm:4.17.5""@types/react": "npm:^18.0.28""@types/react-copy-to-clipboard": "npm:^5.0.2""@types/react-dom": "npm:^18.0.11"@@ -3261,14 +3254,7 @@ __metadata:exenv: "npm:^1.2.2"fuzzy: "npm:^0.1.3"global: "npm:^4.3.0"- lodash.debounce: "npm:^4.0.8"- lodash.get: "npm:^4.4.2"- lodash.isequal: "npm:^4.5.0"- lodash.memoize: "npm:^4.1.2"- lodash.pick: "npm:^4.4.0"- lodash.throttle: "npm:^4.1.1"- lodash.uniq: "npm:^4.0.1"- lodash.uniqby: "npm:^4.7.0"+ lodash: "npm:4.17.21"mapbox-gl: "npm:1.13.1"maplibre-gl: "npm:^3.6.2"markdown-to-jsx: "npm:^7.7.6"@@ -3379,12 +3365,11 @@ __metadata:"@mapbox/vector-tile": "npm:^1.3.1""@types/d3-array": "npm:^2.8.0""@types/geojson": "npm:^7946.0.8"- "@types/lodash.memoize": "npm:^4.1.7"+ "@types/lodash": "npm:4.17.5""@types/supercluster": "npm:^7.1.0"d3-array: "npm:^2.8.0"global: "npm:^4.3.0"lodash: "npm:4.17.21"- lodash.memoize: "npm:^4.1.2"pbf: "npm:^3.1.0"supercluster: "npm:^7.1.0"viewport-mercator-project: "npm:^6.0.0"@@ -3462,8 +3447,7 @@ __metadata:"@turf/helpers": "npm:^6.1.4""@types/geojson": "npm:^7946.0.8""@types/keymirror": "npm:^0.1.1"- "@types/lodash.memoize": "npm:^4.1.7"- "@types/lodash.uniq": "npm:^4.5.7"+ "@types/lodash": "npm:4.17.5""@types/styled-components": "npm:^5.1.32"apache-arrow: "npm:>=15.0.0"buffer: "npm:6.0.3"@@ -3471,9 +3455,7 @@ __metadata:d3-shape: "npm:^1.2.0"global: "npm:^4.3.0"keymirror: "npm:^0.1.1"- lodash.memoize: "npm:^4.1.2"- lodash.throttle: "npm:^4.1.1"- lodash.uniq: "npm:^4.0.1"+ lodash: "npm:4.17.21"long: "npm:^4.0.0"markdown-to-jsx: "npm:^7.7.6"prop-types: "npm:^15.6.0"@@ -3551,25 +3533,14 @@ __metadata:"@turf/bbox": "npm:^6.0.1""@turf/bbox-polygon": "npm:^6.0.1""@turf/boolean-within": "npm:^6.0.1"- "@types/lodash.clonedeep": "npm:^4.5.7"- "@types/lodash.flattendeep": "npm:^4.4.7"- "@types/lodash.get": "npm:^4.4.6"- "@types/lodash.pick": "npm:^4.4.6"- "@types/lodash.uniq": "npm:^4.5.7"- "@types/lodash.xor": "npm:^4.5.7"+ "@types/lodash": "npm:4.17.5""@types/redux-actions": "npm:^2.6.2"copy-to-clipboard: "npm:^3.3.1"d3-color: "npm:^2.0.0"d3-dsv: "npm:^2.0.0"deepmerge: "npm:^4.2.2"global: "npm:^4.3.0"- lodash.clonedeep: "npm:^4.0.1"- lodash.flattendeep: "npm:^4.2.0"- lodash.get: "npm:^4.4.2"- lodash.isequal: "npm:^4.5.0"- lodash.pick: "npm:^4.4.0"- lodash.uniq: "npm:^4.0.1"- lodash.xor: "npm:^4.5.0"+ lodash: "npm:4.17.21"react-palm: "npm:^3.3.8"redux: "npm:^4.2.1"redux-actions: "npm:^2.2.1"@@ -3589,13 +3560,11 @@ __metadata:"@kepler.gl/utils": "npm:3.1.3""@loaders.gl/loader-utils": "npm:^4.3.2""@types/keymirror": "npm:^0.1.1"- "@types/lodash.clonedeep": "npm:^4.5.7"- "@types/lodash.pick": "npm:^4.4.6"+ "@types/lodash": "npm:4.17.5"apache-arrow: "npm:>=15.0.0"global: "npm:^4.3.0"keymirror: "npm:^0.1.1"- lodash.clonedeep: "npm:^4.0.1"- lodash.pick: "npm:^4.4.0"+ lodash: "npm:4.17.21"languageName: unknownlinkType: soft@@ -3620,10 +3589,10 @@ __metadata:"@loaders.gl/mvt": "npm:^4.3.2""@loaders.gl/pmtiles": "npm:^4.3.2""@types/d3-array": "npm:^2.8.0"- "@types/lodash.uniq": "npm:^4.5.7"+ "@types/lodash": "npm:4.17.5"d3-array: "npm:^2.8.0"global: "npm:^4.3.0"- lodash.uniq: "npm:^4.0.1"+ lodash: "npm:4.17.21"moment: "npm:^2.10.6"react-palm: "npm:^3.3.8"type-analyzer: "npm:0.4.0"@@ -3668,11 +3637,7 @@ __metadata:"@turf/helpers": "npm:^6.1.4""@types/d3-array": "npm:^2.8.0""@types/keymirror": "npm:^0.1.1"- "@types/lodash.clonedeep": "npm:^4.5.7"- "@types/lodash.get": "npm:^4.4.6"- "@types/lodash.isequal": "npm:^4.5.5"- "@types/lodash.memoize": "npm:^4.1.7"- "@types/lodash.throttle": "npm:^4.1.7"+ "@types/lodash": "npm:4.17.5"apache-arrow: "npm:>=15.0.0"d3-array: "npm:^2.8.0"d3-color: "npm:^2.0.0"@@ -3682,11 +3647,7 @@ __metadata:global: "npm:^4.3.0"h3-js: "npm:^3.1.0"keymirror: "npm:^0.1.1"- lodash.clonedeep: "npm:^4.0.1"- lodash.get: "npm:^4.4.2"- lodash.isequal: "npm:^4.5.0"- lodash.memoize: "npm:^4.1.2"- lodash.throttle: "npm:^4.1.1"+ lodash: "npm:4.17.21"mapbox-gl: "npm:^1.13.1"maplibre-gl: "npm:^3.6.2"maplibregl-mapbox-request-transformer: "npm:^0.0.2"@@ -9610,24 +9571,6 @@ __metadata:languageName: nodelinkType: hard-"@types/lodash.clonedeep@npm:^4.5.7":- version: 4.5.9- resolution: "@types/lodash.clonedeep@npm:4.5.9"- dependencies:- "@types/lodash": "npm:*"- checksum: 10c0/2f224ce9578046bccd1cd9594fb73540600ebd3d59a45695166a6123e2c376b84ab106b005a00453f357907f25bc8bfd2271b822be76e8f5527eadb4690b5e96- languageName: node- linkType: hard--"@types/lodash.curry@npm:^4.1.7":- version: 4.1.9- resolution: "@types/lodash.curry@npm:4.1.9"- dependencies:- "@types/lodash": "npm:*"- checksum: 10c0/c8cec1d3f1c494cadbc4b8743fca756ec73343076463f7209bbaab2e3e8e9bf75a50594cf499dc14b6bc417d5d5f9226c9754d2e9ef8072095391ddb2bf82480- languageName: node- linkType: hard-"@types/lodash.debounce@npm:^4.0.7":version: 4.0.9resolution: "@types/lodash.debounce@npm:4.0.9"@@ -9637,87 +9580,6 @@ __metadata:languageName: nodelinkType: hard-"@types/lodash.flattendeep@npm:^4.4.7":- version: 4.4.9- resolution: "@types/lodash.flattendeep@npm:4.4.9"- dependencies:- "@types/lodash": "npm:*"- checksum: 10c0/a29065ffeea643ab0206f67f4a5b6aa053ef80e908f86c9b16241fa9963d15f7b5c4be33554aca9db1e171fed5abe608419ce432e18247d14357d818ff627adb- languageName: node- linkType: hard--"@types/lodash.get@npm:^4.4.6":- version: 4.4.9- resolution: "@types/lodash.get@npm:4.4.9"- dependencies:- "@types/lodash": "npm:*"- checksum: 10c0/934ae4f02831afdb9216cb5fcb702f8f4e0b45e13f2d10ed9c7ce7e891800e5dea726b513c98b8370d6292d42ad7745c622ae75733676746b711bea95b6259d5- languageName: node- linkType: hard--"@types/lodash.isequal@npm:^4.5.5":- version: 4.5.8- resolution: "@types/lodash.isequal@npm:4.5.8"- dependencies:- "@types/lodash": "npm:*"- checksum: 10c0/6db28cacf165d55421fbf2970ccfb1682a7b82b743bb7aba4398fa8ab98f1711fca2fe4afa1aa2b7b4afb3eff76c8aca13b22206f5efeb038d99e41300589bca- languageName: node- linkType: hard--"@types/lodash.memoize@npm:^4.1.7":- version: 4.1.9- resolution: "@types/lodash.memoize@npm:4.1.9"- dependencies:- "@types/lodash": "npm:*"- checksum: 10c0/119e4595bd2acdaf1bd318ebf61beb0c5fc63203a526692e2e82a122f9730d40ee1a8ece3f379fdc9a99dfce0a1ce3229788ddedd68a5fa432e4e0d54726fa63- languageName: node- linkType: hard--"@types/lodash.pick@npm:^4.4.6":- version: 4.4.9- resolution: "@types/lodash.pick@npm:4.4.9"- dependencies:- "@types/lodash": "npm:*"- checksum: 10c0/61ae2fb9fe817a2f398863d10dc57e3cb864ebadefb7f3554d8d0c189448e08a174d6bfdd6e0220988ea084a2d47c3377908cf037e2b3ce552aa79ce0f36bc9f- languageName: node- linkType: hard--"@types/lodash.throttle@npm:^4.1.7":- version: 4.1.9- resolution: "@types/lodash.throttle@npm:4.1.9"- dependencies:- "@types/lodash": "npm:*"- checksum: 10c0/93f7096dcaea8f54a4f52d5175d97a471f155f5bae4649c967cc29bcae506a456476d13b4392361799b31c3b96659560e1bbfddf00f550a50c685f6c037411a6- languageName: node- linkType: hard--"@types/lodash.uniq@npm:^4.5.7":- version: 4.5.9- resolution: "@types/lodash.uniq@npm:4.5.9"- dependencies:- "@types/lodash": "npm:*"- checksum: 10c0/feb01dfd7b6e3d2b4d29bdb0d00cce8ffa685f1c219b34ae531f098811faab11696b7bdfc3654edcf65f6180ad0cda6471cec7da8a9e7688f294b5c8177cfea7- languageName: node- linkType: hard--"@types/lodash.uniqby@npm:^4.7.7":- version: 4.7.9- resolution: "@types/lodash.uniqby@npm:4.7.9"- dependencies:- "@types/lodash": "npm:*"- checksum: 10c0/b508927c8bd9a840c629169f8573d0f33a12c7232b4315785537f25914dec441323c54ba609f75fdefaa53f7ecd56f29bd6f598c3920ade45532b8eab76bf044- languageName: node- linkType: hard--"@types/lodash.xor@npm:^4.5.7":- version: 4.5.9- resolution: "@types/lodash.xor@npm:4.5.9"- dependencies:- "@types/lodash": "npm:*"- checksum: 10c0/ad87da8e109ac79ff375d6df6cf867d21bfde9aeccdbe839a9659c195cfcb4dc4c6d4fd0b0de9e66341335dc7f903ce3090946c33ca3b69d70f59fa41e912ada- languageName: node- linkType: hard-"@types/lodash@npm:4.17.5":version: 4.17.5resolution: "@types/lodash@npm:4.17.5"@@ -20802,20 +20664,6 @@ __metadata:languageName: nodelinkType: hard-"lodash.clonedeep@npm:^4.0.1":- version: 4.5.0- resolution: "lodash.clonedeep@npm:4.5.0"- checksum: 10c0/2caf0e4808f319d761d2939ee0642fa6867a4bbf2cfce43276698828380756b99d4c4fa226d881655e6ac298dd453fe12a5ec8ba49861777759494c534936985- languageName: node- linkType: hard--"lodash.curry@npm:^4.1.1":- version: 4.1.1- resolution: "lodash.curry@npm:4.1.1"- checksum: 10c0/f0431947dc9236df879fc13eb40c31a2839c958bd0eaa39170a5758c25a7d85d461716a851ab45a175371950b283480615cdd4b07fb0dd1afff7a2914a90696f- languageName: node- linkType: hard-"lodash.debounce@npm:^4.0.8":version: 4.0.8resolution: "lodash.debounce@npm:4.0.8"@@ -20830,7 +20678,7 @@ __metadata:languageName: nodelinkType: hard-"lodash.flattendeep@npm:^4.2.0, lodash.flattendeep@npm:^4.4.0":+"lodash.flattendeep@npm:^4.4.0":version: 4.4.0resolution: "lodash.flattendeep@npm:4.4.0"checksum: 10c0/83cb80754b921fb4ed2c222b91a82b2524f3bdc60c3ae91e00688bd4bf1bcc28b8a2cc250e11fdc1b6da3a2de09e57008e13f15a209cafdd4f9163d047f97544@@ -20858,7 +20706,7 @@ __metadata:languageName: nodelinkType: hard-"lodash.memoize@npm:4.1.2, lodash.memoize@npm:^4.1.2":+"lodash.memoize@npm:4.1.2":version: 4.1.2resolution: "lodash.memoize@npm:4.1.2"checksum: 10c0/c8713e51eccc650422716a14cece1809cfe34bc5ab5e242b7f8b4e2241c2483697b971a604252807689b9dd69bfe3a98852e19a5b89d506b000b4187a1285df8@@ -20879,13 +20727,6 @@ __metadata:languageName: nodelinkType: hard-"lodash.pick@npm:^4.4.0":- version: 4.4.0- resolution: "lodash.pick@npm:4.4.0"- checksum: 10c0/a04c460b95d1aaa44e9513d1dacf72ea74d838da843e45831de9de64c303f13cdde1859702a6f4dcef417816898ffd47c6ae0614c957ac70245bed2809b8d2e2- languageName: node- linkType: hard-"lodash.throttle@npm:^4.1.1":version: 4.1.1resolution: "lodash.throttle@npm:4.1.1"@@ -20900,13 +20741,6 @@ __metadata:languageName: nodelinkType: hard-"lodash.uniq@npm:^4.0.1":- version: 4.5.0- resolution: "lodash.uniq@npm:4.5.0"- checksum: 10c0/262d400bb0952f112162a320cc4a75dea4f66078b9e7e3075ffbc9c6aa30b3e9df3cf20e7da7d566105e1ccf7804e4fbd7d804eee0b53de05d83f16ffbf41c5e- languageName: node- linkType: hard-"lodash.uniqby@npm:^4.7.0":version: 4.7.0resolution: "lodash.uniqby@npm:4.7.0"@@ -20914,13 +20748,6 @@ __metadata:languageName: nodelinkType: hard-"lodash.xor@npm:^4.5.0":- version: 4.5.0- resolution: "lodash.xor@npm:4.5.0"- checksum: 10c0/5b6c1bdafd22baa9de1ccac04f3a29e06f90a9e7b68ac2c055e95c943ebbf6cbc67b98919488db19ce742e9ac9a70e19c020ef804f503b92961869e39ddaf93a- languageName: node- linkType: hard-"lodash@npm:4.17.21":version: 4.17.21resolution: "lodash@npm:4.17.21"