diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 1931eec08f12f..f21b42bd50906 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -363,7 +363,6 @@ examples/discover_customization_examples @elastic/kibana-data-discovery x-pack/plugins/discover_enhanced @elastic/kibana-data-discovery src/plugins/discover @elastic/kibana-data-discovery src/plugins/discover_shared @elastic/kibana-data-discovery @elastic/obs-ux-logs-team -packages/kbn-discover-features-registry @elastic/kibana-data-discovery packages/kbn-discover-utils @elastic/kibana-data-discovery packages/kbn-doc-links @elastic/docs packages/kbn-docs-utils @elastic/kibana-operations diff --git a/package.json b/package.json index 393b2cd956939..0494c47a79691 100644 --- a/package.json +++ b/package.json @@ -411,7 +411,6 @@ "@kbn/developer-examples-plugin": "link:examples/developer_examples", "@kbn/discover-customization-examples-plugin": "link:examples/discover_customization_examples", "@kbn/discover-enhanced-plugin": "link:x-pack/plugins/discover_enhanced", - "@kbn/discover-features-registry": "link:packages/kbn-discover-features-registry", "@kbn/discover-plugin": "link:src/plugins/discover", "@kbn/discover-shared-plugin": "link:src/plugins/discover_shared", "@kbn/discover-utils": "link:packages/kbn-discover-utils", diff --git a/packages/kbn-discover-features-registry/README.md b/packages/kbn-discover-features-registry/README.md deleted file mode 100644 index 43d45f3300ff9..0000000000000 --- a/packages/kbn-discover-features-registry/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# @kbn/discover-features-registry - -This package exposes a `FeaturesRegistry` class which, once instantiated, allows Discover to register/retrieve external features. \ No newline at end of file diff --git a/packages/kbn-discover-features-registry/jest.config.js b/packages/kbn-discover-features-registry/jest.config.js deleted file mode 100644 index 2132b174cdd49..0000000000000 --- a/packages/kbn-discover-features-registry/jest.config.js +++ /dev/null @@ -1,13 +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. - */ - -module.exports = { - preset: '@kbn/test', - rootDir: '../..', - roots: ['/packages/kbn-discover-features-registry'], -}; diff --git a/packages/kbn-discover-features-registry/kibana.jsonc b/packages/kbn-discover-features-registry/kibana.jsonc deleted file mode 100644 index 1eb204c22667d..0000000000000 --- a/packages/kbn-discover-features-registry/kibana.jsonc +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "shared-common", - "id": "@kbn/discover-features-registry", - "owner": "@elastic/kibana-data-discovery" -} diff --git a/packages/kbn-discover-features-registry/package.json b/packages/kbn-discover-features-registry/package.json deleted file mode 100644 index 5cbd2ef1f6cb1..0000000000000 --- a/packages/kbn-discover-features-registry/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "@kbn/discover-features-registry", - "private": true, - "version": "1.0.0", - "license": "SSPL-1.0 OR Elastic License 2.0", - "sideEffects": false -} \ No newline at end of file diff --git a/packages/kbn-discover-features-registry/tsconfig.json b/packages/kbn-discover-features-registry/tsconfig.json deleted file mode 100644 index 3b1126711c1e1..0000000000000 --- a/packages/kbn-discover-features-registry/tsconfig.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": { - "outDir": "target/types", - "types": [ - "jest", - "node", - "react" - ] - }, - "include": [ - "**/*.ts", - "**/*.tsx", - ], - "exclude": [ - "target/**/*" - ], -} diff --git a/packages/kbn-discover-features-registry/src/features_registry.test.tsx b/src/plugins/discover_shared/common/features_registry/features_registry.test.tsx similarity index 100% rename from packages/kbn-discover-features-registry/src/features_registry.test.tsx rename to src/plugins/discover_shared/common/features_registry/features_registry.test.tsx diff --git a/packages/kbn-discover-features-registry/src/features_registry.ts b/src/plugins/discover_shared/common/features_registry/features_registry.ts similarity index 100% rename from packages/kbn-discover-features-registry/src/features_registry.ts rename to src/plugins/discover_shared/common/features_registry/features_registry.ts diff --git a/packages/kbn-discover-features-registry/src/index.ts b/src/plugins/discover_shared/common/features_registry/index.ts similarity index 94% rename from packages/kbn-discover-features-registry/src/index.ts rename to src/plugins/discover_shared/common/features_registry/index.ts index 57452d2b2429c..e1fa3ece5dd03 100644 --- a/packages/kbn-discover-features-registry/src/index.ts +++ b/src/plugins/discover_shared/common/features_registry/index.ts @@ -7,4 +7,3 @@ */ export { FeaturesRegistry } from './features_registry'; -export * from './types'; diff --git a/packages/kbn-discover-features-registry/src/types.ts b/src/plugins/discover_shared/common/features_registry/types.ts similarity index 100% rename from packages/kbn-discover-features-registry/src/types.ts rename to src/plugins/discover_shared/common/features_registry/types.ts diff --git a/packages/kbn-discover-features-registry/index.ts b/src/plugins/discover_shared/common/index.ts similarity index 86% rename from packages/kbn-discover-features-registry/index.ts rename to src/plugins/discover_shared/common/index.ts index de0577ee3ed83..e1fa3ece5dd03 100644 --- a/packages/kbn-discover-features-registry/index.ts +++ b/src/plugins/discover_shared/common/index.ts @@ -6,4 +6,4 @@ * Side Public License, v 1. */ -export * from './src'; +export { FeaturesRegistry } from './features_registry'; diff --git a/src/plugins/discover_shared/public/services/discover_features/discover_features_service.mock.ts b/src/plugins/discover_shared/public/services/discover_features/discover_features_service.mock.ts index 859028da5a1a4..e1523c2ceaf21 100644 --- a/src/plugins/discover_shared/public/services/discover_features/discover_features_service.mock.ts +++ b/src/plugins/discover_shared/public/services/discover_features/discover_features_service.mock.ts @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -import { FeaturesRegistry } from '@kbn/discover-features-registry'; +import { FeaturesRegistry } from '../../../common'; import { DiscoverFeature } from './types'; const registry = new FeaturesRegistry(); diff --git a/src/plugins/discover_shared/public/services/discover_features/discover_features_service.ts b/src/plugins/discover_shared/public/services/discover_features/discover_features_service.ts index bdcf53a78377b..c5f0489b62b3a 100644 --- a/src/plugins/discover_shared/public/services/discover_features/discover_features_service.ts +++ b/src/plugins/discover_shared/public/services/discover_features/discover_features_service.ts @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -import { FeaturesRegistry } from '@kbn/discover-features-registry'; +import { FeaturesRegistry } from '../../../common'; import { DiscoverFeature } from './types'; export class DiscoverFeaturesService { diff --git a/src/plugins/discover_shared/public/services/discover_features/types.ts b/src/plugins/discover_shared/public/services/discover_features/types.ts index 7850e86cf380e..120abfcd43f30 100644 --- a/src/plugins/discover_shared/public/services/discover_features/types.ts +++ b/src/plugins/discover_shared/public/services/discover_features/types.ts @@ -6,8 +6,8 @@ * Side Public License, v 1. */ -import { FeaturesRegistry } from '@kbn/discover-features-registry'; import { DataTableRecord } from '@kbn/discover-utils'; +import { FeaturesRegistry } from '../../../common'; /** * Features types diff --git a/tsconfig.base.json b/tsconfig.base.json index d7c4ca0372ca3..5c0948d480d0f 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -716,8 +716,6 @@ "@kbn/discover-customization-examples-plugin/*": ["examples/discover_customization_examples/*"], "@kbn/discover-enhanced-plugin": ["x-pack/plugins/discover_enhanced"], "@kbn/discover-enhanced-plugin/*": ["x-pack/plugins/discover_enhanced/*"], - "@kbn/discover-features-registry": ["packages/kbn-discover-features-registry"], - "@kbn/discover-features-registry/*": ["packages/kbn-discover-features-registry/*"], "@kbn/discover-plugin": ["src/plugins/discover"], "@kbn/discover-plugin/*": ["src/plugins/discover/*"], "@kbn/discover-shared-plugin": ["src/plugins/discover_shared"], diff --git a/yarn.lock b/yarn.lock index bddc736db8175..df71fa1e727a0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4484,10 +4484,6 @@ version "0.0.0" uid "" -"@kbn/discover-features-registry@link:packages/kbn-discover-features-registry": - version "0.0.0" - uid "" - "@kbn/discover-plugin@link:src/plugins/discover": version "0.0.0" uid ""