Address few glitches 🐲

Mainly lerna related ones. Saw creating this PR: CoorpAcademy/coorpacademy-private-libraries#161
CoorpAcademy · Oct 11, 2024 · 594ebe5 · 594ebe5
1 parent 3c188dc
commit 594ebe5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/core/config.js b/src/core/config.js
@@ -16,7 +16,8 @@ const nodeConfig = Joi.object().keys({
   dockerfile: [Joi.bool(), Joi.string(), Joi.array().items(Joi.string())],
   travis: [Joi.bool(), Joi.string(), Joi.array().items(Joi.string())],
   package: [Joi.bool(), Joi.string(), Joi.array().items(Joi.string())],
-  serverless: [Joi.bool(), Joi.string(), Joi.array().items(Joi.string())]
+  serverless: [Joi.bool(), Joi.string(), Joi.array().items(Joi.string())],
+  lerna: Joi.bool()
 });
 const dependencyClusterConfig = Joi.object().keys({
   name: Joi.string().required(),

diff --git a/src/core/git.js b/src/core/git.js
@@ -33,7 +33,7 @@ const cleanAndSyncRepo = ({branch = 'master', preCleanCommand = [], postCleanCom
     ...preCleanCommand,
     'git stash',
     `git checkout ${branch}`,
-    `if git rev-parse --abbrev-ref --symbolic-full-name ${branch} ; then git pull; fi`, // pull only if upstream
+    `if git rev-parse --abbrev-ref @--symbolic-full-name ${branch} ; then git pull; fi`, // pull only if upstream
     ...postCleanCommand
   ]);
 

diff --git a/src/updatees/package.js b/src/updatees/package.js
@@ -99,14 +99,13 @@ const updateLock = async (packageManager = 'npm') => {
 };
 
 const updateLearnaPackageEngines = async (nodeVersion, npmVersion, {exact, loose}) => {
+  const listPackages = await execa('npx', ['lerna', 'list', '--json', '--loglevel', 'error'], {
+    all: true,
+    shell: true
+  });
   const lernaPackages = _.map(
     ({location}) => `${chompCurrentFolder(location)}/package.json`,
-    JSON.parse(
-      await execa('npx', ['lerna', 'list', '--json', '--loglevel', 'error'], {
-        all: true,
-        shell: true
-      }).all
-    )
+    listPackages.all
   );
   return updatePackageEngines(nodeVersion, npmVersion, lernaPackages, {exact, loose});