Skip to content

Commit 86b8269

Browse files
authored
Merge branch 'main' into chore/check-scopes
2 parents 473b057 + 7f04b75 commit 86b8269

24 files changed

+149
-212
lines changed

.github/CODEOWNERS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
* @afonsojramos
2+
* @bmulholland

.github/workflows/trigger-homebrew.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
jobs:
66
homebrew:
77
name: Bump Homebrew Cask
8-
runs-on: ubuntu-latest
8+
runs-on: macos-latest
99
steps:
1010
- uses: macauley/action-homebrew-bump-cask@v1
1111
with:

.husky/pre-commit

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/usr/bin/env sh
2+
. "$(dirname -- "$0")/_/husky.sh"
3+
4+
pnpx lint-staged
5+
pnpm test -- --onlyChanged

main.js

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,16 @@ menubarApp.on('ready', () => {
6666
}
6767
});
6868

69+
ipcMain.handle('get-platform', async () => {
70+
return process.platform;
71+
});
72+
ipcMain.handle('get-app-version', async () => {
73+
return app.getVersion();
74+
});
75+
6976
ipcMain.on('reopen-window', () => menubarApp.showWindow());
7077
ipcMain.on('hide-window', () => menubarApp.hideWindow());
78+
7179
ipcMain.on('app-quit', () => menubarApp.app.quit());
7280
ipcMain.on('update-icon', (_, arg) => {
7381
if (!menubarApp.tray.isDestroyed()) {
@@ -78,12 +86,8 @@ menubarApp.on('ready', () => {
7886
}
7987
}
8088
});
81-
ipcMain.handle('get-platform', async () => {
82-
return process.platform;
83-
});
84-
85-
ipcMain.handle('get-app-version', async () => {
86-
return app.getVersion();
89+
ipcMain.on('set-login-item-settings', (event, settings) => {
90+
app.setLoginItemSettings(settings);
8791
});
8892

8993
menubarApp.window.webContents.on('devtools-opened', () => {

package.json

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "gitify",
3-
"version": "4.4.0",
3+
"version": "4.5.1",
44
"description": "GitHub Notifications on your menu bar.",
55
"main": "main.js",
66
"scripts": {
@@ -12,7 +12,8 @@
1212
"prettier:check": "prettier --check 'src/**/*.{js,ts,tsx}'",
1313
"prettier:apply": "prettier --write 'src/**/*.{js,ts,tsx}'",
1414
"test": "jest",
15-
"start": "electron . --enable-logging"
15+
"start": "electron . --enable-logging",
16+
"prepare": "husky install"
1617
},
1718
"repository": {
1819
"type": "git",
@@ -93,19 +94,16 @@
9394
"afterSign": "scripts/notarize.js"
9495
},
9596
"dependencies": {
96-
"@electron/remote": "2.0.11",
97+
"@electron/remote": "2.1.0",
9798
"@primer/octicons-react": "19.8.0",
98-
"axios": "1.5.1",
99+
"axios": "1.6.0",
99100
"date-fns": "2.30.0",
100101
"electron-updater": "6.1.4",
101102
"final-form": "4.20.10",
102-
"history": "4.10.1",
103-
"lodash": "4.17.21",
104103
"menubar": "9.3.0",
105104
"nprogress": "0.2.0",
106105
"react": "18.2.0",
107106
"react-dom": "18.2.0",
108-
"react-emojione": "5.0.1",
109107
"react-final-form": "6.5.9",
110108
"react-router": "6.16.0",
111109
"react-router-dom": "6.16.0",
@@ -116,10 +114,9 @@
116114
"devDependencies": {
117115
"@testing-library/react": "14.0.0",
118116
"@testing-library/react-hooks": "8.0.1",
119-
"@types/jest": "29.5.5",
120-
"@types/lodash": "4.14.199",
117+
"@types/jest": "29.5.10",
121118
"@types/node": "18.18.0",
122-
"@types/react": "18.2.28",
119+
"@types/react": "18.2.42",
123120
"@types/react-router-dom": "5.3.3",
124121
"@types/react-transition-group": "4.4.7",
125122
"autoprefixer": "10.4.16",
@@ -140,7 +137,11 @@
140137
"ts-jest": "29.1.1",
141138
"webpack": "5.88.2",
142139
"webpack-cli": "5.1.4",
143-
"webpack-merge": "5.9.0"
140+
"webpack-merge": "5.9.0",
141+
"husky": "8.0.3"
144142
},
145-
"packageManager": "[email protected]"
143+
"packageManager": "[email protected]",
144+
"lint-staged": {
145+
"*.{md,js,ts,tsx}": "prettier --write"
146+
}
146147
}

pnpm-lock.yaml

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

0 commit comments

Comments
 (0)