chore: upgrade 'nodejs' to '14.17.6'

7 files changed, 21 insertions, 15 deletions

diff --git a/.github/workflows/dependency-updates.yml b/.github/workflows/dependency-updates.yml
index dafcfa4d1..5d7d64efc 100644
--- a/.github/workflows/dependency-updates.yml
+++ b/.github/workflows/dependency-updates.yml
@@ -40,10 +40,10 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-14.17-build-${{ env.cache-name }}-
             ${{ runner.os }}-14.17-build-
-      - name: Use Node.js 14.17.5
+      - name: Use Node.js 14.17.6
         uses: actions/setup-node@v2
         with:
-          node-version: 14.17.5
+          node-version: 14.17.6
       - name: Uninstall locally and reinstall global npm modules
         run: |
           npm uninstall node-gyp
diff --git a/.github/workflows/ferdi-builds.yml b/.github/workflows/ferdi-builds.yml
index ec40d267c..c17011d69 100644
--- a/.github/workflows/ferdi-builds.yml
+++ b/.github/workflows/ferdi-builds.yml
@@ -130,10 +130,10 @@ jobs:
         with:
           key: ${{ runner.os }}-${{ env.cache-name }}
           path: ${{ env.ELECTRON_BUILDER_CACHE }}
-      - name: Use Node.js 14.17.5
+      - name: Use Node.js 14.17.6
         uses: actions/setup-node@v2
         with:
-          node-version: 14.17.5
+          node-version: 14.17.6
       - name: Upgrade Xcode version on the macOS 10.15 default runners provided by GH Actions
         run: |
           sudo rm -Rf /Library/Developer/CommandLineTools/SDKs/*
@@ -228,10 +228,10 @@ jobs:
         with:
           key: ${{ runner.os }}-${{ env.cache-name }}
           path: ${{ env.ELECTRON_BUILDER_CACHE }}
-      - name: Use Node.js 14.17.5
+      - name: Use Node.js 14.17.6
         uses: actions/setup-node@v2
         with:
-          node-version: 14.17.5
+          node-version: 14.17.6
       - name: Uninstall locally and reinstall global npm modules
         run: |
           npm uninstall node-gyp
@@ -343,10 +343,10 @@ jobs:
         with:
           key: ${{ runner.os }}-${{ env.cache-name }}
           path: ${{ env.ELECTRON_BUILDER_CACHE }}
-      - name: Use Node.js 14.17.5
+      - name: Use Node.js 14.17.6
         uses: actions/setup-node@v2
         with:
-          node-version: 14.17.5
+          node-version: 14.17.6
       - name: Uninstall locally and reinstall global npm modules
         run: |
           npm uninstall node-gyp
diff --git a/.nvmrc b/.nvmrc
index 18711d290..5595ae1aa 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-14.17.5
+14.17.6
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9dbc909f5..ba7f47a7d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# [v5.6.1-nightly.48](https://github.com/getferdi/ferdi/compare/v5.6.1-nightly.46...v5.6.1-nightly.48) (2021-09-03)
+
+### Internal
+
+- Upgraded `nodejs` to `14.17.6` 💖 @vraravam
+
 # [v5.6.1-beta.3](https://github.com/getferdi/ferdi/compare/v5.6.1-beta.2...v5.6.1-beta.3) (2021-09-01)
 
 Please note that this is the same code as the `v5.6.1-nightly.46` tag.
@@ -58,7 +64,7 @@ The cumulative changes since the previous beta release are:
 
 ### Internal
 
-- Upgraded 'nodejs' to '14.17.5' 💖 @vraravam
+- Upgraded `nodejs` to `14.17.4` 💖 @vraravam
 - Remove some leftover Franz branding 💖 @vantezzen
 - Switch from `misty` to `concurrently` (#1846) 💖 @vantezzen
 - Services: Normalized all service recipes to be es6 compliant 💖 @vraravam
@@ -433,15 +439,15 @@ The cumulative changes since the previous beta release are:
 
 # [5.6.0-beta.8](https://github.com/getferdi/ferdi/compare/v5.6.0-beta.7...v5.6.0-beta.8) (2021-07-16)
 
-- Upgraded electron to '13.1.7' 💖 @vraravam
+- Upgraded `electron` to `13.1.7` 💖 @vraravam
 - Turned on other h/w architectures (arm64, armv7l) for linux builds. (#1633) 💖 @vraravam
 - chore: run security audit on node modules 💖 @mhatvan
-- Upgraded nodejs to '14.17.3' 💖 @vraravam
+- Upgraded `nodejs` to `14.17.3` 💖 @vraravam
 - Use 'useragent-generator' to generate the user-agent string 💖 @vraravam
 
 # [5.6.0-beta.7](https://github.com/getferdi/ferdi/compare/v5.6.0-beta.6...v5.6.0-beta.7) (2021-07-07)
 
-- Upgraded electron to '13.1.5'. 💖 @vraravam
+- Upgraded `electron` to `13.1.5`. 💖 @vraravam
 - Adjust link opening behavior 💖 @stnkl
 - Fix color adjustments in Settings screen 💖 @kris7t
 - Expose Chrome version to todos webview (fix #1211) (#1478) 💖 @kris7t
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b79432d43..cc3f9e73c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -60,7 +60,7 @@ Currently, these are the combinations of system dependencies that work for MacOS
 
 ```bash
 node -v
-v14.17.5
+v14.17.6
 npm -v
 6.14.13
 ```
diff --git a/Dockerfile b/Dockerfile
index e69babe2b..a7900dbee 100644
--- 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 node:14.17.5-buster as builder
+FROM node:14.17.6-buster as builder
 
 # TODO: Need to setup a non-root user for security purposes
 
diff --git a/recipes b/recipes
-Subproject 2486fbbd72f08b759a2781913f388e91149e79e
+Subproject 04277339b04fead3782ed853c248700b596d2b8