Merge branch 'main' into eui-70.2.x

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

@@ -14,7 +14,8 @@ import { ExpressionRenderDefinition } from '@kbn/expressions-plugin/common';
 import { i18n } from '@kbn/i18n';
 import { CoreSetup } from '@kbn/core/public';
 import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
-import { withSuspense, defaultTheme$ } from '@kbn/presentation-util-plugin/public';
+import { withSuspense } from '@kbn/presentation-util-plugin/public';
+import { defaultTheme$ } from '@kbn/presentation-util-plugin/common';
 import { LazyDebugRenderComponent } from '../components';
 import { JSON } from '../../common';
 

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

@@ -18,7 +18,8 @@ import {
 } 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';
+import { withSuspense } from '@kbn/presentation-util-plugin/public';
+import { defaultTheme$ } from '@kbn/presentation-util-plugin/common';
 import { ErrorRendererConfig } from '../../common/types';
 import { LazyErrorRenderComponent } from '../components';
 

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

@@ -12,7 +12,7 @@ import {
   functionWrapper,
   getElasticLogo,
   getElasticOutline,
-} from '@kbn/presentation-util-plugin/common/lib';
+} from '@kbn/presentation-util-plugin/common';
 import { imageFunction as image } from './image_function';
 
 describe('image', () => {

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

@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { getElasticLogo, resolveWithMissingImage } from '@kbn/presentation-util-plugin/common/lib';
+import { getElasticLogo, resolveWithMissingImage } from '@kbn/presentation-util-plugin/common';
 import { BASE64, URL } from '../constants';
 import { ExpressionImageFunction, ImageMode } from '../types';
 

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

@@ -9,7 +9,7 @@
 import React from 'react';
 import { storiesOf } from '@storybook/react';
 import { Render, waitFor } from '@kbn/presentation-util-plugin/public/__stories__';
-import { getElasticLogo } from '@kbn/presentation-util-plugin/common/lib';
+import { getElasticLogo } from '@kbn/presentation-util-plugin/common';
 import { getImageRenderer } from '../image_renderer';
 import { ImageMode } from '../../../common';
 

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

@@ -16,7 +16,7 @@ import { Observable } from 'rxjs';
 import { CoreTheme } from '@kbn/core/public';
 import { CoreSetup } from '@kbn/core/public';
 import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
-import { getElasticLogo, defaultTheme$, isValidUrl } from '@kbn/presentation-util-plugin/public';
+import { getElasticLogo, defaultTheme$, isValidUrl } from '@kbn/presentation-util-plugin/common';
 import { ImageRendererConfig } from '../../common/types';
 
 const strings = {

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

@@ -7,7 +7,7 @@
  */
 
 import { ExecutionContext } from '@kbn/expressions-plugin/common';
-import { functionWrapper, fontStyle } from '@kbn/presentation-util-plugin/common/lib';
+import { functionWrapper, fontStyle } from '@kbn/presentation-util-plugin/common';
 import { metricFunction } from './metric_function';
 
 describe('metric', () => {

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

@@ -16,7 +16,8 @@ import {
 import { i18n } from '@kbn/i18n';
 import { CoreSetup } from '@kbn/core/public';
 import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
-import { withSuspense, defaultTheme$ } from '@kbn/presentation-util-plugin/public';
+import { withSuspense } from '@kbn/presentation-util-plugin/public';
+import { defaultTheme$ } from '@kbn/presentation-util-plugin/common';
 import { MetricRendererConfig } from '../../common/types';
 
 const strings = {

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

@@ -11,7 +11,7 @@ import {
   getElasticLogo,
   getElasticOutline,
   functionWrapper,
-} from '@kbn/presentation-util-plugin/common/lib';
+} from '@kbn/presentation-util-plugin/common';
 import { repeatImageFunction } from './repeat_image_function';
 
 describe('repeatImage', () => {

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

@@ -11,7 +11,7 @@ import {
   getElasticOutline,
   isValidUrl,
   resolveWithMissingImage,
-} from '@kbn/presentation-util-plugin/common/lib';
+} from '@kbn/presentation-util-plugin/common';
 import { CONTEXT, BASE64, URL } from '../constants';
 import { ExpressionRepeatImageFunction } from '../types';
 

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

@@ -9,7 +9,7 @@
 import React from 'react';
 import { storiesOf } from '@storybook/react';
 import { Render } from '@kbn/presentation-util-plugin/public/__stories__';
-import { getElasticLogo, getElasticOutline } from '@kbn/presentation-util-plugin/common/lib';
+import { getElasticLogo, getElasticOutline } from '@kbn/presentation-util-plugin/common';
 import { waitFor } from '@kbn/presentation-util-plugin/public/__stories__';
 import { getRepeatImageRenderer } from '../repeat_image_renderer';
 

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

@@ -17,12 +17,8 @@ import { i18n } from '@kbn/i18n';
 import { I18nProvider } from '@kbn/i18n-react';
 import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { CoreSetup } from '@kbn/core/public';
-import {
-  defaultTheme$,
-  getElasticOutline,
-  isValidUrl,
-  withSuspense,
-} from '@kbn/presentation-util-plugin/public';
+import { withSuspense } from '@kbn/presentation-util-plugin/public';
+import { defaultTheme$, getElasticOutline, isValidUrl } from '@kbn/presentation-util-plugin/common';
 import { RepeatImageRendererConfig } from '../../common/types';
 
 const strings = {

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

@@ -10,7 +10,7 @@ import {
   functionWrapper,
   getElasticOutline,
   getElasticLogo,
-} from '@kbn/presentation-util-plugin/common/lib';
+} from '@kbn/presentation-util-plugin/common';
 import { revealImageFunction, errors } from './reveal_image_function';
 import { Origin } from '../types';
 import { ExecutionContext } from '@kbn/expressions-plugin/common';

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

@@ -11,7 +11,7 @@ import {
   resolveWithMissingImage,
   getElasticOutline,
   isValidUrl,
-} from '@kbn/presentation-util-plugin/common/lib';
+} from '@kbn/presentation-util-plugin/common';
 import { ExpressionRevealImageFunction, Origin, Position } from '../types';
 import { BASE64, URL } from '../constants';
 

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

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

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

@@ -8,7 +8,7 @@
 
 import React from 'react';
 import { storiesOf } from '@storybook/react';
-import { getElasticOutline, getElasticLogo } from '@kbn/presentation-util-plugin/public';
+import { getElasticOutline, getElasticLogo } from '@kbn/presentation-util-plugin/common';
 import { Render, waitFor } from '@kbn/presentation-util-plugin/public/__stories__';
 import { getRevealImageRenderer } from '..';
 import { Origin } from '../../../common/types/expression_functions';

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

@@ -17,7 +17,8 @@ import {
 import { i18n } from '@kbn/i18n';
 import { CoreSetup } from '@kbn/core/public';
 import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
-import { withSuspense, defaultTheme$ } from '@kbn/presentation-util-plugin/public';
+import { withSuspense } from '@kbn/presentation-util-plugin/public';
+import { defaultTheme$ } from '@kbn/presentation-util-plugin/common';
 import { RevealImageRendererConfig } from '../../common/types';
 
 export const strings = {

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

@@ -7,7 +7,7 @@
  */
 
 import { ExecutionContext } from '@kbn/expressions-plugin/common';
-import { functionWrapper, fontStyle } from '@kbn/presentation-util-plugin/common/lib';
+import { functionWrapper, fontStyle } from '@kbn/presentation-util-plugin/common';
 import { progressFunction, errors } from './progress_function';
 
 describe('progress', () => {

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

@@ -17,7 +17,8 @@ import { i18n } from '@kbn/i18n';
 import { I18nProvider } from '@kbn/i18n-react';
 import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { CoreSetup } from '@kbn/core/public';
-import { withSuspense, defaultTheme$ } from '@kbn/presentation-util-plugin/public';
+import { withSuspense } from '@kbn/presentation-util-plugin/public';
+import { defaultTheme$ } from '@kbn/presentation-util-plugin/common';
 import { ProgressRendererConfig } from '../../common/types';
 import { LazyProgressComponent } from '../components/progress';
 

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

@@ -17,7 +17,8 @@ import {
 import { i18n } from '@kbn/i18n';
 import { CoreSetup } from '@kbn/core/public';
 import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
-import { withSuspense, defaultTheme$ } from '@kbn/presentation-util-plugin/public';
+import { withSuspense } from '@kbn/presentation-util-plugin/public';
+import { defaultTheme$ } from '@kbn/presentation-util-plugin/common';
 import { ShapeRendererConfig } from '../../common/types';
 import { LazyShapeComponent } from '../components/shape';
 

src/plugins/presentation_util/common/index.ts

@@ -6,9 +6,6 @@
  * Side Public License, v 1.
  */
 
-// TODO: https://github.com/elastic/kibana/issues/110893
-/* eslint-disable @kbn/eslint/no_export_all */
-
 export const PLUGIN_ID = 'presentationUtil';
 export const PLUGIN_NAME = 'presentationUtil';
 
@@ -18,4 +15,33 @@ export const PLUGIN_NAME = 'presentationUtil';
  */
 export const EXPRESSIONS_LANGUAGE_ID = 'kibana-expressions';
 
-export * from './labs';
+export type {
+  EnvironmentName,
+  EnvironmentStatus,
+  Project,
+  ProjectConfig,
+  ProjectID,
+  ProjectStatus,
+  SolutionName,
+} from './labs';
+
+export {
+  LABS_PROJECT_PREFIX,
+  environmentNames,
+  projectIDs,
+  projects,
+  getProjectIDs,
+  isProjectEnabledByStatus,
+} from './labs';
+
+export {
+  defaultTheme$,
+  getElasticLogo,
+  fontStyle,
+  functionWrapper,
+  getElasticOutline,
+  isValidUrl,
+  resolveWithMissingImage,
+  encode,
+  parseDataUrl,
+} from './lib';

src/plugins/presentation_util/kibana.json

@@ -9,7 +9,7 @@
   "kibanaVersion": "kibana",
   "server": true,
   "ui": true,
-  "extraPublicDirs": ["common/lib"],
+  "extraPublicDirs": ["common"],
   "requiredPlugins": ["savedObjects", "kibanaReact", "embeddable", "expressions", "dataViews"],
   "optionalPlugins": []
 }

src/plugins/presentation_util/public/index.ts

@@ -6,9 +6,6 @@
  * Side Public License, v 1.
  */
 
-// TODO: https://github.com/elastic/kibana/issues/110893
-/* eslint-disable @kbn/eslint/no_export_all */
-
 import { ExpressionFunction } from '@kbn/expressions-plugin/common';
 import { PresentationUtilPlugin } from './plugin';
 import { pluginServices } from './services';
@@ -29,9 +26,6 @@ export { PluginServices, PluginServiceProvider, PluginServiceRegistry } from './
 
 export type { PresentationUtilPluginSetup, PresentationUtilPluginStart } from './types';
 export type { SaveModalDashboardProps } from './components/types';
-export type { ProjectID, Project } from '../common/labs';
-export { projectIDs } from '../common/labs';
-export * from '../common/lib';
 
 export {
   LazyExpressionInput,
@@ -53,7 +47,11 @@ export {
   type ReduxEmbeddablePackage,
 } from './redux_embeddables';
 
-export * from './components/types';
+export type {
+  ExpressionInputEditorRef,
+  ExpressionInputProps,
+  OnExpressionInputEditorDidMount,
+} from './components/types';
 
 /** @deprecated QuickButtonProps - use `IconButtonGroupProps` from `@kbn/shared-ux-button-toolbar` */
 export type { QuickButtonProps } from './components/solution_toolbar';

src/plugins/presentation_util/tsconfig.json

@@ -5,7 +5,6 @@
     "emitDeclarationOnly": true,
     "declaration": true,
   },
-  "extraPublicDirs": ["common"],
   "include": [
     "common/**/*",
     "public/**/*",

x-pack/plugins/canvas/canvas_plugin_src/functions/browser/markdown.test.js

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper, fontStyle } from '@kbn/presentation-util-plugin/common/lib';
+import { functionWrapper, fontStyle } from '@kbn/presentation-util-plugin/common';
 import { testTable } from '../common/__fixtures__/test_tables';
 import { markdown } from './markdown';
 

x-pack/plugins/canvas/canvas_plugin_src/functions/common/__fixtures__/test_styles.js

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { getElasticLogo } from '@kbn/presentation-util-plugin/common/lib';
+import { getElasticLogo } from '@kbn/presentation-util-plugin/common';
 
 export const fontStyle = {
   type: 'style',

x-pack/plugins/canvas/canvas_plugin_src/functions/common/all.test.js

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common';
 import { all } from './all';
 
 describe('all', () => {

x-pack/plugins/canvas/canvas_plugin_src/functions/common/alterColumn.test.js

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common';
 import { getFunctionErrors } from '../../../i18n';
 import { emptyTable, testTable } from './__fixtures__/test_tables';
 import { alterColumn } from './alterColumn';

x-pack/plugins/canvas/canvas_plugin_src/functions/common/any.test.js

@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common';
 import { any } from './any';
 
 describe('any', () => {

x-pack/plugins/canvas/canvas_plugin_src/functions/common/as.test.js

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common';
 import { asFn } from './as';
 
 describe('as', () => {

x-pack/plugins/canvas/canvas_plugin_src/functions/common/axis_config.test.js

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common';
 import { getFunctionErrors } from '../../../i18n';
 import { testTable } from './__fixtures__/test_tables';
 import { axisConfig } from './axisConfig';

x-pack/plugins/canvas/canvas_plugin_src/functions/common/case.test.js

@@ -7,7 +7,7 @@
 
 import { of } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
-import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common';
 import { caseFn } from './case';
 
 describe('case', () => {

x-pack/plugins/canvas/canvas_plugin_src/functions/common/clear.test.js

@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common';
 import { testTable } from './__fixtures__/test_tables';
 import { clear } from './clear';
 

x-pack/plugins/canvas/canvas_plugin_src/functions/common/columns.test.js

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common';
 import { emptyTable, testTable } from './__fixtures__/test_tables';
 import { columns } from './columns';
 

x-pack/plugins/canvas/canvas_plugin_src/functions/common/compare.test.js

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib';
+import { functionWrapper } from '@kbn/presentation-util-plugin/common';
 import { getFunctionErrors } from '../../../i18n';
 import { compare } from './compare';
 

x-pack/plugins/canvas/canvas_plugin_src/functions/common/containerStyle.ts

@@ -6,7 +6,7 @@
  */
 
 import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
-import { isValidUrl } from '@kbn/presentation-util-plugin/common/lib';
+import { isValidUrl } from '@kbn/presentation-util-plugin/common';
 import { ContainerStyle, Overflow, BackgroundRepeat, BackgroundSize } from '../../../types';
 import { getFunctionHelp, getFunctionErrors } from '../../../i18n';