Merge pull request #137 from zowe-actions/fix/lerna-default-config

Make the default lerna config smarter
zowe-actions · Mar 4, 2024 · 611d26f · 611d26f
2 parents 61cfdfa + 85ec01f
commit 611d26f
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 8 deletions.
diff --git a/dist/lerna.js b/dist/lerna.js
diff --git a/packages/lerna/src/init.ts b/packages/lerna/src/init.ts
@@ -42,10 +42,14 @@ export default async function (context: IContext, config: IPluginConfig): Promis
         }
         if (config[IS_LERNA_JSON_TEMP]) {
             context.version.new = packageJson.version;
-            fs.writeFileSync("lerna.json", JSON.stringify({
-                version: packageJson.version,
-                useWorkspaces: true
-            }, null, 2));
+            const lernaConfig: Record<string, any> = { version: packageJson.version };
+            if (fs.existsSync("pnpm-workspaces.yaml")) {
+                lernaConfig.npmClient = "pnpm";
+            }
+            if ((await utils.getLernaMajorVersion() || 0) < 7) {
+                lernaConfig.useWorkspaces = true;
+            }
+            fs.writeFileSync("lerna.json", JSON.stringify(lernaConfig, null, 2));
         }
     } catch {
         throw new Error(`Missing or invalid package.json in branch ${context.branch.name}`);

diff --git a/packages/lerna/src/utils.ts b/packages/lerna/src/utils.ts
@@ -29,6 +29,12 @@ async function npxCmd(): Promise<string> {
     return usePnpm ? "pnpm exec" : "npx";
 }
 
+export async function getLernaMajorVersion(): Promise<number> {
+    // If using lerna lite, the version is "unknown" so this function will return NaN
+    const cmdOutput = await exec.getExecOutput(await npxCmd(), ["lerna", "--version"]);
+    return parseInt(cmdOutput.stdout.split(".", 1)[0]);
+}
+
 export async function lernaList(onlyChanged?: boolean): Promise<Record<string, any>[]> {
     const cmdArgs = ["lerna"];
     if (onlyChanged) {