Use merge to add build results to publish context

src/tasks/publish/subtasks/getBuildAndUploadTask.ts

@@ -1,8 +1,9 @@
 import Listr, { ListrTask } from "listr";
 import { BuildAndUploadOptions } from "../../buildAndUpload/types.js";
-import { ListrContextBuild, ListrContextPublish } from "../../../types.js";
+import { ListrContextPublish } from "../../../types.js";
 import { buildAndUpload } from "../../buildAndUpload/index.js";
 import { VerbosityOptions } from "../../../commands/build/types.js";
+import { merge } from "lodash-es";
 
 export function getBuildAndUploadTask({
   buildOptions,
@@ -21,24 +22,8 @@ export function getBuildAndUploadTask({
 
       const buildResults = await buildTasks.run();
 
-      copyBuildCtxToPublishCtx({
-        buildCtx: buildResults,
-        publishCtx: ctx
-      });
+      // Add build results to publish context
+      ctx = merge(ctx, buildResults);
     }
   };
 }
-
-function copyBuildCtxToPublishCtx({
-  buildCtx,
-  publishCtx
-}: {
-  buildCtx: ListrContextBuild;
-  publishCtx: ListrContextPublish;
-}) {
-  for (const [key, result] of Object.entries(buildCtx)) {
-    publishCtx[key] = publishCtx[key]
-      ? { ...publishCtx[key], ...result }
-      : result;
-  }
-}

src/tasks/publish/subtasks/getFetchApmVersionsTask.ts

@@ -16,16 +16,20 @@ export function getFetchNextVersionsFromApmTask({
     title: "Fetch current versions from APM",
     task: async ctx => {
 
-      for (const { manifest } of packagesToBuildProps) {
+      for (const { manifest, variant, releaseDir } of packagesToBuildProps) {
         const dnpName = manifest.name;
 
-        ctx[dnpName] = ctx[dnpName] || {};
-        ctx[dnpName].nextVersion = await getNextPackageVersion({
+        const nextVersion = await getNextPackageVersion({
           manifest,
           releaseType,
           ethProvider
         });
 
+        ctx[dnpName] = {
+          variant,
+          releaseDir,
+          nextVersion
+        }
       }
     }
   };