Merged all changes from develop;

Bumped Ferdium to 7.0.0
ferdium · Nov 10, 2024 · e624942 · e624942
2 parents a98731a + 8a7fca5
commit e624942
Show file tree

Hide file tree

Showing 61 changed files with 1,571 additions and 775 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -2963,6 +2963,33 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "danny8376",
+      "name": "Danny Tsai",
+      "avatar_url": "https://avatars.githubusercontent.com/u/3490463?v=4",
+      "profile": "http://saru.moe",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "insidewhy",
+      "name": "insidewhy",
+      "avatar_url": "https://avatars.githubusercontent.com/u/97685?v=4",
+      "profile": "https://github.com/insidewhy",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "DenysMb",
+      "name": "Denys Madureira",
+      "avatar_url": "https://avatars.githubusercontent.com/u/33737137?v=4",
+      "profile": "https://github.com/DenysMb",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "commitType": "docs"

diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
@@ -5,6 +5,7 @@
 # 'FERDIUM_PUBLISH_TOKEN' (A GitHub Personal Access Token with appropriate permissions - for publishing the built artifacts)
 # 'APPLEID' (The username of your Apple developer account - for notarizing the mac artifacts)
 # 'APPLEID_PASSWORD' (An app-specific password - for notarizing the mac artifacts)
+# 'APPLE_TEAM_ID' (The TeamID in your Apple developer account - for notarizing the mac artifacts)
 # 'CSC_LINK' (The HTTPS link or local path to certificate - for code signing of mac artifacts)
 # 'CSC_KEY_PASSWORD' (The password to decrypt the certificate given in CSC_LINK - for code signing of mac artifacts)
 # 'WIN_CSC_LINK' (The HTTPS link or local path to certificate - for code signing of windows artifacts)
@@ -34,7 +35,7 @@ env:
 
 jobs:
   check_updates:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     name: 'Check latest commit: ${{ github.event.inputs.message }}'
     outputs:
       should_run: ${{ steps.should_run.outputs.should_run }}
@@ -46,14 +47,14 @@ jobs:
           ref: nightly
           submodules: recursive
           fetch-depth: 0 # Note: Needed to be able to pull the 'develop' branch as well for merging
-      - name: Install pnpm
-        uses: pnpm/action-setup@v3
-        if: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]')) }}
       - name: Use Node.js specified in the '.nvmrc' file
         uses: actions/setup-node@v4
         if: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]')) }}
         with:
           node-version-file: '.nvmrc'
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
+        if: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]')) }}
       - 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
@@ -131,7 +132,7 @@ jobs:
     name: 'macos ${{ github.event.inputs.message }}'
     needs: check_updates
     if: ${{ (needs.check_updates.outputs.should_run != 'false') && (github.event_name != 'workflow_dispatch' || (github.event_name == 'workflow_dispatch' && (contains(github.event.inputs.message, '[macOS]') || (!contains(github.event.inputs.message, '[macOS]') && !contains(github.event.inputs.message, '[Linux]') && !contains(github.event.inputs.message, '[Windows]'))))) }}
-    runs-on: macos-12
+    runs-on: macos-14
     steps:
       - name: Set env vars
         run: |
@@ -169,12 +170,12 @@ jobs:
         with:
           key: ${{ runner.os }}-${{ env.cache-name }}-${{ secrets.CACHE_VERSION }}-${{ hashFiles('./pnpm-lock.yaml') }}
           path: ${{ env.ELECTRON_BUILDER_CACHE }}
-      - name: Install pnpm
-        uses: pnpm/action-setup@v3
       - name: Use Node.js specified in the '.nvmrc' file
         uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
       - name: Install node dependencies
         uses: nick-fields/retry@v3
         with:
@@ -183,10 +184,16 @@ jobs:
           max_attempts: 3
           retry_on: error
       - name: Package recipes
-        run: pnpm i && pnpm lint && pnpm reformat-files && pnpm package
         working-directory: ./recipes
+        run: |
+          pnpm i
+          pnpm lint
+          pnpm reformat-files
+          pnpm package
       - name: Run linter and tests
-        run: pnpm lint && pnpm test
+        run: |
+          pnpm lint
+          pnpm test
       - name: Build Ferdium without publish for any branch not 'nightly' and not 'release'
         if: ${{ env.GIT_BRANCH_NAME != 'nightly' && env.GIT_BRANCH_NAME != 'release' }}
         env:
@@ -200,6 +207,7 @@ jobs:
           CSC_IDENTITY_AUTO_DISCOVERY: true
           APPLEID: ${{ secrets.APPLEID }}
           APPLEID_PASSWORD: ${{ secrets.APPLEID_PASSWORD }}
