Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: upgrade used node and pnpm version #1433

Merged
merged 10 commits into from
Nov 1, 2023
Merged

chore: upgrade used node and pnpm version #1433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
dd81d3e
Update submodules [skip ci]
invalid-email-address Oct 19, 2023
dd78db6
Merge branch 'develop' of github.com:mcmxcdev/ferdium-app into develop
mcmxcdev Oct 22, 2023
fd77801
Update submodules [skip ci]
invalid-email-address Oct 25, 2023
b7b36d6
Merge branch 'develop' of github.com:ferdium/ferdium-app into develop
mcmxcdev Oct 28, 2023
a57b02a
Merge branch 'develop' of github.com:mcmxcdev/ferdium-app into develop
mcmxcdev Oct 28, 2023
0975c4b
Merge branch 'develop' of github.com:ferdium/ferdium-app into chore/u…
mcmxcdev Oct 31, 2023
536df05
chore: upgrade used node and pnpm version
mcmxcdev Oct 31, 2023
3c3cce0
Merge branch 'develop' into chore/upgrade-used-node-and-pnpm-version
mcmxcdev Nov 1, 2023
98f1f2e
Update submodules [skip ci]
mcmxcdev Nov 1, 2023
f3aa7a8
Merge branch 'chore/upgrade-used-node-and-pnpm-version' of github.com…
mcmxcdev Nov 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .nvmrc
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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",
Comment on lines -208 to -209
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These two are not upgradable?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

peerDependencyRules.allowedVersions is a feature by pnpm to ignore dependencies which have incompatible peer requirements.

react-loader which is unmaintained only allowed react >=17, so we hacked it here. Since react-loader was replaced by a modern alternative in #1410, I was able to get rid of this now redundant override ;)

"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
Loading