From 3a373a2fdc789081232fa3183a466a9d084affcb Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Thu, 10 Apr 2025 04:48:09 +1000 Subject: [PATCH 1/2] fix: electron menuitem regression Signed-off-by: Adam Setch --- package.json | 266 ++++++++++++++++++++++++------------------------- pnpm-lock.yaml | 36 ++++--- 2 files changed, 157 insertions(+), 145 deletions(-) diff --git a/package.json b/package.json index 892603d9e..af075efc7 100644 --- a/package.json +++ b/package.json @@ -1,135 +1,135 @@ { - "name": "gitify", - "version": "6.2.0", - "description": "GitHub notifications on your menu bar.", - "main": "build/main.js", - "scripts": { - "clean": "rimraf build coverage dist node_modules", - "build": "concurrently --names \"main,renderer\" --prefix-colors \"blue,green\" \"pnpm build:main\" \"pnpm build:renderer\"", - "build:main": "webpack --config ./config/webpack.config.main.prod.ts", - "build:renderer": "webpack --config ./config/webpack.config.renderer.prod.ts", - "watch": "concurrently --names \"main,renderer\" --prefix-colors \"blue,green\" \"pnpm watch:main\" \"pnpm watch:renderer\"", - "watch:main": "webpack --watch --config ./config/webpack.config.main.base.ts", - "watch:renderer": "webpack --watch --config ./config/webpack.config.renderer.base.ts", - "prepare:remove-source-maps": "ts-node ./scripts/delete-source-maps.ts", - "package:linux": "electron-builder --linux --config ./config/electron-builder.js", - "package:macos": "electron-builder --mac --config ./config/electron-builder.js", - "package:win": "electron-builder --win --config ./config/electron-builder.js", - "lint:check": "biome check", - "lint": "biome check --fix", - "test": "jest", - "start": "electron . --enable-logging", - "prepare": "husky" - }, - "engines": { - "node": ">=20" - }, - "repository": { - "type": "git", - "url": "https://github.com/gitify-app/gitify.git" - }, - "keywords": [ - "gitify", - "github", - "notifier", - "notifications", - "electron", - "atom", - "shell", - "app", - "tray" - ], - "author": { - "name": "Adam Setch", - "url": "https://github.com/setchy" - }, - "contributors": [ - { - "name": "Emmanouil Konstantinidis", - "url": "https://github.com/manosim" - }, - { - "name": "Jake 'Sid' Smith", - "url": "https://github.com/JakeSidSmith" - }, - { - "name": "Adam Setch", - "url": "https://github.com/setchy" - }, - { - "name": "Afonso Ramos", - "url": "https://github.com/afonsojramos" - } - ], - "license": "MIT", - "bugs": { - "url": "https://github.com/gitify-app/gitify/issues" - }, - "homepage": "https://gitify.io/", - "dependencies": { - "@electron/remote": "2.1.2", - "electron-log": "5.3.3", - "electron-updater": "6.6.2", - "menubar": "9.5.1", - "react": "19.1.0", - "react-dom": "19.1.0", - "react-router-dom": "7.5.0", - "update-electron-app": "3.1.1" - }, - "devDependencies": { - "@biomejs/biome": "1.9.4", - "@discordapp/twemoji": "15.1.0", - "@electron/notarize": "3.0.1", - "@primer/octicons-react": "19.15.1", - "@primer/primitives": "10.5.0", - "@primer/react": "36.27.0", - "@tailwindcss/postcss": "4.1.3", - "@testing-library/react": "16.3.0", - "@types/jest": "29.5.14", - "@types/node": "22.14.0", - "@types/react": "19.1.0", - "@types/react-dom": "19.1.1", - "@types/react-router-dom": "5.3.3", - "@types/semver": "7.7.0", - "axios": "1.8.4", - "clsx": "2.1.1", - "concurrently": "9.1.2", - "copy-webpack-plugin": "13.0.0", - "css-loader": "7.1.2", - "css-minimizer-webpack-plugin": "7.0.2", - "date-fns": "4.1.0", - "electron": "35.1.4", - "electron-builder": "25.1.8", - "final-form": "4.20.10", - "graphql-tag": "2.12.6", - "html-webpack-plugin": "5.6.3", - "husky": "9.1.7", - "jest": "29.7.0", - "jest-environment-jsdom": "29.7.0", - "mini-css-extract-plugin": "2.9.2", - "nock": "13.5.6", - "postcss": "8.5.3", - "postcss-loader": "8.1.1", - "rimraf": "6.0.1", - "semver": "7.7.1", - "styled-components": "6.1.17", - "tailwind-merge": "3.2.0", - "tailwindcss": "4.1.3", - "terser-webpack-plugin": "5.3.14", - "ts-jest": "29.3.1", - "ts-loader": "9.5.2", - "ts-node": "10.9.2", - "typescript": "5.8.3", - "webpack": "5.99.0", - "webpack-cli": "6.0.1", - "webpack-merge": "6.0.1" - }, - "packageManager": "pnpm@10.8.0", - "pnpm": { - "onlyBuiltDependencies": ["@biomejs/biome", "electron", "esbuild"] - }, - "lint-staged": { - "*": "biome check --fix --no-errors-on-unmatched", - "*.{js,ts,tsx}": "pnpm test -- --findRelatedTests -u --passWithNoTests" - } + "name": "gitify", + "version": "6.2.0", + "description": "GitHub notifications on your menu bar.", + "main": "build/main.js", + "scripts": { + "clean": "rimraf build coverage dist node_modules", + "build": "concurrently --names \"main,renderer\" --prefix-colors \"blue,green\" \"pnpm build:main\" \"pnpm build:renderer\"", + "build:main": "webpack --config ./config/webpack.config.main.prod.ts", + "build:renderer": "webpack --config ./config/webpack.config.renderer.prod.ts", + "watch": "concurrently --names \"main,renderer\" --prefix-colors \"blue,green\" \"pnpm watch:main\" \"pnpm watch:renderer\"", + "watch:main": "webpack --watch --config ./config/webpack.config.main.base.ts", + "watch:renderer": "webpack --watch --config ./config/webpack.config.renderer.base.ts", + "prepare:remove-source-maps": "ts-node ./scripts/delete-source-maps.ts", + "package:linux": "electron-builder --linux --config ./config/electron-builder.js", + "package:macos": "electron-builder --mac --config ./config/electron-builder.js", + "package:win": "electron-builder --win --config ./config/electron-builder.js", + "lint:check": "biome check", + "lint": "biome check --fix", + "test": "jest", + "start": "electron . --enable-logging", + "prepare": "husky" + }, + "engines": { + "node": ">=20" + }, + "repository": { + "type": "git", + "url": "https://github.com/gitify-app/gitify.git" + }, + "keywords": [ + "gitify", + "github", + "notifier", + "notifications", + "electron", + "atom", + "shell", + "app", + "tray" + ], + "author": { + "name": "Adam Setch", + "url": "https://github.com/setchy" + }, + "contributors": [ + { + "name": "Emmanouil Konstantinidis", + "url": "https://github.com/manosim" + }, + { + "name": "Jake 'Sid' Smith", + "url": "https://github.com/JakeSidSmith" + }, + { + "name": "Adam Setch", + "url": "https://github.com/setchy" + }, + { + "name": "Afonso Ramos", + "url": "https://github.com/afonsojramos" + } + ], + "license": "MIT", + "bugs": { + "url": "https://github.com/gitify-app/gitify/issues" + }, + "homepage": "https://gitify.io/", + "dependencies": { + "@electron/remote": "2.1.2", + "electron-log": "5.3.3", + "electron-updater": "6.6.2", + "menubar": "9.5.1", + "react": "19.1.0", + "react-dom": "19.1.0", + "react-router-dom": "7.5.0", + "update-electron-app": "3.1.1" + }, + "devDependencies": { + "@biomejs/biome": "1.9.4", + "@discordapp/twemoji": "15.1.0", + "@electron/notarize": "3.0.1", + "@primer/octicons-react": "19.15.1", + "@primer/primitives": "10.5.0", + "@primer/react": "36.27.0", + "@tailwindcss/postcss": "4.1.3", + "@testing-library/react": "16.3.0", + "@types/jest": "29.5.14", + "@types/node": "22.14.0", + "@types/react": "19.1.0", + "@types/react-dom": "19.1.1", + "@types/react-router-dom": "5.3.3", + "@types/semver": "7.7.0", + "axios": "1.8.4", + "clsx": "2.1.1", + "concurrently": "9.1.2", + "copy-webpack-plugin": "13.0.0", + "css-loader": "7.1.2", + "css-minimizer-webpack-plugin": "7.0.2", + "date-fns": "4.1.0", + "electron": "34.4.1", + "electron-builder": "25.1.8", + "final-form": "4.20.10", + "graphql-tag": "2.12.6", + "html-webpack-plugin": "5.6.3", + "husky": "9.1.7", + "jest": "29.7.0", + "jest-environment-jsdom": "29.7.0", + "mini-css-extract-plugin": "2.9.2", + "nock": "13.5.6", + "postcss": "8.5.3", + "postcss-loader": "8.1.1", + "rimraf": "6.0.1", + "semver": "7.7.1", + "styled-components": "6.1.17", + "tailwind-merge": "3.2.0", + "tailwindcss": "4.1.3", + "terser-webpack-plugin": "5.3.14", + "ts-jest": "29.3.1", + "ts-loader": "9.5.2", + "ts-node": "10.9.2", + "typescript": "5.8.3", + "webpack": "5.99.0", + "webpack-cli": "6.0.1", + "webpack-merge": "6.0.1" + }, + "packageManager": "pnpm@10.8.0", + "pnpm": { + "onlyBuiltDependencies": ["@biomejs/biome", "electron", "esbuild"] + }, + "lint-staged": { + "*": "biome check --fix --no-errors-on-unmatched", + "*.{js,ts,tsx}": "pnpm test -- --findRelatedTests -u --passWithNoTests" + } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b7ae85b0b..5bd8de0ab 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -10,7 +10,7 @@ importers: dependencies: '@electron/remote': specifier: 2.1.2 - version: 2.1.2(electron@35.1.4) + version: 2.1.2(electron@34.4.1) electron-log: specifier: 5.3.3 version: 5.3.3 @@ -19,7 +19,7 @@ importers: version: 6.6.2 menubar: specifier: 9.5.1 - version: 9.5.1(electron@35.1.4) + version: 9.5.1(electron@34.4.1) react: specifier: 19.1.0 version: 19.1.0 @@ -97,8 +97,8 @@ importers: specifier: 4.1.0 version: 4.1.0 electron: - specifier: 35.1.4 - version: 35.1.4 + specifier: 34.4.1 + version: 34.4.1 electron-builder: specifier: 25.1.8 version: 25.1.8(electron-builder-squirrel-windows@24.13.3) @@ -930,6 +930,9 @@ packages: '@types/ms@0.7.34': resolution: {integrity: sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==} + '@types/node@20.17.30': + resolution: {integrity: sha512-7zf4YyHA+jvBNfVrk2Gtvs6x7E8V+YDW05bNfG2XkWDJfYRXrTiP/DsB2zSYTaHX0bGIujTBQdMVAhb+j7mwpg==} + '@types/node@22.14.0': resolution: {integrity: sha512-Kmpl+z84ILoG+3T/zQFyAJsU6EPTmOCj8/2+83fSN6djd6I4o7uOuGIH6vq3PrjY5BGitSbFuMN18j3iknubbA==} @@ -1905,8 +1908,8 @@ packages: electron-updater@6.6.2: resolution: {integrity: sha512-Cr4GDOkbAUqRHP5/oeOmH/L2Bn6+FQPxVLZtPbcmKZC63a1F3uu5EefYOssgZXG3u/zBlubbJ5PJdITdMVggbw==} - electron@35.1.4: - resolution: {integrity: sha512-8HjE2wqxY//T09Of8k1eTpK/NeTG2FkTyRD+fyKXmec4wZVscGgZcmWFC0HYN4ktyHAjtplpxdFXjtqRnvzBMg==} + electron@34.4.1: + resolution: {integrity: sha512-iYzeLBdCrAR3i0RVSLa+mzuFZwH6HGxTGKsI+SS41sg2anZj4R5mHjOiHsxcZ50/ih47NJbuVRJgPIVlTF+USg==} engines: {node: '>= 12.20.55'} hasBin: true @@ -4148,6 +4151,9 @@ packages: engines: {node: '>=14.17'} hasBin: true + undici-types@6.19.8: + resolution: {integrity: sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==} + undici-types@6.21.0: resolution: {integrity: sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==} @@ -4735,9 +4741,9 @@ snapshots: - bluebird - supports-color - '@electron/remote@2.1.2(electron@35.1.4)': + '@electron/remote@2.1.2(electron@34.4.1)': dependencies: - electron: 35.1.4 + electron: 34.4.1 '@electron/universal@1.5.1': dependencies: @@ -5353,6 +5359,10 @@ snapshots: '@types/ms@0.7.34': {} + '@types/node@20.17.30': + dependencies: + undici-types: 6.19.8 + '@types/node@22.14.0': dependencies: undici-types: 6.21.0 @@ -6564,10 +6574,10 @@ snapshots: transitivePeerDependencies: - supports-color - electron@35.1.4: + electron@34.4.1: dependencies: '@electron/get': 2.0.3 - '@types/node': 22.14.0 + '@types/node': 20.17.30 extract-zip: 2.0.1 transitivePeerDependencies: - supports-color @@ -7802,9 +7812,9 @@ snapshots: mdn-data@2.0.30: {} - menubar@9.5.1(electron@35.1.4): + menubar@9.5.1(electron@34.4.1): dependencies: - electron: 35.1.4 + electron: 34.4.1 electron-positioner: 4.1.0 merge-stream@2.0.0: {} @@ -9085,6 +9095,8 @@ snapshots: typescript@5.8.3: {} + undici-types@6.19.8: {} + undici-types@6.21.0: {} unified@10.1.2: From 118bdc8bd9267457a83a3b8d133d322859feb195 Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Thu, 10 Apr 2025 04:50:26 +1000 Subject: [PATCH 2/2] fix: electron menuitem regression Signed-off-by: Adam Setch --- package.json | 266 +++++++++++++++++++++++++-------------------------- 1 file changed, 133 insertions(+), 133 deletions(-) diff --git a/package.json b/package.json index af075efc7..94f7809c1 100644 --- a/package.json +++ b/package.json @@ -1,135 +1,135 @@ { - "name": "gitify", - "version": "6.2.0", - "description": "GitHub notifications on your menu bar.", - "main": "build/main.js", - "scripts": { - "clean": "rimraf build coverage dist node_modules", - "build": "concurrently --names \"main,renderer\" --prefix-colors \"blue,green\" \"pnpm build:main\" \"pnpm build:renderer\"", - "build:main": "webpack --config ./config/webpack.config.main.prod.ts", - "build:renderer": "webpack --config ./config/webpack.config.renderer.prod.ts", - "watch": "concurrently --names \"main,renderer\" --prefix-colors \"blue,green\" \"pnpm watch:main\" \"pnpm watch:renderer\"", - "watch:main": "webpack --watch --config ./config/webpack.config.main.base.ts", - "watch:renderer": "webpack --watch --config ./config/webpack.config.renderer.base.ts", - "prepare:remove-source-maps": "ts-node ./scripts/delete-source-maps.ts", - "package:linux": "electron-builder --linux --config ./config/electron-builder.js", - "package:macos": "electron-builder --mac --config ./config/electron-builder.js", - "package:win": "electron-builder --win --config ./config/electron-builder.js", - "lint:check": "biome check", - "lint": "biome check --fix", - "test": "jest", - "start": "electron . --enable-logging", - "prepare": "husky" - }, - "engines": { - "node": ">=20" - }, - "repository": { - "type": "git", - "url": "https://github.com/gitify-app/gitify.git" - }, - "keywords": [ - "gitify", - "github", - "notifier", - "notifications", - "electron", - "atom", - "shell", - "app", - "tray" - ], - "author": { - "name": "Adam Setch", - "url": "https://github.com/setchy" - }, - "contributors": [ - { - "name": "Emmanouil Konstantinidis", - "url": "https://github.com/manosim" - }, - { - "name": "Jake 'Sid' Smith", - "url": "https://github.com/JakeSidSmith" - }, - { - "name": "Adam Setch", - "url": "https://github.com/setchy" - }, - { - "name": "Afonso Ramos", - "url": "https://github.com/afonsojramos" - } - ], - "license": "MIT", - "bugs": { - "url": "https://github.com/gitify-app/gitify/issues" - }, - "homepage": "https://gitify.io/", - "dependencies": { - "@electron/remote": "2.1.2", - "electron-log": "5.3.3", - "electron-updater": "6.6.2", - "menubar": "9.5.1", - "react": "19.1.0", - "react-dom": "19.1.0", - "react-router-dom": "7.5.0", - "update-electron-app": "3.1.1" - }, - "devDependencies": { - "@biomejs/biome": "1.9.4", - "@discordapp/twemoji": "15.1.0", - "@electron/notarize": "3.0.1", - "@primer/octicons-react": "19.15.1", - "@primer/primitives": "10.5.0", - "@primer/react": "36.27.0", - "@tailwindcss/postcss": "4.1.3", - "@testing-library/react": "16.3.0", - "@types/jest": "29.5.14", - "@types/node": "22.14.0", - "@types/react": "19.1.0", - "@types/react-dom": "19.1.1", - "@types/react-router-dom": "5.3.3", - "@types/semver": "7.7.0", - "axios": "1.8.4", - "clsx": "2.1.1", - "concurrently": "9.1.2", - "copy-webpack-plugin": "13.0.0", - "css-loader": "7.1.2", - "css-minimizer-webpack-plugin": "7.0.2", - "date-fns": "4.1.0", - "electron": "34.4.1", - "electron-builder": "25.1.8", - "final-form": "4.20.10", - "graphql-tag": "2.12.6", - "html-webpack-plugin": "5.6.3", - "husky": "9.1.7", - "jest": "29.7.0", - "jest-environment-jsdom": "29.7.0", - "mini-css-extract-plugin": "2.9.2", - "nock": "13.5.6", - "postcss": "8.5.3", - "postcss-loader": "8.1.1", - "rimraf": "6.0.1", - "semver": "7.7.1", - "styled-components": "6.1.17", - "tailwind-merge": "3.2.0", - "tailwindcss": "4.1.3", - "terser-webpack-plugin": "5.3.14", - "ts-jest": "29.3.1", - "ts-loader": "9.5.2", - "ts-node": "10.9.2", - "typescript": "5.8.3", - "webpack": "5.99.0", - "webpack-cli": "6.0.1", - "webpack-merge": "6.0.1" - }, - "packageManager": "pnpm@10.8.0", - "pnpm": { - "onlyBuiltDependencies": ["@biomejs/biome", "electron", "esbuild"] - }, - "lint-staged": { - "*": "biome check --fix --no-errors-on-unmatched", - "*.{js,ts,tsx}": "pnpm test -- --findRelatedTests -u --passWithNoTests" - } + "name": "gitify", + "version": "6.2.0", + "description": "GitHub notifications on your menu bar.", + "main": "build/main.js", + "scripts": { + "clean": "rimraf build coverage dist node_modules", + "build": "concurrently --names \"main,renderer\" --prefix-colors \"blue,green\" \"pnpm build:main\" \"pnpm build:renderer\"", + "build:main": "webpack --config ./config/webpack.config.main.prod.ts", + "build:renderer": "webpack --config ./config/webpack.config.renderer.prod.ts", + "watch": "concurrently --names \"main,renderer\" --prefix-colors \"blue,green\" \"pnpm watch:main\" \"pnpm watch:renderer\"", + "watch:main": "webpack --watch --config ./config/webpack.config.main.base.ts", + "watch:renderer": "webpack --watch --config ./config/webpack.config.renderer.base.ts", + "prepare:remove-source-maps": "ts-node ./scripts/delete-source-maps.ts", + "package:linux": "electron-builder --linux --config ./config/electron-builder.js", + "package:macos": "electron-builder --mac --config ./config/electron-builder.js", + "package:win": "electron-builder --win --config ./config/electron-builder.js", + "lint:check": "biome check", + "lint": "biome check --fix", + "test": "jest", + "start": "electron . --enable-logging", + "prepare": "husky" + }, + "engines": { + "node": ">=20" + }, + "repository": { + "type": "git", + "url": "https://github.com/gitify-app/gitify.git" + }, + "keywords": [ + "gitify", + "github", + "notifier", + "notifications", + "electron", + "atom", + "shell", + "app", + "tray" + ], + "author": { + "name": "Adam Setch", + "url": "https://github.com/setchy" + }, + "contributors": [ + { + "name": "Emmanouil Konstantinidis", + "url": "https://github.com/manosim" + }, + { + "name": "Jake 'Sid' Smith", + "url": "https://github.com/JakeSidSmith" + }, + { + "name": "Adam Setch", + "url": "https://github.com/setchy" + }, + { + "name": "Afonso Ramos", + "url": "https://github.com/afonsojramos" + } + ], + "license": "MIT", + "bugs": { + "url": "https://github.com/gitify-app/gitify/issues" + }, + "homepage": "https://gitify.io/", + "dependencies": { + "@electron/remote": "2.1.2", + "electron-log": "5.3.3", + "electron-updater": "6.6.2", + "menubar": "9.5.1", + "react": "19.1.0", + "react-dom": "19.1.0", + "react-router-dom": "7.5.0", + "update-electron-app": "3.1.1" + }, + "devDependencies": { + "@biomejs/biome": "1.9.4", + "@discordapp/twemoji": "15.1.0", + "@electron/notarize": "3.0.1", + "@primer/octicons-react": "19.15.1", + "@primer/primitives": "10.5.0", + "@primer/react": "36.27.0", + "@tailwindcss/postcss": "4.1.3", + "@testing-library/react": "16.3.0", + "@types/jest": "29.5.14", + "@types/node": "22.14.0", + "@types/react": "19.1.0", + "@types/react-dom": "19.1.1", + "@types/react-router-dom": "5.3.3", + "@types/semver": "7.7.0", + "axios": "1.8.4", + "clsx": "2.1.1", + "concurrently": "9.1.2", + "copy-webpack-plugin": "13.0.0", + "css-loader": "7.1.2", + "css-minimizer-webpack-plugin": "7.0.2", + "date-fns": "4.1.0", + "electron": "34.4.1", + "electron-builder": "25.1.8", + "final-form": "4.20.10", + "graphql-tag": "2.12.6", + "html-webpack-plugin": "5.6.3", + "husky": "9.1.7", + "jest": "29.7.0", + "jest-environment-jsdom": "29.7.0", + "mini-css-extract-plugin": "2.9.2", + "nock": "13.5.6", + "postcss": "8.5.3", + "postcss-loader": "8.1.1", + "rimraf": "6.0.1", + "semver": "7.7.1", + "styled-components": "6.1.17", + "tailwind-merge": "3.2.0", + "tailwindcss": "4.1.3", + "terser-webpack-plugin": "5.3.14", + "ts-jest": "29.3.1", + "ts-loader": "9.5.2", + "ts-node": "10.9.2", + "typescript": "5.8.3", + "webpack": "5.99.0", + "webpack-cli": "6.0.1", + "webpack-merge": "6.0.1" + }, + "packageManager": "pnpm@10.8.0", + "pnpm": { + "onlyBuiltDependencies": ["@biomejs/biome", "electron", "esbuild"] + }, + "lint-staged": { + "*": "biome check --fix --no-errors-on-unmatched", + "*.{js,ts,tsx}": "pnpm test -- --findRelatedTests -u --passWithNoTests" + } }