Skip to content
Snippets Groups Projects
Commit 409cd4ad authored by Rhys Arkins's avatar Rhys Arkins
Browse files

refactor: monorepoPackages -> internalPackages

parent e1966a60
No related branches found
No related tags found
No related merge requests found
......@@ -29,19 +29,19 @@ function detectMonorepos(packageFiles) {
{ packageFile },
'Found monorepo packages with base path ' + basePath
);
const subPackagePatterns = packages.map(pattern =>
const internalPackagePatterns = packages.map(pattern =>
upath.join(basePath, pattern)
);
const subPackages = packageFiles.filter(sp =>
matchesAnyPattern(path.dirname(sp.packageFile), subPackagePatterns)
const internalPackageFiles = packageFiles.filter(sp =>
matchesAnyPattern(path.dirname(sp.packageFile), internalPackagePatterns)
);
const subPackageNames = subPackages
const internalPackages = internalPackageFiles
.map(sp => sp.packageJsonName)
.filter(Boolean);
// add all names to main package.json
packageFile.monorepoPackages = subPackageNames;
for (const subPackage of subPackages) {
subPackage.monorepoPackages = subPackageNames.filter(
packageFile.internalPackages = internalPackages;
for (const subPackage of internalPackageFiles) {
subPackage.internalPackages = internalPackages.filter(
name => name !== subPackage.packageJsonName
);
subPackage.lernaDir = lernaDir;
......
......@@ -20,8 +20,8 @@ async function fetchDepUpdates(packageFileConfig, dep) {
logger.debug({ depName: dep.depName }, 'Dependency is ignored');
dep.skipReason = 'ignored';
} else if (
depConfig.monorepoPackages &&
depConfig.monorepoPackages.includes(depName)
depConfig.internalPackages &&
depConfig.internalPackages.includes(depName)
) {
logger.debug(
{ depName: dep.depName },
......
......@@ -10,22 +10,22 @@ Array [
"packageFile": "package.json",
},
Object {
"lernaClient": undefined,
"lernaDir": ".",
"monorepoPackages": Array [
"internalPackages": Array [
"@org/b",
],
"lernaClient": undefined,
"lernaDir": ".",
"npmLock": undefined,
"packageFile": "packages/a/package.json",
"packageJsonName": "@org/a",
"yarnLock": undefined,
},
Object {
"lernaClient": undefined,
"lernaDir": ".",
"monorepoPackages": Array [
"internalPackages": Array [
"@org/a",
],
"lernaClient": undefined,
"lernaDir": ".",
"npmLock": undefined,
"packageFile": "packages/b/package.json",
"packageJsonName": "@org/b",
......@@ -48,22 +48,22 @@ Array [
],
},
Object {
"lernaClient": "yarn",
"lernaDir": ".",
"monorepoPackages": Array [
"internalPackages": Array [
"@org/b",
],
"lernaClient": "yarn",
"lernaDir": ".",
"npmLock": undefined,
"packageFile": "packages/a/package.json",
"packageJsonName": "@org/a",
"yarnLock": undefined,
},
Object {
"lernaClient": "yarn",
"lernaDir": ".",
"monorepoPackages": Array [
"internalPackages": Array [
"@org/a",
],
"lernaClient": "yarn",
"lernaDir": ".",
"npmLock": undefined,
"packageFile": "packages/b/package.json",
"packageJsonName": "@org/b",
......
......@@ -23,7 +23,7 @@ describe('manager/npm/extract', () => {
await detectMonorepos(packageFiles);
expect(packageFiles).toMatchSnapshot();
expect(packageFiles[1].lernaDir).toEqual('.');
expect(packageFiles[1].monorepoPackages).toEqual(['@org/b']);
expect(packageFiles[1].internalPackages).toEqual(['@org/b']);
});
it('uses yarn workspaces package settings', async () => {
const packageFiles = [
......@@ -46,7 +46,7 @@ describe('manager/npm/extract', () => {
await detectMonorepos(packageFiles);
expect(packageFiles).toMatchSnapshot();
expect(packageFiles[1].lernaDir).toEqual('.');
expect(packageFiles[1].monorepoPackages).toEqual(['@org/b']);
expect(packageFiles[1].internalPackages).toEqual(['@org/b']);
});
});
});
......@@ -61,7 +61,7 @@ Object {
"updates": Array [],
},
],
"monorepoPackages": Array [
"internalPackages": Array [
"zzzz",
],
"packageFile": "package.json",
......
......@@ -35,7 +35,7 @@ describe('workers/repository/process/fetch', () => {
{ depName: 'zzzz' },
{ depName: 'foo' },
],
monorepoPackages: ['zzzz'],
internalPackages: ['zzzz'],
},
],
};
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment