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

Jump to bottom

Upgrade node, pnpm and deps #1833

Merged
merged 1 commit into from
Jun 29, 2024
Merged

Upgrade node, pnpm and deps #1833

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 @@
20.14.0
20.15.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": "20.14.0",
"pnpm": "9.1.4"
"node": "20.15.0",
"pnpm": "9.4.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:20.14.0-buster AS builder
FROM docker.io/library/node:20.15.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
22 changes: 11 additions & 11 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": "20.14.0",
"pnpm": "9.1.4"
"node": "20.15.0",
"pnpm": "9.4.0"
},
"engine-strict": true,
"volta": {
"node": "20.14.0",
"pnpm": "9.1.4"
"node": "20.15.0",
"pnpm": "9.4.0"
},
"packageManager": "pnpm@9.1.4",
"packageManager": "pnpm@9.4.0",
"scripts": {
"prepare": "is-ci || husky",
"start": "electron ./build",
Expand Down Expand Up @@ -65,8 +65,8 @@
"@emotion/styled": "11.11.5",
"@mdi/js": "7.4.47",
"@mdi/react": "1.6.1",
"@mui/icons-material": "5.15.20",
"@mui/material": "5.15.20",
"@mui/icons-material": "5.15.21",
"@mui/material": "5.15.21",
"@octokit/core": "5.1.0",
"@sentry/electron": "4.14.0",
"@superwf/mobx-react-router": "7.4.0",
Expand All @@ -75,7 +75,7 @@
"classnames": "2.5.1",
"color": "4.2.3",
"csstype": "3.1.3",
"darkreader": "4.9.86",
"darkreader": "4.9.87",
"dbus-next": "0.10.2",
"debug": "4.3.5",
"electron-dl": "3.5.2",
Expand Down Expand Up @@ -116,7 +116,7 @@
"react-jss": "10.10.0",
"react-loader-spinner": "5.4.5",
"react-modal": "3.16.1",
"react-router-dom": "6.23.1",
"react-router-dom": "6.24.0",
"react-sortable-hoc": "2.0.0",
"react-tooltip": "5.27.0",
"react-topbar-progress-indicator": "4.1.1",
Expand All @@ -143,10 +143,10 @@
"@types/color": "3.0.6",
"@types/fs-extra": "11.0.4",
"@types/jest": "29.5.12",
"@types/lodash": "4.17.5",
"@types/lodash": "4.17.6",
"@types/minimist": "1.2.5",
"@types/ms": "0.7.34",
"@types/node": "20.14.8",
"@types/node": "20.14.9",
"@types/prop-types": "15.7.12",
"@types/react": "18.3.3",
"@types/react-color": "3.0.12",
Expand Down
Loading