+          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
           CSC_LINK: ${{ secrets.CSC_LINK }}
           CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
         run: pnpm build --publish always
@@ -209,7 +217,7 @@ jobs:
     name: 'ubuntu ${{ github.event.inputs.message }}'
     needs: check_updates
     if: ${{ (needs.check_updates.outputs.should_run != 'false') && (github.event_name != 'workflow_dispatch' || (github.event_name == 'workflow_dispatch' && (contains(github.event.inputs.message, '[Linux]') || (!contains(github.event.inputs.message, '[macOS]') && !contains(github.event.inputs.message, '[Linux]') && !contains(github.event.inputs.message, '[Windows]'))))) }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Set env vars
         run: |
@@ -247,12 +255,12 @@ jobs:
         with:
           key: ${{ runner.os }}-${{ env.cache-name }}-${{ secrets.CACHE_VERSION }}-${{ hashFiles('./pnpm-lock.yaml') }}
           path: ${{ env.ELECTRON_BUILDER_CACHE }}
-      - name: Install pnpm
-        uses: pnpm/action-setup@v3
       - name: Use Node.js specified in the '.nvmrc' file
         uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
       - name: Install node dependencies
         uses: nick-fields/retry@v3
         with:
@@ -280,10 +288,16 @@ jobs:
           fi
         shell: bash
       - name: Package recipes
-        run: pnpm i && pnpm lint && pnpm reformat-files && pnpm package
+        run: |
+          pnpm i
+          pnpm lint
+          pnpm reformat-files
+          pnpm package
         working-directory: ./recipes
       - name: Run linter and tests
-        run: pnpm lint && pnpm test
+        run: |
+          pnpm lint
+          pnpm test
       - name: Build Ferdium without publish for any branch not 'nightly' and not 'release'
         if: ${{ env.GIT_BRANCH_NAME != 'nightly' && env.GIT_BRANCH_NAME != 'release' }}
         env:
@@ -346,12 +360,12 @@ jobs:
         with:
           key: ${{ runner.os }}-${{ env.cache-name }}-${{ secrets.CACHE_VERSION }}-${{ hashFiles('./pnpm-lock.yaml') }}
           path: ${{ env.ELECTRON_BUILDER_CACHE }}
-      - name: Install pnpm
-        uses: pnpm/action-setup@v3
       - name: Use Node.js specified in the '.nvmrc' file
         uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
       #TODO - Remove this once https://github.com/electron-userland/electron-builder/issues/6933#issuecomment-1213438889 is resolved
       - name: Tweak pnpm.cjs
         run: |
@@ -368,11 +382,17 @@ jobs:
           max_attempts: 3
           retry_on: error
       - name: Package recipes
-        run: pnpm i && pnpm lint && pnpm reformat-files && pnpm package
+        run: |
+          pnpm i
+          pnpm lint
+          pnpm reformat-files
+          pnpm package
         working-directory: ./recipes
         shell: bash
       - name: Run linter and tests
-        run: pnpm lint && pnpm test
+        run: |
+          pnpm lint
+          pnpm test
         shell: bash
       - name: Build Ferdium without publish for any branch not 'nightly' and not 'release'
         if: ${{ env.GIT_BRANCH_NAME != 'nightly' && env.GIT_BRANCH_NAME != 'release' }}

diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml
@@ -14,7 +14,7 @@ permissions:
 jobs:
   codespell:
     name: Check for spelling errors
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout

diff --git a/.github/workflows/homebrew-cask-updates.yml b/.github/workflows/homebrew-cask-updates.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   bump-casks:
-    runs-on: macos-12
+    runs-on: macos-14
     steps:
       - name: Publish nightly
         uses: macauley/action-homebrew-bump-cask@v1

diff --git a/.github/workflows/reddit.yml b/.github/workflows/reddit.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Release for Reddit
         uses: bluwy/release-for-reddit-action@v2

diff --git a/.github/workflows/tag-repos.yml b/.github/workflows/tag-repos.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   tag-repos:
-    runs-on: macos-12
+    runs-on: macos-14
     steps:
       - name: Checkout code along with submodules for the 'nightly' branch if the trigger event is 'release'
         uses: actions/checkout@v4

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-20.17.0
+20.18.0
diff --git a/CONTRIBUTING.md b/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.17.0",
-  "pnpm": "9.9.0"
+  "node": "20.18.0",
+  "pnpm": "9.12.3"
 }
 ```
 

diff --git a/Dockerfile b/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.17.0-buster AS builder
+FROM docker.io/library/node:20.18.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"