refactor: lernaDir -> lernaJsonFile

renovatebot · Mar 19, 2021 · 3d3cc74 · 3d3cc74
1 parent 19e16ff
commit 3d3cc74
Show file tree

Hide file tree

Showing 8 changed files with 60 additions and 56 deletions.
diff --git a/lib/manager/npm/extract/__snapshots__/index.spec.ts.snap b/lib/manager/npm/extract/__snapshots__/index.spec.ts.snap
@@ -13,7 +13,7 @@ Object {
   ],
   "ignoreNpmrcFile": undefined,
   "lernaClient": undefined,
-  "lernaDir": undefined,
+  "lernaJsonFile": undefined,
   "lernaPackages": undefined,
   "npmLock": undefined,
   "npmrc": undefined,
@@ -135,7 +135,7 @@ Object {
   ],
   "ignoreNpmrcFile": undefined,
   "lernaClient": undefined,
-  "lernaDir": undefined,
+  "lernaJsonFile": undefined,
   "lernaPackages": undefined,
   "npmLock": undefined,
   "npmrc": undefined,
@@ -297,7 +297,7 @@ Object {
   ],
   "ignoreNpmrcFile": undefined,
   "lernaClient": undefined,
-  "lernaDir": undefined,
+  "lernaJsonFile": undefined,
   "lernaPackages": undefined,
   "npmLock": undefined,
   "npmrc": undefined,
@@ -345,7 +345,7 @@ Object {
   ],
   "ignoreNpmrcFile": undefined,
   "lernaClient": undefined,
-  "lernaDir": undefined,
+  "lernaJsonFile": undefined,
   "lernaPackages": undefined,
   "npmLock": undefined,
   "npmrc": undefined,
@@ -404,7 +404,7 @@ Object {
   ],
   "ignoreNpmrcFile": undefined,
   "lernaClient": undefined,
-  "lernaDir": undefined,
+  "lernaJsonFile": undefined,
   "lernaPackages": undefined,
   "npmLock": undefined,
   "npmrc": undefined,
@@ -457,7 +457,7 @@ Object {
   ],
   "ignoreNpmrcFile": undefined,
   "lernaClient": undefined,
-  "lernaDir": undefined,
+  "lernaJsonFile": undefined,
   "lernaPackages": undefined,
   "npmLock": undefined,
   "npmrc": undefined,
@@ -592,7 +592,7 @@ Object {
   ],
   "ignoreNpmrcFile": undefined,
   "lernaClient": "npm",
-  "lernaDir": ".",
+  "lernaJsonFile": "lerna.json",
   "lernaPackages": undefined,
   "npmLock": undefined,
   "npmrc": undefined,
@@ -727,7 +727,7 @@ Object {
   ],
   "ignoreNpmrcFile": undefined,
   "lernaClient": "yarn",
-  "lernaDir": ".",
+  "lernaJsonFile": "lerna.json",
   "lernaPackages": undefined,
   "npmLock": undefined,
   "npmrc": undefined,
@@ -862,7 +862,7 @@ Object {
   ],
   "ignoreNpmrcFile": undefined,
   "lernaClient": undefined,
-  "lernaDir": undefined,
+  "lernaJsonFile": undefined,
   "lernaPackages": undefined,
   "npmLock": undefined,
   "npmrc": undefined,
