diff --git a/package.json b/package.json index 35440f6c..a9b6c280 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "@npmcli/arborist": "^7.0.0", "commit-and-tag-version": "12.4.1", "conventional-changelog": "5.1.0", - "conventional-recommended-bump": "9.0.0", + "conventional-recommended-bump": "10.0.0", "debug": "^4.3.1", "execa": "^5.0.0", "glob": "^8.0.0", diff --git a/src/build-release-graph.js b/src/build-release-graph.js index 3a47e6ba..87233482 100644 --- a/src/build-release-graph.js +++ b/src/build-release-graph.js @@ -14,12 +14,12 @@ const { createSyncLogger, createAsyncLogger } = require('./log'); const defaultReleaseType = 'patch'; async function getReleaseType(packageName, cwd) { - const conventionalRecommendedBump = require('conventional-recommended-bump'); + const { Bumper, packagePrefix } = await import('conventional-recommended-bump'); // let { preset } = require('commit-and-tag-version/defaults'); let preset = require('commit-and-tag-version/lib/preset-loader')({}); - let tagPrefix = `${packageName}@`; + let tagPrefix = packagePrefix(packageName); let originalCwd = process.cwd(); @@ -27,11 +27,17 @@ async function getReleaseType(packageName, cwd) { try { process.chdir(cwd); - myReleaseType = (await conventionalRecommendedBump({ - preset, - path: cwd, - tagPrefix, - })).releaseType; + let bumper = new Bumper(cwd); + + bumper.loadPreset(preset); + + myReleaseType = await bumper.bump(); + + // myReleaseType = (await conventionalRecommendedBump({ + // preset, + // path: cwd, + // tagPrefix, + // })).releaseType; } finally { process.chdir(originalCwd); } diff --git a/yarn.lock b/yarn.lock index 27f20186..53ecad49 100644 --- a/yarn.lock +++ b/yarn.lock @@ -176,6 +176,14 @@ dependencies: chalk "^4.1.0" +"@conventional-changelog/git-client@^1.0.0": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@conventional-changelog/git-client/-/git-client-1.0.1.tgz#143be2777ba389c3c14f83fa19b7cab6a49a503b" + integrity sha512-PJEqBwAleffCMETaVm/fUgHldzBE35JFk3/9LL6NUA5EXa3qednu+UT6M7E5iBu3zIQZCULYIiZ90fBYHt6xUw== + dependencies: + "@types/semver" "^7.5.5" + semver "^7.5.2" + "@crowdstrike/commitlint@^8.0.0": version "8.0.1" resolved "https://registry.npmjs.org/@crowdstrike/commitlint/-/commitlint-8.0.1.tgz#5c1127d03613bfab6db4cb42465162cc0e71dc7b" @@ -827,6 +835,11 @@ "@types/glob" "*" "@types/node" "*" +"@types/semver@^7.5.5": + version "7.5.8" + resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.8.tgz#8268a8c57a3e4abd25c165ecd36237db7948a55e" + integrity sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ== + "@types/supports-color@^8.0.0": version "8.1.3" resolved "https://registry.npmjs.org/@types/supports-color/-/supports-color-8.1.3.tgz#b769cdce1d1bb1a3fa794e35b62c62acdf93c139" @@ -1560,6 +1573,11 @@ conventional-changelog-preset-loader@^4.1.0: resolved "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-4.1.0.tgz#996bc40d516471c5bf8248fdc30222563b9bcfe6" integrity sha512-HozQjJicZTuRhCRTq4rZbefaiCzRM2pr6u2NL3XhrmQm4RMnDXfESU6JKu/pnKwx5xtdkYfNCsbhN5exhiKGJA== +conventional-changelog-preset-loader@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-5.0.0.tgz#922ad617c13ad3243bef967cfc0f8373893c216d" + integrity sha512-SetDSntXLk8Jh1NOAl1Gu5uLiCNSYenB5tm0YVeZKePRIgDW9lQImromTwLa3c/Gae298tsgOM+/CYT9XAl0NA== + conventional-changelog-writer@^5.0.0: version "5.0.1" resolved "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-5.0.1.tgz#e0757072f045fe03d91da6343c843029e702f359" @@ -1642,6 +1660,11 @@ conventional-commits-filter@^4.0.0: resolved "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-4.0.0.tgz#845d713e48dc7d1520b84ec182e2773c10c7bf7f" integrity sha512-rnpnibcSOdFcdclpFwWa+pPlZJhXE7l+XK04zxhbWrhgpR96h33QLz8hITTXbcYICxVr3HZFtbtUAQ+4LdBo9A== +conventional-commits-filter@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-5.0.0.tgz#72811f95d379e79d2d39d5c0c53c9351ef284e86" + integrity sha512-tQMagCOC59EVgNZcC5zl7XqO30Wki9i9J3acbUvkaosCT6JX3EeFwJD7Qqp4MCikRnzS18WXV3BLIQ66ytu6+Q== + conventional-commits-parser@^3.2.0: version "3.2.4" resolved "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.2.4.tgz#a7d3b77758a202a9b2293d2112a8d8052c740972" @@ -1674,6 +1697,24 @@ conventional-commits-parser@^5.0.0: meow "^12.0.1" split2 "^4.0.0" +conventional-commits-parser@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-6.0.0.tgz#74e3be5344d8cd99f7c3353da2efa1d1dd618061" + integrity sha512-TbsINLp48XeMXR8EvGjTnKGsZqBemisPoyWESlpRyR8lif0lcwzqz+NMtYSj1ooF/WYjSuu7wX0CtdeeMEQAmA== + dependencies: + meow "^13.0.0" + +conventional-recommended-bump@10.0.0: + version "10.0.0" + resolved "https://registry.yarnpkg.com/conventional-recommended-bump/-/conventional-recommended-bump-10.0.0.tgz#1e46c2c9534457088d10a47a154b307365c2e043" + integrity sha512-RK/fUnc2btot0oEVtrj3p2doImDSs7iiz/bftFCDzels0Qs1mxLghp+DFHMaOC0qiCI6sWzlTDyBFSYuot6pRA== + dependencies: + "@conventional-changelog/git-client" "^1.0.0" + conventional-changelog-preset-loader "^5.0.0" + conventional-commits-filter "^5.0.0" + conventional-commits-parser "^6.0.0" + meow "^13.0.0" + conventional-recommended-bump@7.0.1: version "7.0.1" resolved "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-7.0.1.tgz#ec01f6c7f5d0e2491c2d89488b0d757393392424" @@ -1687,18 +1728,6 @@ conventional-recommended-bump@7.0.1: git-semver-tags "^5.0.0" meow "^8.1.2" -conventional-recommended-bump@9.0.0: - version "9.0.0" - resolved "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-9.0.0.tgz#2910b08b10e6c705301335ab916e7438eba5907f" - integrity sha512-HR1yD0G5HgYAu6K0wJjLd7QGRK8MQDqqj6Tn1n/ja1dFwBCE6QmV+iSgQ5F7hkx7OUR/8bHpxJqYtXj2f/opPQ== - dependencies: - conventional-changelog-preset-loader "^4.1.0" - conventional-commits-filter "^4.0.0" - conventional-commits-parser "^5.0.0" - git-raw-commits "^4.0.0" - git-semver-tags "^7.0.0" - meow "^12.0.1" - core-util-is@~1.0.0: version "1.0.3" resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" @@ -3449,6 +3478,11 @@ meow@^12.0.1: resolved "https://registry.npmjs.org/meow/-/meow-12.1.1.tgz#e558dddbab12477b69b2e9a2728c327f191bace6" integrity sha512-BhXM0Au22RwUneMPwSCnyhTOizdWoIEPU9sp0Aqa1PnDMR5Wv2FGXYDjuzJEIX+Eo2Rb8xuYe5jrnm5QowQFkw== +meow@^13.0.0: + version "13.2.0" + resolved "https://registry.yarnpkg.com/meow/-/meow-13.2.0.tgz#6b7d63f913f984063b3cc261b6e8800c4cd3474f" + integrity sha512-pxQJQzB6djGPXh08dacEloMFopsOqGVRKFPYvPOt9XDZ1HasbgDZA74CJGreSU4G3Ak7EFJGoiH2auq+yXISgA== + meow@^8.0.0, meow@^8.1.2: version "8.1.2" resolved "https://registry.npmjs.org/meow/-/meow-8.1.2.tgz#bcbe45bda0ee1729d350c03cffc8395a36c4e897"