diff --git a/common/functions/pie.js b/common/functions/pie.js index 94c1cf5d5e3bc..5c1ec1bb51656 100644 --- a/common/functions/pie.js +++ b/common/functions/pie.js @@ -1,5 +1,5 @@ -import { get, map, groupBy, sortBy } from 'lodash'; import keyBy from 'lodash.keyby'; +import { get, map, groupBy, sortBy } from 'lodash'; import { getColorsFromPalette } from '../lib/get_colors_from_palette'; import { getLegendConfig } from '../lib/get_legend_config'; diff --git a/common/functions/plot/index.js b/common/functions/plot/index.js index fcfff36f5818f..a6c3bafba098c 100644 --- a/common/functions/plot/index.js +++ b/common/functions/plot/index.js @@ -1,5 +1,5 @@ -import { groupBy, get, set, map, sortBy } from 'lodash'; import keyBy from 'lodash.keyby'; +import { groupBy, get, set, map, sortBy } from 'lodash'; import { getColorsFromPalette } from '../../lib/get_colors_from_palette'; import { getLegendConfig } from '../../lib/get_legend_config'; import { getFlotAxisConfig } from './get_flot_axis_config'; diff --git a/common/interpreter/interpret.js b/common/interpreter/interpret.js index 710f02d8129e1..f531e2f956029 100644 --- a/common/interpreter/interpret.js +++ b/common/interpreter/interpret.js @@ -1,5 +1,5 @@ -import { each, keys, last, mapValues, reduce, zipObject } from 'lodash'; import clone from 'lodash.clone'; +import { each, keys, last, mapValues, reduce, zipObject } from 'lodash'; import { getType } from '../lib/get_type'; import { fromExpression } from '../lib/ast'; import { getByAlias } from '../lib/get_by_alias'; diff --git a/package.json b/package.json index 1ed6c0a48e775..9321430fe9f6b 100644 --- a/package.json +++ b/package.json @@ -83,7 +83,7 @@ }, "devDependencies": { "@elastic/eslint-config-kibana": "link:../../kibana/packages/eslint-config-kibana", - "@elastic/eslint-import-resolver-kibana": "^2.0.0", + "@kbn/eslint-import-resolver-kibana": "link:../../kibana/packages/kbn-eslint-import-resolver-kibana", "@kbn/plugin-helpers": "link:../../kibana/packages/kbn-plugin-helpers", "ansi-colors": "^1.0.1", "aws-sdk": "^2.141.0", diff --git a/public/components/element_content/index.js b/public/components/element_content/index.js index d881dfb8e91e1..97273a84af834 100644 --- a/public/components/element_content/index.js +++ b/public/components/element_content/index.js @@ -1,6 +1,6 @@ +import PropTypes from 'prop-types'; import { compose, withProps } from 'recompose'; import { get } from 'lodash'; -import PropTypes from 'prop-types'; import { renderFunctionsRegistry } from '../../lib/render_functions_registry'; import { ElementContent as Component } from './element_content'; diff --git a/public/components/element_types/element_types.js b/public/components/element_types/element_types.js index 1efffa1b0b323..77ada0a162759 100644 --- a/public/components/element_types/element_types.js +++ b/public/components/element_types/element_types.js @@ -1,8 +1,8 @@ import React, { Fragment } from 'react'; import PropTypes from 'prop-types'; -import { map, includes, sortBy } from 'lodash'; -import lowerCase from 'lodash.lowercase'; import { EuiFieldSearch, EuiContextMenuItem, EuiPopoverTitle } from '@elastic/eui'; +import lowerCase from 'lodash.lowercase'; +import { map, includes, sortBy } from 'lodash'; export const ElementTypes = ({ elements, onClick, search, setSearch }) => { search = lowerCase(search); diff --git a/public/components/enhance/error_boundary.js b/public/components/enhance/error_boundary.js index 12d97b8a8ada0..dd6625705cea3 100644 --- a/public/components/enhance/error_boundary.js +++ b/public/components/enhance/error_boundary.js @@ -1,7 +1,7 @@ import React, { Fragment } from 'react'; +import { withState, withHandlers, lifecycle, mapProps, compose } from 'recompose'; import PropTypes from 'prop-types'; import { omit } from 'lodash'; -import { withState, withHandlers, lifecycle, mapProps, compose } from 'recompose'; export const errorBoundaryHoc = compose( withState('error', 'setError', null), diff --git a/public/components/palette_picker/palette_picker.js b/public/components/palette_picker/palette_picker.js index d2a3eefff82ce..752c9a1da19c2 100644 --- a/public/components/palette_picker/palette_picker.js +++ b/public/components/palette_picker/palette_picker.js @@ -1,7 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { map } from 'lodash'; import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; +import { map } from 'lodash'; import { Popover } from '../popover'; import { PaletteSwatch } from '../palette_swatch'; import { palettes } from '../../../common/lib/palettes'; diff --git a/public/components/workpad_loader/workpad_loader.js b/public/components/workpad_loader/workpad_loader.js index b940c72d358da..1d5149bc8b5c8 100644 --- a/public/components/workpad_loader/workpad_loader.js +++ b/public/components/workpad_loader/workpad_loader.js @@ -1,7 +1,5 @@ import React from 'react'; import PropTypes from 'prop-types'; -import moment from 'moment'; -import { sortByOrder } from 'lodash'; import { EuiFlexGroup, EuiFlexItem, @@ -10,6 +8,8 @@ import { EuiText, EuiTitle, } from '@elastic/eui'; +import { sortByOrder } from 'lodash'; +import moment from 'moment'; import { ConfirmModal } from '../confirm_modal'; import { Link } from '../link'; import { Tooltip } from '../tooltip'; diff --git a/public/expression_types/arg_types/axis_config/extended_template.js b/public/expression_types/arg_types/axis_config/extended_template.js index cd26003859bd3..da5391614b013 100644 --- a/public/expression_types/arg_types/axis_config/extended_template.js +++ b/public/expression_types/arg_types/axis_config/extended_template.js @@ -1,8 +1,8 @@ import React, { Fragment } from 'react'; import PropTypes from 'prop-types'; -import { get } from 'lodash'; -import { set } from 'object-path-immutable'; import { EuiSelect, EuiFormRow, EuiText } from '@elastic/eui'; +import { set } from 'object-path-immutable'; +import { get } from 'lodash'; const defaultExpression = { type: 'expression', diff --git a/public/expression_types/arg_types/container_style/container_style.js b/public/expression_types/arg_types/container_style/container_style.js index 61967b22e2c3a..6912bf652b286 100644 --- a/public/expression_types/arg_types/container_style/container_style.js +++ b/public/expression_types/arg_types/container_style/container_style.js @@ -1,6 +1,6 @@ import { withHandlers } from 'recompose'; -import { get } from 'lodash'; import { set } from 'object-path-immutable'; +import { get } from 'lodash'; import { templateFromReactComponent } from '../../../lib/template_from_react_component'; import { SimpleTemplate } from './simple_template'; import { ExtendedTemplate } from './extended_template'; diff --git a/public/expression_types/arg_types/series_style/extended_template.js b/public/expression_types/arg_types/series_style/extended_template.js index c592b6f2f77e2..c518579c268a0 100644 --- a/public/expression_types/arg_types/series_style/extended_template.js +++ b/public/expression_types/arg_types/series_style/extended_template.js @@ -1,8 +1,8 @@ import React from 'react'; import PropTypes from 'prop-types'; import { EuiFlexGroup, EuiFlexItem, EuiFormRow, EuiSelect } from '@elastic/eui'; -import { get } from 'lodash'; import { set, del } from 'object-path-immutable'; +import { get } from 'lodash'; export const ExtendedTemplate = props => { const { typeInstance, onValueChange, labels, argValue } = props; diff --git a/public/expression_types/arg_types/series_style/simple_template.js b/public/expression_types/arg_types/series_style/simple_template.js index 17ff753969616..fcae99261c80f 100644 --- a/public/expression_types/arg_types/series_style/simple_template.js +++ b/public/expression_types/arg_types/series_style/simple_template.js @@ -1,8 +1,8 @@ import React, { Fragment } from 'react'; import PropTypes from 'prop-types'; -import { get } from 'lodash'; -import { set, del } from 'object-path-immutable'; import { EuiFlexGroup, EuiFlexItem, EuiIcon, EuiLink, EuiButtonIcon } from '@elastic/eui'; +import { set, del } from 'object-path-immutable'; +import { get } from 'lodash'; import { ColorPickerMini } from '../../../components/color_picker_mini'; import { TooltipIcon } from '../../../components/tooltip_icon'; diff --git a/public/expression_types/arg_types/textarea.js b/public/expression_types/arg_types/textarea.js index 279fc613d1829..2f99f0b290222 100644 --- a/public/expression_types/arg_types/textarea.js +++ b/public/expression_types/arg_types/textarea.js @@ -1,8 +1,8 @@ import React from 'react'; import PropTypes from 'prop-types'; import { compose, withProps } from 'recompose'; -import { get } from 'lodash'; import { EuiForm, EuiTextArea, EuiSpacer, EuiButton } from '@elastic/eui'; +import { get } from 'lodash'; import { createStatefulPropHoc } from '../../components/enhance/stateful_prop'; import { templateFromReactComponent } from '../../lib/template_from_react_component'; diff --git a/public/expression_types/function_form.js b/public/expression_types/function_form.js index 68024360f4e2b..c81da0d3150f7 100644 --- a/public/expression_types/function_form.js +++ b/public/expression_types/function_form.js @@ -1,6 +1,6 @@ +import { EuiCallOut } from '@elastic/eui'; import React from 'react'; import { isPlainObject, uniq, last, compact } from 'lodash'; -import { EuiCallOut } from '@elastic/eui'; import { fromExpression } from '../../common/lib/ast'; import { ArgAddPopover } from '../components/arg_add_popover'; import { SidebarSection } from '../components/sidebar/sidebar_section'; diff --git a/public/lib/autocomplete_proposals.js b/public/lib/autocomplete_proposals.js index 09d894224139b..42f62a9952b3e 100644 --- a/public/lib/autocomplete_proposals.js +++ b/public/lib/autocomplete_proposals.js @@ -1,5 +1,5 @@ -import { flatten, get, map, filter, includes } from 'lodash'; import uniqBy from 'lodash.uniqby'; +import { flatten, get, map, filter, includes } from 'lodash'; import { parse } from '../../common/lib/grammar'; import { functionsRegistry } from './functions_registry'; import { typesRegistry } from './types_registry'; diff --git a/public/render_functions/pie/index.js b/public/render_functions/pie/index.js index aa20e77862ea5..9dd3f94ab85b8 100644 --- a/public/render_functions/pie/index.js +++ b/public/render_functions/pie/index.js @@ -1,6 +1,6 @@ +import $ from 'jquery'; import { debounce, includes } from 'lodash'; import '../../lib/flot-charts'; -import $ from 'jquery'; import { pie as piePlugin } from './plugins/pie'; export const pie = () => ({ diff --git a/public/render_functions/plot/plot.js b/public/render_functions/plot/plot.js index 58e5619eb60f2..165a2490d0154 100644 --- a/public/render_functions/plot/plot.js +++ b/public/render_functions/plot/plot.js @@ -1,5 +1,5 @@ -import { debounce, includes } from 'lodash'; import $ from 'jquery'; +import { debounce, includes } from 'lodash'; import { size } from './plugins/size'; import { text } from './plugins/text'; import '../../lib/flot-charts'; diff --git a/public/render_functions/plot/plugins/text.js b/public/render_functions/plot/plugins/text.js index d99b9af8c9604..574bdc931c1ca 100644 --- a/public/render_functions/plot/plugins/text.js +++ b/public/render_functions/plot/plugins/text.js @@ -1,5 +1,5 @@ -import { get } from 'lodash'; import $ from 'jquery'; +import { get } from 'lodash'; /* FreeBSD-License diff --git a/public/render_functions/time_filter/components/pretty_duration/lib/format_duration.js b/public/render_functions/time_filter/components/pretty_duration/lib/format_duration.js index 75e50354ab30f..e631826965129 100644 --- a/public/render_functions/time_filter/components/pretty_duration/lib/format_duration.js +++ b/public/render_functions/time_filter/components/pretty_duration/lib/format_duration.js @@ -1,5 +1,5 @@ -import moment from 'moment'; import dateMath from '@elastic/datemath'; +import moment from 'moment'; import { quickRanges } from './quick_ranges'; import { timeUnits } from './time_units'; diff --git a/public/state/actions/elements.js b/public/state/actions/elements.js index f4e57ea0d058b..8ecb3b628ddd0 100644 --- a/public/state/actions/elements.js +++ b/public/state/actions/elements.js @@ -1,7 +1,7 @@ import { createAction } from 'redux-actions'; -import { get, pick, cloneDeep, without } from 'lodash'; -import { set, del } from 'object-path-immutable'; import { createThunk } from 'redux-thunks'; +import { set, del } from 'object-path-immutable'; +import { get, pick, cloneDeep, without } from 'lodash'; import { getPages, getElementById, getSelectedPageIndex } from '../selectors/workpad'; import { getValue } from '../selectors/resolved_args'; import { getDefaultElement } from '../defaults'; diff --git a/public/state/reducers/elements.js b/public/state/reducers/elements.js index 43acab707687b..6a9755c3118df 100644 --- a/public/state/reducers/elements.js +++ b/public/state/reducers/elements.js @@ -1,6 +1,6 @@ import { handleActions } from 'redux-actions'; -import { get } from 'lodash'; import { assign, push, del, set } from 'object-path-immutable'; +import { get } from 'lodash'; import * as actions from '../actions/elements'; function getPageIndexById(workpadState, pageId) { diff --git a/public/state/reducers/resolved_args.js b/public/state/reducers/resolved_args.js index ce9041c7b9d32..adebc87d9925a 100644 --- a/public/state/reducers/resolved_args.js +++ b/public/state/reducers/resolved_args.js @@ -1,6 +1,6 @@ import { handleActions } from 'redux-actions'; -import { get } from 'lodash'; import { set, del } from 'object-path-immutable'; +import { get } from 'lodash'; import { prepend } from '../../lib/modify_path'; import * as actions from '../actions/resolved_args'; import { flushContext } from '../actions/elements'; diff --git a/server/functions/pointseries/index.js b/server/functions/pointseries/index.js index df4e2239389cb..424efff705291 100644 --- a/server/functions/pointseries/index.js +++ b/server/functions/pointseries/index.js @@ -1,7 +1,7 @@ -import { groupBy, zipObject, omit, values } from 'lodash'; import uniqBy from 'lodash.uniqby'; -import moment from 'moment'; import { evaluate } from 'tinymath'; +import { groupBy, zipObject, omit, values } from 'lodash'; +import moment from 'moment'; import { pivotObjectArray } from '../../../common/lib/pivot_object_array'; import { unquoteString } from '../../../common/lib/unquote_string'; import { isColumnReference } from './lib/is_column_reference';