From c9d1a2fecdb66c34a2b05c2b7aa4e7b79bfe0d34 Mon Sep 17 00:00:00 2001 From: Gerard Soldevila Date: Mon, 23 Dec 2024 10:06:45 +0100 Subject: [PATCH] Relocating module `@kbn/core-base-common` --- .github/CODEOWNERS | 2 +- package.json | 2 +- packages/kbn-relocate/utils/relocate.ts | 2 +- packages/react/kibana_context/root/BUILD.bazel | 2 +- .../core/packages/base/common}/BUILD.bazel | 0 .../core/packages/base/common}/README.md | 0 .../core/packages/base/common}/index.ts | 0 .../core/packages/base/common}/jest.config.js | 4 ++-- .../core/packages/base/common}/kibana.jsonc | 0 .../core/packages/base/common}/package.json | 0 .../core/packages/base/common}/src/eui.ts | 0 .../core/packages/base/common}/src/plugins.ts | 0 .../core/packages/base/common}/tsconfig.json | 2 +- tsconfig.base.json | 4 ++-- yarn.lock | 2 +- 15 files changed, 10 insertions(+), 10 deletions(-) rename {packages/core/base/core-base-common => src/core/packages/base/common}/BUILD.bazel (100%) rename {packages/core/base/core-base-common => src/core/packages/base/common}/README.md (100%) rename {packages/core/base/core-base-common => src/core/packages/base/common}/index.ts (100%) rename {packages/core/base/core-base-common => src/core/packages/base/common}/jest.config.js (85%) rename {packages/core/base/core-base-common => src/core/packages/base/common}/kibana.jsonc (100%) rename {packages/core/base/core-base-common => src/core/packages/base/common}/package.json (100%) rename {packages/core/base/core-base-common => src/core/packages/base/common}/src/eui.ts (100%) rename {packages/core/base/core-base-common => src/core/packages/base/common}/src/plugins.ts (100%) rename {packages/core/base/core-base-common => src/core/packages/base/common}/tsconfig.json (81%) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 53e7f34666b1c..e7170dc43b1f4 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -59,7 +59,6 @@ packages/core/analytics/core-analytics-server-mocks @elastic/kibana-core packages/core/application/core-application-browser-mocks @elastic/kibana-core packages/core/apps/core-apps-browser-mocks @elastic/kibana-core packages/core/base/core-base-browser-mocks @elastic/kibana-core -packages/core/base/core-base-common @elastic/kibana-core packages/core/base/core-base-common-internal @elastic/kibana-core packages/core/base/core-base-server-internal @elastic/kibana-core packages/core/base/core-base-server-mocks @elastic/kibana-core @@ -557,6 +556,7 @@ src/core/packages/application/common @elastic/kibana-core src/core/packages/apps/browser-internal @elastic/kibana-core src/core/packages/apps/server-internal @elastic/kibana-core src/core/packages/base/browser-internal @elastic/kibana-core +src/core/packages/base/common @elastic/kibana-core src/core/packages/core @elastic/kibana-core src/platform/packages/private/default-nav/devtools @elastic/kibana-management src/platform/packages/private/default-nav/management @elastic/kibana-management diff --git a/package.json b/package.json index 043328793866b..27a45eb42a550 100644 --- a/package.json +++ b/package.json @@ -256,7 +256,7 @@ "@kbn/core-apps-browser-internal": "link:src/core/packages/apps/browser-internal", "@kbn/core-apps-server-internal": "link:src/core/packages/apps/server-internal", "@kbn/core-base-browser-internal": "link:src/core/packages/base/browser-internal", - "@kbn/core-base-common": "link:packages/core/base/core-base-common", + "@kbn/core-base-common": "link:src/core/packages/base/common", "@kbn/core-base-common-internal": "link:packages/core/base/core-base-common-internal", "@kbn/core-base-server-internal": "link:packages/core/base/core-base-server-internal", "@kbn/core-capabilities-browser-internal": "link:packages/core/capabilities/core-capabilities-browser-internal", diff --git a/packages/kbn-relocate/utils/relocate.ts b/packages/kbn-relocate/utils/relocate.ts index 233c03b84ea05..31592f92e5742 100644 --- a/packages/kbn-relocate/utils/relocate.ts +++ b/packages/kbn-relocate/utils/relocate.ts @@ -156,7 +156,7 @@ const replaceReferencesInternal = async ( let d = dst; // For .bazel references, we need to keep the original name reference if we are renaming the path - // For example, in the move "packages/core/base/core-base-common" to "src/core/packages/base/common", + // For example, in the move "src/core/packages/base/common" to "src/core/packages/base/common", // we need to keep the reference name to core-base-common by replacing it with "src/core/packages/base/common:core-base-common" if ( file.endsWith('.bazel') && diff --git a/packages/react/kibana_context/root/BUILD.bazel b/packages/react/kibana_context/root/BUILD.bazel index fc073da074a61..e78f513deeac6 100644 --- a/packages/react/kibana_context/root/BUILD.bazel +++ b/packages/react/kibana_context/root/BUILD.bazel @@ -25,7 +25,7 @@ DEPS = [ "@npm//react", "@npm//tslib", "@npm//@elastic/eui", - "//packages/core/base/core-base-common", + "//src/core/packages/base/common:core-base-common", "//packages/shared-ux/router/impl:shared-ux-router", ] diff --git a/packages/core/base/core-base-common/BUILD.bazel b/src/core/packages/base/common/BUILD.bazel similarity index 100% rename from packages/core/base/core-base-common/BUILD.bazel rename to src/core/packages/base/common/BUILD.bazel diff --git a/packages/core/base/core-base-common/README.md b/src/core/packages/base/common/README.md similarity index 100% rename from packages/core/base/core-base-common/README.md rename to src/core/packages/base/common/README.md diff --git a/packages/core/base/core-base-common/index.ts b/src/core/packages/base/common/index.ts similarity index 100% rename from packages/core/base/core-base-common/index.ts rename to src/core/packages/base/common/index.ts diff --git a/packages/core/base/core-base-common/jest.config.js b/src/core/packages/base/common/jest.config.js similarity index 85% rename from packages/core/base/core-base-common/jest.config.js rename to src/core/packages/base/common/jest.config.js index 2d868d29fa4bf..8d4d5a7856044 100644 --- a/packages/core/base/core-base-common/jest.config.js +++ b/src/core/packages/base/common/jest.config.js @@ -9,6 +9,6 @@ module.exports = { preset: '@kbn/test/jest_node', - rootDir: '../../../..', - roots: ['/packages/core/base/core-base-common'], + rootDir: '../../../../..', + roots: ['/src/core/packages/base/common'], }; diff --git a/packages/core/base/core-base-common/kibana.jsonc b/src/core/packages/base/common/kibana.jsonc similarity index 100% rename from packages/core/base/core-base-common/kibana.jsonc rename to src/core/packages/base/common/kibana.jsonc diff --git a/packages/core/base/core-base-common/package.json b/src/core/packages/base/common/package.json similarity index 100% rename from packages/core/base/core-base-common/package.json rename to src/core/packages/base/common/package.json diff --git a/packages/core/base/core-base-common/src/eui.ts b/src/core/packages/base/common/src/eui.ts similarity index 100% rename from packages/core/base/core-base-common/src/eui.ts rename to src/core/packages/base/common/src/eui.ts diff --git a/packages/core/base/core-base-common/src/plugins.ts b/src/core/packages/base/common/src/plugins.ts similarity index 100% rename from packages/core/base/core-base-common/src/plugins.ts rename to src/core/packages/base/common/src/plugins.ts diff --git a/packages/core/base/core-base-common/tsconfig.json b/src/core/packages/base/common/tsconfig.json similarity index 81% rename from packages/core/base/core-base-common/tsconfig.json rename to src/core/packages/base/common/tsconfig.json index 40ac62b671e04..20ffd85947c56 100644 --- a/packages/core/base/core-base-common/tsconfig.json +++ b/src/core/packages/base/common/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../../tsconfig.base.json", + "extends": "../../../../../tsconfig.base.json", "compilerOptions": { "outDir": "target/types", "types": [ diff --git a/tsconfig.base.json b/tsconfig.base.json index 5661de001ef74..d6726232c1c47 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -264,8 +264,8 @@ "@kbn/core-base-browser-internal/*": ["src/core/packages/base/browser-internal/*"], "@kbn/core-base-browser-mocks": ["packages/core/base/core-base-browser-mocks"], "@kbn/core-base-browser-mocks/*": ["packages/core/base/core-base-browser-mocks/*"], - "@kbn/core-base-common": ["packages/core/base/core-base-common"], - "@kbn/core-base-common/*": ["packages/core/base/core-base-common/*"], + "@kbn/core-base-common": ["src/core/packages/base/common"], + "@kbn/core-base-common/*": ["src/core/packages/base/common/*"], "@kbn/core-base-common-internal": ["packages/core/base/core-base-common-internal"], "@kbn/core-base-common-internal/*": ["packages/core/base/core-base-common-internal/*"], "@kbn/core-base-server-internal": ["packages/core/base/core-base-server-internal"], diff --git a/yarn.lock b/yarn.lock index eff267099b275..abd0b9fd2a332 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4345,7 +4345,7 @@ version "0.0.0" uid "" -"@kbn/core-base-common@link:packages/core/base/core-base-common": +"@kbn/core-base-common@link:src/core/packages/base/common": version "0.0.0" uid ""