aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore8
-rw-r--r--.nvmrc2
-rw-r--r--CONTRIBUTING.md4
-rw-r--r--Dockerfile4
-rw-r--r--package-lock.json2
-rw-r--r--package.json2
m---------recipes0
7 files changed, 15 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore
index c8c226532..325338740 100644
--- a/.gitignore
+++ b/.gitignore
@@ -107,6 +107,14 @@ fabric.properties
107# https://plugins.jetbrains.com/plugin/12206-codestream 107# https://plugins.jetbrains.com/plugin/12206-codestream
108.idea/codestream.xml 108.idea/codestream.xml
109 109
110# Idea modules and profiles
111.idea/ferdium-app.iml
112.idea/modules.xml
113.idea/.gitignore
114.idea/vcs.xml
115.idea/inspectionProfiles/Project_Default.xml
116.idea/misc.xml
117
110### macOS ### 118### macOS ###
111# General 119# General
112.DS_Store 120.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
67# Note: 'jq' is not a required system dependency; its only here to show the combined output of versions needed 67# Note: 'jq' is not a required system dependency; its only here to show the combined output of versions needed
68$ jq --null-input '[inputs.engines] | add' < ./package.json < ./recipes/package.json 68$ jq --null-input '[inputs.engines] | add' < ./package.json < ./recipes/package.json
69{ 69{
70 "node": "16.14.2", 70 "node": "16.15.0",
71 "npm": "8.7.0", 71 "npm": "8.7.0",
72 "pnpm": "6.32.11" 72 "pnpm": "7.0.1"
73} 73}
74``` 74```
75 75
diff --git a/Dockerfile b/Dockerfile
index db6886e2b..34d9f9c2c 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.14.2-buster as builder 3FROM docker.io/library/node:16.15.0-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.7.0 pnpm@6.32.11 19RUN npm i -g npm@8.7.0 pnpm@7.0.1
20 20
21COPY package*.json ./ 21COPY package*.json ./
22 22
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 @@
164 "webpack-dev-server": "^3.11.3" 164 "webpack-dev-server": "^3.11.3"
165 }, 165 },
166 "engines": { 166 "engines": {
167 "node": "16.14.2", 167 "node": "16.15.0",
168 "npm": "8.7.0" 168 "npm": "8.7.0"
169 }, 169 },
170 "optionalDependencies": { 170 "optionalDependencies": {
diff --git a/package.json b/package.json
index cdf7707c0..32f04ade7 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
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.14.2", 16 "node": "16.15.0",
17 "npm": "8.7.0" 17 "npm": "8.7.0"
18 }, 18 },
19 "engine-strict": true, 19 "engine-strict": true,
diff --git a/recipes b/recipes
Subproject c7f346870a0af4e33290be9e6654686d6436ac3 Subproject ec9605b7c41b916c4d9c44f57d65dcedf3767a0