From 34189650ee140bdea2025afa680099cfe2db4079 Mon Sep 17 00:00:00 2001 From: Vijay Aravamudhan Date: Tue, 16 Apr 2024 12:25:10 +0000 Subject: Upgrade node and pnpm (#1690) --- .nvmrc | 2 +- CONTRIBUTING.md | 4 ++-- Dockerfile | 2 +- package.json | 10 +++++----- recipes | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.nvmrc b/.nvmrc index 2b9cabc07..87834047a 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -20.12.0 +20.12.2 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6ac0edb86..9d575b15d 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.12.0", - "pnpm": "8.15.5" + "node": "20.12.2", + "pnpm": "8.15.7" } ``` diff --git a/Dockerfile b/Dockerfile index b0238e008..efae454d5 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.12.0-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" diff --git a/package.json b/package.json index e39cace3b..28e757bc9 100644 --- a/package.json +++ b/package.json @@ -13,15 +13,15 @@ "repository": "https://github.com/ferdium/ferdium-app.git", "private": true, "engines": { - "node": "20.12.0", - "pnpm": "8.15.5" + "node": "20.12.2", + "pnpm": "8.15.7" }, "engine-strict": true, "volta": { - "node": "20.12.0", - "pnpm": "8.15.5" + "node": "20.12.2", + "pnpm": "8.15.7" }, - "packageManager": "pnpm@8.15.5", + "packageManager": "pnpm@8.15.7", "scripts": { "prepare": "is-ci || husky", "start": "electron ./build", diff --git a/recipes b/recipes index 0337750c5..f8a2b904c 160000 --- a/recipes +++ b/recipes @@ -1 +1 @@ -Subproject commit 0337750c523f319d3ddbfc6f34245a8c60e73c57 +Subproject commit f8a2b904ce185a2e06536d0b23524987e29c9f58 -- cgit v1.2.3-54-g00ecf