Skip to content

Commit 43ea112

Browse files
authored
chore: resolve Changesets CD's version tag naming style (electron-userland#9353)
chore: fix CD auto-tagging of releases since we want `vVersion` for electron-builder and scoped `packageName@version` for electron-updater
1 parent 21623e1 commit 43ea112

3 files changed

Lines changed: 7 additions & 37 deletions

File tree

patches/@changesets__cli@2.25.0.patch

Lines changed: 0 additions & 30 deletions
This file was deleted.

patches/@changesets__cli@2.29.7.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ index 53fc925f8aa492e7333033483e9f3e45839963ad..e0902ee40002980cd8a1e16103ff313c
44
+++ b/dist/changesets-cli.cjs.js
55
@@ -924,8 +924,8 @@ async function getUnpublishedPackages(packages, preState) {
66
}
7-
7+
88
async function getUntaggedPackages(packages, cwd, tool) {
99
- const packageWithTags = await Promise.all(packages.map(async pkg => {
1010
- const tagName = tool === "root" ? `v${pkg.packageJson.version}` : `${pkg.packageJson.name}@${pkg.packageJson.version}`;
1111
+ const packageWithTags = await Promise.all(packages.filter(pkg => ["electron-builder", "electron-updater"].includes(pkg.packageJson.name)).map(async pkg => {
12-
+ const tagName = ("root" !== tool && pkg.packageJson.name !== 'electron-builder') ? `${pkg.packageJson.name}@${pkg.packageJson.version}` : `v${pkg.packageJson.version}`
12+
+ const tagName = (pkg.packageJson.name === "electron-builder") ? `v${pkg.packageJson.version}` : `${pkg.packageJson.name}@${pkg.packageJson.version}`;
1313
const isMissingTag = !((await git__namespace.tagExists(tagName, cwd)) || (await git__namespace.remoteTagExists(tagName)));
1414
return {
1515
pkg,
@@ -19,12 +19,12 @@ index 6c363c0551d7a5b69e2e48be0bcd757699609094..272ce19c87ac3e5f02bb150ae4a4076d
1919
+++ b/dist/changesets-cli.esm.js
2020
@@ -886,8 +886,8 @@ async function getUnpublishedPackages(packages, preState) {
2121
}
22-
22+
2323
async function getUntaggedPackages(packages, cwd, tool) {
2424
- const packageWithTags = await Promise.all(packages.map(async pkg => {
2525
- const tagName = tool === "root" ? `v${pkg.packageJson.version}` : `${pkg.packageJson.name}@${pkg.packageJson.version}`;
2626
+ const packageWithTags = await Promise.all(packages.filter(pkg => ["electron-builder", "electron-updater"].includes(pkg.packageJson.name)).map(async pkg => {
27-
+ const tagName = ("root" !== tool && pkg.packageJson.name !== 'electron-builder') ? `${pkg.packageJson.name}@${pkg.packageJson.version}` : `v${pkg.packageJson.version}`
27+
+ const tagName = (pkg.packageJson.name === 'electron-builder') ? `v${pkg.packageJson.version}` : `${pkg.packageJson.name}@${pkg.packageJson.version}`;
2828
const isMissingTag = !((await git.tagExists(tagName, cwd)) || (await git.remoteTagExists(tagName)));
2929
return {
3030
pkg,

pnpm-lock.yaml

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)