Fix paths for kibana packages used by plugins (#57097)

shaileshcheke · mistic · elasticmachine · mistic · commit 09ff93704d2a · 2020-02-12T04:05:41.000Z
* 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 <tiagoffcc@hotmail.com> Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
diff --git a/packages/kbn-pm/dist/index.js b/packages/kbn-pm/dist/index.js
@@ -108545,7 +108545,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
@@ -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
@@ -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.

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@`
`2`	`2`	`"name": "quux",`
`3`	`3`	`"version": "1.0.0",`
`4`	`4`	`"dependencies": {`
`5`		`- "@kbn/foo": "link:../../kibana/packages/foo"`
	`5`	`+ "@kbn/foo": "link:../../packages/foo"`
`6`	`6`	`}`
`7`	`7`	`}`