Skip to content

[7.6] fix(NA): support legacy plugins path in plugins (#57472) #57531

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mistic merged 1 commit into from
Feb 13, 2020
Merged

[7.6] fix(NA): support legacy plugins path in plugins (#57472) #57531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion packages/kbn-pm/dist/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108545,7 +108545,9 @@ __webpack_require__.r(__webpack_exports__);
* to Kibana itself.
*/

const isKibanaDep = depVersion => depVersion.includes('../../packages/');
const isKibanaDep = depVersion => // For ../kibana-extra/ directory (legacy only)
depVersion.includes('../../kibana/packages/') || // For plugins/ directory
depVersion.includes('../../packages/');
/**
* This prepares the dependencies for an _external_ project.
*/
Expand Down
6 changes: 5 additions & 1 deletion packages/kbn-pm/src/production/prepare_project_dependencies.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,11 @@ import { Project } from '../utils/project';
* to the Kibana root directory or `../kibana-extra/{plugin}` relative
* to Kibana itself.
*/
const isKibanaDep = (depVersion: string) => depVersion.includes('../../packages/');
const isKibanaDep = (depVersion: string) =>
// For ../kibana-extra/ directory (legacy only)
depVersion.includes('../../kibana/packages/') ||
// For plugins/ directory
depVersion.includes('../../packages/');

/**
* This prepares the dependencies for an _external_ project.
Expand Down