chore: fix correct changelog generation for dependencies (#1818)

rudderlabs · Aug 2, 2024 · 5e06978 · 5e06978
1 parent 815b9bf
commit 5e06978
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 28 deletions.
diff --git a/.github/workflows/draft-new-release.yml b/.github/workflows/draft-new-release.yml
@@ -78,6 +78,7 @@ jobs:
         id: finish-release
         env:
           HUSKY: 0
+          BASE_BRANCH: ${{ steps.create-release.outputs.branch_name }}
         run: |
           echo "Current version: $CURRENT_VERSION_VALUE"
           echo "New version: $NEW_VERSION_VALUE"

diff --git a/package.json b/package.json
@@ -52,7 +52,7 @@
     "build:v1.1": "nx run-many -t build --projects=rudder-sdk-js",
     "build:sanity": "rm -rf packages/sanity-suite/dist && nx run-many --targets=build:all --projects=@rudderstack/analytics-js-sanity-suite",
     "bump-version:monorepo": "npm version minor --git-tag-version false",
-    "release": "nx affected --base=origin/main --target=version --parallel=1 --skipCommitTypes=docs,ci,chore,test",
+    "release": "nx affected --base=origin/main --target=version --parallel=1 --skipCommitTypes=docs,ci,chore,test --baseBranch=$BASE_BRANCH",
     "release:nx": "nx release --skip-publish --verbose --dry-run",
     "release:github": "nx affected --target=github --parallel=1 --skipCommitTypes=docs,ci,chore,test",
     "deploy:npm": "nx affected --target=deploy --parallel=1 --skipCommitTypes=docs,ci,chore,test"

diff --git a/packages/analytics-js-common/project.json b/packages/analytics-js-common/project.json
@@ -43,11 +43,9 @@
     "version": {
       "executor": "@jscutlery/semver:version",
       "options": {
-        "baseBranch": "main",
         "preset": "conventionalcommits",
         "tagPrefix": "{projectName}@",
-        "trackDeps": true,
-        "push": true
+        "trackDeps": true
       }
     },
     "github": {

diff --git a/packages/analytics-js-cookies/project.json b/packages/analytics-js-cookies/project.json
@@ -43,11 +43,9 @@
     "version": {
       "executor": "@jscutlery/semver:version",
       "options": {
-        "baseBranch": "main",
         "preset": "conventionalcommits",
         "tagPrefix": "{projectName}@",
-        "trackDeps": true,
-        "push": true
+        "trackDeps": true
       }
     },
     "github": {

diff --git a/packages/analytics-js-integrations/project.json b/packages/analytics-js-integrations/project.json
@@ -43,11 +43,9 @@
     "version": {
       "executor": "@jscutlery/semver:version",
       "options": {
-        "baseBranch": "main",
         "preset": "conventionalcommits",
         "tagPrefix": "{projectName}@",
-        "trackDeps": true,
-        "push": true
+        "trackDeps": true
       }
     },
     "github": {

diff --git a/packages/analytics-js-plugins/project.json b/packages/analytics-js-plugins/project.json
@@ -43,11 +43,9 @@
     "version": {
       "executor": "@jscutlery/semver:version",
       "options": {
-        "baseBranch": "main",
         "preset": "conventionalcommits",
         "tagPrefix": "{projectName}@",
-        "trackDeps": true,
-        "push": true
+        "trackDeps": true
       }
     },
     "github": {

diff --git a/packages/analytics-js-service-worker/project.json b/packages/analytics-js-service-worker/project.json
@@ -43,11 +43,9 @@
     "version": {
       "executor": "@jscutlery/semver:version",
       "options": {
-        "baseBranch": "main",
         "preset": "conventionalcommits",
         "tagPrefix": "{projectName}@",
-        "trackDeps": true,
-        "push": true
+        "trackDeps": true
       }
     },
     "github": {

diff --git a/packages/analytics-js/project.json b/packages/analytics-js/project.json
@@ -51,11 +51,9 @@
     "version": {
       "executor": "@jscutlery/semver:version",
       "options": {
-        "baseBranch": "main",
         "preset": "conventionalcommits",
         "tagPrefix": "{projectName}@",
-        "trackDeps": true,
-        "push": true
+        "trackDeps": true
       }
     },
     "github": {

diff --git a/packages/analytics-v1.1/project.json b/packages/analytics-v1.1/project.json
@@ -51,11 +51,9 @@
     "version": {
       "executor": "@jscutlery/semver:version",
       "options": {
-        "baseBranch": "main",
         "preset": "conventionalcommits",
         "tagPrefix": "{projectName}@",
-        "trackDeps": true,
-        "push": true
+        "trackDeps": true
       }
     },
     "github": {

diff --git a/packages/loading-scripts/project.json b/packages/loading-scripts/project.json
@@ -43,11 +43,9 @@
     "version": {
       "executor": "@jscutlery/semver:version",
       "options": {
-        "baseBranch": "main",
         "preset": "conventionalcommits",
         "tagPrefix": "{projectName}@",
-        "trackDeps": true,
-        "push": true
+        "trackDeps": true
       }
     },
     "github": {

diff --git a/packages/sanity-suite/project.json b/packages/sanity-suite/project.json
@@ -43,11 +43,9 @@
     "version": {
       "executor": "@jscutlery/semver:version",
       "options": {
-        "baseBranch": "main",
         "preset": "conventionalcommits",
         "tagPrefix": "{projectName}@",
-        "trackDeps": true,
-        "push": true
+        "trackDeps": true
       }
     }
   }

diff --git a/patches/@jscutlery+semver+5.2.2.patch b/patches/@jscutlery+semver+5.2.2.patch
@@ -0,0 +1,13 @@
+diff --git a/node_modules/@jscutlery/semver/src/executors/version/utils/try-bump.js b/node_modules/@jscutlery/semver/src/executors/version/utils/try-bump.js
+index 13c94d0..f616b64 100644
+--- a/node_modules/@jscutlery/semver/src/executors/version/utils/try-bump.js
++++ b/node_modules/@jscutlery/semver/src/executors/version/utils/try-bump.js
+@@ -167,7 +167,7 @@ function _getDependencyVersions({ commitParserOptions, preset, dependencyRoots,
+     return (0, rxjs_1.forkJoin)(dependencyRoots.map(({ path: projectRoot, name: dependencyName }) => {
+         /* Get dependency version changes since last project version */
+         const tagPrefix = (0, tag_1.formatTagPrefix)({
+-            versionTagPrefix,
++            versionTagPrefix: `{projectName}@`,
+             projectName: dependencyName,
+             syncVersions,
+         });