[inspector/expressions] remove root-level redirect to common (#136999) (#136997) (#137103)

* [inspector/expressions] remove root-level redirect to common (#136999) (#136997)

(cherry picked from commit 0596007f64)

* [CI] Auto-commit changed files from 'node scripts/eslint --no-cache --fix'

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>

examples/partial_results_example/public/app/app.tsx

@@ -22,7 +22,7 @@ import {
   EuiText,
   EuiTitle,
 } from '@elastic/eui';
-import type { Datatable } from '@kbn/expressions-plugin';
+import type { Datatable } from '@kbn/expressions-plugin/common';
 import { ExpressionsContext } from './expressions_context';
 
 const expression = `getEvents

examples/partial_results_example/public/app/expressions_context.ts

@@ -7,6 +7,6 @@
  */
 
 import { createContext } from 'react';
-import type { ExpressionsServiceStart } from '@kbn/expressions-plugin';
+import type { ExpressionsServiceStart } from '@kbn/expressions-plugin/common';
 
 export const ExpressionsContext = createContext<ExpressionsServiceStart | undefined>(undefined);

examples/partial_results_example/public/functions/count_event.ts

@@ -8,7 +8,7 @@
 
 import { Observable, fromEvent } from 'rxjs';
 import { scan, startWith } from 'rxjs/operators';
-import type { ExpressionFunctionDefinition } from '@kbn/expressions-plugin';
+import type { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 
 export interface CountEventArguments {
   event: string;

examples/partial_results_example/public/functions/get_events.ts

@@ -8,7 +8,7 @@
 
 import { Observable, fromEvent, merge } from 'rxjs';
 import { distinct, map, pluck, scan, take } from 'rxjs/operators';
-import type { Datatable, ExpressionFunctionDefinition } from '@kbn/expressions-plugin';
+import type { Datatable, ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 
 const EVENTS: Array<keyof WindowEventMap> = [
   'mousedown',

examples/partial_results_example/public/functions/pluck.ts

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { Datatable, ExpressionFunctionDefinition } from '@kbn/expressions-plugin';
+import type { Datatable, ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 
 export interface PluckArguments {
   key: string;

examples/partial_results_example/public/plugin.tsx

@@ -7,7 +7,7 @@
  */
 import React from 'react';
 import ReactDOM from 'react-dom';
-import type { ExpressionsServiceSetup } from '@kbn/expressions-plugin';
+import type { ExpressionsServiceSetup } from '@kbn/expressions-plugin/common';
 import { ExpressionsServiceFork } from '@kbn/expressions-plugin/common/service/expressions_fork';
 import { AppMountParameters, AppNavLinkStatus, CoreSetup, Plugin } from '@kbn/core/public';
 import type { DeveloperExamplesSetup } from '@kbn/developer-examples-plugin/public';

packages/kbn-eslint-config/.eslintrc.js

@@ -107,6 +107,16 @@ module.exports = {
           to: '@kbn/utility-types-jest',
           disallowedMessage: `import from @kbn/utility-types-jest instead`
         },
+        {
+          from: '@kbn/inspector-plugin',
+          to: '@kbn/inspector-plugin/common',
+          exact: true,
+        },
+        {
+          from: '@kbn/expressions-plugin',
+          to: '@kbn/expressions-plugin/common',
+          exact: true,
+        },
         {
           from: '@kbn/kibana-utils-plugin',
           to: '@kbn/kibana-utils-plugin/common',

src/plugins/chart_expressions/expression_gauge/common/types/expression_functions.ts

@@ -12,7 +12,7 @@ import {
   Datatable,
   ExpressionFunctionDefinition,
   ExpressionValueRender,
-} from '@kbn/expressions-plugin';
+} from '@kbn/expressions-plugin/common';
 import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/public';
 import { CustomPaletteState } from '@kbn/charts-plugin/common';
 import {

src/plugins/chart_expressions/expression_gauge/public/components/utils/accessors.ts

@@ -7,7 +7,7 @@
  */
 
 import type { CustomPaletteParams } from '@kbn/coloring';
-import type { DatatableColumn, DatatableRow } from '@kbn/expressions-plugin';
+import type { DatatableColumn, DatatableRow } from '@kbn/expressions-plugin/common';
 import { getAccessorByDimension } from '@kbn/visualizations-plugin/common/utils';
 import { Accessors, GaugeArguments } from '../../../common';
 

src/plugins/chart_expressions/expression_heatmap/common/types/expression_functions.ts

@@ -11,7 +11,7 @@ import {
   Datatable,
   ExpressionFunctionDefinition,
   ExpressionValueRender,
-} from '@kbn/expressions-plugin';
+} from '@kbn/expressions-plugin/common';
 import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/common';
 
 import { CustomPaletteState } from '@kbn/charts-plugin/common';

src/plugins/chart_expressions/expression_metric/common/types/expression_functions.ts

@@ -12,7 +12,7 @@ import {
   ExpressionFunctionDefinition,
   ExpressionValueRender,
   Style,
-} from '@kbn/expressions-plugin';
+} from '@kbn/expressions-plugin/common';
 import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/common';
 import { ColorMode, CustomPaletteState } from '@kbn/charts-plugin/common';
 import { VisParams, visType, LabelPositionType } from './expression_renderers';

src/plugins/chart_expressions/expression_metric/public/__stories__/metric_renderer.stories.tsx

@@ -10,7 +10,7 @@ import React from 'react';
 import { storiesOf } from '@storybook/react';
 import { from } from 'rxjs';
 import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/common';
-import { Datatable, DatatableColumn } from '@kbn/expressions-plugin';
+import { Datatable, DatatableColumn } from '@kbn/expressions-plugin/common';
 import { Render } from '@kbn/presentation-util-plugin/public/__stories__';
 import { ColorMode, CustomPaletteState } from '@kbn/charts-plugin/common';
 import { getMetricVisRenderer } from '../expression_renderers';

src/plugins/chart_expressions/expression_metric/public/expression_renderers/metric_vis_renderer.tsx

@@ -20,7 +20,7 @@ import {
   IInterpreterRenderHandlers,
 } from '@kbn/expressions-plugin/common/expression_renderers';
 import { getColumnByAccessor } from '@kbn/visualizations-plugin/common/utils';
-import { Datatable } from '@kbn/expressions-plugin';
+import { Datatable } from '@kbn/expressions-plugin/common';
 import { EXPRESSION_METRIC_NAME, MetricVisRenderConfig, VisParams } from '../../common';
 
 // @ts-ignore

src/plugins/chart_expressions/expression_partition_vis/public/utils/formatters.test.ts

@@ -7,7 +7,7 @@
  */
 
 import { fieldFormatsMock } from '@kbn/field-formats-plugin/common/mocks';
-import { Datatable } from '@kbn/expressions-plugin';
+import { Datatable } from '@kbn/expressions-plugin/common';
 import { createMockVisData } from '../mocks';
 import { generateFormatters, getAvailableFormatter, getFormatter } from './formatters';
 import { BucketColumns } from '../../common/types';

src/plugins/chart_expressions/expression_partition_vis/public/utils/get_split_dimension_accessor.test.ts

@@ -7,7 +7,7 @@
  */
 
 import { fieldFormatsMock } from '@kbn/field-formats-plugin/common/mocks';
-import { DatatableColumn } from '@kbn/expressions-plugin';
+import { DatatableColumn } from '@kbn/expressions-plugin/common';
 import { createMockVisData } from '../mocks';
 import { getSplitDimensionAccessor } from './get_split_dimension_accessor';
 import { BucketColumns } from '../../common/types';

src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/get_color.test.ts

@@ -8,7 +8,7 @@
 
 import type { PaletteOutput, PaletteDefinition } from '@kbn/coloring';
 import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
-import { Datatable } from '@kbn/expressions-plugin';
+import { Datatable } from '@kbn/expressions-plugin/common';
 import { byDataColorPaletteMap } from './get_color';
 
 describe('#byDataColorPaletteMap', () => {

src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/sort_predicate.test.ts

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Datatable } from '@kbn/expressions-plugin';
+import { Datatable } from '@kbn/expressions-plugin/common';
 import { extractUniqTermsMap } from './sort_predicate';
 
 describe('#extractUniqTermsMap', () => {

src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/sort_predicate.ts

@@ -7,7 +7,7 @@
  */
 
 import { ArrayEntry } from '@elastic/charts';
-import { Datatable } from '@kbn/expressions-plugin';
+import { Datatable } from '@kbn/expressions-plugin/common';
 import { BucketColumns, ChartTypes, PartitionVisParams } from '../../../common/types';
 
 type SortFn = (([name1, node1]: ArrayEntry, [name2, node2]: ArrayEntry) => number) | undefined;

src/plugins/chart_expressions/expression_partition_vis/public/utils/legend.ts

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { DatatableColumn } from '@kbn/expressions-plugin';
+import { DatatableColumn } from '@kbn/expressions-plugin/common';
 import { BucketColumns, ChartTypes, LegendDisplay } from '../../common/types';
 
 type GetLegendIsFlatFn = (splitChartDimension: DatatableColumn | undefined) => boolean;

src/plugins/chart_expressions/expression_tagcloud/common/types/expression_functions.ts

@@ -12,7 +12,7 @@ import {
   Datatable,
   ExpressionFunctionDefinition,
   ExpressionValueRender,
-} from '@kbn/expressions-plugin';
+} from '@kbn/expressions-plugin/common';
 import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/common';
 import { EXPRESSION_NAME, ScaleOptions, Orientation } from '../constants';
 

src/plugins/chart_expressions/expression_xy/common/__mocks__/index.ts

@@ -8,7 +8,7 @@
 
 import { Position } from '@elastic/charts';
 import type { PaletteOutput } from '@kbn/coloring';
-import { Datatable, DatatableRow } from '@kbn/expressions-plugin';
+import { Datatable, DatatableRow } from '@kbn/expressions-plugin/common';
 import { LayerTypes } from '../constants';
 import { DataLayerConfig, ExtendedDataLayerConfig, XYProps } from '../types';
 

src/plugins/chart_expressions/expression_xy/common/helpers/table.test.ts

@@ -7,7 +7,7 @@
  */
 
 import moment from 'moment';
-import { Datatable } from '@kbn/expressions-plugin';
+import { Datatable } from '@kbn/expressions-plugin/common';
 import { normalizeTable } from './table';
 import { createSampleDatatableWithRows } from '../__mocks__';
 

src/plugins/chart_expressions/expression_xy/common/types/expression_functions.ts

@@ -9,7 +9,7 @@
 import { HorizontalAlignment, Position, VerticalAlignment } from '@elastic/charts';
 import { $Values } from '@kbn/utility-types';
 import type { PaletteOutput } from '@kbn/coloring';
-import { Datatable, ExpressionFunctionDefinition } from '@kbn/expressions-plugin';
+import { Datatable, ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { LegendSize } from '@kbn/visualizations-plugin/public';
 import { EventAnnotationOutput } from '@kbn/event-annotation-plugin/common';
 import type { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/common/expression_functions';

src/plugins/chart_expressions/expression_xy/common/utils/log_datatables.ts

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ExecutionContext } from '@kbn/expressions-plugin';
+import { ExecutionContext } from '@kbn/expressions-plugin/common';
 import { Dimension, prepareLogTable } from '@kbn/visualizations-plugin/common/utils';
 import { LayerTypes, REFERENCE_LINE } from '../constants';
 import { strings } from '../i18n';

src/plugins/chart_expressions/expression_xy/public/expression_renderers/xy_chart_renderer.tsx

@@ -14,7 +14,7 @@ import ReactDOM from 'react-dom';
 import type { PaletteRegistry } from '@kbn/coloring';
 import type { ChartsPluginStart } from '@kbn/charts-plugin/public';
 import { EventAnnotationServiceType } from '@kbn/event-annotation-plugin/public';
-import { ExpressionRenderDefinition } from '@kbn/expressions-plugin';
+import { ExpressionRenderDefinition } from '@kbn/expressions-plugin/common';
 import { FormatFactory } from '@kbn/field-formats-plugin/common';
 import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import type { XYChartProps } from '../../common';

src/plugins/chart_expressions/expression_xy/public/helpers/color_assignment.test.ts

@@ -10,7 +10,7 @@ import { getColorAssignments } from './color_assignment';
 import type { DataLayerConfig } from '../../common';
 import type { FormatFactory } from '../types';
 import { LayerTypes } from '../../common/constants';
-import { Datatable } from '@kbn/expressions-plugin';
+import { Datatable } from '@kbn/expressions-plugin/common';
 
 describe('color_assignment', () => {
   const tables: Record<string, Datatable> = {

src/plugins/chart_expressions/expression_xy/public/helpers/data_layers.tsx

@@ -24,7 +24,7 @@ import {
   IFieldFormat,
   SerializedFieldFormat,
 } from '@kbn/field-formats-plugin/common';
-import { Datatable } from '@kbn/expressions-plugin';
+import { Datatable } from '@kbn/expressions-plugin/common';
 import {
   getFormatByAccessor,
   getAccessorByDimension,

src/plugins/chart_expressions/expression_xy/public/helpers/format.ts

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { DatatableColumn } from '@kbn/expressions-plugin';
+import { DatatableColumn } from '@kbn/expressions-plugin/common';
 import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/common/expression_functions';
 import { getFormatByAccessor, getColumnByAccessor } from '@kbn/visualizations-plugin/common/utils';
 

src/plugins/data/common/exports/export_csv.test.ts

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Datatable } from '@kbn/expressions-plugin';
+import { Datatable } from '@kbn/expressions-plugin/common';
 import { FieldFormat } from '@kbn/field-formats-plugin/common';
 import { datatableToCSV } from './export_csv';
 

src/plugins/data/common/exports/export_csv.tsx

@@ -8,7 +8,7 @@
 
 // Inspired by the inspector CSV exporter
 
-import { Datatable } from '@kbn/expressions-plugin';
+import { Datatable } from '@kbn/expressions-plugin/common';
 import { FormatFactory } from '@kbn/field-formats-plugin/common';
 import { createEscapeValue } from './escape_value';
 

src/plugins/data/common/exports/formula_checks.ts

@@ -7,7 +7,7 @@
  */
 
 import { startsWith } from 'lodash';
-import { Datatable } from '@kbn/expressions-plugin';
+import { Datatable } from '@kbn/expressions-plugin/common';
 import { CSV_FORMULA_CHARS } from './constants';
 
 export const cellHasFormulas = (val: string) =>

src/plugins/data/common/search/aggs/agg_config.test.ts

@@ -7,7 +7,7 @@
  */
 
 import { identity } from 'lodash';
-import type { ExpressionAstExpression } from '@kbn/expressions-plugin';
+import type { ExpressionAstExpression } from '@kbn/expressions-plugin/common';
 
 import { AggConfig, IAggConfig } from './agg_config';
 import { AggConfigs, CreateAggConfigParams } from './agg_configs';

src/plugins/data/common/search/tabify/tabify.ts

@@ -7,7 +7,7 @@
  */
 
 import { get } from 'lodash';
-import type { Datatable } from '@kbn/expressions-plugin';
+import type { Datatable } from '@kbn/expressions-plugin/common';
 import { TabbedAggResponseWriter } from './response_writer';
 import { TabifyBuckets } from './buckets';
 import type { TabbedResponseWriterOptions } from './types';

src/plugins/data/common/search/tabify/utils.test.ts

@@ -7,7 +7,7 @@
  */
 
 import { checkColumnForPrecisionError } from './utils';
-import type { DatatableColumn } from '@kbn/expressions-plugin';
+import type { DatatableColumn } from '@kbn/expressions-plugin/common';
 
 describe('tabify utils', () => {
   describe('checkDatatableForPrecisionError', () => {

src/plugins/data/common/search/tabify/utils.ts

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { DatatableColumn } from '@kbn/expressions-plugin';
+import type { DatatableColumn } from '@kbn/expressions-plugin/common';
 
 /** @public **/
 export const checkColumnForPrecisionError = (column: DatatableColumn) =>

src/plugins/data/public/actions/filters/create_filters_from_range_select.ts

@@ -8,7 +8,7 @@
 
 import { last } from 'lodash';
 import moment from 'moment';
-import { Datatable } from '@kbn/expressions-plugin';
+import { Datatable } from '@kbn/expressions-plugin/common';
 import { esFilters, IFieldType, RangeFilterParams } from '../..';
 import { getIndexPatterns, getSearchService } from '../../services';
 import { AggConfigSerialized } from '../../../common/search/aggs';

src/plugins/data/public/utils/table_inspector_view/components/download_options.tsx

@@ -19,7 +19,7 @@ import {
   EuiPopover,
   EuiToolTip,
 } from '@elastic/eui';
-import { Datatable } from '@kbn/expressions-plugin';
+import { Datatable } from '@kbn/expressions-plugin/common';
 import { downloadMultipleAs } from '@kbn/share-plugin/public';
 import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import { IUiSettingsClient } from '@kbn/core/public';

src/plugins/discover/public/application/main/components/layout/discover_layout.test.tsx

@@ -29,7 +29,7 @@ import {
 } from '../../utils/use_saved_search';
 import { discoverServiceMock } from '../../../../__mocks__/services';
 import { FetchStatus } from '../../../types';
-import { RequestAdapter } from '@kbn/inspector-plugin';
+import { RequestAdapter } from '@kbn/inspector-plugin/common';
 import { Chart } from '../chart/point_series';
 import { DiscoverSidebar } from '../sidebar/discover_sidebar';
 import { ElasticSearchHit } from '../../../../types';

src/plugins/discover/public/application/main/components/layout/types.ts

@@ -9,7 +9,7 @@
 import type { Query, TimeRange, SavedObject } from '@kbn/data-plugin/public';
 import type { DataView, DataViewAttributes } from '@kbn/data-views-plugin/public';
 import { ISearchSource } from '@kbn/data-plugin/public';
-import { RequestAdapter } from '@kbn/inspector-plugin';
+import { RequestAdapter } from '@kbn/inspector-plugin/common';
 import { AppState, GetStateReturn } from '../../services/discover_state';
 import { DataRefetch$, SavedSearchData } from '../../utils/use_saved_search';
 import { SavedSearch } from '../../../../services/saved_searches';

src/plugins/discover/public/application/main/utils/fetch_all.test.ts

@@ -9,7 +9,7 @@ import { FetchStatus } from '../../types';
 import { BehaviorSubject, firstValueFrom, Subject } from 'rxjs';
 import { reduce } from 'rxjs/operators';
 import { SearchSource } from '@kbn/data-plugin/public';
-import { RequestAdapter } from '@kbn/inspector-plugin';
+import { RequestAdapter } from '@kbn/inspector-plugin/common';
 import { savedSearchMock } from '../../../__mocks__/saved_search';
 import { ReduxLikeStateContainer } from '@kbn/kibana-utils-plugin/common';
 import { AppState } from '../services/discover_state';

src/plugins/discover/public/application/main/utils/fetch_all.ts

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 import { ISearchSource } from '@kbn/data-plugin/public';
-import { Adapters } from '@kbn/inspector-plugin';
+import { Adapters } from '@kbn/inspector-plugin/common';
 import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import { ReduxLikeStateContainer } from '@kbn/kibana-utils-plugin/common';
 import { DataViewType } from '@kbn/data-views-plugin/public';

src/plugins/discover/public/application/main/utils/fetch_chart.test.ts

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 import { of, throwError as throwErrorRx } from 'rxjs';
-import { RequestAdapter } from '@kbn/inspector-plugin';
+import { RequestAdapter } from '@kbn/inspector-plugin/common';
 import { savedSearchMockWithTimeField } from '../../../__mocks__/saved_search';
 import { fetchChart, updateSearchSource } from './fetch_chart';
 import { ReduxLikeStateContainer } from '@kbn/kibana-utils-plugin/common';

src/plugins/discover/public/application/main/utils/fetch_documents.test.ts

@@ -7,7 +7,7 @@
  */
 import { fetchDocuments } from './fetch_documents';
 import { throwError as throwErrorRx, of } from 'rxjs';
-import { RequestAdapter } from '@kbn/inspector-plugin';
+import { RequestAdapter } from '@kbn/inspector-plugin/common';
 import { savedSearchMock, savedSearchMockWithTimeField } from '../../../__mocks__/saved_search';
 import { discoverServiceMock } from '../../../__mocks__/services';
 import { IKibanaSearchResponse } from '@kbn/data-plugin/public';

src/plugins/discover/public/application/main/utils/fetch_total_hits.test.ts

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 import { throwError as throwErrorRx, of } from 'rxjs';
-import { RequestAdapter } from '@kbn/inspector-plugin';
+import { RequestAdapter } from '@kbn/inspector-plugin/common';
 import { savedSearchMock, savedSearchMockWithTimeField } from '../../../__mocks__/saved_search';
 import { fetchTotalHits } from './fetch_total_hits';
 import { discoverServiceMock } from '../../../__mocks__/services';

src/plugins/embeddable/public/lib/embeddables/i_embeddable.ts

@@ -7,7 +7,7 @@
  */
 
 import { Observable } from 'rxjs';
-import { ErrorLike } from '@kbn/expressions-plugin';
+import { ErrorLike } from '@kbn/expressions-plugin/common';
 import { Adapters } from '../types';
 import { IContainer } from '../containers/i_container';
 import { EmbeddableInput } from '../../../common/types';

src/plugins/embeddable/public/lib/triggers/triggers.ts

@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { Datatable } from '@kbn/expressions-plugin';
+import { Datatable } from '@kbn/expressions-plugin/common';
 import { Trigger, RowClickContext } from '@kbn/ui-actions-plugin/public';
 import { IEmbeddable } from '..';
 

src/plugins/expression_error/public/components/debug_component.tsx

@@ -8,7 +8,7 @@
 
 import React, { useState, useEffect, useCallback } from 'react';
 import { useResizeObserver } from '@elastic/eui';
-import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
+import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin/common';
 import { withSuspense } from '@kbn/presentation-util-plugin/public';
 import { NodeDimensions } from '../../common/types';
 import { LazyDebugComponent } from '.';

src/plugins/expression_error/public/components/error_component.tsx

@@ -8,7 +8,7 @@
 
 import React, { useState, useEffect, useCallback } from 'react';
 import { EuiIcon, useResizeObserver, EuiPopover } from '@elastic/eui';
-import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
+import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin/common';
 import { withSuspense } from '@kbn/presentation-util-plugin/public';
 import { ErrorRendererConfig } from '../../common/types';
 import { LazyErrorComponent } from '.';

src/plugins/expression_error/public/expression_renderers/error_renderer.tsx

@@ -12,7 +12,10 @@ import { Observable } from 'rxjs';
 import { CoreTheme } from '@kbn/core/public';
 import { I18nProvider } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
-import { ExpressionRenderDefinition, IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
+import {
+  ExpressionRenderDefinition,
+  IInterpreterRenderHandlers,
+} from '@kbn/expressions-plugin/common';
 import { CoreSetup } from '@kbn/core/public';
 import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { withSuspense, defaultTheme$ } from '@kbn/presentation-util-plugin/public';

src/plugins/expression_image/__fixtures__/function_specs.ts

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ExpressionFunction } from '@kbn/expressions-plugin';
+import { ExpressionFunction } from '@kbn/expressions-plugin/common';
 import { imageFunction } from '../common/expression_functions';
 
 export const functionSpecs = [imageFunction].map((fn) => new ExpressionFunction(fn()));

src/plugins/expression_image/common/expression_functions/image_function.test.ts

@@ -7,7 +7,7 @@
  */
 
 import expect from '@kbn/expect';
-import { ExecutionContext } from '@kbn/expressions-plugin';
+import { ExecutionContext } from '@kbn/expressions-plugin/common';
 import {
   functionWrapper,
   getElasticLogo,

src/plugins/expression_image/common/types/expression_functions.ts

@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin';
+import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 
 export enum ImageMode {
   CONTAIN = 'contain',

src/plugins/expression_image/public/expression_renderers/image_renderer.tsx

@@ -7,7 +7,10 @@
  */
 import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
-import { ExpressionRenderDefinition, IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
+import {
+  ExpressionRenderDefinition,
+  IInterpreterRenderHandlers,
+} from '@kbn/expressions-plugin/common';
 import { i18n } from '@kbn/i18n';
 import { Observable } from 'rxjs';
 import { CoreTheme } from '@kbn/core/public';

src/plugins/expression_metric/__fixtures__/function_specs.ts

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ExpressionFunction } from '@kbn/expressions-plugin';
+import { ExpressionFunction } from '@kbn/expressions-plugin/common';
 import { metricFunction } from '../common/expression_functions';
 
 export const functionSpecs = [metricFunction].map((fn) => new ExpressionFunction(fn()));

src/plugins/expression_metric/common/expression_functions/metric_function.test.ts

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ExecutionContext } from '@kbn/expressions-plugin';
+import { ExecutionContext } from '@kbn/expressions-plugin/common';
 import { functionWrapper, fontStyle } from '@kbn/presentation-util-plugin/common/lib';
 import { metricFunction } from './metric_function';
 

src/plugins/expression_metric/common/types/expression_functions.ts

@@ -9,7 +9,7 @@ import {
   ExpressionFunctionDefinition,
   ExpressionValueRender,
   Style,
-} from '@kbn/expressions-plugin';
+} from '@kbn/expressions-plugin/common';
 
 export type Input = number | string | null;
 

src/plugins/expression_metric/public/expression_renderers/__stories__/metric_renderer.stories.tsx

@@ -8,7 +8,7 @@
 
 import React, { CSSProperties } from 'react';
 import { storiesOf } from '@storybook/react';
-import { Style } from '@kbn/expressions-plugin';
+import { Style } from '@kbn/expressions-plugin/common';
 import { Render } from '@kbn/presentation-util-plugin/public/__stories__';
 import { getMetricRenderer } from '../metric_renderer';
 import { MetricRendererConfig } from '../../../common';

src/plugins/expression_metric/public/expression_renderers/metric_renderer.tsx

@@ -9,7 +9,10 @@ import React, { CSSProperties, lazy } from 'react';
 import { Observable } from 'rxjs';
 import { CoreTheme } from '@kbn/core/public';
 import { render, unmountComponentAtNode } from 'react-dom';
-import { ExpressionRenderDefinition, IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
+import {
+  ExpressionRenderDefinition,
+  IInterpreterRenderHandlers,
+} from '@kbn/expressions-plugin/common';
 import { i18n } from '@kbn/i18n';
 import { CoreSetup } from '@kbn/core/public';
 import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';

src/plugins/expression_repeat_image/common/expression_functions/repeat_image_function.test.ts

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ExecutionContext } from '@kbn/expressions-plugin';
+import { ExecutionContext } from '@kbn/expressions-plugin/common';
 import {
   getElasticLogo,
   getElasticOutline,

src/plugins/expression_repeat_image/common/types/expression_functions.ts

@@ -5,7 +5,10 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { ExpressionFunctionDefinition, ExpressionValueRender } from '@kbn/expressions-plugin';
+import {
+  ExpressionFunctionDefinition,
+  ExpressionValueRender,
+} from '@kbn/expressions-plugin/common';
 
 interface Arguments {
   image: string | null;

src/plugins/expression_repeat_image/public/components/repeat_image_component.tsx

@@ -8,7 +8,7 @@
 
 import React, { ReactElement, useEffect, useState } from 'react';
 import { times } from 'lodash';
-import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
+import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin/common';
 import { RepeatImageRendererConfig } from '../../common';
 
 interface RepeatImageComponentProps extends RepeatImageRendererConfig {

src/plugins/expression_repeat_image/public/expression_renderers/repeat_image_renderer.tsx

@@ -9,7 +9,10 @@ import React, { lazy } from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { Observable } from 'rxjs';
 import { CoreTheme } from '@kbn/core/public';
-import { ExpressionRenderDefinition, IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
+import {
+  ExpressionRenderDefinition,
+  IInterpreterRenderHandlers,
+} from '@kbn/expressions-plugin/common';
 import { i18n } from '@kbn/i18n';
 import { I18nProvider } from '@kbn/i18n-react';
 import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';

src/plugins/expression_reveal_image/common/expression_functions/reveal_image.test.ts

@@ -13,7 +13,7 @@ import {
 } from '@kbn/presentation-util-plugin/common/lib';
 import { revealImageFunction, errors } from './reveal_image_function';
 import { Origin } from '../types';
-import { ExecutionContext } from '@kbn/expressions-plugin';
+import { ExecutionContext } from '@kbn/expressions-plugin/common';
 
 describe('revealImageFunction', () => {
   const fn = functionWrapper(revealImageFunction);

src/plugins/expression_reveal_image/common/types/expression_functions.ts

@@ -5,7 +5,10 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { ExpressionFunctionDefinition, ExpressionValueRender } from '@kbn/expressions-plugin';
+import {
+  ExpressionFunctionDefinition,
+  ExpressionValueRender,
+} from '@kbn/expressions-plugin/common';
 
 export enum Origin {
   TOP = 'top',

src/plugins/expression_reveal_image/public/components/reveal_image_component.tsx

@@ -8,7 +8,7 @@
 
 import React, { useRef, useState, useEffect, useCallback } from 'react';
 import { useResizeObserver } from '@elastic/eui';
-import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
+import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin/common';
 import { css, CSSObject } from '@emotion/react';
 import { isValidUrl } from '@kbn/presentation-util-plugin/public';
 import { NodeDimensions, RevealImageRendererConfig, OriginString } from '../../common/types';

src/plugins/expression_reveal_image/public/expression_renderers/reveal_image_renderer.tsx

@@ -10,7 +10,10 @@ import { render, unmountComponentAtNode } from 'react-dom';
 import { Observable } from 'rxjs';
 import { CoreTheme } from '@kbn/core/public';
 import { I18nProvider } from '@kbn/i18n-react';
-import { ExpressionRenderDefinition, IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
+import {
+  ExpressionRenderDefinition,
+  IInterpreterRenderHandlers,
+} from '@kbn/expressions-plugin/common';
 import { i18n } from '@kbn/i18n';
 import { CoreSetup } from '@kbn/core/public';
 import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';

src/plugins/expression_shape/__fixtures__/function_specs.ts

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ExpressionFunction } from '@kbn/expressions-plugin';
+import { ExpressionFunction } from '@kbn/expressions-plugin/common';
 import { shapeFunction } from '../common/expression_functions';
 
 export const functionSpecs = [shapeFunction].map((fn) => new ExpressionFunction(fn()));

src/plugins/expression_shape/common/expression_functions/progress_function.test.ts

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ExecutionContext } from '@kbn/expressions-plugin';
+import { ExecutionContext } from '@kbn/expressions-plugin/common';
 import { functionWrapper, fontStyle } from '@kbn/presentation-util-plugin/common/lib';
 import { progressFunction, errors } from './progress_function';
 

src/plugins/expression_shape/common/types/expression_functions.ts

@@ -10,7 +10,7 @@ import {
   ExpressionFunctionDefinition,
   ExpressionValueRender,
   Style,
-} from '@kbn/expressions-plugin';
+} from '@kbn/expressions-plugin/common';
 
 export enum Shape {
   ARROW = 'arrow',

src/plugins/expression_shape/public/components/progress/progress_component.tsx

@@ -8,7 +8,7 @@
 
 import React, { CSSProperties, RefCallback, useCallback, useEffect, useRef, useState } from 'react';
 import { useResizeObserver } from '@elastic/eui';
-import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
+import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin/common';
 import { withSuspense } from '@kbn/presentation-util-plugin/public';
 import { NodeDimensions, ProgressRendererConfig } from '../../../common/types';
 import { ShapeRef, SvgConfig, SvgTextAttributes } from '../reusable/types';

src/plugins/expression_shape/public/components/shape/types.ts

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
+import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin/common';
 import { ShapeRendererConfig } from '../../../common/types';
 
 export interface ShapeComponentProps extends ShapeRendererConfig {

src/plugins/expression_shape/public/expression_renderers/progress_renderer.tsx

@@ -9,7 +9,10 @@ import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { Observable } from 'rxjs';
 import { CoreTheme } from '@kbn/core/public';
-import { ExpressionRenderDefinition, IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
+import {
+  ExpressionRenderDefinition,
+  IInterpreterRenderHandlers,
+} from '@kbn/expressions-plugin/common';
 import { i18n } from '@kbn/i18n';
 import { I18nProvider } from '@kbn/i18n-react';
 import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';

src/plugins/expression_shape/public/expression_renderers/shape_renderer.tsx

@@ -10,7 +10,10 @@ import { render, unmountComponentAtNode } from 'react-dom';
 import { Observable } from 'rxjs';
 import { CoreTheme } from '@kbn/core/public';
 import { I18nProvider } from '@kbn/i18n-react';
-import { ExpressionRenderDefinition, IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
+import {
+  ExpressionRenderDefinition,
+  IInterpreterRenderHandlers,
+} from '@kbn/expressions-plugin/common';
 import { i18n } from '@kbn/i18n';
 import { CoreSetup } from '@kbn/core/public';
 import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';

src/plugins/input_control_vis/public/input_control_vis_renderer.tsx

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ExpressionRenderDefinition } from '@kbn/expressions-plugin';
+import { ExpressionRenderDefinition } from '@kbn/expressions-plugin/common';
 import { InputControlVisDependencies } from './plugin';
 import { InputControlRenderValue } from './input_control_fn';
 import type { InputControlVisControllerType } from './vis_controller';

src/plugins/input_control_vis/public/vis_controller.tsx

@@ -12,7 +12,7 @@ import { render, unmountComponentAtNode } from 'react-dom';
 import { Subscription } from 'rxjs';
 
 import { I18nStart } from '@kbn/core/public';
-import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
+import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin/common';
 import { Filter } from '@kbn/es-query';
 import { VisualizationContainer } from '@kbn/visualizations-plugin/public';
 import { FilterManager } from '@kbn/data-plugin/public';

src/plugins/inspector/index.ts

@@ -1,9 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-export * from './common';

src/plugins/presentation_util/public/__stories__/render.tsx

@@ -8,7 +8,10 @@
 
 import { action } from '@storybook/addon-actions';
 import React, { useRef, useEffect } from 'react';
-import { ExpressionRenderDefinition, IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
+import {
+  ExpressionRenderDefinition,
+  IInterpreterRenderHandlers,
+} from '@kbn/expressions-plugin/common';
 
 export const defaultHandlers: IInterpreterRenderHandlers = {
   getRenderMode: () => 'view',

src/plugins/presentation_util/public/components/expression_input/expression_input.stories.tsx

@@ -10,7 +10,11 @@ import React from 'react';
 import { action } from '@storybook/addon-actions';
 import { Meta } from '@storybook/react';
 
-import { ExpressionFunction, ExpressionFunctionParameter, Style } from '@kbn/expressions-plugin';
+import {
+  ExpressionFunction,
+  ExpressionFunctionParameter,
+  Style,
+} from '@kbn/expressions-plugin/common';
 import { ExpressionInput } from '.';
 import { registerExpressionsLanguage } from './language';
 

src/plugins/presentation_util/public/index.ts

@@ -9,7 +9,7 @@
 // TODO: https://github.com/elastic/kibana/issues/110893
 /* eslint-disable @kbn/eslint/no_export_all */
 
-import { ExpressionFunction } from '@kbn/expressions-plugin';
+import { ExpressionFunction } from '@kbn/expressions-plugin/common';
 import { PresentationUtilPlugin } from './plugin';
 import { pluginServices } from './services';
 

src/plugins/ui_actions/public/triggers/row_click_trigger.ts

@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { Datatable } from '@kbn/expressions-plugin';
+import type { Datatable } from '@kbn/expressions-plugin/common';
 import { Trigger } from '.';
 
 export const ROW_CLICK_TRIGGER = 'ROW_CLICK_TRIGGER';

src/plugins/vis_types/gauge/public/utils/palette.ts

@@ -7,7 +7,7 @@
  */
 
 import { ColorSchemas, getHeatmapColors } from '@kbn/charts-plugin/common';
-import { Range } from '@kbn/expressions-plugin';
+import { Range } from '@kbn/expressions-plugin/common';
 
 export interface PaletteConfig {
   color: Array<string | undefined>;

src/plugins/vis_types/heatmap/public/utils/palette.test.ts

@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import type { Range } from '@kbn/expressions-plugin';
+import type { Range } from '@kbn/expressions-plugin/common';
 import type { ColorSchemas } from '@kbn/charts-plugin/common';
 import { getStopsWithColorsFromRanges, getStopsWithColorsFromColorsNumber } from './palette';
 

src/plugins/vis_types/heatmap/public/utils/palette.ts

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 import { ColorSchemas, getHeatmapColors } from '@kbn/charts-plugin/common';
-import { Range } from '@kbn/expressions-plugin';
+import { Range } from '@kbn/expressions-plugin/common';
 
 export interface PaletteConfig {
   color: Array<string | undefined>;

src/plugins/vis_types/metric/public/utils/palette.ts

@@ -7,7 +7,7 @@
  */
 
 import { ColorSchemas, getHeatmapColors } from '@kbn/charts-plugin/common';
-import { Range } from '@kbn/expressions-plugin';
+import { Range } from '@kbn/expressions-plugin/common';
 
 export interface PaletteConfig {
   color: Array<string | undefined>;

src/plugins/vis_types/table/public/components/table_vis_basic.test.tsx

@@ -10,7 +10,7 @@ import React from 'react';
 import { shallow } from 'enzyme';
 import { TableVisBasic } from './table_vis_basic';
 import { FormattedColumn, TableVisConfig, TableVisUiState } from '../types';
-import { DatatableColumn } from '@kbn/expressions-plugin';
+import { DatatableColumn } from '@kbn/expressions-plugin/common';
 import { createTableVisCell } from './table_vis_cell';
 import { createGridColumns } from './table_vis_columns';
 

src/plugins/vis_types/table/public/components/table_vis_basic.tsx

@@ -17,7 +17,7 @@ import {
 import { i18n } from '@kbn/i18n';
 import { orderBy } from 'lodash';
 
-import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
+import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin/common';
 import { createTableVisCell } from './table_vis_cell';
 import { TableContext, TableVisConfig, TableVisUseUiStateProps } from '../types';
 import { usePagination } from '../utils';

src/plugins/vis_types/table/public/components/table_vis_cell.tsx

@@ -9,7 +9,7 @@
 import React from 'react';
 import { EuiDataGridCellValueElementProps } from '@elastic/eui';
 
-import { DatatableRow } from '@kbn/expressions-plugin';
+import { DatatableRow } from '@kbn/expressions-plugin/common';
 import { FormattedColumns } from '../types';
 
 export const createTableVisCell =

src/plugins/vis_types/table/public/components/table_vis_columns.tsx

@@ -10,7 +10,11 @@ import React from 'react';
 import { EuiDataGridColumnCellActionProps, EuiDataGridColumn } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { DatatableColumn, DatatableRow, IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
+import {
+  DatatableColumn,
+  DatatableRow,
+  IInterpreterRenderHandlers,
+} from '@kbn/expressions-plugin/common';
 import { FormattedColumns, TableVisUiState } from '../types';
 
 interface FilterCellData {

src/plugins/vis_types/table/public/components/table_vis_controls.tsx

@@ -17,7 +17,7 @@ import {
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 
-import { DatatableColumn, DatatableRow } from '@kbn/expressions-plugin';
+import { DatatableColumn, DatatableRow } from '@kbn/expressions-plugin/common';
 import { CoreStart } from '@kbn/core/public';
 import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { exporters } from '@kbn/data-plugin/public';

src/plugins/vis_types/table/public/components/table_vis_split.tsx

@@ -8,7 +8,7 @@
 
 import React, { memo } from 'react';
 
-import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
+import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin/common';
 import { TableGroup, TableVisConfig, TableVisUseUiStateProps } from '../types';
 import { TableVisBasic } from './table_vis_basic';
 

src/plugins/vis_types/table/public/components/table_visualization.test.tsx

@@ -12,7 +12,7 @@ jest.mock('../utils', () => ({
 
 import React from 'react';
 import { shallow } from 'enzyme';
-import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
+import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin/common';
 import { coreMock } from '@kbn/core/public/mocks';
 import { TableVisConfig, TableVisData } from '../types';
 import TableVisualizationComponent from './table_visualization';

src/plugins/vis_types/table/public/components/table_visualization.tsx

@@ -11,7 +11,7 @@ import React, { useEffect } from 'react';
 import classNames from 'classnames';
 
 import { CoreStart } from '@kbn/core/public';
-import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
+import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin/common';
 import type { PersistedState } from '@kbn/visualizations-plugin/public';
 import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { TableVisConfig, TableVisData } from '../types';

src/plugins/vis_types/table/public/types.ts

@@ -7,7 +7,7 @@
  */
 
 import type { IFieldFormat } from '@kbn/field-formats-plugin/common';
-import { DatatableColumn, DatatableRow } from '@kbn/expressions-plugin';
+import { DatatableColumn, DatatableRow } from '@kbn/expressions-plugin/common';
 import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/public';
 import { TableVisParams } from '../common';
 

src/plugins/vis_types/table/public/utils/add_percentage_column.ts

@@ -8,7 +8,7 @@
 
 import { findIndex } from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { DatatableColumn } from '@kbn/expressions-plugin';
+import { DatatableColumn } from '@kbn/expressions-plugin/common';
 import { getFormatService } from '../services';
 import { FormattedColumns, TableContext } from '../types';
 

src/plugins/vis_types/table/public/utils/create_formatted_table.test.ts

@@ -14,7 +14,7 @@ jest.mock('../services', () => ({
   })),
 }));
 
-import { Datatable } from '@kbn/expressions-plugin';
+import { Datatable } from '@kbn/expressions-plugin/common';
 import { AggTypes } from '../../common';
 import { TableVisConfig } from '../types';
 import { createFormattedTable } from './create_formatted_table';

src/plugins/vis_types/table/public/utils/create_formatted_table.ts

@@ -7,7 +7,7 @@
  */
 
 import { chain } from 'lodash';
-import { Datatable } from '@kbn/expressions-plugin';
+import { Datatable } from '@kbn/expressions-plugin/common';
 import { getFormatService } from '../services';
 import { FormattedColumn, FormattedColumns, TableVisConfig, TableContext } from '../types';
 import { AggTypes } from '../../common';

src/plugins/vis_types/table/public/utils/table_vis_response_handler.test.ts

@@ -30,7 +30,7 @@ jest.mock('./add_percentage_column', () => ({
   })),
 }));
 
-import { Datatable } from '@kbn/expressions-plugin';
+import { Datatable } from '@kbn/expressions-plugin/common';
 import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/public';
 import { AggTypes } from '../../common';
 import { TableGroup, TableVisConfig } from '../types';

src/plugins/vis_types/table/public/utils/table_vis_response_handler.ts

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Datatable } from '@kbn/expressions-plugin';
+import { Datatable } from '@kbn/expressions-plugin/common';
 import { getFormatService } from '../services';
 import { TableVisData, TableGroup, TableVisConfig, TableContext } from '../types';
 import { addPercentageColumn } from './add_percentage_column';

src/plugins/vis_types/timelion/public/components/timelion_vis_component.tsx

@@ -24,7 +24,7 @@ import { RangeFilterParams } from '@kbn/es-query';
 import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { useActiveCursor } from '@kbn/charts-plugin/public';
 
-import type { IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
+import type { IInterpreterRenderHandlers } from '@kbn/expressions-plugin/common';
 import { AreaSeriesComponent, BarSeriesComponent } from './series';
 
 import {

src/plugins/vis_types/timelion/public/legacy/timelion_vis_component.tsx

@@ -13,7 +13,7 @@ import { debounce, compact, get, each, cloneDeep, last, map } from 'lodash';
 import { useResizeObserver } from '@elastic/eui';
 import { RangeFilterParams } from '@kbn/es-query';
 
-import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
+import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin/common';
 import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { DEFAULT_TIME_FORMAT } from '../../common/lib';