diff options
-rw-r--r-- | .github/workflows/builds.yml | 12 | ||||
-rw-r--r-- | .github/workflows/dependency-updates.yml | 4 | ||||
-rw-r--r-- | .nvmrc | 2 | ||||
-rw-r--r-- | CONTRIBUTING.md | 6 | ||||
-rw-r--r-- | Dockerfile | 4 | ||||
-rw-r--r-- | package-lock.json | 129 | ||||
-rw-r--r-- | package.json | 4 | ||||
m--------- | recipes | 0 |
8 files changed, 141 insertions, 20 deletions
diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index 6a2cef44d..3729cf4a8 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml | |||
@@ -138,10 +138,12 @@ jobs: | |||
138 | uses: actions/setup-node@v2 | 138 | uses: actions/setup-node@v2 |
139 | with: | 139 | with: |
140 | node-version-file: '.nvmrc' | 140 | node-version-file: '.nvmrc' |
141 | - name: Install npm | ||
142 | run: npm i -gf npm@8.7.0 | ||
141 | - name: Install pnpm | 143 | - name: Install pnpm |
142 | uses: pnpm/action-setup@v2.0.1 | 144 | uses: pnpm/action-setup@v2.0.1 |
143 | with: | 145 | with: |
144 | version: 6.24.1 | 146 | version: 6.32.8 |
145 | - name: Install node dependencies | 147 | - name: Install node dependencies |
146 | run: npm i | 148 | run: npm i |
147 | - name: Package recipes | 149 | - name: Package recipes |
@@ -220,10 +222,12 @@ jobs: | |||
220 | uses: actions/setup-node@v2 | 222 | uses: actions/setup-node@v2 |
221 | with: | 223 | with: |
222 | node-version-file: '.nvmrc' | 224 | node-version-file: '.nvmrc' |
225 | - name: Install npm | ||
226 | run: npm i -gf npm@8.7.0 | ||
223 | - name: Install pnpm | 227 | - name: Install pnpm |
224 | uses: pnpm/action-setup@v2.0.1 | 228 | uses: pnpm/action-setup@v2.0.1 |
225 | with: | 229 | with: |
226 | version: 6.24.1 | 230 | version: 6.32.8 |
227 | - name: Install node dependencies | 231 | - name: Install node dependencies |
228 | run: npm i | 232 | run: npm i |
229 | - name: Figure out used package.json version | 233 | - name: Figure out used package.json version |
@@ -305,10 +309,12 @@ jobs: | |||
305 | uses: actions/setup-node@v2 | 309 | uses: actions/setup-node@v2 |
306 | with: | 310 | with: |
307 | node-version-file: '.nvmrc' | 311 | node-version-file: '.nvmrc' |
312 | - name: Install npm | ||
313 | run: npm i -gf npm@8.7.0 | ||
308 | - name: Install pnpm | 314 | - name: Install pnpm |
309 | uses: pnpm/action-setup@v2.0.1 | 315 | uses: pnpm/action-setup@v2.0.1 |
310 | with: | 316 | with: |
311 | version: 6.24.1 | 317 | version: 6.32.8 |
312 | - name: Install node dependencies | 318 | - name: Install node dependencies |
313 | uses: nick-invision/retry@v2.4.0 | 319 | uses: nick-invision/retry@v2.4.0 |
314 | with: | 320 | with: |
diff --git a/.github/workflows/dependency-updates.yml b/.github/workflows/dependency-updates.yml index 0f6befb55..d8c53cbbd 100644 --- a/.github/workflows/dependency-updates.yml +++ b/.github/workflows/dependency-updates.yml | |||
@@ -35,10 +35,12 @@ jobs: | |||
35 | uses: actions/setup-node@v2 | 35 | uses: actions/setup-node@v2 |
36 | with: | 36 | with: |
37 | node-version-file: '.nvmrc' | 37 | node-version-file: '.nvmrc' |
38 | - name: Install npm | ||
39 | run: npm i -gf npm@8.7.0 | ||
38 | - name: Install pnpm | 40 | - name: Install pnpm |
39 | uses: pnpm/action-setup@v2.0.1 | 41 | uses: pnpm/action-setup@v2.0.1 |
40 | with: | 42 | with: |
41 | version: 6.24.1 | 43 | version: 6.32.8 |
42 | - name: Install node dependencies | 44 | - name: Install node dependencies |
43 | run: npm i | 45 | run: npm i |
44 | - name: Update submodules | 46 | - name: Update submodules |
@@ -1 +1 @@ | |||
16.13.1 | 16.14.2 | ||
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 081066fee..aaa9404af 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md | |||
@@ -60,11 +60,11 @@ Currently, these are the combinations of system dependencies that work for MacOS | |||
60 | 60 | ||
61 | ```bash | 61 | ```bash |
62 | node -v | 62 | node -v |
63 | v16.13.1 | 63 | v16.14.2 |
64 | npm -v | 64 | npm -v |
65 | 8.1.2 | 65 | 8.7.0 |
66 | pnpm -v | 66 | pnpm -v |
67 | 6.24.1 | 67 | 6.32.8 |
68 | ``` | 68 | ``` |
69 | 69 | ||
70 | _Note:_ You can choose any package manager to manage multiple versions of `node` and `npm`. For eg, [nvm](https://github.com/nvm-sh/nvm) or [asdf](https://github.com/asdf-vm/asdf). | 70 | _Note:_ You can choose any package manager to manage multiple versions of `node` and `npm`. For eg, [nvm](https://github.com/nvm-sh/nvm) or [asdf](https://github.com/asdf-vm/asdf). |
diff --git a/Dockerfile b/Dockerfile index 92ce19d57..925f81600 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 | ||
3 | FROM docker.io/library/node:16.13.1-buster as builder | 3 | FROM docker.io/library/node:16.14.2-buster as builder |
4 | 4 | ||
5 | ENV PATH="/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:/usr/local/lib:/usr/include:/usr/share" | 5 | ENV 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 | ||
17 | WORKDIR /usr/src/ferdium | 17 | WORKDIR /usr/src/ferdium |
18 | 18 | ||
19 | RUN npm i -g npm@8.1.2 pnpm@6.24.1 | 19 | RUN npm i -g npm@8.7.0 pnpm@6.32.8 |
20 | 20 | ||
21 | COPY package*.json ./ | 21 | COPY package*.json ./ |
22 | 22 | ||
diff --git a/package-lock.json b/package-lock.json index 878a97c10..6c22b5020 100644 --- a/package-lock.json +++ b/package-lock.json | |||
@@ -164,8 +164,8 @@ | |||
164 | "webpack-dev-server": "^3.11.2" | 164 | "webpack-dev-server": "^3.11.2" |
165 | }, | 165 | }, |
166 | "engines": { | 166 | "engines": { |
167 | "node": "^16.13.1", | 167 | "node": "16.14.2", |
168 | "npm": "^8.1.2" | 168 | "npm": "8.7.0" |
169 | }, | 169 | }, |
170 | "optionalDependencies": { | 170 | "optionalDependencies": { |
171 | "node-mac-permissions": "git@github.com:vraravam/node-mac-permissions.git#3cffec37379e6584627d831611a8ff12b57bbcdb" | 171 | "node-mac-permissions": "git@github.com:vraravam/node-mac-permissions.git#3cffec37379e6584627d831611a8ff12b57bbcdb" |
@@ -21177,6 +21177,67 @@ | |||
21177 | "node": ">= 10.12.0" | 21177 | "node": ">= 10.12.0" |
21178 | } | 21178 | } |
21179 | }, | 21179 | }, |
21180 | "node_modules/node-gyp/node_modules/are-we-there-yet": { | ||
21181 | "version": "3.0.0", | ||
21182 | "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.0.tgz", | ||
21183 | "integrity": "sha512-0GWpv50YSOcLXaN6/FAKY3vfRbllXWV2xvfA/oKJF8pzFhWXPV+yjhJXDBbjscDYowv7Yw1A3uigpzn5iEGTyw==", | ||
21184 | "dev": true, | ||
21185 | "dependencies": { | ||
21186 | "delegates": "^1.0.0", | ||
21187 | "readable-stream": "^3.6.0" | ||
21188 | }, | ||
21189 | "engines": { | ||
21190 | "node": "^12.13.0 || ^14.15.0 || >=16" | ||
21191 | } | ||
21192 | }, | ||
21193 | "node_modules/node-gyp/node_modules/gauge": { | ||
21194 | "version": "4.0.4", | ||
21195 | "resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz", | ||
21196 | "integrity": "sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==", | ||
21197 | "dev": true, | ||
21198 | "dependencies": { | ||
21199 | "aproba": "^1.0.3 || ^2.0.0", | ||
21200 | "color-support": "^1.1.3", | ||
21201 | "console-control-strings": "^1.1.0", | ||
21202 | "has-unicode": "^2.0.1", | ||
21203 | "signal-exit": "^3.0.7", | ||
21204 | "string-width": "^4.2.3", | ||
21205 | "strip-ansi": "^6.0.1", | ||
21206 | "wide-align": "^1.1.5" | ||
21207 | }, | ||
21208 | "engines": { | ||
21209 | "node": "^12.13.0 || ^14.15.0 || >=16.0.0" | ||
21210 | } | ||
21211 | }, | ||
21212 | "node_modules/node-gyp/node_modules/npmlog": { | ||
21213 | "version": "6.0.1", | ||
21214 | "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.1.tgz", | ||
21215 | "integrity": "sha512-BTHDvY6nrRHuRfyjt1MAufLxYdVXZfd099H4+i1f0lPywNQyI4foeNXJRObB/uy+TYqUW0vAD9gbdSOXPst7Eg==", | ||
21216 | "dev": true, | ||
21217 | "dependencies": { | ||
21218 | "are-we-there-yet": "^3.0.0", | ||
21219 | "console-control-strings": "^1.1.0", | ||
21220 | "gauge": "^4.0.0", | ||
21221 | "set-blocking": "^2.0.0" | ||
21222 | }, | ||
21223 | "engines": { | ||
21224 | "node": "^12.13.0 || ^14.15.0 || >=16" | ||
21225 | } | ||
21226 | }, | ||
21227 | "node_modules/node-gyp/node_modules/readable-stream": { | ||
21228 | "version": "3.6.0", | ||
21229 | "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", | ||
21230 | "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", | ||
21231 | "dev": true, | ||
21232 | "dependencies": { | ||
21233 | "inherits": "^2.0.3", | ||
21234 | "string_decoder": "^1.1.1", | ||
21235 | "util-deprecate": "^1.0.1" | ||
21236 | }, | ||
21237 | "engines": { | ||
21238 | "node": ">= 6" | ||
21239 | } | ||
21240 | }, | ||
21180 | "node_modules/node-int64": { | 21241 | "node_modules/node-int64": { |
21181 | "version": "0.4.0", | 21242 | "version": "0.4.0", |
21182 | "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", | 21243 | "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", |
@@ -21235,6 +21296,7 @@ | |||
21235 | "version": "2.2.0", | 21296 | "version": "2.2.0", |
21236 | "resolved": "git+ssh://git@github.com/vraravam/node-mac-permissions.git#3cffec37379e6584627d831611a8ff12b57bbcdb", | 21297 | "resolved": "git+ssh://git@github.com/vraravam/node-mac-permissions.git#3cffec37379e6584627d831611a8ff12b57bbcdb", |
21237 | "integrity": "sha512-kl87EmBwDK4Rn/uI/WsjMvqpr8Ivk5ptNU/HYEie/5uBqQdW3jWCHnlL5guCbNprXtLM5a+ROT1TiFNMkIM+fQ==", | 21298 | "integrity": "sha512-kl87EmBwDK4Rn/uI/WsjMvqpr8Ivk5ptNU/HYEie/5uBqQdW3jWCHnlL5guCbNprXtLM5a+ROT1TiFNMkIM+fQ==", |
21299 | "hasInstallScript": true, | ||
21238 | "license": "MIT", | 21300 | "license": "MIT", |
21239 | "optional": true, | 21301 | "optional": true, |
21240 | "os": [ | 21302 | "os": [ |
@@ -25765,9 +25827,9 @@ | |||
25765 | } | 25827 | } |
25766 | }, | 25828 | }, |
25767 | "node_modules/signal-exit": { | 25829 | "node_modules/signal-exit": { |
25768 | "version": "3.0.6", | 25830 | "version": "3.0.7", |
25769 | "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz", | 25831 | "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", |
25770 | "integrity": "sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==" | 25832 | "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" |
25771 | }, | 25833 | }, |
25772 | "node_modules/simple-encryptor": { | 25834 | "node_modules/simple-encryptor": { |
25773 | "version": "2.0.0", | 25835 | "version": "2.0.0", |
@@ -47395,6 +47457,57 @@ | |||
47395 | "semver": "^7.3.5", | 47457 | "semver": "^7.3.5", |
47396 | "tar": "^6.1.2", | 47458 | "tar": "^6.1.2", |
47397 | "which": "^2.0.2" | 47459 | "which": "^2.0.2" |
47460 | }, | ||
47461 | "dependencies": { | ||
47462 | "are-we-there-yet": { | ||
47463 | "version": "3.0.0", | ||
47464 | "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.0.tgz", | ||
47465 | "integrity": "sha512-0GWpv50YSOcLXaN6/FAKY3vfRbllXWV2xvfA/oKJF8pzFhWXPV+yjhJXDBbjscDYowv7Yw1A3uigpzn5iEGTyw==", | ||
47466 | "dev": true, | ||
47467 | "requires": { | ||
47468 | "delegates": "^1.0.0", | ||
47469 | "readable-stream": "^3.6.0" | ||
47470 | } | ||
47471 | }, | ||
47472 | "gauge": { | ||
47473 | "version": "4.0.4", | ||
47474 | "resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz", | ||
47475 | "integrity": "sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==", | ||
47476 | "dev": true, | ||
47477 | "requires": { | ||
47478 | "aproba": "^1.0.3 || ^2.0.0", | ||
47479 | "color-support": "^1.1.3", | ||
47480 | "console-control-strings": "^1.1.0", | ||
47481 | "has-unicode": "^2.0.1", | ||
47482 | "signal-exit": "^3.0.7", | ||
47483 | "string-width": "^4.2.3", | ||
47484 | "strip-ansi": "^6.0.1", | ||
47485 | "wide-align": "^1.1.5" | ||
47486 | } | ||
47487 | }, | ||
47488 | "npmlog": { | ||
47489 | "version": "6.0.1", | ||
47490 | "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.1.tgz", | ||
47491 | "integrity": "sha512-BTHDvY6nrRHuRfyjt1MAufLxYdVXZfd099H4+i1f0lPywNQyI4foeNXJRObB/uy+TYqUW0vAD9gbdSOXPst7Eg==", | ||
47492 | "dev": true, | ||
47493 | "requires": { | ||
47494 | "are-we-there-yet": "^3.0.0", | ||
47495 | "console-control-strings": "^1.1.0", | ||
47496 | "gauge": "^4.0.0", | ||
47497 | "set-blocking": "^2.0.0" | ||
47498 | } | ||
47499 | }, | ||
47500 | "readable-stream": { | ||
47501 | "version": "3.6.0", | ||
47502 | "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", | ||
47503 | "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", | ||
47504 | "dev": true, | ||
47505 | "requires": { | ||
47506 | "inherits": "^2.0.3", | ||
47507 | "string_decoder": "^1.1.1", | ||
47508 | "util-deprecate": "^1.0.1" | ||
47509 | } | ||
47510 | } | ||
47398 | } | 47511 | } |
47399 | }, | 47512 | }, |
47400 | "node-int64": { | 47513 | "node-int64": { |
@@ -51080,9 +51193,9 @@ | |||
51080 | } | 51193 | } |
51081 | }, | 51194 | }, |
51082 | "signal-exit": { | 51195 | "signal-exit": { |
51083 | "version": "3.0.6", | 51196 | "version": "3.0.7", |
51084 | "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz", | 51197 | "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", |
51085 | "integrity": "sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==" | 51198 | "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" |
51086 | }, | 51199 | }, |
51087 | "simple-encryptor": { | 51200 | "simple-encryptor": { |
51088 | "version": "2.0.0", | 51201 | "version": "2.0.0", |
diff --git a/package.json b/package.json index 7f948cc9d..3b197d28c 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.13.1", | 16 | "node": "16.14.2", |
17 | "npm": "^8.1.2" | 17 | "npm": "8.7.0" |
18 | }, | 18 | }, |
19 | "engine-strict": true, | 19 | "engine-strict": true, |
20 | "scripts": { | 20 | "scripts": { |
diff --git a/recipes b/recipes | |||
Subproject c819fe925dac556dee8336d3c19147073179c71 | Subproject 596c75eb5b81ada1695214969ba327367fc3f97 | ||