Merge branch 'develop' into release

Bumped up version for stable release

.codespellrc

@@ -0,0 +1,9 @@
+[codespell]
+# Ref: https://github.com/codespell-project/codespell#using-a-config-file
+skip = .git*,*.svg,*.css,.codespellrc,locales,pnpm-lock.yaml,i18n,config.ts,extensions.json
+check-hidden = true
+# Case sensitive names, or phrases (typically non-English), to ignore
+# Python style regex. \b is a match at a word boundary
+ignore-regex = \b(Manuel|Sie diesen|Sie den|l'authentification)\b
+# Case insensitive comma separated list of words to ignore
+# ignore-words-list =

.eslintignore

@@ -10,6 +10,7 @@ pids
 # Coverage directory used by tools like istanbul
 coverage
 .eslintcache
+.eslintrc.js
 
 # Dependency directory
 # https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git

.eslintrc.js

@@ -17,8 +17,9 @@ module.exports = {
     'plugin:unicorn/recommended',
     'plugin:sonar/recommended',
     'plugin:prettier/recommended',
+    'plugin:@eslint-react/recommended-legacy',
   ],
-  plugins: ['jest'],
+  plugins: ['@eslint-react', 'jest'],
   settings: {
     react: {
       pragma: 'React', // Pragma to use, default to "React"
@@ -45,6 +46,7 @@ module.exports = {
         // TODO: Opt-in to a stricter ruleset in the future
         // 'plugin:@typescript-eslint/strict-type-checked',
         'plugin:@typescript-eslint/stylistic-type-checked',
+        'plugin:@eslint-react/recommended-type-checked-legacy',
       ],
       parser: '@typescript-eslint/parser',
       plugins: [],
@@ -71,6 +73,12 @@ module.exports = {
         // eslint-plugin-import
         'import/no-extraneous-dependencies': 0,
 
+        // @eslint-react
+        '@eslint-react/no-class-component': 0,
+        '@eslint-react/no-complicated-conditional-rendering': 0,
+        '@eslint-react/no-leaked-conditional-rendering': 0,
+        '@eslint-react/hooks-extra/ensure-custom-hooks-using-other-hooks': 0,
+
         // sonar
         'sonar/no-try-promise': 0,
       },
@@ -105,7 +113,7 @@ module.exports = {
     'react/jsx-filename-extension': 1,
     'react/jsx-no-bind': 1,
     'react/jsx-props-no-spreading': 0,
-    'react/prefer-stateless-function': 1,
+    'react/prefer-stateless-function': 0,
     'react/static-property-placement': 0,
     'react/state-in-constructor': 1,
     'react/sort-comp': 0,
@@ -134,17 +142,10 @@ module.exports = {
     'unicorn/no-null': 0,
     'unicorn/prefer-module': 0,
     'unicorn/prevent-abbreviations': 0,
-    'unicorn/import-style': [
-      2,
-      {
-        styles: {
-          path: {
-            named: true,
-          },
-        },
-      },
-    ],
+    'unicorn/import-style': 0,
     'unicorn/consistent-destructuring': 0,
+    'unicorn/no-anonymous-default-export': 0,
+    'unicorn/no-array-for-each': 0,
     // eslint-plugin-sonar
     'sonar/function-name': 0,
   },

.github/workflows/builds.yml

@@ -54,7 +54,6 @@ jobs:
         if: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]')) }}
         with:
           node-version-file: '.nvmrc'
-          cache: 'pnpm'
       - name: Install node dependencies
         if: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]')) }}
         uses: nick-fields/retry@v3
@@ -176,7 +175,6 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
-          cache: 'pnpm'
       - name: Install node dependencies
         uses: nick-fields/retry@v3
         with:
@@ -255,7 +253,6 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
-          cache: 'pnpm'
       - name: Install node dependencies
         uses: nick-fields/retry@v3
         with:
@@ -355,7 +352,6 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
-          cache: 'pnpm'
       #TODO - Remove this once https://github.com/electron-userland/electron-builder/issues/6933#issuecomment-1213438889 is resolved
       - name: Tweak pnpm.cjs
         run: |

.github/workflows/codespell.yml

@@ -0,0 +1,23 @@
+# Codespell configuration is within .codespellrc
+---
+name: Codespell
+
+on:
+  push:
+    branches: [develop]
+  pull_request:
+    branches: [develop]
+
+permissions:
+  contents: read
+
+jobs:
+  codespell:
+    name: Check for spelling errors
+    runs-on: ubuntu-22.04
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Codespell
+        uses: codespell-project/actions-codespell@v2

.nvmrc

@@ -1 +1 @@
-20.11.1
+20.12.2

CHANGELOG.md

@@ -192,7 +192,7 @@
 - Fix default accent color to Ferdium gradient
 - Fix reload after resume and add idle time setting
 - Don't replace custom icon when service updates
-- Workaroud for in-app Password Recovery
+- Workaround for in-app Password Recovery
 - Fix navigation toolbar buttons not being clickable
 - Fix drag-n-drop not working if the service name is shown
 - Fix ribbon menu style on windows
@@ -225,7 +225,7 @@
 - Resurrect the electron-process-manager for Ferdium
 - Hide sidebar buttons toggled behind a hamburger menu
 - Add monochromatic Service icons option with Dim adjustment
-- Add new service-level option where the user can choose whether to open links in Ferdium or in the default browser. Currently implimented only for discord, skype, steamchat and zoom.
+- Add new service-level option where the user can choose whether to open links in Ferdium or in the default browser. Currently implemented only for discord, skype, steamchat and zoom.
 
 ### Services
 

CONTRIBUTING.md

@@ -62,8 +62,8 @@ Currently, these are the combinations of system dependencies that work for MacOS
 # Note: 'jq' is not a required system dependency; its only here to show the combined output of versions needed
 $ jq --null-input '[inputs.engines] | add' < ./package.json < ./recipes/package.json
 {
-  "node": "20.11.1",
-  "pnpm": "8.15.5"
+  "node": "20.12.2",
+  "pnpm": "8.15.7"
 }
 ```
 

Dockerfile

@@ -1,6 +1,6 @@
 # Note: Before running this file, you should have already cloned the git repo + submodules on the host machine. This is used when actively developing on your local machine, but you want to build for a different architecture
 
-FROM docker.io/library/node:20.11.1-buster AS builder
+FROM docker.io/library/node:20.12.2-buster AS builder
 
 ENV PATH="/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:/usr/local/lib:/usr/include:/usr/share"
 

build-helpers/notarize.js

@@ -11,15 +11,14 @@ exports.default = async function notarizing(context) {
 
   const appName = context.packager.appInfo.productFilename;
 
-  // @ts-ignore global-require
+  // eslint-disable-next-line global-require
   const { notarize } = require('@electron/notarize');
 
   await notarize({
     tool: 'notarytool',
-    appBundleId: 'org.ferdium.ferdium-app',
     appPath: `${appOutDir}/${appName}.app`,
     teamId: '55E9FPJ93P',
-    appleId: process.env.APPLEID,
-    appleIdPassword: process.env.APPLEID_PASSWORD,
+    appleId: process.env.APPLEID || '',
+    appleIdPassword: process.env.APPLEID_PASSWORD || '',
   });
 };