diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 9254aa5b7a4c5..0384282e984c9 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -870,15 +870,15 @@ src/platform/packages/shared/kbn-server-route-repository @elastic/obs-knowledge- src/platform/packages/shared/kbn-server-route-repository-client @elastic/obs-knowledge-team src/platform/packages/shared/kbn-server-route-repository-utils @elastic/obs-knowledge-team x-pack/platform/plugins/shared/serverless @elastic/appex-sharedux -src/platform/packages/private/serverless/settings/common @elastic/appex-sharedux @elastic/kibana-management +src/platform/packages/shared/serverless/settings/common @elastic/appex-sharedux @elastic/kibana-management x-pack/solutions/observability/plugins/serverless_observability @elastic/obs-ux-management-team src/platform/packages/shared/serverless/settings/observability_project @elastic/appex-sharedux @elastic/kibana-management @elastic/obs-ux-management-team src/platform/packages/private/serverless/project_switcher @elastic/appex-sharedux x-pack/solutions/search/plugins/serverless_search @elastic/search-kibana src/platform/packages/shared/serverless/settings/search_project @elastic/search-kibana @elastic/kibana-management src/platform/packages/shared/serverless/settings/security_project @elastic/security-solution @elastic/kibana-management -packages/serverless/storybook/config @elastic/appex-sharedux -src/platform/packages/private/serverless/types @elastic/appex-sharedux +src/platform/packages/shared/serverless/storybook/config @elastic/appex-sharedux +src/platform/packages/shared/serverless/types @elastic/appex-sharedux test/plugin_functional/plugins/session_notifications @elastic/kibana-core x-pack/solutions/security/plugins/session_view @elastic/kibana-cloud-security-posture packages/kbn-set-map @elastic/kibana-operations diff --git a/package.json b/package.json index cdb9a148c544b..4495f49e95ced 100644 --- a/package.json +++ b/package.json @@ -871,14 +871,14 @@ "@kbn/server-route-repository-client": "link:src/platform/packages/shared/kbn-server-route-repository-client", "@kbn/server-route-repository-utils": "link:src/platform/packages/shared/kbn-server-route-repository-utils", "@kbn/serverless": "link:x-pack/platform/plugins/shared/serverless", - "@kbn/serverless-common-settings": "link:src/platform/packages/private/serverless/settings/common", + "@kbn/serverless-common-settings": "link:src/platform/packages/shared/serverless/settings/common", "@kbn/serverless-observability": "link:x-pack/solutions/observability/plugins/serverless_observability", "@kbn/serverless-observability-settings": "link:src/platform/packages/shared/serverless/settings/observability_project", "@kbn/serverless-project-switcher": "link:src/platform/packages/private/serverless/project_switcher", "@kbn/serverless-search": "link:x-pack/solutions/search/plugins/serverless_search", "@kbn/serverless-search-settings": "link:src/platform/packages/shared/serverless/settings/search_project", "@kbn/serverless-security-settings": "link:src/platform/packages/shared/serverless/settings/security_project", - "@kbn/serverless-types": "link:src/platform/packages/private/serverless/types", + "@kbn/serverless-types": "link:src/platform/packages/shared/serverless/types", "@kbn/session-notifications-plugin": "link:test/plugin_functional/plugins/session_notifications", "@kbn/session-view-plugin": "link:x-pack/solutions/security/plugins/session_view", "@kbn/share-examples-plugin": "link:examples/share_examples", @@ -1498,7 +1498,7 @@ "@kbn/scout-oblt": "link:x-pack/solutions/observability/packages/kbn-scout-oblt", "@kbn/scout-reporting": "link:packages/kbn-scout-reporting", "@kbn/security-api-integration-helpers": "link:x-pack/test/security_api_integration/packages/helpers", - "@kbn/serverless-storybook-config": "link:packages/serverless/storybook/config", + "@kbn/serverless-storybook-config": "link:src/platform/packages/shared/serverless/storybook/config", "@kbn/set-map": "link:packages/kbn-set-map", "@kbn/shared-ux-card-no-data-mocks": "link:src/platform/packages/shared/shared-ux/card/no_data/mocks", "@kbn/shared-ux-file-image-mocks": "link:src/platform/packages/shared/shared-ux/file/image/mocks", diff --git a/src/dev/storybook/aliases.ts b/src/dev/storybook/aliases.ts index 82a6706cb9fc9..a166115cabeee 100644 --- a/src/dev/storybook/aliases.ts +++ b/src/dev/storybook/aliases.ts @@ -70,7 +70,7 @@ export const storybookAliases = { // Skipped, please check and fix https://github.com/elastic/kibana/issues/207227 // security_solution: 'x-pack/solutions/security/plugins/security_solution/.storybook', // security_solution_packages: 'x-pack/solutions/security/packages/storybook/config', - serverless: 'packages/serverless/storybook/config', + serverless: 'src/platform/packages/shared/serverless/storybook/config', shared_ux: 'src/platform/packages/private/shared-ux/storybook/config', threat_intelligence: 'x-pack/solutions/security/plugins/threat_intelligence/.storybook', triggers_actions_ui: 'x-pack/platform/plugins/shared/triggers_actions_ui/.storybook', diff --git a/src/platform/packages/private/serverless/settings/common/README.mdx b/src/platform/packages/shared/serverless/settings/common/README.mdx similarity index 100% rename from src/platform/packages/private/serverless/settings/common/README.mdx rename to src/platform/packages/shared/serverless/settings/common/README.mdx diff --git a/src/platform/packages/private/serverless/settings/common/index.ts b/src/platform/packages/shared/serverless/settings/common/index.ts similarity index 100% rename from src/platform/packages/private/serverless/settings/common/index.ts rename to src/platform/packages/shared/serverless/settings/common/index.ts diff --git a/src/platform/packages/private/serverless/settings/common/kibana.jsonc b/src/platform/packages/shared/serverless/settings/common/kibana.jsonc similarity index 86% rename from src/platform/packages/private/serverless/settings/common/kibana.jsonc rename to src/platform/packages/shared/serverless/settings/common/kibana.jsonc index 89a0efe2937d8..13763ff50ea8c 100644 --- a/src/platform/packages/private/serverless/settings/common/kibana.jsonc +++ b/src/platform/packages/shared/serverless/settings/common/kibana.jsonc @@ -6,5 +6,5 @@ "@elastic/kibana-management" ], "group": "platform", - "visibility": "private" -} \ No newline at end of file + "visibility": "shared" +} diff --git a/src/platform/packages/private/serverless/settings/common/package.json b/src/platform/packages/shared/serverless/settings/common/package.json similarity index 100% rename from src/platform/packages/private/serverless/settings/common/package.json rename to src/platform/packages/shared/serverless/settings/common/package.json diff --git a/src/platform/packages/private/serverless/settings/common/tsconfig.json b/src/platform/packages/shared/serverless/settings/common/tsconfig.json similarity index 100% rename from src/platform/packages/private/serverless/settings/common/tsconfig.json rename to src/platform/packages/shared/serverless/settings/common/tsconfig.json diff --git a/packages/serverless/storybook/config/README.mdx b/src/platform/packages/shared/serverless/storybook/config/README.mdx similarity index 100% rename from packages/serverless/storybook/config/README.mdx rename to src/platform/packages/shared/serverless/storybook/config/README.mdx diff --git a/packages/serverless/storybook/config/constants.ts b/src/platform/packages/shared/serverless/storybook/config/constants.ts similarity index 85% rename from packages/serverless/storybook/config/constants.ts rename to src/platform/packages/shared/serverless/storybook/config/constants.ts index 89c1c1d0e7ba1..98e77d967438a 100644 --- a/packages/serverless/storybook/config/constants.ts +++ b/src/platform/packages/shared/serverless/storybook/config/constants.ts @@ -11,4 +11,5 @@ export const TITLE = 'Serverless Storybook'; /** The remote URL of the root from which Storybook loads stories for Serverless. */ -export const URL = 'https://github.com/elastic/kibana/tree/main/packages/serverless'; +export const URL = + 'https://github.com/elastic/kibana/tree/main/src/platform/packages/shared/serverless'; diff --git a/packages/serverless/storybook/config/index.ts b/src/platform/packages/shared/serverless/storybook/config/index.ts similarity index 100% rename from packages/serverless/storybook/config/index.ts rename to src/platform/packages/shared/serverless/storybook/config/index.ts diff --git a/packages/serverless/storybook/config/kibana.jsonc b/src/platform/packages/shared/serverless/storybook/config/kibana.jsonc similarity index 72% rename from packages/serverless/storybook/config/kibana.jsonc rename to src/platform/packages/shared/serverless/storybook/config/kibana.jsonc index a141e67afd745..2b00fac438a55 100644 --- a/packages/serverless/storybook/config/kibana.jsonc +++ b/src/platform/packages/shared/serverless/storybook/config/kibana.jsonc @@ -2,5 +2,7 @@ "type": "shared-common", "id": "@kbn/serverless-storybook-config", "owner": "@elastic/appex-sharedux", + "group": "platform", + "visibility": "shared", "devOnly": true } diff --git a/packages/serverless/storybook/config/main.ts b/src/platform/packages/shared/serverless/storybook/config/main.ts similarity index 100% rename from packages/serverless/storybook/config/main.ts rename to src/platform/packages/shared/serverless/storybook/config/main.ts diff --git a/packages/serverless/storybook/config/manager.ts b/src/platform/packages/shared/serverless/storybook/config/manager.ts similarity index 100% rename from packages/serverless/storybook/config/manager.ts rename to src/platform/packages/shared/serverless/storybook/config/manager.ts diff --git a/packages/serverless/storybook/config/package.json b/src/platform/packages/shared/serverless/storybook/config/package.json similarity index 100% rename from packages/serverless/storybook/config/package.json rename to src/platform/packages/shared/serverless/storybook/config/package.json diff --git a/packages/serverless/storybook/config/preview.ts b/src/platform/packages/shared/serverless/storybook/config/preview.ts similarity index 100% rename from packages/serverless/storybook/config/preview.ts rename to src/platform/packages/shared/serverless/storybook/config/preview.ts diff --git a/packages/serverless/storybook/config/tsconfig.json b/src/platform/packages/shared/serverless/storybook/config/tsconfig.json similarity index 80% rename from packages/serverless/storybook/config/tsconfig.json rename to src/platform/packages/shared/serverless/storybook/config/tsconfig.json index 1d676d9c2948d..f5f74cc7e1a90 100644 --- a/packages/serverless/storybook/config/tsconfig.json +++ b/src/platform/packages/shared/serverless/storybook/config/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../../tsconfig.base.json", + "extends": "../../../../../../../tsconfig.base.json", "compilerOptions": { "outDir": "target/types", "types": [ diff --git a/src/platform/packages/private/serverless/types/README.mdx b/src/platform/packages/shared/serverless/types/README.mdx similarity index 100% rename from src/platform/packages/private/serverless/types/README.mdx rename to src/platform/packages/shared/serverless/types/README.mdx diff --git a/src/platform/packages/private/serverless/types/index.d.ts b/src/platform/packages/shared/serverless/types/index.d.ts similarity index 100% rename from src/platform/packages/private/serverless/types/index.d.ts rename to src/platform/packages/shared/serverless/types/index.d.ts diff --git a/src/platform/packages/private/serverless/types/kibana.jsonc b/src/platform/packages/shared/serverless/types/kibana.jsonc similarity index 83% rename from src/platform/packages/private/serverless/types/kibana.jsonc rename to src/platform/packages/shared/serverless/types/kibana.jsonc index 89901c4c56d4f..3d4392ba22159 100644 --- a/src/platform/packages/private/serverless/types/kibana.jsonc +++ b/src/platform/packages/shared/serverless/types/kibana.jsonc @@ -5,5 +5,5 @@ "@elastic/appex-sharedux" ], "group": "platform", - "visibility": "private" -} \ No newline at end of file + "visibility": "shared" +} diff --git a/src/platform/packages/private/serverless/types/package.json b/src/platform/packages/shared/serverless/types/package.json similarity index 100% rename from src/platform/packages/private/serverless/types/package.json rename to src/platform/packages/shared/serverless/types/package.json diff --git a/src/platform/packages/private/serverless/types/tsconfig.json b/src/platform/packages/shared/serverless/types/tsconfig.json similarity index 100% rename from src/platform/packages/private/serverless/types/tsconfig.json rename to src/platform/packages/shared/serverless/types/tsconfig.json diff --git a/tsconfig.base.json b/tsconfig.base.json index e45fd85f42831..80b2d45f0a956 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -1734,8 +1734,8 @@ "@kbn/server-route-repository-utils/*": ["src/platform/packages/shared/kbn-server-route-repository-utils/*"], "@kbn/serverless": ["x-pack/platform/plugins/shared/serverless"], "@kbn/serverless/*": ["x-pack/platform/plugins/shared/serverless/*"], - "@kbn/serverless-common-settings": ["src/platform/packages/private/serverless/settings/common"], - "@kbn/serverless-common-settings/*": ["src/platform/packages/private/serverless/settings/common/*"], + "@kbn/serverless-common-settings": ["src/platform/packages/shared/serverless/settings/common"], + "@kbn/serverless-common-settings/*": ["src/platform/packages/shared/serverless/settings/common/*"], "@kbn/serverless-observability": ["x-pack/solutions/observability/plugins/serverless_observability"], "@kbn/serverless-observability/*": ["x-pack/solutions/observability/plugins/serverless_observability/*"], "@kbn/serverless-observability-settings": ["src/platform/packages/shared/serverless/settings/observability_project"], @@ -1748,10 +1748,10 @@ "@kbn/serverless-search-settings/*": ["src/platform/packages/shared/serverless/settings/search_project/*"], "@kbn/serverless-security-settings": ["src/platform/packages/shared/serverless/settings/security_project"], "@kbn/serverless-security-settings/*": ["src/platform/packages/shared/serverless/settings/security_project/*"], - "@kbn/serverless-storybook-config": ["packages/serverless/storybook/config"], - "@kbn/serverless-storybook-config/*": ["packages/serverless/storybook/config/*"], - "@kbn/serverless-types": ["src/platform/packages/private/serverless/types"], - "@kbn/serverless-types/*": ["src/platform/packages/private/serverless/types/*"], + "@kbn/serverless-storybook-config": ["src/platform/packages/shared/serverless/storybook/config"], + "@kbn/serverless-storybook-config/*": ["src/platform/packages/shared/serverless/storybook/config/*"], + "@kbn/serverless-types": ["src/platform/packages/shared/serverless/types"], + "@kbn/serverless-types/*": ["src/platform/packages/shared/serverless/types/*"], "@kbn/session-notifications-plugin": ["test/plugin_functional/plugins/session_notifications"], "@kbn/session-notifications-plugin/*": ["test/plugin_functional/plugins/session_notifications/*"], "@kbn/session-view-plugin": ["x-pack/solutions/security/plugins/session_view"], diff --git a/yarn.lock b/yarn.lock index b4060f8ae6b66..1d60762c2a6d0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7318,7 +7318,7 @@ version "0.0.0" uid "" -"@kbn/serverless-common-settings@link:src/platform/packages/private/serverless/settings/common": +"@kbn/serverless-common-settings@link:src/platform/packages/shared/serverless/settings/common": version "0.0.0" uid "" @@ -7346,11 +7346,11 @@ version "0.0.0" uid "" -"@kbn/serverless-storybook-config@link:packages/serverless/storybook/config": +"@kbn/serverless-storybook-config@link:src/platform/packages/shared/serverless/storybook/config": version "0.0.0" uid "" -"@kbn/serverless-types@link:src/platform/packages/private/serverless/types": +"@kbn/serverless-types@link:src/platform/packages/shared/serverless/types": version "0.0.0" uid ""