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 merge requests found
...@@ -29,19 +29,19 @@ function detectMonorepos(packageFiles) { ...@@ -29,19 +29,19 @@ function detectMonorepos(packageFiles) {
{ packageFile }, { packageFile },
'Found monorepo packages with base path ' + basePath 'Found monorepo packages with base path ' + basePath
); );
const subPackagePatterns = packages.map(pattern => const internalPackagePatterns = packages.map(pattern =>
upath.join(basePath, pattern) upath.join(basePath, pattern)
); );
const subPackages = packageFiles.filter(sp => const internalPackageFiles = packageFiles.filter(sp =>
matchesAnyPattern(path.dirname(sp.packageFile), subPackagePatterns) matchesAnyPattern(path.dirname(sp.packageFile), internalPackagePatterns)
); );
const subPackageNames = subPackages const internalPackages = internalPackageFiles
.map(sp => sp.packageJsonName) .map(sp => sp.packageJsonName)
.filter(Boolean); .filter(Boolean);
// add all names to main package.json // add all names to main package.json
packageFile.monorepoPackages = subPackageNames; packageFile.internalPackages = internalPackages;
for (const subPackage of subPackages) { for (const subPackage of internalPackageFiles) {
subPackage.monorepoPackages = subPackageNames.filter( subPackage.internalPackages = internalPackages.filter(
name => name !== subPackage.packageJsonName name => name !== subPackage.packageJsonName
); );
subPackage.lernaDir = lernaDir; subPackage.lernaDir = lernaDir;
......
...@@ -20,8 +20,8 @@ async function fetchDepUpdates(packageFileConfig, dep) { ...@@ -20,8 +20,8 @@ async function fetchDepUpdates(packageFileConfig, dep) {
logger.debug({ depName: dep.depName }, 'Dependency is ignored'); logger.debug({ depName: dep.depName }, 'Dependency is ignored');
dep.skipReason = 'ignored'; dep.skipReason = 'ignored';
} else if ( } else if (
depConfig.monorepoPackages && depConfig.internalPackages &&
depConfig.monorepoPackages.includes(depName) depConfig.internalPackages.includes(depName)
) { ) {
logger.debug( logger.debug(
{ depName: dep.depName }, { depName: dep.depName },
......
...@@ -10,22 +10,22 @@ Array [ ...@@ -10,22 +10,22 @@ Array [
"packageFile": "package.json", "packageFile": "package.json",
}, },
Object { Object {
"lernaClient": undefined, "internalPackages": Array [
"lernaDir": ".",
"monorepoPackages": Array [
"@org/b", "@org/b",
], ],
"lernaClient": undefined,
"lernaDir": ".",
"npmLock": undefined, "npmLock": undefined,
"packageFile": "packages/a/package.json", "packageFile": "packages/a/package.json",
"packageJsonName": "@org/a", "packageJsonName": "@org/a",
"yarnLock": undefined, "yarnLock": undefined,
}, },
Object { Object {
"lernaClient": undefined, "internalPackages": Array [
"lernaDir": ".",
"monorepoPackages": Array [
"@org/a", "@org/a",
], ],
"lernaClient": undefined,
"lernaDir": ".",
"npmLock": undefined, "npmLock": undefined,
"packageFile": "packages/b/package.json", "packageFile": "packages/b/package.json",
"packageJsonName": "@org/b", "packageJsonName": "@org/b",
...@@ -48,22 +48,22 @@ Array [ ...@@ -48,22 +48,22 @@ Array [
], ],
}, },
Object { Object {
"lernaClient": "yarn", "internalPackages": Array [
"lernaDir": ".",
"monorepoPackages": Array [
"@org/b", "@org/b",
], ],
"lernaClient": "yarn",
"lernaDir": ".",
"npmLock": undefined, "npmLock": undefined,
"packageFile": "packages/a/package.json", "packageFile": "packages/a/package.json",
"packageJsonName": "@org/a", "packageJsonName": "@org/a",
"yarnLock": undefined, "yarnLock": undefined,
}, },
Object { Object {
"lernaClient": "yarn", "internalPackages": Array [
"lernaDir": ".",
"monorepoPackages": Array [
"@org/a", "@org/a",
], ],
"lernaClient": "yarn",
"lernaDir": ".",
"npmLock": undefined, "npmLock": undefined,
"packageFile": "packages/b/package.json", "packageFile": "packages/b/package.json",
"packageJsonName": "@org/b", "packageJsonName": "@org/b",
......
...@@ -23,7 +23,7 @@ describe('manager/npm/extract', () => { ...@@ -23,7 +23,7 @@ describe('manager/npm/extract', () => {
await detectMonorepos(packageFiles); await detectMonorepos(packageFiles);
expect(packageFiles).toMatchSnapshot(); expect(packageFiles).toMatchSnapshot();
expect(packageFiles[1].lernaDir).toEqual('.'); 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 () => { it('uses yarn workspaces package settings', async () => {
const packageFiles = [ const packageFiles = [
...@@ -46,7 +46,7 @@ describe('manager/npm/extract', () => { ...@@ -46,7 +46,7 @@ describe('manager/npm/extract', () => {
await detectMonorepos(packageFiles); await detectMonorepos(packageFiles);
expect(packageFiles).toMatchSnapshot(); expect(packageFiles).toMatchSnapshot();
expect(packageFiles[1].lernaDir).toEqual('.'); expect(packageFiles[1].lernaDir).toEqual('.');
expect(packageFiles[1].monorepoPackages).toEqual(['@org/b']); expect(packageFiles[1].internalPackages).toEqual(['@org/b']);
}); });
}); });
}); });
...@@ -61,7 +61,7 @@ Object { ...@@ -61,7 +61,7 @@ Object {
"updates": Array [], "updates": Array [],
}, },
], ],
"monorepoPackages": Array [ "internalPackages": Array [
"zzzz", "zzzz",
], ],
"packageFile": "package.json", "packageFile": "package.json",
......
...@@ -35,7 +35,7 @@ describe('workers/repository/process/fetch', () => { ...@@ -35,7 +35,7 @@ describe('workers/repository/process/fetch', () => {
{ depName: 'zzzz' }, { depName: 'zzzz' },
{ depName: 'foo' }, { 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