From 3208e3c18bd0ccc769708f6577e9c82d5ad3da60 Mon Sep 17 00:00:00 2001
From: Samuel Salazar <samuel.salazar@okta.com>
Date: Mon, 30 Mar 2026 14:59:48 -0400
Subject: [PATCH] ci: switch to conventionalcommits preset for semantic-release

---
 .github/workflows/prepare-release.yml |  5 +++--
 .releaserc.json                       | 14 ++++++++++++--
 package.json                          |  1 +
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
index 351596a..357e8de 100644
--- a/.github/workflows/prepare-release.yml
+++ b/.github/workflows/prepare-release.yml
@@ -37,7 +37,8 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          NEXT_VERSION=$(npx semantic-release --dry-run --plugins @semantic-release/commit-analyzer | tee /dev/stderr | awk '/The next release version is/{print $NF}')
+          # Run semantic-release with dry-run to detect version
+          NEXT_VERSION=$(npx semantic-release --dry-run --verify-conditions false | tee /dev/stderr | awk '/The next release version is/{print $NF}')
           echo "next=$NEXT_VERSION" >> $GITHUB_OUTPUT
 
       - name: Update package.json
@@ -48,7 +49,7 @@ jobs:
 
       - name: Update CHANGELOG.md
         if: steps.version.outputs.next != ''
-        run: npx conventional-changelog-cli -p angular -i CHANGELOG.md -s
+        run: npx conventional-changelog-cli -p conventionalcommits -i CHANGELOG.md -s
 
       - name: Create Pull Request
         if: steps.version.outputs.next != ''
diff --git a/.releaserc.json b/.releaserc.json
index 01d9e2e..6ae408d 100644
--- a/.releaserc.json
+++ b/.releaserc.json
@@ -3,8 +3,18 @@
     "master"
   ],
   "plugins": [
-    "@semantic-release/commit-analyzer",
-    "@semantic-release/release-notes-generator",
+    [
+      "@semantic-release/commit-analyzer",
+      {
+        "preset": "conventionalcommits"
+      }
+    ],
+    [
+      "@semantic-release/release-notes-generator",
+      {
+        "preset": "conventionalcommits"
+      }
+    ],
     [
       "@semantic-release/npm",
       {
diff --git a/package.json b/package.json
index d85f183..68fa19f 100644
--- a/package.json
+++ b/package.json
@@ -55,6 +55,7 @@
     "atob": "^2.1.2",
     "chai": "^4.1.2",
     "conventional-changelog": "~1.1.0",
+    "conventional-changelog-conventionalcommits": "^9.3.0",
     "eslint": "^4.19.1",
     "husky": "^9.1.7",
     "mocha": "^5.2.0",