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.

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

Sync update node and pnpm #92

Merged
merged 1 commit into from
Jan 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.18.0
20.9.0
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ Currently, these are the combinations of system dependencies that work for MacOS
```bash
$ jq --null-input '[inputs.engines] | add' < ./package.json < ./recipes/package.json
{
"node": "18.18.0",
"node": "20.9.0",
"pnpm": "8.7.6",
"python": "3.11.1"
}
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:18.18.0-alpine as build
FROM node:20.9.0-alpine as build

WORKDIR /server-build

Expand All @@ -12,7 +12,7 @@ RUN pnpm install --config.build-from-source=sqlite --config.sqlite=/usr/local
RUN pnpm build

# ---- RUNTIME IMAGE ----------------------------------------------------------
FROM node:18.18.0-alpine
FROM node:20.9.0-alpine

WORKDIR /app
LABEL maintainer="ferdium"
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
"version": "2.0.4",
"description": "Ferdium server to replace the default Franz/Ferdi server.",
"engines": {
"node": "18.18.0",
"pnpm": "8.7.6",
"node": "20.9.0",
"pnpm": "^8.10.0",
"python": "3.11.1"
},
"engine-strict": true,
"volta": {
"node": "18.18.0",
"pnpm": "8.7.6",
"node": "20.9.0",
"pnpm": "^8.10.0",
Copy link
Member

Choose a reason for hiding this comment

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

This is invalid configuration, it will break for volta users locally when running pnpm i. You need to specify exact version.

Copy link
Member Author

Choose a reason for hiding this comment

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

Ups, my bad. Can you raise a PR fixing it or should I?

Copy link
Member

Choose a reason for hiding this comment

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

Please raise a PR, can't get to it right now!

"python": "3.11.1"
},
"homepage": "https://github.com/ferdium/ferdium-server",
Expand Down
Loading