Create temporary lerna.json if it doesn't exist

Signed-off-by: Timothy Johnson <timothy.johnson@broadcom.com>
zowe-actions · Feb 2, 2024 · 0345062 · 0345062
1 parent d88f823
commit 0345062
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 19 deletions.
diff --git a/dist/changelog.js b/dist/changelog.js
diff --git a/dist/lerna.js b/dist/lerna.js
diff --git a/packages/changelog/src/version.ts b/packages/changelog/src/version.ts
@@ -88,11 +88,14 @@ function getPackageChangelog(context: IContext, changelogFile: string, headerLin
 }
 
 function updatePackageChangelog(context: IContext, changelogFile: string, headerLine: string): boolean {
-    if (context.version.new !== context.version.old && fs.existsSync(changelogFile)) {
+    if (fs.existsSync(changelogFile)) {
         const oldContents = fs.readFileSync(changelogFile, "utf-8");
         const newVersion = context.version.overrides[path.dirname(changelogFile)]?.new || context.version.new;
-        const newContents = oldContents.replace(headerLine, `## \`${newVersion}\``);
+        if (oldContents.includes(`## \`${newVersion}\``)) {
+            return false;
+        }
 
+        const newContents = oldContents.replace(headerLine, `## \`${newVersion}\``);
         if (newContents !== oldContents) {
             fs.writeFileSync(changelogFile, newContents);
             context.logger.info(`Updated version header in ${changelogFile}`)

diff --git a/packages/lerna/src/config.ts b/packages/lerna/src/config.ts
@@ -16,7 +16,10 @@
 
 import { IPluginConfig as NpmPluginConfig } from "@octorelease/npm";
 
+export const IS_LERNA_JSON_TEMP = Symbol();
+
 export type IPluginConfig = NpmPluginConfig & {
     pruneShrinkwrap?: boolean | string[];
     versionIndependent?: string[];
+    [IS_LERNA_JSON_TEMP]?: boolean;
 };
diff --git a/packages/lerna/src/init.ts b/packages/lerna/src/init.ts
@@ -18,17 +18,20 @@ import * as fs from "fs";
 import * as path from "path";
 import { IContext } from "@octorelease/core";
 import { DEFAULT_NPM_REGISTRY, utils as npmUtils } from "@octorelease/npm";
-import { IPluginConfig } from "./config";
+import { IPluginConfig, IS_LERNA_JSON_TEMP } from "./config";
 import * as utils from "./utils";
 
 export default async function (context: IContext, config: IPluginConfig): Promise<void> {
     let publishConfig;
-    try {
-        const lernaJson = JSON.parse(fs.readFileSync("lerna.json", "utf-8"));
-        context.version.new = lernaJson.version;
-        publishConfig = lernaJson.command?.publish;
-    } catch {
-        throw new Error(`Missing or invalid lerna.json in branch ${context.branch.name}`);
+    config[IS_LERNA_JSON_TEMP] = !fs.existsSync("lerna.json");
+    if (!config[IS_LERNA_JSON_TEMP]) {
+        try {
+            const lernaJson = JSON.parse(fs.readFileSync("lerna.json", "utf-8"));
+            context.version.new = lernaJson.version;
+            publishConfig = lernaJson.command?.publish;
+        } catch {
+            throw new Error(`Missing or invalid lerna.json in branch ${context.branch.name}`);
+        }
     }
 
     try {
@@ -37,6 +40,13 @@ export default async function (context: IContext, config: IPluginConfig): Promis
         if (publishConfig == null) {
             publishConfig = packageJson.publishConfig;
         }
+        if (config[IS_LERNA_JSON_TEMP]) {
+            context.version.new = packageJson.version;
+            fs.writeFileSync("lerna.json", JSON.stringify({
+                version: packageJson.version,
+                useWorkspaces: true
+            }, null, 2));
+        }
     } catch {
         throw new Error(`Missing or invalid package.json in branch ${context.branch.name}`);
     }

diff --git a/packages/lerna/src/version.ts b/packages/lerna/src/version.ts
@@ -20,7 +20,7 @@ import findUp from "find-up";
 import * as glob from "@actions/glob";
 import { IContext } from "@octorelease/core";
 import { utils as npmUtils } from "@octorelease/npm";
-import { IPluginConfig } from "./config";
+import { IPluginConfig, IS_LERNA_JSON_TEMP } from "./config";
 import * as utils from "./utils";
 
 export default async function (context: IContext, config: IPluginConfig): Promise<void> {
@@ -47,7 +47,10 @@ export default async function (context: IContext, config: IPluginConfig): Promis
     }
 
     await utils.lernaPostVersion(); // Update lockfile because lerna doesn't
-    context.changedFiles.push("lerna.json", "package.json");
+    context.changedFiles.push("package.json");
+    if (!config[IS_LERNA_JSON_TEMP]) {
+        context.changedFiles.push("lerna.json");
+    }
     const lockfilePath = await findUp(["pnpm-lock.yaml", "yarn.lock", "npm-shrinkwrap.json", "package-lock.json"]);
     if (lockfilePath != null) {
         context.changedFiles.push(path.relative(context.rootDir, lockfilePath));