From 4b241d87656d4c618bada0c9d41854e9f4395774 Mon Sep 17 00:00:00 2001 From: Kishan B Date: Tue, 10 May 2022 14:32:10 +0530 Subject: Upgrade 'node' (16.14 -> 16.15); Upgrade 'pnpm' (6 --> 7) (#128) Co-authored-by: Vijay A --- .gitignore | 8 ++++++++ .nvmrc | 2 +- CONTRIBUTING.md | 4 ++-- Dockerfile | 4 ++-- package-lock.json | 2 +- package.json | 2 +- recipes | 2 +- 7 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index c8c226532..325338740 100644 --- a/.gitignore +++ b/.gitignore @@ -107,6 +107,14 @@ fabric.properties # https://plugins.jetbrains.com/plugin/12206-codestream .idea/codestream.xml +# Idea modules and profiles +.idea/ferdium-app.iml +.idea/modules.xml +.idea/.gitignore +.idea/vcs.xml +.idea/inspectionProfiles/Project_Default.xml +.idea/misc.xml + ### macOS ### # General .DS_Store diff --git a/.nvmrc b/.nvmrc index d9f880069..99cdd8009 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -16.14.2 +16.15.0 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d7b94de3f..5e108519f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -67,9 +67,9 @@ 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": "16.14.2", + "node": "16.15.0", "npm": "8.7.0", - "pnpm": "6.32.11" + "pnpm": "7.0.1" } ``` diff --git a/Dockerfile b/Dockerfile index db6886e2b..34d9f9c2c 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:16.14.2-buster as builder +FROM docker.io/library/node:16.15.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" @@ -16,7 +16,7 @@ RUN apt-get update -y \ WORKDIR /usr/src/ferdium -RUN npm i -g npm@8.7.0 pnpm@6.32.11 +RUN npm i -g npm@8.7.0 pnpm@7.0.1 COPY package*.json ./ diff --git a/package-lock.json b/package-lock.json index c3e3095f7..e3b934b9d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -164,7 +164,7 @@ "webpack-dev-server": "^3.11.3" }, "engines": { - "node": "16.14.2", + "node": "16.15.0", "npm": "8.7.0" }, "optionalDependencies": { diff --git a/package.json b/package.json index cdf7707c0..32f04ade7 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "repository": "https://github.com/ferdium/ferdium-app.git", "private": true, "engines": { - "node": "16.14.2", + "node": "16.15.0", "npm": "8.7.0" }, "engine-strict": true, diff --git a/recipes b/recipes index c7f346870..ec9605b7c 160000 --- a/recipes +++ b/recipes @@ -1 +1 @@ -Subproject commit c7f346870a0af4e33290be9e6654686d6436ac3a +Subproject commit ec9605b7c41b916c4d9c44f57d65dcedf3767a08 -- cgit v1.2.3-70-g09d2