Merge branch 'main' into feat/webpack-to-vite

Signed-off-by: Adam Setch <adam.setch@outlook.com>

Author: setchy

.github/workflows/publish.yml

@@ -8,6 +8,33 @@ permissions:
   contents: write
 
 jobs:
+  prepare:
+    name: Prepare draft release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@0c366fd6a839edf440554fa01a7085ccba70ac98
+
+      - name: Parse release branch
+        if: startsWith(github.ref, 'refs/heads/release/')
+        run: |
+          # Extract the branch name (e.g. release/v1.2.3[-meta])
+          ref=${GITHUB_REF#refs/heads/}
+          echo "RELEASE_BRANCH=$ref" >> $GITHUB_ENV
+          # Also export a RELEASE_TAG by removing the `release/` prefix (keeps leading 'v')
+          tag=${ref#release/}
+          echo "RELEASE_TAG=$tag" >> $GITHUB_ENV
+        shell: bash
+
+      - name: Create draft release
+        uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b # v2.5.0
+        with:
+          name: "${{ env.RELEASE_TAG }}"
+          tag_name: "${{ env.RELEASE_TAG }}"
+          draft: true
+          body: '# <img src="https://github.com/gitify-app/gitify/blob/3554605d32a6c08a3d4ec17b02b90e2dd276a152/assets/images/tray-active%402x.png" /> Gitify ${{ env.RELEASE_TAG }}'
+          generate_release_notes: true
+
   release:
     name: Publish ${{ matrix.platform }} (electron-builder)
     strategy:

CONTRIBUTING.md

@@ -67,20 +67,27 @@ If you encounter a bug or have a feature request, please [open an issue][github-
 
 The release process is automated. Follow the steps below.
 
-1. Verify that all features you want targeted in the release have been merged to `main`.
-2. Check the [Renovate Dependency Dashboard][github-dependency-dashboard] to see if there are any updates you want included.
-3. Create a [new **draft** release][github-new-release]. Set the tag version to something with the format of `v1.2.3`. Save as a **draft** before moving to the next step
-4. Create a branch that starts with `release/vX.X.X` (ie. `release/v1.2.3`).  In this branch you need to:
-  * Run `pnpm version <new-version-number` to **bump the version** of the app . 
-  * Commit these changes and open a PR. A GitHub Actions workflow will build, sign and upload the release assets for each commit to that branch as long as a branch is named like `release/vX.X.X` and there is a draft release with the same version number(`package.json`).
-5. Merge your release branch into `main`.
-6. Publish the release once you've finalized the release notes and confirmed all assets are there.
-7. Edit current [Milestone][github-milestones] to have: 
-   * description: link to the release notes
-   * due date: date of release
-   * close milestone
-8. Create a [New Milestone][github-new-milestone] for upcoming release.
-9. A new homebrew cask will be [automatically published][homebrew-cask-autobump-workflow] (workflow runs ~3 hours)
+1. **Verify features:** Ensure all features and fixes you want included in the release are merged into `main`.
+2. **Check dependencies:** Review the [Renovate Dependency Dashboard][github-dependency-dashboard] for any dependency updates you want to include.
+3. **Create a release branch:**
+  - Name your branch `release/vX.X.X` (e.g., `release/v1.2.3`).
+  - Run `pnpm version <new-version-number>` to **bump the version** in `package.json` and create a version commit/tag.
+  - Update `sonar.projectVersion` within `sonar-project.properties`
+  - Commit and push these changes.
+  - Open a Pull Request (PR) from your release branch. 
+4. **GitHub release:** GitHub Actions will automatically build, sign, and upload release assets to a new draft release with automated release notes.
+5. **Merge the release branch:** Once the PR is approved and checks pass, merge your release branch into `main`.
+6. **Publish the release:**
+  - Finalize the release notes in the draft release on GitHub.
+  - Confirm all assets are present and correct.
+  - Publish the release.
+7. **Update milestones:**
+  - Edit the current [Milestone][github-milestones]:
+    - Add a link to the release notes in the description.
+    - Set the due date to the release date.
+    - Close the milestone.
+  - Create a [New Milestone][github-new-milestone] for the next release cycle.
+8. A new homebrew cask will be [automatically published][homebrew-cask-autobump-workflow] (workflow runs ~3 hours)
 
 ### Design Guidelines
 

README.md

@@ -6,25 +6,56 @@
 
 ![Gitify][gitify-social]
 
-### Download
+---
 
-You can download Gitify for **free** from [gitify.io][website] or install it via [Homebrew Cask][brew].
+## Features
 
+- 🔔 Unified notifications from GitHub Cloud & GitHub Enterprise Server
+- 💻 Cross-platform: macOS, Windows, and Linux
+- 🎨 Customizable settings, filters and themes
+- 🖥️ Tray/menu bar integration
+- ⚡ Fast, native experience
+
+
+## Quick Start
+
+1. **Download** Gitify for free from [gitify.io][website].
+2. **Install** and launch the app for your platform.
+3. **Authenticate** with your GitHub account, Personal Access Token or OAuth client/secret and start receiving notifications.
+
+
+#### Homebrew
+macOS users can also install via [Homebrew][brew]
 ```shell
 brew install gitify
 ```
 
-Gitify supports macOS, Windows and Linux.
 
-### FAQ
+## Build & Development
+
+To build and run Gitify locally:
+
+```shell
+pnpm install
+pnpm build
+pnpm dev
+```
+
+See [CONTRIBUTING.md](CONTRIBUTING.md) for full development and contribution instructions.
+
+
+## FAQ
+
+See our [Gitify FAQs][faqs] for answers to common questions.
+
 
-Please visit our [Gitify FAQs][faqs] for all commonly asked questions.
+## Community & Support
 
-### Contributing
+- Open an [issue][github-issues] for bugs or feature requests
+- See [CONTRIBUTING.md](CONTRIBUTING.md) for more ways to get involved
 
-Please read our [Contributing Guidelines](CONTRIBUTING.md) for more information.
 
-### License
+## License
 
 Gitify is licensed under the MIT Open Source license. 
 For more information, see [LICENSE](LICENSE).
@@ -37,6 +68,7 @@ For more information, see [LICENSE](LICENSE).
 
 [github]: https://github.com/gitify-app/gitify
 [github-actions]: https://github.com/gitify-app/gitify/actions
+[github-issues]: https://github.com/gitify-app/gitify/issues
 [github-releases]: https://github.com/gitify-app/gitify/releases/latest
 [github-website]: https://github.com/gitify-app/website
 [github-website-pulls]: https://github.com/gitify-app/website/pulls

codegen.ts

@@ -15,21 +15,15 @@ const config: CodegenConfig = {
   },
   documents: ['src/renderer/utils/api/**/*.graphql'],
   generates: {
-    'src/renderer/utils/api/graphql/generated/': {
-      preset: 'client',
-      presetConfig: {
-        fragmentMasking: false, // Disables masking
-      },
+    'src/renderer/utils/api/graphql/generated/graphql.ts': {
+      plugins: ['typescript', 'typescript-operations', 'typed-document-node'],
       config: {
+        onlyOperationTypes: true,
         documentMode: 'string',
-        enumsAsTypes: true,
         useTypeImports: true,
-      },
-    },
-    'src/renderer/utils/api/graphql/generated/schema.graphql': {
-      plugins: ['schema-ast'],
-      config: {
-        includeDirectives: true,
+        enumsAsTypes: true,
+        skipTypename: true,
+        fragmentMasking: false, // Disables masking
       },
     },
   },

package.json

@@ -78,6 +78,7 @@
     "@electron/notarize": "3.1.1",
     "@graphql-codegen/cli": "6.1.1",
     "@graphql-codegen/schema-ast": "5.0.0",
+    "@graphql-typed-document-node/core": "3.2.0",
     "@octokit/core": "7.0.6",
     "@octokit/graphql": "9.0.3",
     "@octokit/oauth-methods": "6.0.2",
@@ -107,7 +108,7 @@
     "concurrently": "9.2.1",
     "date-fns": "4.1.0",
     "dotenv": "17.3.1",
-    "electron": "40.4.0",
+    "electron": "40.4.1",
     "electron-builder": "26.7.0",
     "final-form": "5.0.0",
     "graphql": "16.12.0",

pnpm-lock.yaml

@@ -57,7 +57,6 @@ export function mockAuthorResponseNode(login: string): AuthorFieldsFragment {
     htmlUrl: `https://github.com/${login}` as Link,
     avatarUrl: 'https://avatars.githubusercontent.com/u/583231?v=4' as Link,
     type: 'User',
-    __typename: 'User',
   } satisfies AuthorFieldsFragment;
 }