@docupace/pipeline 1.0.39-matttest.23 → 1.0.39-matttest.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docupace/pipeline",
-  "version": "1.0.39-matttest.23",
+  "version": "1.0.39-matttest.24",
   "description": "",
   "main": "index.js",
   "type": "module",
@@ -23,6 +23,7 @@
     "commander": "^12.1.0",
     "dotenv": "^16.4.7",
     "fs-extra": "^11.3.0",
+    "inquirer": "^12.6.1",
     "js-yaml": "^4.1.0",
     "lodash": "^4.17.21",
     "openai": "^4.76.3",
@@ -42,6 +43,7 @@
     "test-deploy-core": "dp-next-cli deploy-core-pipeline dev template",
     "test-deploy-from-site": "dp-next-cli deploy-from-site --from-env dev --to-env dev --from-site financialdev --to-site template --deploy-core true",
     "test-run-pipline": "dp-next-cli run-pipeline -r docupace-next-e2e -b master -p run-tests-qa",
-    "test-validate": "dp-changset-cli validate"
+    "test-validate": "dp-changset-cli validate",
+    "test-create": "dp-changset-cli create-changeset"
   }
 }

package/src/changeset/cli.js

@@ -1,146 +1,72 @@
 #!/usr/bin/env node
 import { Command } from 'commander';
 import { $ } from 'zx';
-import path from 'path';
 import { validateChangesets } from './validate.js';
-import fs from 'fs';
-import OpenAI from 'openai';
-import { zodResponseFormat } from 'openai/helpers/zod';
-import z from 'zod';
 import dotenv from 'dotenv';
-import { makeJiraRequest, updateComponentVersion } from '../next/jira.js';
+import { getChangedAppPackages, isMonoRepo, setGitInfo } from '../next/util.js';
+import { updateJiraWithVersion, versionCommand } from './version.js';
+import { createChangeset } from './create.js';
+import { getPackage } from './util.js';
+
 dotenv.config({ path: ['.env.pipeline.local', 'config/.env.pipeline.local'] });
-import { setGitInfo } from '../next/util.js';
 
 const program = new Command();
 
 const args = process.argv;
 
