Skip to content

Commit

Permalink
chore: upgrade used node and pnpm version (#1433)
Browse files Browse the repository at this point in the history
- upgrade node and pnpm version in `engines`, `volta` and `packageManager` config
- upgrade `@types/node` to v20
- remove `react-loader` overrides from `peerDependencyRules.allowedVersions`
- remove `@npmcli/move-file` 2.0.1 from `allowedDeprecatedVersions`
- update node image to 20.9.0 in `Dockerfile`
- update required system dependencies in `CONTRIBUTING.md`
- update node version to 20.9.0 in `.nvmrc`
- correct type definitions for `setInterval` usage in `WebviewCrashHandler` and `AppStore` necessary due to `@types/node` upgrade
  • Loading branch information
mcmxcdev authored Nov 1, 2023
1 parent fb7177d commit 264e704
Show file tree
Hide file tree
Showing 8 changed files with 68 additions and 62 deletions.
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.18.0
20.9.0
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ 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": "18.18.0",
"pnpm": "8.7.6"
"node": "20.9.0",
"pnpm": "8.10.0"
}
```

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -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:18.18.0-buster as builder
FROM docker.io/library/node:20.9.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"

Expand Down
16 changes: 7 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
"repository": "https://github.com/ferdium/ferdium-app.git",
"private": true,
"engines": {
"node": "18.18.0",
"pnpm": "8.7.6"
"node": "20.9.0",
"pnpm": "8.10.0"
},
"engine-strict": true,
"volta": {
"node": "18.18.0",
"pnpm": "8.7.6"
"node": "20.9.0",
"pnpm": "8.10.0"
},
"packageManager": "pnpm@8.7.6",
"packageManager": "pnpm@8.10.0",
"scripts": {
"prepare": "is-ci || husky install",
"start": "electron ./build",
Expand Down Expand Up @@ -146,7 +146,7 @@
"@types/lodash": "4.14.198",
"@types/minimist": "1.2.2",
"@types/ms": "0.7.31",
"@types/node": "18.15.3",
"@types/node": "20.8.10",
"@types/prop-types": "15.7.6",
"@types/react": "18.2.22",
"@types/react-color": "3.0.6",
Expand Down Expand Up @@ -205,8 +205,6 @@
"esbuild-sass-plugin>esbuild": "^0.16.7",
"react-electron-web-view>react": "^18.0.0",
"react-electron-web-view>react-dom": "^18.0.0",
"react-loader>react": "^18.0.0",
"react-loader>react-dom": "^18.0.0",
"react-sortable-hoc>react": "^18.0.0",
"react-sortable-hoc>react-dom": "^18.0.0"
}
Expand All @@ -218,7 +216,7 @@
"har-validator": "5.1.5",
"uuid": "3.4.0",
"@sinonjs/fake-timers": "10.2.0",
"@npmcli/move-file": "1.1.2 || 2.0.1",
"@npmcli/move-file": "1.1.2",
"source-map-resolve": "0.5.3",
"source-map-url": "0.4.1",
"resolve-url": "0.2.1",
Expand Down
Loading

0 comments on commit 264e704

Please sign in to comment.