Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Move @kbn/config-schema to server] maps_ems #191783

Merged
merged 1 commit into from
Aug 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/plugins/maps_ems/public/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/maps_ems/public/kibana_services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/maps_ems/public/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: '' }),
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/maps_ems/server/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion src/plugins/maps_ems/server/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/maps_ems/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down