Skip to content

Commit b8eacf6

Browse files
committed
Merge branch 'main' into renovate/primer-react-37.x
2 parents d18d34e + baa5b0a commit b8eacf6

File tree

153 files changed

+18524
-12266
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

153 files changed

+18524
-12266
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ jobs:
2525
name: Tests
2626
uses: ./.github/workflows/test.yml
2727
needs: lint
28+
secrets: inherit
2829

2930
build:
3031
name: Build

.github/workflows/release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ jobs:
1414
name: Tests
1515
uses: ./.github/workflows/test.yml
1616
needs: lint
17+
secrets: inherit
1718

1819
publish:
1920
name: Publish

.github/workflows/test.yml

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,36 @@ jobs:
1818
- run: pnpm install
1919
- run: pnpm tsc --noEmit
2020
- run: pnpm test -- --coverage --runInBand --verbose
21-
- name: Coveralls
22-
uses: coverallsapp/github-action@v2
23-
21+
- name: Archive code coverage results
22+
uses: actions/upload-artifact@v4
23+
with:
24+
name: code-coverage-report
25+
path: coverage/lcov.info
26+
27+
sonarqube:
28+
name: SonarQube Cloud Analysis
29+
runs-on: ubuntu-latest
30+
needs: run-unit-tests
31+
# Only analyze PRs from the same repository. Limitation of SonarQube Cloud
32+
if: github.event.pull_request.head.repo.fork == false
33+
34+
steps:
35+
- uses: actions/checkout@v4
36+
with:
37+
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
38+
- uses: pnpm/action-setup@v3
39+
- uses: actions/setup-node@v4
40+
with:
41+
node-version-file: '.nvmrc'
42+
cache: 'pnpm'
43+
- run: pnpm install
44+
- name: Download a single artifact
45+
uses: actions/download-artifact@v4
46+
with:
47+
name: code-coverage-report
48+
path: coverage/
49+
- name: SonarQube Cloud Scan
50+
uses: SonarSource/sonarqube-scan-action@v4
51+
env:
52+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
53+
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.github/workflows/triage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Triage PR
22

33
on:
4-
pull_request:
4+
pull_request_target:
55
types:
66
- opened
77
- edited

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
22.13.0
1+
22.13.1

README.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Gitify
22

3-
[![CI Workflow][ci-workflow-badge]][github-actions] [![Release Workflow][release-workflow-badge]][github-actions] [![Coveralls][coveralls-badge]][coveralls] [![Renovate enabled][renovate-badge]][renovate] [![Contributors][contributors-badge]][github] [![Downloads - Total][downloads-total-badge]][website] [![Downloads - Latest Release][downloads-latest-badge]][website] [![OSS License][license-badge]][license] [![Latest Release][github-release-badge]][github-releases] [![Homebrew Cask][homebrew-cask-badge]][homebrew-cask]
3+
[![CI Workflow][ci-workflow-badge]][github-actions] [![Release Workflow][release-workflow-badge]][github-actions] [![Coverage][coverage-badge]][coverage] [![Quality Gate Status][quality-badge]][quality] [![Renovate enabled][renovate-badge]][renovate] [![Contributors][contributors-badge]][github] [![Downloads - Total][downloads-total-badge]][website] [![Downloads - Latest Release][downloads-latest-badge]][website] [![OSS License][license-badge]][license] [![Latest Release][github-release-badge]][github-releases] [![Homebrew Cask][homebrew-cask-badge]][homebrew-cask]
44

55
> GitHub Notifications on your menu bar. Available on macOS, Windows and Linux.
66
7-
![Gitify](assets/images/press.png)
7+
![Gitify][gitify-social]
88

99
### Download
1010

@@ -33,6 +33,7 @@ For more information, see [LICENSE](LICENSE).
3333
<!-- LINK LABELS -->
3434
[website]: https://www.gitify.io
3535
[faqs]: https://www.gitify.io/faq/
36+
[gitify-social]: https://raw.githubusercontent.com/gitify-app/website/master/public/images/social.png
3637

3738
[github]: https://github.com/gitify-app/gitify
3839
[github-actions]: https://github.com/gitify-app/gitify/actions
@@ -42,8 +43,11 @@ For more information, see [LICENSE](LICENSE).
4243
[brew]: https://brew.sh/
4344
[homebrew-cask]: https://formulae.brew.sh/cask/gitify
4445

45-
[coveralls]: https://coveralls.io/github/gitify-app/gitify
46-
[coveralls-badge]: https://img.shields.io/coverallsCoverage/github/gitify-app/gitify?logo=coveralls
46+
[coverage-badge]: https://img.shields.io/sonar/coverage/gitify-app_gitify?server=https%3A%2F%2Fsonarcloud.io&logo=sonarcloud
47+
[coverage]: https://sonarcloud.io/summary/new_code?id=gitify-app_gitify
48+
[quality-badge]: https://img.shields.io/sonar/quality_gate/gitify-app_gitify?server=https%3A%2F%2Fsonarcloud.io&logo=sonarcloud
49+
[quality]: https://sonarcloud.io/summary/new_code?id=gitify-app_gitify
50+
4751
[ci-workflow-badge]: https://github.com/gitify-app/gitify/actions/workflows/ci.yml/badge.svg
4852
[release-workflow-badge]: https://github.com/gitify-app/gitify/actions/workflows/release.yml/badge.svg
4953
[downloads-total-badge]: https://img.shields.io/github/downloads/gitify-app/gitify/total?label=downloads@all&logo=github