@@ -883,7 +883,7 @@ Object {
   "deps": Array [],
   "ignoreNpmrcFile": undefined,
   "lernaClient": "npm",
-  "lernaDir": ".",
+  "lernaJsonFile": "lerna.json",
   "lernaPackages": undefined,
   "npmLock": undefined,
   "npmrc": undefined,
@@ -1020,7 +1020,7 @@ Object {
   ],
   "ignoreNpmrcFile": undefined,
   "lernaClient": "npm",
-  "lernaDir": ".",
+  "lernaJsonFile": "lerna.json",
   "lernaPackages": undefined,
   "npmLock": undefined,
   "npmrc": undefined,
@@ -1041,7 +1041,7 @@ Object {
   "deps": Array [],
   "ignoreNpmrcFile": undefined,
   "lernaClient": "npm",
-  "lernaDir": ".",
+  "lernaJsonFile": "lerna.json",
   "lernaPackages": undefined,
   "npmLock": undefined,
   "npmrc": undefined,
@@ -1064,7 +1064,7 @@ Object {
   "deps": Array [],
   "ignoreNpmrcFile": undefined,
   "lernaClient": undefined,
-  "lernaDir": undefined,
+  "lernaJsonFile": undefined,
   "lernaPackages": undefined,
   "npmLock": undefined,
   "npmrc": undefined,
@@ -1201,7 +1201,7 @@ Object {
   ],
   "ignoreNpmrcFile": undefined,
   "lernaClient": undefined,
-  "lernaDir": undefined,
+  "lernaJsonFile": undefined,
   "lernaPackages": undefined,
   "npmLock": undefined,
   "npmrc": undefined,

diff --git a/lib/manager/npm/extract/__snapshots__/monorepo.spec.ts.snap b/lib/manager/npm/extract/__snapshots__/monorepo.spec.ts.snap
@@ -17,7 +17,7 @@ Array [
         "depName": "foo",
       },
     ],
-    "lernaDir": ".",
+    "lernaJsonFile": "lerna.json",
     "lernaPackages": Array [
       "packages/*",
     ],
@@ -39,15 +39,15 @@ Array [
       },
     ],
     "lernaClient": undefined,
-    "lernaDir": ".",
+    "lernaJsonFile": "lerna.json",
     "npmLock": undefined,
     "packageFile": "packages/a/package.json",
     "packageJsonName": "@org/a",
     "yarnLock": undefined,
   },
   Object {
     "lernaClient": undefined,
-    "lernaDir": ".",
+    "lernaJsonFile": "lerna.json",
     "npmLock": undefined,
     "packageFile": "packages/b/package.json",
     "packageJsonName": "@org/b",
@@ -75,7 +75,7 @@ Array [
         "depName": "foo",
       },
     ],
-    "lernaDir": ".",
+    "lernaJsonFile": "lerna.json",
     "lernaPackages": Array [
       "packages/*",
     ],
@@ -98,15 +98,15 @@ Array [
       },
     ],
     "lernaClient": undefined,
