more import fixes

elastic · Sep 27, 2022 · 9a83880 · 9a83880
1 parent 07681fc
commit 9a83880
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/core/server/core_app/bundle_routes/register_bundle_routes.ts b/src/core/server/core_app/bundle_routes/register_bundle_routes.ts
@@ -12,7 +12,7 @@ import { fromRoot } from '@kbn/utils';
 import UiSharedDepsNpm from '@kbn/ui-shared-deps-npm';
 import * as UiSharedDepsSrc from '@kbn/ui-shared-deps-src';
 import type { IRouter } from '@kbn/core-http-server';
-import { UiPlugins } from '../../plugins';
+import type { UiPlugins } from '@kbn/core-plugins-base-server-internal';
 import { FileHashCache } from './file_hash_cache';
 import { registerRouteForBundle } from './bundles_route';
 

diff --git a/src/core/server/core_app/core_app.test.ts b/src/core/server/core_app/core_app.test.ts
@@ -10,9 +10,9 @@ import { registerBundleRoutesMock } from './core_app.test.mocks';
 
 import { mockCoreContext } from '@kbn/core-base-server-mocks';
 import { mockRouter } from '@kbn/core-http-router-server-mocks';
+import type { UiPlugins } from '@kbn/core-plugins-base-server-internal';
 import { coreMock, httpServerMock } from '../mocks';
 import { httpResourcesMock } from '../http_resources/http_resources_service.mock';
-import type { UiPlugins } from '../plugins';
 import { PluginType } from '../plugins';
 import { CoreApp } from './core_app';
 import { RequestHandlerContext } from '..';

diff --git a/src/core/server/core_app/core_app.ts b/src/core/server/core_app/core_app.ts
@@ -20,10 +20,10 @@ import type {
   KibanaRequest,
   IBasePath,
 } from '@kbn/core-http-server';
+import type { UiPlugins } from '@kbn/core-plugins-base-server-internal';
 import { HttpResources, HttpResourcesServiceToolkit } from '../http_resources';
 import { InternalCorePreboot, InternalCoreSetup } from '../internal_types';
 import { registerBundleRoutes } from './bundle_routes';
-import { UiPlugins } from '../plugins';
 import type { InternalCoreAppRequestHandlerContext } from './internal_types';
 
 /** @internal */

diff --git a/src/core/server/mocks.ts b/src/core/server/mocks.ts
@@ -31,7 +31,7 @@ import { coreUsageDataServiceMock } from '@kbn/core-usage-data-server-mocks';
 import { i18nServiceMock } from '@kbn/core-i18n-server-mocks';
 import { statusServiceMock } from '@kbn/core-status-server-mocks';
 import { uiSettingsServiceMock } from '@kbn/core-ui-settings-server-mocks';
-import { renderingMock } from '@kbn/core-rendering-server-mocks';
+import { renderingServiceMock } from '@kbn/core-rendering-server-mocks';
 import type {
   PluginInitializerContext,
   CoreSetup,
@@ -57,7 +57,7 @@ export {
 export { migrationMocks } from '@kbn/core-saved-objects-migration-server-mocks';
 export { uiSettingsServiceMock } from '@kbn/core-ui-settings-server-mocks';
 export { metricsServiceMock } from '@kbn/core-metrics-server-mocks';
-export { renderingMock } from '@kbn/core-rendering-server-mocks';
+export { renderingServiceMock } from '@kbn/core-rendering-server-mocks';
 export { statusServiceMock } from '@kbn/core-status-server-mocks';
 export { contextServiceMock } from '@kbn/core-http-context-server-mocks';
 export { capabilitiesServiceMock } from '@kbn/core-capabilities-server-mocks';
@@ -237,7 +237,7 @@ function createInternalCoreSetupMock() {
     environment: environmentServiceMock.createSetupContract(),
     i18n: i18nServiceMock.createSetupContract(),
     httpResources: httpResourcesMock.createSetupContract(),
-    rendering: renderingMock.createSetupContract(),
+    rendering: renderingServiceMock.createSetupContract(),
     uiSettings: uiSettingsServiceMock.createSetupContract(),
     logging: loggingServiceMock.createInternalSetupContract(),
     metrics: metricsServiceMock.createInternalSetupContract(),