assets/images/press.png

-443 KB
Binary file not shown.

config/webpack.config.renderer.base.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ const configuration: webpack.Configuration = {
4040
},
4141

4242
plugins: [
43-
// Development Keys - See README.md
43+
// Development Keys - See CONTRIBUTING.md
4444
new webpack.EnvironmentPlugin({
45-
OAUTH_CLIENT_ID: '3fef4433a29c6ad8f22c',
46-
OAUTH_CLIENT_SECRET: '9670de733096c15322183ff17ed0fc8704050379',
45+
OAUTH_CLIENT_ID: 'Ov23liQIkFs5ehQLNzHF',
46+
OAUTH_CLIENT_SECRET: '404b80632292e18419dbd2a6ed25976856e95255',
4747
}),
4848

4949
// Extract CSS into a separate file

package.json

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "gitify",
3-
"version": "5.18.0",
3+
"version": "6.0.0",
44
"description": "GitHub notifications on your menu bar.",
55
"main": "build/main.js",
66
"scripts": {
@@ -69,7 +69,7 @@
6969
"build": {
7070
"productName": "Gitify",
7171
"appId": "com.electron.gitify",
72-
"copyright": "Copyright © 2024 Gitify Team",
72+
"copyright": "Copyright © 2025 Gitify Team",
7373
"asar": true,
7474
"files": [
7575
"assets/images/*",
@@ -80,6 +80,12 @@
8080
"package.json"
8181
],
8282
"electronLanguages": ["en"],
83+
"protocols": [
84+
{
85+
"name": "Gitify",
86+
"schemes": ["gitify", "gitify-dev"]
87+
}
88+
],
8389
"mac": {
8490
"category": "public.app-category.developer-tools",
8591
"icon": "assets/images/app-icon.icns",
@@ -123,41 +129,41 @@
123129
"repo": "gitify"
124130
},
125131
"afterSign": "scripts/notarize.js",
126-
"afterPack": "scripts/remove-unused-locales.js"
132+
"afterPack": "scripts/afterPack.js"
127133
},
128134
"dependencies": {
129135
"@electron/remote": "2.1.2",
130-
"electron-log": "5.2.4",
136+
"electron-log": "5.3.0",
131137
"electron-updater": "6.3.9",
132138
"menubar": "9.5.1",
133139
"react": "19.0.0",
134140
"react-dom": "19.0.0",
135-
"react-router-dom": "7.1.3",
136-
"update-electron-app": "3.1.0"
141+
"react-router-dom": "7.1.5",
142+
"update-electron-app": "3.1.1"
137143
},
138144
"devDependencies": {
139145
"@biomejs/biome": "1.9.4",
140146
"@discordapp/twemoji": "15.1.0",
141147
"@electron/notarize": "2.5.0",
142-
"@primer/octicons-react": "19.14.0",
143-
"@primer/react": "37.9.1",
148+
"@primer/octicons-react": "19.15.0",
149+
"@primer/primitives": "10.3.4",
150+
"@primer/react": "36.27.0",
151+
"@tailwindcss/postcss": "4.0.3",
144152
"@testing-library/react": "16.2.0",
145153
"@types/jest": "29.5.14",
146-
"@types/node": "22.10.7",
147-
"@types/nprogress": "0.2.3",
148-
"@types/react": "19.0.7",
154+
"@types/node": "22.13.1",
155+
"@types/react": "19.0.8",
149156
"@types/react-dom": "19.0.3",
150157
"@types/react-router-dom": "5.3.3",
151158
"@types/semver": "7.5.8",
152-
"autoprefixer": "10.4.20",
153159
"axios": "1.7.9",
154160
"clsx": "2.1.1",
155161
"concurrently": "9.1.2",
156162
"copy-webpack-plugin": "12.0.2",
157163
"css-loader": "7.1.2",
158164
"css-minimizer-webpack-plugin": "7.0.0",
159165
"date-fns": "4.1.0",
160-
"electron": "34.0.0",
166+
"electron": "34.1.0",
161167
"electron-builder": "25.1.8",
162168
"final-form": "4.20.10",
163169
"graphql-tag": "2.12.6",
@@ -167,15 +173,13 @@
167173
"jest-environment-jsdom": "29.7.0",
168174
"mini-css-extract-plugin": "2.9.2",
169175
"nock": "13.5.6",
170-
"nprogress": "0.2.0",
171176
"postcss": "8.5.1",
172177
"postcss-loader": "8.1.1",
173-
"react-final-form": "6.5.9",
174178
"rimraf": "6.0.1",
175-
"semver": "7.6.3",
179+
"semver": "7.7.1",
176180
"styled-components": "6.1.14",
177-
"tailwind-merge": "2.6.0",
178-
"tailwindcss": "3.4.17",
181+
"tailwind-merge": "3.0.1",
182+
"tailwindcss": "4.0.3",
179183
"terser-webpack-plugin": "5.3.11",
180184
"ts-jest": "29.2.5",
181185
"ts-loader": "9.5.2",
@@ -185,7 +189,7 @@
185189
"webpack-cli": "6.0.1",
186190
"webpack-merge": "6.0.1"
187191
},
188-
"packageManager": "[email protected].4",
192+
"packageManager": "[email protected].5",
189193
"lint-staged": {
190194
"*": "biome check --fix --no-errors-on-unmatched",
191195
"*.{js,ts,tsx}": "pnpm test -- --findRelatedTests -u --passWithNoTests"

0 commit comments

Comments
 (0)