aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Vijay A <vraravam@users.noreply.github.com>2022-06-20 07:55:13 +0530
committerLibravatar Vijay A <vraravam@users.noreply.github.com>2022-06-20 07:55:46 +0530
commit2a406fd3f67cfdaacfa21d58ec1cb3c4a91f84a1 (patch)
tree41281456f632fe06ea0a1c380893dc9b127b9128
parent6.0.0-nightly.68 [skip ci] (diff)
downloadferdium-app-2a406fd3f67cfdaacfa21d58ec1cb3c4a91f84a1.tar.gz
ferdium-app-2a406fd3f67cfdaacfa21d58ec1cb3c4a91f84a1.tar.zst
ferdium-app-2a406fd3f67cfdaacfa21d58ec1cb3c4a91f84a1.zip
Upgrade 'node' to '16.15.1' and 'pnpm' to '7.3.0'
-rw-r--r--.nvmrc2
-rw-r--r--CONTRIBUTING.md6
-rw-r--r--Dockerfile4
-rw-r--r--package-lock.json4
-rw-r--r--package.json4
m---------recipes0
6 files changed, 10 insertions, 10 deletions
diff --git a/.nvmrc b/.nvmrc
index 99cdd8009..d9289897d 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
16.15.0 16.15.1
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 00e28ecec..0c53a5024 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -63,9 +63,9 @@ Currently, these are the combinations of system dependencies that work for MacOS
63# Note: 'jq' is not a required system dependency; its only here to show the combined output of versions needed 63# Note: 'jq' is not a required system dependency; its only here to show the combined output of versions needed
64$ jq --null-input '[inputs.engines] | add' < ./package.json < ./recipes/package.json 64$ jq --null-input '[inputs.engines] | add' < ./package.json < ./recipes/package.json
65{ 65{
66 "node": "16.15.0", 66 "node": "16.15.1",
67 "npm": "8.10.0", 67 "npm": "8.12.2",
68 "pnpm": "7.2.1" 68 "pnpm": "7.3.0"
69} 69}
70``` 70```
71 71
diff --git a/Dockerfile b/Dockerfile
index 4b363744d..b243e7095 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
1# 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 1# 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
2 2
3FROM docker.io/library/node:16.15.0-buster as builder 3FROM docker.io/library/node:16.15.1-buster as builder
4 4
5ENV PATH="/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:/usr/local/lib:/usr/include:/usr/share" 5ENV PATH="/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:/usr/local/lib:/usr/include:/usr/share"
6 6
@@ -16,7 +16,7 @@ RUN apt-get update -y \
16 16
17WORKDIR /usr/src/ferdium 17WORKDIR /usr/src/ferdium
18 18
19RUN npm i -g npm@8.10.0 pnpm@7.2.1 19RUN npm i -g npm@8.12.2 pnpm@7.2.1
20 20
21COPY package*.json ./ 21COPY package*.json ./
22 22
diff --git a/package-lock.json b/package-lock.json
index ed83a0af0..7a133e4b1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -163,8 +163,8 @@
163 "webpack-dev-server": "4.9.2" 163 "webpack-dev-server": "4.9.2"
164 }, 164 },
165 "engines": { 165 "engines": {
166 "node": "16.15.0", 166 "node": "16.15.1",
167 "npm": "8.10.0" 167 "npm": "8.12.2"
168 }, 168 },
169 "optionalDependencies": { 169 "optionalDependencies": {
170 "macos-notification-state": "github:nbashkankov/macos-notification-state#fix-monterey-detect", 170 "macos-notification-state": "github:nbashkankov/macos-notification-state#fix-monterey-detect",
diff --git a/package.json b/package.json
index 8ce84b497..c9fce37d4 100644
--- a/package.json
+++ b/package.json
@@ -13,8 +13,8 @@
13 "repository": "https://github.com/ferdium/ferdium-app.git", 13 "repository": "https://github.com/ferdium/ferdium-app.git",
14 "private": true, 14 "private": true,
15 "engines": { 15 "engines": {
16 "node": "16.15.0", 16 "node": "16.15.1",
17 "npm": "8.10.0" 17 "npm": "8.12.2"
18 }, 18 },
19 "engine-strict": true, 19 "engine-strict": true,
20 "scripts": { 20 "scripts": {
diff --git a/recipes b/recipes
Subproject a34fcc0c3be23225d5d0b212bdfe32e04b4a592 Subproject 6cbc1977a9b42818bde6011b5a87d87fa40d819