Merge branch 'develop' into release: Bump version to '6.2.4'

.all-contributorsrc

@@ -2871,7 +2871,8 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/39555268?v=4",
       "profile": "https://github.com/victorbnl",
       "contributions": [
-        "code"
+        "code",
+        "security"
       ]
     },
     {
@@ -2918,6 +2919,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "abacao",
+      "name": "André Bação",
+      "avatar_url": "https://avatars.githubusercontent.com/u/17479246?v=4",
+      "profile": "http://blog.bacao.pt",
+      "contributions": [
+        "security"
+      ]
     }
   ]
 }

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -9,7 +9,8 @@ body:
         1. Please remember that if you are logging a bug for some service that has *stopped working*, please log the bug [here](https://github.com/ferdium/ferdium-recipes/issues)
         2. If you are requesting support for a new service in Ferdium, please log it [here](https://github.com/ferdium/ferdium-recipes/pulls)
         3. Please remember to read the [self-help documentation](https://github.com/ferdium/ferdium-app#troubleshooting-recipes-self-help) - in case it helps you unblock yourself for issues related to old recipes.
-        4. Please fill our form below, this way we can analyse and fix the problem as fast as possible.
+        4. If you are adding screenshots and/or videos, please do add it in English so that a wider group of people can understand and help with resolution.
+        5. Please fill our form below, this way we can analyse and fix the problem as fast as possible.
   - type: checkboxes
     attributes:
       label: Avoid duplicates

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -9,7 +9,8 @@ body:
         1. Please remember that if you are logging a bug for some service that has *stopped working*, please log the bug [here](https://github.com/ferdium/ferdium-recipes/issues)
         2. If you are requesting support for a new service in Ferdium, please log it [here](https://github.com/ferdium/ferdium-recipes/pulls)
         3. Please remember to read the [self-help documentation](https://github.com/ferdium/ferdium-app#troubleshooting-recipes-self-help) - in case it helps you unblock yourself for issues related to old recipes.
-        4. Please fill our form below, this way we can analyse and fix the problem as fast as possible.
+        4. If you are adding screenshots and/or videos, please do add it in English so that a wider group of people can understand and help with resolution.
+        5. Please fill our form below, this way we can analyse and fix the problem as fast as possible.
   - type: checkboxes
     attributes:
       label: Preflight Checklist

.github/ISSUE_TEMPLATE/open_issue.yml

@@ -7,6 +7,7 @@ body:
         1. Please remember that if you are logging a bug for some service that has *stopped working*, please log the bug [here](https://github.com/ferdium/fedium-recipes/issues)
         2. If you are requesting support for a new service in Ferdium, please log it [here](https://github.com/ferdium/ferdium-recipes/pulls)
         3. Please remember to read the [self-help documentation](https://github.com/ferdium/ferdium-app#troubleshooting-recipes-self-help) - in case it helps you unblock yourself for issues related to old recipes.
+        4. If you are adding screenshots and/or videos, please do add it in English so that a wider group of people can understand and help with resolution.
   - type: textarea
     attributes:
       label: "Your issue"

.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "npm" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"

.github/workflows/builds.yml

@@ -89,7 +89,6 @@ jobs:
             echo "Update browserslist db"
             npx browserslist@latest --update-db
             git add .
-            echo "GIT_DIRTY=$(git status -s | wc -l)" >> $GITHUB_ENV
 
             echo "Run linter, reformatter, rebrander and tests"
             pnpm prepare-code
@@ -357,6 +356,10 @@ jobs:
           node-version-file: ".nvmrc"
       - name: Install pnpm
         run: npm i -gf "pnpm@$(node -p 'require(\"./package.json\").engines.pnpm')" && pnpm -v
+      #TODO - Remove this once https://github.com/electron-userland/electron-builder/issues/6933#issuecomment-1213438889 is resolved
+      - name: Tweak pnpm.cjs
+        run: sed -i 's/\/usr\/bin\/env node/node/g' /c/npm/prefix/node_modules/pnpm/bin/pnpm.cjs
+        shell: bash
       - name: Install node dependencies
         uses: nick-fields/retry@v2.8.2
         with:

.nvmrc

@@ -1 +1 @@
-16.18.1
+18.13.0

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": "16.18.1",
-  "pnpm": "7.18.2"
+  "node": "18.13.0",
+  "pnpm": "7.25.1"
 }
 ```
 

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:16.18.1-buster as builder
+FROM docker.io/library/node:18.13.0-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"