From 42aa19dd00cf4c48250f621f443fb701c52088b4 Mon Sep 17 00:00:00 2001 From: Vijay A Date: Tue, 26 Sep 2023 07:38:28 +0530 Subject: Upgrade 'node' to '18.18.0' and 'pnpm' to '8.7.6' --- .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 55bffd620..02c8b485e 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -18.15.0 +18.18.0 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 341fb3eb4..8a6268274 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": "18.15.0", - "pnpm": "8.7.1" + "node": "18.18.0", + "pnpm": "8.7.6" } ``` diff --git a/Dockerfile b/Dockerfile index 2a245a4f7..0707a4771 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:18.15.0-buster as builder +FROM docker.io/library/node:18.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 13af04dad..0fd814da3 100644 --- a/package.json +++ b/package.json @@ -13,15 +13,15 @@ "repository": "https://github.com/ferdium/ferdium-app.git", "private": true, "engines": { - "node": "18.15.0", - "pnpm": "8.7.1" + "node": "18.18.0", + "pnpm": "8.7.6" }, "engine-strict": true, "volta": { - "node": "18.15.0", - "pnpm": "8.7.1" + "node": "18.18.0", + "pnpm": "8.7.6" }, - "packageManager": "pnpm@8.7.1", + "packageManager": "pnpm@8.7.6", "scripts": { "prepare": "is-ci || husky install", "start": "electron ./build", diff --git a/recipes b/recipes index 9bfc14a93..cdafac130 160000 --- a/recipes +++ b/recipes @@ -1 +1 @@ -Subproject commit 9bfc14a932bd266bc61d72b03fc844561254df6a +Subproject commit cdafac130fd454610d1fa2cb53b061b17b64e2ce -- cgit v1.2.3-54-g00ecf