-    "lernaDir": ".",
+    "lernaJsonFile": "lerna.json",
     "npmLock": undefined,
     "packageFile": "packages/a/package.json",
     "packageJsonName": "@org/a",
     "yarnLock": undefined,
   },
   Object {
     "lernaClient": undefined,
-    "lernaDir": ".",
+    "lernaJsonFile": "lerna.json",
     "npmLock": undefined,
     "packageFile": "packages/b/package.json",
     "packageJsonName": "@org/b",
@@ -119,7 +119,7 @@ exports[`manager/npm/extract .extractPackageFile() uses yarn workspaces package
 Array [
   Object {
     "lernaClient": "yarn",
-    "lernaDir": ".",
+    "lernaJsonFile": "lerna.json",
     "lernaPackages": Array [
       "oldpackages/*",
     ],
@@ -130,15 +130,15 @@ Array [
   },
   Object {
     "lernaClient": "yarn",
-    "lernaDir": ".",
+    "lernaJsonFile": "lerna.json",
     "npmLock": undefined,
     "packageFile": "packages/a/package.json",
     "packageJsonName": "@org/a",
     "yarnLock": undefined,
   },
   Object {
     "lernaClient": "yarn",
-    "lernaDir": ".",
+    "lernaJsonFile": "lerna.json",
     "npmLock": undefined,
     "packageFile": "packages/b/package.json",
     "packageJsonName": "@org/b",
@@ -156,15 +156,15 @@ Array [
   Object {
     "hasYarnWorkspaces": true,
     "lernaClient": undefined,
-    "lernaDir": undefined,
+    "lernaJsonFile": undefined,
     "npmLock": undefined,
     "packageFile": "packages/a/package.json",
     "packageJsonName": "@org/a",
     "yarnLock": "yarn.lock",
   },
   Object {
     "lernaClient": undefined,
-    "lernaDir": undefined,
+    "lernaJsonFile": undefined,
     "npmLock": undefined,
     "packageFile": "packages/b/package.json",
     "packageJsonName": "@org/b",

diff --git a/lib/manager/npm/extract/index.ts b/lib/manager/npm/extract/index.ts
@@ -1,5 +1,4 @@
 import is from '@sindresorhus/is';
-import { dirname } from 'upath';
 import validateNpmPackageName from 'validate-npm-package-name';
 import { getAdminConfig } from '../../../config/admin';
 import { CONFIG_VALIDATION } from '../../../constants/error-messages';
@@ -124,7 +123,7 @@ export async function extractPackageFile(
     yarnrc = (await readLocalFile(yarnrcFileName, 'utf8')) || undefined;
   }
 
-  let lernaDir: string;
+  let lernaJsonFile: string;
   let lernaPackages: string[];
   let lernaClient: 'yarn' | 'npm';
   let hasFileRefs = false;
@@ -134,16 +133,17 @@ export async function extractPackageFile(
     useWorkspaces?: boolean;
   };
   try {
-    const lernaJsonFileName = getSiblingFileName(fileName, 'lerna.json');
-    lernaJson = JSON.parse(await readLocalFile(lernaJsonFileName, 'utf8'));
+    lernaJsonFile = getSiblingFileName(fileName, 'lerna.json');
+    lernaJson = JSON.parse(await readLocalFile(lernaJsonFile, 'utf8'));
   } catch (err) /* istanbul ignore next */ {
     logger.warn({ err }, 'Could not parse lerna.json');
   }
   if (lernaJson && !lernaJson.useWorkspaces) {
-    lernaDir = dirname(fileName);
     lernaPackages = lernaJson.packages;
     lernaClient =
       lernaJson.npmClient === 'yarn' || lockFiles.yarnLock ? 'yarn' : 'npm';
+  } else {
+    lernaJsonFile = undefined;
   }
 
   const depTypes = {
@@ -335,7 +335,7 @@ export async function extractPackageFile(
         packageJsonName ||
         packageFileVersion ||
         npmrc ||
-        lernaDir ||
+        lernaJsonFile ||
         yarnWorkspacesPackages
       )
     ) {
@@ -366,7 +366,7 @@ export async function extractPackageFile(
     ignoreNpmrcFile,
     yarnrc,
     ...lockFiles,
-    lernaDir,
+    lernaJsonFile,
     lernaClient,
     lernaPackages,
     skipInstalls,

diff --git a/lib/manager/npm/extract/monorepo.spec.ts b/lib/manager/npm/extract/monorepo.spec.ts
@@ -6,7 +6,7 @@ describe('manager/npm/extract', () => {
       const packageFiles = [
         {
           packageFile: 'package.json',
-          lernaDir: '.',
+          lernaJsonFile: 'lerna.json',
           lernaPackages: ['packages/*'],
           packages: ['packages/*'],
           deps: [
@@ -46,7 +46,7 @@ describe('manager/npm/extract', () => {
       ] as any;
       detectMonorepos(packageFiles, false);
       expect(packageFiles).toMatchSnapshot();
-      expect(packageFiles[1].lernaDir).toEqual('.');
+      expect(packageFiles[1].lernaJsonFile).toEqual('lerna.json');
       expect(
         packageFiles.some((packageFile) =>
           packageFile.deps?.some((dep) => dep.skipReason)
@@ -57,7 +57,7 @@ describe('manager/npm/extract', () => {
       const packageFiles = [
         {
           packageFile: 'package.json',
-          lernaDir: '.',
+          lernaJsonFile: 'lerna.json',
           lernaPackages: ['packages/*'],
           packages: ['packages/*'],
           deps: [
@@ -97,7 +97,7 @@ describe('manager/npm/extract', () => {
       ] as any;
       detectMonorepos(packageFiles, true);
       expect(packageFiles).toMatchSnapshot();
-      expect(packageFiles[1].lernaDir).toEqual('.');
+      expect(packageFiles[1].lernaJsonFile).toEqual('lerna.json');
       expect(
         packageFiles.some((packageFile) =>
           packageFile.deps?.some((dep) => dep.skipReason)
@@ -108,7 +108,7 @@ describe('manager/npm/extract', () => {
       const packageFiles = [
         {
           packageFile: 'package.json',
-          lernaDir: '.',
+          lernaJsonFile: 'lerna.json',
           lernaPackages: ['oldpackages/*'],
           lernaClient: 'yarn',
           yarnWorkspacesPackages: ['packages/*'],
@@ -124,7 +124,7 @@ describe('manager/npm/extract', () => {
       ];
       detectMonorepos(packageFiles, false);
       expect(packageFiles).toMatchSnapshot();
-      expect(packageFiles[1].lernaDir).toEqual('.');
+      expect(packageFiles[1].lernaJsonFile).toEqual('lerna.json');
     });
     it('uses yarn workspaces package settings without lerna', () => {
       const packageFiles = [

diff --git a/lib/manager/npm/extract/monorepo.ts b/lib/manager/npm/extract/monorepo.ts
@@ -23,7 +23,7 @@ export function detectMonorepos(
       packageFile,
       npmLock,
       yarnLock,
-      lernaDir,
+      lernaJsonFile,
       lernaClient,
       lernaPackages,
       yarnWorkspacesPackages,
@@ -56,7 +56,7 @@ export function detectMonorepos(
         });
       }
       for (const subPackage of internalPackageFiles) {
-        subPackage.lernaDir = lernaDir;
+        subPackage.lernaJsonFile = lernaJsonFile;
         subPackage.lernaClient = lernaClient;
         subPackage.yarnLock = subPackage.yarnLock || yarnLock;
         subPackage.npmLock = subPackage.npmLock || npmLock;