From 984b5a89b86ad8fc6a4f974963fceb5784b1d78b Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@keylocation.sg>
Date: Thu, 27 Jul 2017 22:15:50 +0200
Subject: [PATCH] fix(lerna): Use packages path from lerna.json (#542)
---
lib/workers/repository/apis.js | 3 ++-
test/workers/repository/apis.spec.js | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/lib/workers/repository/apis.js b/lib/workers/repository/apis.js
index eab7b0b0a7..581705d778 100644
--- a/lib/workers/repository/apis.js
+++ b/lib/workers/repository/apis.js
@@ -36,7 +36,8 @@ async function checkForLerna(config) {
}
config.logger.debug({ lernaJson }, 'Found lerna config');
try {
- const lernaPackages = await config.api.getSubDirectories('packages');
+ const packagesPath = lernaJson.packages[0].slice(0, -2);
+ const lernaPackages = await config.api.getSubDirectories(packagesPath);
if (lernaPackages.length === 0) {
return {};
}
diff --git a/test/workers/repository/apis.spec.js b/test/workers/repository/apis.spec.js
index 4b10a9c00f..932562b4d7 100644
--- a/test/workers/repository/apis.spec.js
+++ b/test/workers/repository/apis.spec.js
@@ -59,7 +59,7 @@ describe('workers/repository/apis', () => {
it('ignores zero length lerna', async () => {
const config = {
api: {
- getFileJson: jest.fn(() => ({})),
+ getFileJson: jest.fn(() => ({ packages: ['packages/*'] })),
getSubDirectories: jest.fn(() => []),
},
logger,
@@ -70,7 +70,7 @@ describe('workers/repository/apis', () => {
it('returns lerna package names', async () => {
const config = {
api: {
- getFileJson: jest.fn(() => ({})),
+ getFileJson: jest.fn(() => ({ packages: ['packages/*'] })),
getSubDirectories: jest.fn(() => ['a', 'b']),
},
logger,
--
GitLab