diff options
| author |  Vijay Aravamudhan <vraravam@users.noreply.github.com> | 2024-04-16 12:25:10 +0000 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2024-04-16 17:55:10 +0530 |
| commit | 34189650ee140bdea2025afa680099cfe2db4079 (patch) | |
| tree | 4822abd955bb4e67f3f10dc3d7e53633185eb3d4 | |
| parent | chore: upgrade `@electron/notarize` to v2 (#1687) (diff) | |
| download | ferdium-app-34189650ee140bdea2025afa680099cfe2db4079.tar.gz ferdium-app-34189650ee140bdea2025afa680099cfe2db4079.tar.zst ferdium-app-34189650ee140bdea2025afa680099cfe2db4079.zip | |
Upgrade node and pnpm (#1690)
| -rw-r--r-- | .nvmrc | 2 | ||||
| -rw-r--r-- | CONTRIBUTING.md | 4 | ||||
| -rw-r--r-- | Dockerfile | 2 | ||||
| -rw-r--r-- | package.json | 10 | ||||
| m--------- | recipes | 0 |
5 files changed, 9 insertions, 9 deletions
| @@ -1 +1 @@ | |||
| 20.12.0 | 20.12.2 | ||
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6ac0edb86..9d575b15d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md | |||
| @@ -62,8 +62,8 @@ Currently, these are the combinations of system dependencies that work for MacOS | |||
| 62 | # Note: 'jq' is not a required system dependency; its only here to show the combined output of versions needed | 62 | # Note: 'jq' is not a required system dependency; its only here to show the combined output of versions needed |
| 63 | $ jq --null-input '[inputs.engines] | add' < ./package.json < ./recipes/package.json | 63 | $ jq --null-input '[inputs.engines] | add' < ./package.json < ./recipes/package.json |
| 64 | { | 64 | { |
| 65 | "node": "20.12.0", | 65 | "node": "20.12.2", |
| 66 | "pnpm": "8.15.5" | 66 | "pnpm": "8.15.7" |
| 67 | } | 67 | } |
| 68 | ``` | 68 | ``` |
| 69 | 69 | ||
diff --git a/Dockerfile b/Dockerfile index b0238e008..efae454d5 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:20.12.0-buster AS builder | 3 | FROM docker.io/library/node:20.12.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 | ||
diff --git a/package.json b/package.json index e39cace3b..28e757bc9 100644 --- a/package.json +++ b/package.json | |||
| @@ -13,15 +13,15 @@ | |||
| 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": "20.12.0", | 16 | "node": "20.12.2", |
| 17 | "pnpm": "8.15.5" | 17 | "pnpm": "8.15.7" |
| 18 | }, | 18 | }, |
| 19 | "engine-strict": true, | 19 | "engine-strict": true, |
| 20 | "volta": { | 20 | "volta": { |
| 21 | "node": "20.12.0", | 21 | "node": "20.12.2", |
| 22 | "pnpm": "8.15.5" | 22 | "pnpm": "8.15.7" |
| 23 | }, | 23 | }, |
| 24 | "packageManager": "pnpm@8.15.5", | 24 | "packageManager": "pnpm@8.15.7", |
| 25 | "scripts": { | 25 | "scripts": { |
| 26 | "prepare": "is-ci || husky", | 26 | "prepare": "is-ci || husky", |
| 27 | "start": "electron ./build", | 27 | "start": "electron ./build", |
diff --git a/recipes b/recipes | |||
| Subproject 0337750c523f319d3ddbfc6f34245a8c60e73c5 | Subproject f8a2b904ce185a2e06536d0b23524987e29c9f5 | ||