From 3c3d0b539ccd763cdec49c6bd3b40c4291dc5e22 Mon Sep 17 00:00:00 2001 From: Shailesh cheke Date: Wed, 12 Feb 2020 09:34:35 +0530 Subject: [PATCH] Fix paths for kibana packages used by plugins (#57097) * Fix paths for kibana packages in prepare_project_dependencies(#40858). * Dist/index.js after yarn build. * chore(NA): correctly include kbm pm new dist file * Commit after cherry-pick 985c85c from recreation branch. Co-authored-by: Tiago Costa Co-authored-by: Elastic Machine --- packages/kbn-pm/dist/index.js | 2 +- .../external_packages/with_kibana_link_deps/package.json | 2 +- packages/kbn-pm/src/production/prepare_project_dependencies.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/kbn-pm/dist/index.js b/packages/kbn-pm/dist/index.js index eec75033e8beb..e3df1ab585ee4 100644 --- a/packages/kbn-pm/dist/index.js +++ b/packages/kbn-pm/dist/index.js @@ -108562,7 +108562,7 @@ __webpack_require__.r(__webpack_exports__); * to Kibana itself. */ -const isKibanaDep = depVersion => depVersion.includes('../../kibana/'); +const isKibanaDep = depVersion => depVersion.includes('../../packages/'); /** * This prepares the dependencies for an _external_ project. */ diff --git a/packages/kbn-pm/src/production/__fixtures__/external_packages/with_kibana_link_deps/package.json b/packages/kbn-pm/src/production/__fixtures__/external_packages/with_kibana_link_deps/package.json index 6466095ed5df1..c0ed787bcb0e8 100644 --- a/packages/kbn-pm/src/production/__fixtures__/external_packages/with_kibana_link_deps/package.json +++ b/packages/kbn-pm/src/production/__fixtures__/external_packages/with_kibana_link_deps/package.json @@ -2,6 +2,6 @@ "name": "quux", "version": "1.0.0", "dependencies": { - "@kbn/foo": "link:../../kibana/packages/foo" + "@kbn/foo": "link:../../packages/foo" } } diff --git a/packages/kbn-pm/src/production/prepare_project_dependencies.ts b/packages/kbn-pm/src/production/prepare_project_dependencies.ts index e02a2515cf4a4..af0575b95e51a 100644 --- a/packages/kbn-pm/src/production/prepare_project_dependencies.ts +++ b/packages/kbn-pm/src/production/prepare_project_dependencies.ts @@ -25,7 +25,7 @@ import { Project } from '../utils/project'; * to the Kibana root directory or `../kibana-extra/{plugin}` relative * to Kibana itself. */ -const isKibanaDep = (depVersion: string) => depVersion.includes('../../kibana/'); +const isKibanaDep = (depVersion: string) => depVersion.includes('../../packages/'); /** * This prepares the dependencies for an _external_ project.