-async function createChangesetDirectory() {
-  try {
-    // Use path.join to build a safe path to `.changeset`
-    const targetDir = path.join(process.cwd(), '.changeset');
+async function commitTagCommand(releases) {
+  console.log('📌 Checking for updates to commit...');
 
-    // Create the directory recursively if it doesn't exist
-    await fs.promises.mkdir(targetDir, { recursive: true });
-  } catch (error) {
-    console.error('Error creating .changeset directory:', error);
+  // Check if there are changes to commit
+  const status = (await $`git status --porcelain`).stdout.trim();
+  if (!status) {
+    console.log('✅ No changes to commit. Exiting.');
+    return;
   }
-}
-
-function run(command) {
-  return new Promise((resolve, reject) => {
-    exec(command, { shell: true }, (error, stdout, stderr) => {
-      if (error) {
-        reject(error);
-      } else {
-        resolve({ stdout, stderr });
-      }
-    });
-  });
-}
 
-async function fileExists(filePath) {
-  try {
-    await fs.promises.access(filePath);
-    return true;
-  } catch {
-    return false;
-  }
-}
+  console.log('📌 Committing and tagging the new version...');
+  await setGitInfo();
+  await $`git add .`;
 
-async function getMainPackage() {
-  const mainModulePath = process.cwd();
-  if (mainModulePath) {
-    const packageJsonPath = path.join(mainModulePath, 'package.json');
-    if (await fileExists(packageJsonPath)) {
-      const fileContent = await fs.promises.readFile(packageJsonPath, 'utf-8');
-      const packageJson = JSON.parse(fileContent);
-      return packageJson;
-    }
+  if (isMonoRepo()) {
+    await commitTagMono(releases);
+  } else {
+    await commitTag();
   }
-  throw new Error('Main package.json not found');
 }
 
-const changeSetPackage = `{
-  "name": "changeset-package",
-  "version": "1.0.0",
-  "description": "",
-  "scripts": {
-  },
-  "type": "module",
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "dependencies": {},
-  "devDependencies": {
-    "@changesets/cli": "^2.27.10"
-  }
+export function getAppReleases(releases) {
+  const appReleases = releases.filter((release) =>
+    release.name.endsWith('-app'),
+  );
+  return appReleases;
 }
-`;
-
-async function versionCommand(closeVersion = false) {
-  console.log('📦 Running Changeset versioning...');
-  await setGitInfo();
-  await $`mv package.json package.json.bak`;
-  await $`mv pnpm-lock.yaml pnpm-lock.yaml.bak`;
-  await fs.promises.writeFile('package.json', changeSetPackage);
-  await $`pnpm install`;
-  await $`rm package.json pnpm-lock.yaml`;
-  await $`mv package.json.bak package.json`;
-  await $`mv pnpm-lock.yaml.bak pnpm-lock.yaml`;
-  if (closeVersion) {
-    await $`pnpm changeset pre exit`;
-  }
 
-  await $`pnpm changeset version`;
+function getAppNameFromPackageName(packageName) {
+  const appName = packageName.includes('/')
+    ? packageName.split('/')[1]
+    : packageName;
 
-  // Read the updated package.json to get the new version and package name
-  const packageJson = JSON.parse(
-    await fs.promises.readFile('package.json', 'utf-8'),
-  );
-  const version = packageJson.version;
-  const packageName = packageJson.name;
+  return appName;
+}
 
-  if (closeVersion) {
-    return { version, packageName };
+async function commitTagMono(releases) {
+  let versions = [];
+  for (const release of getAppReleases(releases)) {
+    const newVersion = release.newVersion;
+    const appName = getAppNameFromPackageName(release.name);
+    versions.push(`${appName}@${newVersion}`);
   }
-
-  // Get the last commit message and extract Jira ticket
-  const lastCommit = (await $`git log -1 --pretty=%B`).stdout.trim();
-  console.log(`Last commit '${lastCommit}' being processed to get Jira ticket`);
-
-  const jiraTicketMatch = lastCommit.match(/([A-Z]+-\d+)/);
-  const jiraTicketId = jiraTicketMatch ? jiraTicketMatch[0] : null;
-
-  // If we have all the necessary data, update the component version in Jira
-  if (jiraTicketId && version && packageName) {
-    try {
-      await updateComponentVersion(jiraTicketId, packageName, version);
-    } catch (error) {
-      console.error(
-        `Failed to update Jira component version: ${error.message}`,
-      );
-    }
+  await $`git commit -m "Version bump to ${versions.join(',')} and changelog"`;
+  for (const newVersion of versions) {
+    await $`git tag v${newVersion}`;
+    console.log(`✅ Version ${newVersion} tagged.`);
   }
-
-  console.log('✅ Changeset versioning complete.');
-  return { version, packageName };
+  await $`git push origin --tags`;
+  console.log(`✅ Version pushed.`);
 }
 
-async function commitTagCommand() {
-  console.log('📌 Checking for updates to commit...');
-
-  // Check if there are changes to commit
-  const status = (await $`git status --porcelain`).stdout.trim();
-  if (!status) {
-    console.log('✅ No changes to commit. Exiting.');
-    return;
-  }
-
-  console.log('📌 Committing and tagging the new version...');
-  await setGitInfo();
-  await $`git add .`;
+async function commitTag() {
   const newVersion = (
     await $`node -p "require('./package.json').version"`
   ).stdout.trim();
@@ -163,7 +89,7 @@ program
     try {
       await validateChangesets();
       console.log('✅ Changeset validation passed.');
-    } catch (error) {
+    } catch {
       console.error(
         '❌ No changeset found. Please add a changeset to this PR. Please see more information at https://docupacellc.atlassian.net/wiki/spaces/PM/pages/1350893571/Creating+changesets+for+Docupace+Next',
       );
@@ -192,8 +118,9 @@ program
   .description('Run versioning and commit-and-tag in sequence')
   .action(async () => {
     console.log('📦 Running all steps...');
-    await versionCommand();
-    await commitTagCommand();
+    const releases = await versionCommand();
+    await updateJiraWithVersion(releases);
+    await commitTagCommand(releases);
   });
 
 program
@@ -201,15 +128,21 @@ program
   .description('Closes a version')
   .action(async () => {
     console.log('📦 Running all steps...');
-    const { version } = await versionCommand(true);
-    await commitTagCommand();
+    const releases = await versionCommand(true);
+    await commitTagCommand(releases);
 
-    // Get current branch
     const { stdout: currentBranch } = await $`git rev-parse --abbrev-ref HEAD`;
 
-    // Create and push release branch
-    await $`git checkout -b release/${version}`;
-    await $`git push origin release/${version}`;
+    if (isMonoRepo()) {
+      for (const release of getAppReleases(releases)) {
+        const appName = getAppNameFromPackageName(release.name);
+        await $`git checkout -b release/${appName}/${release.newVersion}`;
+        await $`git push origin release/${appName}/${release.newVersion}`;
+      }
+    } else {
+      await $`git checkout -b release/${releases[0].newVersion}`;
+      await $`git push origin release/${releases[0].newVersion}`;
+    }
 
     // Return to original branch
     await $`git checkout ${currentBranch.trim()}`;
@@ -227,100 +160,7 @@ program
     'Creates a changeset based on the current branch and Jira ticket information',
   )
   .action(async () => {
-    const mainPackage = await getMainPackage();
-    const componentName = mainPackage.name;
-
-    try {
-      // Step 1: Get the current branch name
-      const branchName = (await $`git branch --show-current`).stdout.trim();
-      console.log(`Current branch: ${branchName}`);
-
-      // Step 2: Extract Jira ticket number (e.g., matching JIRA-1234 pattern)
-      const jiraTicketMatch = branchName.match(/([A-Z]+-\d+)/);
-      if (!jiraTicketMatch) {
-        throw new Error('No Jira ticket found in the branch name.');
-      }
-      const jiraTicketId = jiraTicketMatch[0];
-
-      const jiraBaseUrl = 'https://docupacellc.atlassian.net';
-      const jiraEmail = process.env.JIRA_API_EMAIL;
-      const jiraApiKey = process.env.JIRA_API_KEY;
-      const jiraFullApiKey = `${jiraEmail}:${jiraApiKey}`;
-      const jiraUrl = `${jiraBaseUrl}/rest/api/2/issue/${jiraTicketId}`;
-      const jiraResponse = await fetch(jiraUrl, {
-        headers: {
-          Authorization: `Basic ${Buffer.from(jiraFullApiKey).toString('base64')}`,
-          'Content-Type': 'application/json',
-        },
-      });
-
-      if (!jiraResponse.ok) {
-        throw new Error(
-          `Failed to fetch Jira ticket. Status: ${jiraResponse.status}`,
-        );
-      }
-      const jiraTicketData = await jiraResponse.json();
-
-      const jiraSummary = jiraTicketData.fields.summary;
-
-      console.log(
-        `Generating release notes for ${jiraTicketId} - ${jiraSummary}`,
-      );
-
-      const openaiClient = new OpenAI({
-        apiKey: process.env['OPENAI_API_KEY'],
-      });
-
-      const ChangeRequestSchema = z.object({
-        change_type: z.enum(['patch', 'minor']),
-        summary: z.string(),
-        jira_ticket_id: z.string(),
-      });
-
-      const openAiResponse = await openaiClient.chat.completions.create({
-        model: 'gpt-4o-mini',
-        messages: [
-          {
-            role: 'system',
-            content: `Process JSON from a Jira ticket to generate simple maximum 2 sentence release note for the ticket and determine the change type for bug it should be a patch for new feature it should be a minor change`,
-          },
-          {
-            role: 'user',
-            content: JSON.stringify(jiraTicketData),
-          },
-        ],
-        response_format: zodResponseFormat(
-          ChangeRequestSchema,
-          'changeset_schema',
-        ),
-        temperature: 0,
-      });
-
-      const assistantResponse = openAiResponse.choices[0].message.content;
-      const parsedResponse = JSON.parse(assistantResponse);
-
-      const { change_type, summary } = parsedResponse;
-      console.log(`Change type: ${change_type}`);
-      console.log(`Release note: ${summary}`);
-
-      // Step 5: Create a changeset .md file
-      const changesetContent = `---
-"${componentName}": ${change_type}
----
-
-${summary} [${jiraTicketId}]
-      `;
-      const changesetFile = `./.changeset/${jiraTicketId}.md`;
-
-      await createChangesetDirectory();
-      await fs.promises.writeFile(changesetFile, changesetContent);
-      console.log(`Created changeset file at ${changesetFile}`);
-
-      console.log('Done!');
-    } catch (err) {
-      console.error(`Error: ${err.message}`);
-      process.exit(1);
-    }
+    await createChangeset();
   });
 
 // Parse arguments

package/src/changeset/create.js

@@ -0,0 +1,182 @@
+import { $ } from 'zx';
+import OpenAI from 'openai';
+import z from 'zod';
+import { zodResponseFormat } from 'openai/helpers/zod';
+import fs from 'fs';
+import path from 'path';
+import { getAllAppPackages, isMonoRepo } from '../next/util.js';
+import inquirer from 'inquirer';
+import { getMainPackage, getPackage } from './util.js';
+
+async function createChangesetDirectory() {
+  try {
+    // Use path.join to build a safe path to `.changeset`
+    const targetDir = path.join(process.cwd(), '.changeset');
+
+    // Create the directory recursively if it doesn't exist
+    await fs.promises.mkdir(targetDir, { recursive: true });
+  } catch (error) {
+    console.error('Error creating .changeset directory:', error);
+  }
+}
+
+/**
+ * Gets the current git branch name
+ */
+async function getCurrentBranch() {
+  const branchName = (await $`git branch --show-current`).stdout.trim();
+  console.log(`Current branch: ${branchName}`);
+  return branchName;
+}
+
+/**
+ * Extracts a Jira ticket ID from a branch name
+ */
+function extractJiraTicketId(branchName) {
+  const jiraTicketMatch = branchName.match(/([A-Z]+-\d+)/);
+  if (!jiraTicketMatch) {
+    throw new Error('No Jira ticket found in the branch name.');
+  }
+  return jiraTicketMatch[0];
+}
+
+/**
+ * Fetches Jira ticket data from Jira API
+ */
+async function fetchJiraTicketData(jiraTicketId) {
+  const jiraBaseUrl = 'https://docupacellc.atlassian.net';
+  const jiraEmail = process.env.JIRA_API_EMAIL;
+  const jiraApiKey = process.env.JIRA_API_KEY;
+  const jiraFullApiKey = `${jiraEmail}:${jiraApiKey}`;
+  const jiraUrl = `${jiraBaseUrl}/rest/api/2/issue/${jiraTicketId}`;
+
+  const jiraResponse = await fetch(jiraUrl, {
+    headers: {
+      Authorization: `Basic ${Buffer.from(jiraFullApiKey).toString('base64')}`,
+      'Content-Type': 'application/json',
+    },
+  });
+
+  if (!jiraResponse.ok) {
+    throw new Error(
+      `Failed to fetch Jira ticket. Status: ${jiraResponse.status}`,
+    );
+  }
+
+  return await jiraResponse.json();
+}
+
+/**
+ * Generates release notes using OpenAI
+ */
+async function generateReleaseNotes(jiraTicketData) {
+  const openaiClient = new OpenAI({
+    apiKey: process.env['OPENAI_API_KEY'],
+  });
+
+  const ChangeRequestSchema = z.object({
+    change_type: z.enum(['patch', 'minor']),
+    summary: z.string(),
+    jira_ticket_id: z.string(),
+  });
+
+  const openAiResponse = await openaiClient.chat.completions.create({
+    model: 'gpt-4o-mini',
+    messages: [
+      {
+        role: 'system',
+        content: `Process JSON from a Jira ticket to generate simple maximum 2 sentence release note for the ticket and determine the change type for bug it should be a patch for new feature it should be a minor change`,
+      },
+      {
+        role: 'user',
+        content: JSON.stringify(jiraTicketData),
+      },
+    ],
+    response_format: zodResponseFormat(ChangeRequestSchema, 'changeset_schema'),
+    temperature: 0,
+  });
+
+  const assistantResponse = openAiResponse.choices[0].message.content;
+  return JSON.parse(assistantResponse);
+}
+
+/**
+ * Writes the changeset file
+ */
+async function writeChangesetFile(
+  componentName,
+  jiraTicketId,
+  changeType,
+  summary,
+) {
+  const changesetContent = `---
+"${componentName}": ${changeType}
+---
+
+${summary} [${jiraTicketId}]
+  `;
+  const changesetFile = `./.changeset/${jiraTicketId}.md`;
+
+  await createChangesetDirectory();
+  await fs.promises.writeFile(changesetFile, changesetContent);
+  console.log(`Created changeset file at ${changesetFile}`);
+}
+
+/**
+ * Main function to create a changeset
+ */
+
+export async function createChangeset() {
+  if (isMonoRepo()) {
+    const appPackages = await getAllAppPackages();
+    const response = await inquirer.prompt([
+      {
+        type: 'list',
+        name: 'package',
+        message: 'Which package do you want to generate changesetfor?',
+        choices: appPackages.map((appPackage) => appPackage.name),
+      },
+    ]);
+
+    const selectedPackage = appPackages.find(
+      (appPackage) => appPackage.name == response.package,
+    );
+
+    const selectedPackageContent = await getPackage(selectedPackage.path);
+    await createChangesetForPackage(selectedPackageContent);
+  } else {
+    const mainPackage = await getMainPackage();
+    await createChangesetForPackage(mainPackage);
+  }
+}
+
+export async function createChangesetForPackage(mainPackage) {
+  const componentName = mainPackage.name;
+  try {
+    // Step 1: Get the current branch name
+    const branchName = await getCurrentBranch();
+
+    // Step 2: Extract Jira ticket number
+    const jiraTicketId = extractJiraTicketId(branchName);
+
+    // Step 3: Fetch Jira ticket data
+    const jiraTicketData = await fetchJiraTicketData(jiraTicketId);
+    const jiraSummary = jiraTicketData.fields.summary;
+    console.log(
+      `Generating release notes for ${jiraTicketId} - ${jiraSummary}`,
+    );
+
+    // Step 4: Generate release notes using OpenAI
+    const { change_type, summary } = await generateReleaseNotes(jiraTicketData);
+    console.log(`Change type: ${change_type}`);
+    console.log(`Release note: ${summary}`);
+
+    // Step 5: Create a changeset .md file
+    await writeChangesetFile(componentName, jiraTicketId, change_type, summary);
+
+    console.log('Done!');
+  } catch (err) {
+    console.error(`Error: ${err.message}`);
+    process.exit(1);
+  }
+}

package/src/changeset/util.js

@@ -0,0 +1,27 @@
+import path from 'path';
+import fs from 'fs';
+
+async function fileExists(filePath) {
+  try {
+    await fs.promises.access(filePath);
+    return true;
+  } catch {
+    return false;
+  }
+}
+export async function getMainPackage() {
+  const mainModulePath = process.cwd();
+  return getPackage(mainModulePath);
+}
+
+export async function getPackage(mainModulePath) {
+  if (mainModulePath) {
+    const packageJsonPath = path.join(mainModulePath, 'package.json');
+    if (await fileExists(packageJsonPath)) {
+      const fileContent = await fs.promises.readFile(packageJsonPath, 'utf-8');
+      const packageJson = JSON.parse(fileContent);
+      return packageJson;
+    }
+  }
+  throw new Error('Main package.json not found');
+}

package/src/changeset/validate.js

@@ -2,39 +2,25 @@ import fs from 'fs';
 import path from 'path';
 import { $ } from 'zx';
 
-import { getChangedPackages, isMonoRepo, setGitInfo } from '../next/util.js';
+import { isMonoRepo, setGitInfo } from '../next/util.js';
+import { versionStatus } from './version.js';
+import { getAppReleases } from './cli.js';
 
 const CHANGESET_DIR = '.changeset';
 
 export async function validateChangesets() {
-  /*if (isMonoRepo()) {
-    const branch = process.env.BITBUCKET_BRANCH;
+  if (isMonoRepo()) {
+    await setGitInfo();
     const destBranch = process.env.BITBUCKET_PR_DESTINATION_BRANCH;
-
-    const changePackages = await getChangedPackages(destBranch, branch);
-
-    const appPackages = changePackages.filter((appPackage) =>
-      appPackage.name.endsWith('-app'),
-    );
-
-    let appPaths;
-    if (appPackages.length > 0) {
-      appPaths = appPackages.map((appPackage) => appPackage.path);
-      for (const appPath of appPaths) {
-        const changesetPath = path.resolve(appPath, CHANGESET_DIR);
-        await validateChangesetPath(changesetPath);
-      }
-    } else {
-      throw new Error('No changeset for at least one app');
+    await $`git fetch origin ${destBranch}:${destBranch}`;
+    const releases = await versionStatus(destBranch);
+    const appReleases = getAppReleases(releases);
+    if (appReleases.length == 0) {
+      throw new Error('Must have a changeset for at lease one app');
     }
   } else {
     await validateChangesetPath(path.resolve(process.cwd(), CHANGESET_DIR));
-  }*/
-
-  await setGitInfo();
-  const destBranch = process.env.BITBUCKET_PR_DESTINATION_BRANCH;
-  await $`git fetch origin ${destBranch}:${destBranch}`;
-  await $`changeset status --since=${destBranch}`;
+  }
 }
 
 export async function validateChangesetPath(directoryPath) {

package/src/changeset/version.js

@@ -0,0 +1,89 @@
+import { setGitInfo } from '../next/util.js';
+import { $ } from 'zx';
+import fs from 'fs';
+import { updateComponentVersion } from '../next/jira.js';
+
+const changeSetPackage = `{
+  "name": "changeset-package",
+  "version": "1.0.0",
+  "description": "",
+  "scripts": {
+  },
+  "type": "module",
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {},
+  "devDependencies": {
+    "@changesets/cli": "^2.27.10"
+  }
+}
+`;
+
+export async function versionStatus(sinceBranch) {
+  const outputPath = './changeset-output.json';
+
+  if (sinceBranch) {
+    await $`pnpm changeset status --output=${outputPath} --since=${sinceBranch}`;
+  } else {
+    await $`pnpm changeset status --output=${outputPath}`;
+  }
+
+  // Read the file and parse JSON
+  const jsonOutput = JSON.parse(await fs.promises.readFile(outputPath, 'utf8'));
+
+  await fs.promises.rm(outputPath);
+  return jsonOutput.releases;
+}
+
+export async function versionCommand(closeVersion = false) {
+  console.log('📦 Running Changeset versioning...');
+  await setGitInfo();
+  await $`mv package.json package.json.bak`;
+  await $`mv pnpm-lock.yaml pnpm-lock.yaml.bak`;
+  await fs.promises.writeFile('package.json', changeSetPackage);
+  await $`pnpm install`;
+  await $`rm package.json pnpm-lock.yaml`;
+  await $`mv package.json.bak package.json`;
+  await $`mv pnpm-lock.yaml.bak pnpm-lock.yaml`;
+  if (closeVersion) {
+    await $`pnpm changeset pre exit`;
+  }
+
+  try {
+    const releases = await versionStatus();
+
+    await $`pnpm changeset version`;
+
+    return releases;
+  } catch {
+    return [];
+  }
+}
+
+export async function updateJiraWithVersion(releases) {
+  const lastCommit = (await $`git log -1 --pretty=%B`).stdout.trim();
+  console.log(`Last commit '${lastCommit}' being processed to get Jira ticket`);
+
+  const jiraTicketMatch = lastCommit.match(/([A-Z]+-\d+)/);
+  const jiraTicketId = jiraTicketMatch ? jiraTicketMatch[0] : null;
+
+  // If we have all the necessary data, update the component version in Jira
+  if (jiraTicketId) {
+    for (const release of releases) {
+      try {
+        await updateComponentVersion(
+          jiraTicketId,
+          release.name,
+          release.newVersion,
+        );
+      } catch (error) {
+        console.error(
+          `Failed to update Jira component version: ${error.message}`,
+        );
+      }
+    }
+  }
+
+  console.log('✅ Changeset versioning complete.');
+}

package/src/next/jira.js

@@ -12,11 +12,6 @@ const jiraClient = axios.create({
   },
 });
 
-const packageComponents = {
-  'docupace-ui': 'next-ui',
-  'docupace-graphql-server': 'graphql-server',
-  '@docupace/template': 'template',
-};
 /**
  * Updates the component version custom field in Jira
  * @param {string} issueKey - The Jira issue key
@@ -24,7 +19,7 @@ const packageComponents = {
  * @param {string} version - The version to set
  */
 export async function updateComponentVersion(issueKey, packageName, version) {
-  const component = packageComponents[packageName] ?? packageName;
+  const component = packageName;
   console.log(
     `Updating ${issueKey} for package ${packageName} translated to component ${component} with version ${version}`,
   );

package/src/next/publish.js

@@ -56,12 +56,13 @@ export async function publish(gitSha) {
   await $`docker tag ${IMAGE_NAME} ${JF_REGISTRY_FULL_URL}/${BUILD_IMAGE_NAME}`;
   await $`docker push ${JF_REGISTRY_FULL_URL}/${BUILD_IMAGE_NAME}`;
 
-  const GIT_TAGS = (await $`git tag --points-at HEAD`).stdout
+  const gitTags = (await $`git tag --points-at HEAD`).stdout
     .trim()
     .split('\n')
     .filter(Boolean);
-  for (const GIT_TAG of GIT_TAGS) {
-    const tagName = `${BITBUCKET_REPO_SLUG}:${GIT_TAG}`;
+  for (const gitTag of gitTags) {
+    const version = gitTag.includes('@') ? 'v' + gitTag.split('@')[1] : gitTag;
+    const tagName = `${IMAGE_PREFIX}:${version}`;
     await $`docker tag ${IMAGE_NAME} ${JF_REGISTRY_FULL_URL}/${tagName}`;
     await $`docker push ${JF_REGISTRY_FULL_URL}/${tagName}`;
   }

package/src/next/util.js

@@ -3,8 +3,6 @@ import { join } from 'path';
 import { $, nothrow } from 'zx';
 import path from 'path';
 
-const GIT_SHA = (await $`git log --pretty=format:'%h' -n 1`).stdout.trim();
-
 export function isMonoRepo() {
   // Check for the presence of turbo.json which indicates a Turborepo monorepo
   return existsSync(join(process.cwd(), 'turbo.json'));
@@ -41,6 +39,33 @@ export async function getChangedPackagesInternal(fromRef, toRef) {
   }
 }
 
+export async function getAllPackages() {
+  try {
+    const turboDryOutput = await $`turbo run build --dry=json`;
+    const dryRunJson = turboDryOutput.stdout.trim();
+    const dryRun = JSON.parse(dryRunJson);
+
+    const packages = dryRun.tasks.map((task) => ({
+      name: task.package,
+      directory: task.directory,
+      path: path.resolve(process.cwd(), task.directory),
+    }));
+
+    return packages;
+  } catch (error) {
+    console.error('Error getting changed packages:', error);
+    return [];
+  }
+}
+
+export async function getAllAppPackages() {
+  const changedPackages = await getAllPackages();
+  const appPackages = changedPackages.filter((appPackage) =>
+    appPackage.directory.startsWith('apps'),
+  );
+  return appPackages;
+}
+
 export async function getChangedPackages() {
   const branch = process.env.BITBUCKET_BRANCH;
   const destBranch = process.env.BITBUCKET_PR_DESTINATION_BRANCH;
@@ -60,24 +85,6 @@ export async function getChangedAppPackages() {
   return appPackages;
 }
 
-export async function buildChangePackages() {
-  const appPackages = await getChangedAppPackages();
-  if (appPackages.length == 0) {
-    throw new Error('Nothing to build');
-  }
-  for (const appPackage of appPackages) {
-    await dockerBuild(appPackage);
-  }
-}
-
-export async function dockerBuild(appPackage) {
-  process.env.DOCKER_HOST = '';
-  const shortName = appPackage.name.replace('@docupace/', '');
-  const imageName = `${process.env.BITBUCKET_REPO_SLUG}-${shortName}:sha-${GIT_SHA}-withMaps`;
-  console.log(`Building Docker image ${imageName}...`);
-  await $`docker build --secret id=npm_token,env=DOCUPACE_NPM_TOKEN . --file ${path.resolve(appPackage.path, 'Dockerfile')} --target builder --tag ${imageName}`;
-}
-
 export async function setGitInfo() {
   await $`git config --global user.email "gitops@docupace.com"`;
   await $`git config --global user.name "Gitops"`;