diff --git a/.changeset/backstage-changelog.js b/.changeset/backstage-changelog.js index 45ed53afe4..22038b348b 100644 --- a/.changeset/backstage-changelog.js +++ b/.changeset/backstage-changelog.js @@ -16,7 +16,7 @@ const { default: defaultChangelogFunctions, -} = require('@changesets/changelog-github'); +} = require('@changesets/cli/changelog'); // Custom CHANGELOG generation for changesets, stolen from here with one minor change: // https://github.com/atlassian/changesets/blob/main/packages/cli/src/changelog/index.ts @@ -32,34 +32,7 @@ async function getDependencyReleaseLine(changesets, dependenciesUpdated) { return ['- Updated dependencies', ...updatedDependenciesList].join('\n'); } -async function getReleaseLine(changeset, type, options) { - const { ignoreUserThanks = [], ...rest } = options ?? {}; - const releaseLine = await defaultChangelogFunctions.getReleaseLine( - changeset, - type, - rest, - ); - - const ignoredUsers = new Set(ignoreUserThanks); - return releaseLine.replace(/Thanks\s(.*)!\s/g, (_, text) => { - // extracts user name and profile url from the markdown link - const regex = /\[@(\w+)\]\((https:\/\/github\.com\/[^\)]+)\)/g; - - let matches; - const links = []; - - while ((matches = regex.exec(text)) !== null) { - const [, user, url] = matches; - if (!ignoredUsers.has(user)) { - links.push(`[@${user}](${url})`); - } - } - - return links.length ? `Thanks ${links.join(', ')}! ` : ''; - }); -} - module.exports = { - getReleaseLine, + getReleaseLine: defaultChangelogFunctions.getReleaseLine, getDependencyReleaseLine, }; diff --git a/.changeset/config.json b/.changeset/config.json index 94e435bd93..283caa6ac4 100644 --- a/.changeset/config.json +++ b/.changeset/config.json @@ -1,19 +1,6 @@ { "$schema": "https://unpkg.com/@changesets/config@1.3.0/schema.json", - "changelog": [ - "./backstage-changelog.js", - { - "repo": "backstage/backstage", - "ignoreUserThanks": [ - "benjdlambert", - "freben", - "jhaals", - "Rugvip", - "renovate", - "dependabot" - ] - } - ], + "changelog": "./backstage-changelog.js", "commit": false, "linked": [], "access": "public", diff --git a/package.json b/package.json index a13b7463f2..10645d341e 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,6 @@ "version": "1.20.0-next.2", "dependencies": { "@backstage/errors": "workspace:^", - "@changesets/changelog-github": "^0.4.8", "@manypkg/get-packages": "^1.1.3", "@useoptic/optic": "^0.50.10" }, diff --git a/yarn.lock b/yarn.lock index 6534e7d908..15365689ff 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10415,17 +10415,6 @@ __metadata: languageName: node linkType: hard -"@changesets/changelog-github@npm:^0.4.8": - version: 0.4.8 - resolution: "@changesets/changelog-github@npm:0.4.8" - dependencies: - "@changesets/get-github-info": ^0.5.2 - "@changesets/types": ^5.2.1 - dotenv: ^8.1.0 - checksum: 8a357cc08757e0eeca267ee05141f68bef936582abef8b78a5d30d99f5a86e41b7d3debba70992b73b2f57b0fc6201ec1cc3c65116930167ee3197b427b865c5 - languageName: node - linkType: hard - "@changesets/cli@npm:^2.14.0": version: 2.26.2 resolution: "@changesets/cli@npm:2.26.2" @@ -10506,16 +10495,6 @@ __metadata: languageName: node linkType: hard -"@changesets/get-github-info@npm:^0.5.2": - version: 0.5.2 - resolution: "@changesets/get-github-info@npm:0.5.2" - dependencies: - dataloader: ^1.4.0 - node-fetch: ^2.5.0 - checksum: 067e07eeaecdbedbd1c715513c4aa6206a941bd1d3af292d067792808c6fa6644caad2b35fba614a44892559c031c234df8028f8d2abd4cb2682d48080ef5df3 - languageName: node - linkType: hard - "@changesets/get-release-plan@npm:^3.0.17": version: 3.0.17 resolution: "@changesets/get-release-plan@npm:3.0.17" @@ -25208,13 +25187,6 @@ __metadata: languageName: node linkType: hard -"dataloader@npm:^1.4.0": - version: 1.4.0 - resolution: "dataloader@npm:1.4.0" - checksum: e2c93d43afde68980efc0cd9ff48e9851116e27a9687f863e02b56d46f7e7868cc762cd6dcbaf4197e1ca850a03651510c165c2ae24b8e9843fd894002ad0e20 - languageName: node - linkType: hard - "dataloader@npm:^2.0.0, dataloader@npm:^2.2.2": version: 2.2.2 resolution: "dataloader@npm:2.2.2" @@ -25999,13 +25971,6 @@ __metadata: languageName: node linkType: hard -"dotenv@npm:^8.1.0": - version: 8.6.0 - resolution: "dotenv@npm:8.6.0" - checksum: 38e902c80b0666ab59e9310a3d24ed237029a7ce34d976796349765ac96b8d769f6df19090f1f471b77a25ca391971efde8a1ea63bb83111bd8bec8e5cc9b2cd - languageName: node - linkType: hard - "drange@npm:^1.0.2": version: 1.1.1 resolution: "drange@npm:1.1.1" @@ -36192,7 +36157,7 @@ __metadata: languageName: node linkType: hard -"node-fetch@npm:^2.5.0, node-fetch@npm:^2.6.0, node-fetch@npm:^2.6.1, node-fetch@npm:^2.6.12, node-fetch@npm:^2.6.5, node-fetch@npm:^2.6.7": +"node-fetch@npm:^2.6.0, node-fetch@npm:^2.6.1, node-fetch@npm:^2.6.12, node-fetch@npm:^2.6.5, node-fetch@npm:^2.6.7": version: 2.7.0 resolution: "node-fetch@npm:2.7.0" dependencies: @@ -41297,7 +41262,6 @@ __metadata: "@backstage/e2e-test-utils": "workspace:*" "@backstage/errors": "workspace:^" "@backstage/repo-tools": "workspace:*" - "@changesets/changelog-github": ^0.4.8 "@changesets/cli": ^2.14.0 "@manypkg/get-packages": ^1.1.3 "@octokit/rest": ^19.0.3