Skip to content

Commit

Permalink
Merge branch 'development' of github.com:FreeTubeApp/FreeTube into fe…
Browse files Browse the repository at this point in the history
…at/constrain-changelog-modal-width
  • Loading branch information
kommunarr committed May 14, 2024
2 parents 88fd91c + a9c9f10 commit 71355c8
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 6 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
"postcss": "^8.4.38",
"postcss-scss": "^4.0.9",
"prettier": "^2.8.8",
"rimraf": "^5.0.5",
"rimraf": "^5.0.7",
"sass": "^1.77.1",
"sass-loader": "^14.2.1",
"stylelint": "^16.5.0",
Expand Down
12 changes: 11 additions & 1 deletion src/renderer/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,17 @@ export default defineComponent({
.then((json) => {
const tagName = json[0].tag_name
const versionNumber = tagName.replace('v', '').replace('-beta', '')
this.updateChangelog = marked.parse(json[0].body)

let changelog = json[0].body
// Link usernames to their GitHub profiles
.replaceAll(/@(\S+)\b/g, '[@$1](https://github.com/$1)')
// Shorten pull request links to #1234
.replaceAll(/https:\/\/github\.com\/FreeTubeApp\/FreeTube\/pull\/(\d+)/g, '[#$1]($&)')

// Add the title
changelog = `# ${json[0].name}\n${changelog}`

this.updateChangelog = marked.parse(changelog)
this.changeLogTitle = json[0].name

this.updateBannerMessage = this.$t('Version {versionNumber} is now available! Click for more details', { versionNumber })
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7453,10 +7453,10 @@ rimraf@^3.0.0, rimraf@^3.0.2:
dependencies:
glob "^7.1.3"

rimraf@^5.0.5:
version "5.0.5"
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-5.0.5.tgz#9be65d2d6e683447d2e9013da2bf451139a61ccf"
integrity sha512-CqDakW+hMe/Bz202FPEymy68P+G50RfMQK+Qo5YUqc9SPipvbGjCGKd0RSKEelbsfQuw3g5NZDSrlZZAJurH1A==
rimraf@^5.0.5, rimraf@^5.0.7:
version "5.0.7"
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-5.0.7.tgz#27bddf202e7d89cb2e0381656380d1734a854a74"
integrity sha512-nV6YcJo5wbLW77m+8KjH8aB/7/rxQy9SZ0HY5shnwULfS+9nmTtVXAJET5NdZmCzA4fPI/Hm1wo/Po/4mopOdg==
dependencies:
glob "^10.3.7"

Expand Down

0 comments on commit 71355c8

Please sign in to comment.