From 594ad4af7aca0ed28aa095fd68e2eda59108a842 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Fern=C3=A1ndez=20Haro?= Date: Fri, 30 Aug 2024 00:18:15 +0200 Subject: [PATCH] [Move `@kbn/config-schema` to server] `maps_ems` --- src/plugins/maps_ems/public/index.ts | 4 ++-- src/plugins/maps_ems/public/kibana_services.ts | 2 +- src/plugins/maps_ems/public/plugin.ts | 2 +- src/plugins/maps_ems/{ => server}/config.ts | 2 +- src/plugins/maps_ems/server/index.ts | 2 +- src/plugins/maps_ems/server/plugin.ts | 2 +- src/plugins/maps_ems/tsconfig.json | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) rename src/plugins/maps_ems/{ => server}/config.ts (99%) diff --git a/src/plugins/maps_ems/public/index.ts b/src/plugins/maps_ems/public/index.ts index 48158e74f3e83..ebeeed1e59e6f 100644 --- a/src/plugins/maps_ems/public/index.ts +++ b/src/plugins/maps_ems/public/index.ts @@ -9,14 +9,14 @@ import type { PluginInitializerContext } from '@kbn/core/public'; import type { EMSClient } from '@elastic/ems-client'; import { MapsEmsPlugin } from './plugin'; -import type { MapConfig } from '../config'; +import type { MapConfig } from '../server/config'; import type { EMSSettings } from '../common'; export function plugin(initializerContext: PluginInitializerContext) { return new MapsEmsPlugin(initializerContext); } -export type { MapConfig, TileMapConfig } from '../config'; +export type { MapConfig, TileMapConfig } from '../server/config'; export type { EMSConfig } from '../common'; // eslint-disable-next-line @typescript-eslint/no-empty-interface diff --git a/src/plugins/maps_ems/public/kibana_services.ts b/src/plugins/maps_ems/public/kibana_services.ts index 6e49b58fbae81..7438779d843d9 100644 --- a/src/plugins/maps_ems/public/kibana_services.ts +++ b/src/plugins/maps_ems/public/kibana_services.ts @@ -8,7 +8,7 @@ import { LicensingPluginStart } from '@kbn/licensing-plugin/public'; import { ILicense } from '@kbn/licensing-plugin/common/types'; -import type { MapConfig } from '../config'; +import type { MapConfig } from '../server/config'; import { LICENSE_CHECK_ID } from '../common'; let kibanaVersion: string; diff --git a/src/plugins/maps_ems/public/plugin.ts b/src/plugins/maps_ems/public/plugin.ts index 3632799f645e1..f0f0413ca4382 100644 --- a/src/plugins/maps_ems/public/plugin.ts +++ b/src/plugins/maps_ems/public/plugin.ts @@ -15,7 +15,7 @@ import { getIsEnterprisePlus, } from './kibana_services'; import type { MapsEmsPluginPublicSetup, MapsEmsPluginPublicStart } from '.'; -import type { MapConfig } from '../config'; +import type { MapConfig } from '../server/config'; import { createEMSSettings } from '../common/ems_settings'; import { createEMSClientLazy } from './lazy_load_bundle'; diff --git a/src/plugins/maps_ems/config.ts b/src/plugins/maps_ems/server/config.ts similarity index 99% rename from src/plugins/maps_ems/config.ts rename to src/plugins/maps_ems/server/config.ts index 5535809f04316..6c40b4ae4dcbe 100644 --- a/src/plugins/maps_ems/config.ts +++ b/src/plugins/maps_ems/server/config.ts @@ -16,7 +16,7 @@ import { DEFAULT_EMS_ROADMAP_ID, DEFAULT_EMS_ROADMAP_DESATURATED_ID, DEFAULT_EMS_DARKMAP_ID, -} from './common'; +} from '../common'; const tileMapConfigOptionsSchema = schema.object({ attribution: schema.string({ defaultValue: '' }), diff --git a/src/plugins/maps_ems/server/index.ts b/src/plugins/maps_ems/server/index.ts index 0fea54b0ba974..aa86d70fff6e4 100644 --- a/src/plugins/maps_ems/server/index.ts +++ b/src/plugins/maps_ems/server/index.ts @@ -7,7 +7,7 @@ */ import { PluginInitializerContext, PluginConfigDescriptor } from '@kbn/core/server'; -import { MapConfig, mapConfigSchema } from '../config'; +import { MapConfig, mapConfigSchema } from './config'; export type { EMSSettings } from '../common'; export type { MapsEmsPluginServerSetup } from './plugin'; diff --git a/src/plugins/maps_ems/server/plugin.ts b/src/plugins/maps_ems/server/plugin.ts index 255fbaf4f912a..b53663056db75 100644 --- a/src/plugins/maps_ems/server/plugin.ts +++ b/src/plugins/maps_ems/server/plugin.ts @@ -9,7 +9,7 @@ import { ILicense, LicensingPluginSetup } from '@kbn/licensing-plugin/server'; import { Plugin, PluginInitializerContext } from '@kbn/core-plugins-server'; import { CoreSetup } from '@kbn/core-lifecycle-server'; -import { MapConfig } from '../config'; +import { MapConfig } from './config'; import { LICENSE_CHECK_ID, EMSSettings } from '../common'; export interface MapsEmsPluginServerSetup { diff --git a/src/plugins/maps_ems/tsconfig.json b/src/plugins/maps_ems/tsconfig.json index e8ed41cf54f36..95c001e37d28d 100644 --- a/src/plugins/maps_ems/tsconfig.json +++ b/src/plugins/maps_ems/tsconfig.json @@ -3,7 +3,7 @@ "compilerOptions": { "outDir": "target/types", }, - "include": ["common/**/*", "public/**/*", "server/**/*", "./config.ts"], + "include": ["common/**/*", "public/**/*", "server/**/*"], "kbn_references": [ "@kbn/core", "@kbn/licensing-plugin",