diff --git a/.nvmrc b/.nvmrc index 3516580bbb..2a393af592 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -20.17.0 +20.18.0 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 334b45204d..f4b338f937 100644 --- 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.0" } ``` diff --git a/Dockerfile b/Dockerfile index 4be0ddb52f..feab740844 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 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" diff --git a/package.json b/package.json index 5c6ee21fcc..98a7bec330 100644 --- a/package.json +++ b/package.json @@ -13,15 +13,15 @@ "repository": "https://github.com/ferdium/ferdium-app.git", "private": true, "engines": { - "node": "20.17.0", - "pnpm": "9.9.0" + "node": "20.18.0", + "pnpm": "9.12.0" }, "engine-strict": true, "volta": { - "node": "20.17.0", - "pnpm": "9.9.0" + "node": "20.18.0", + "pnpm": "9.12.0" }, - "packageManager": "pnpm@9.9.0", + "packageManager": "pnpm@9.12.0", "scripts": { "prepare": "is-ci || husky", "start": "electron ./build", diff --git a/recipes b/recipes index e419e881b3..da1c32813e 160000 --- a/recipes +++ b/recipes @@ -1 +1 @@ -Subproject commit e419e881b386c2fdc3faec145d8b6499b80fdf02 +Subproject commit da1c32813e704dab189f5c9d36b6676202a8bdf6