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

Upgrade node to the latest LTS (20.11.0) and pnpm to the latest (8.14.1) #93

Merged
merged 3 commits into from
Jan 14, 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 @@
20.9.0
20.11.0
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ 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": "20.9.0",
"pnpm": "8.7.6",
"python": "3.11.1"
"node": "20.11.0",
"pnpm": "8.14.1",
"python": "3.12.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:20.9.0-alpine as build
FROM node:20.11.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:20.9.0-alpine
FROM node:20.11.0-alpine

WORKDIR /app
LABEL maintainer="ferdium"
Expand Down
7 changes: 6 additions & 1 deletion app/Controllers/Http/ServiceController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,12 @@ export default class ServiceController {
return response.send(servicesArray);
}

public async delete({ request, params, auth, response }: HttpContextContract) {
public async delete({
request,
params,
auth,
response,
}: HttpContextContract) {
// @ts-expect-error Property 'user' does not exist on type 'HttpContextContract'.
const user = auth.user ?? request.user;

Expand Down
7 changes: 6 additions & 1 deletion app/Controllers/Http/WorkspaceController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,12 @@ export default class WorkspaceController {
});
}

public async delete({ request, response, auth, params }: HttpContextContract) {
public async delete({
request,
response,
auth,
params,
}: HttpContextContract) {
// @ts-expect-error Property 'user' does not exist on type 'HttpContextContract'.
const user = auth.user ?? request.user;

Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
"version": "2.0.5",
"description": "Ferdium server to replace the default Franz/Ferdi server.",
"engines": {
"node": "20.9.0",
"pnpm": "^8.10.0",
"python": "3.11.1"
"node": "20.11.0",
"pnpm": "8.14.1",
"python": "3.12.1"
},
"engine-strict": true,
"volta": {
"node": "20.9.0",
"pnpm": "^8.10.0",
"python": "3.11.1"
"node": "20.11.0",
"pnpm": "8.14.1",
"python": "3.12.1"
},
"homepage": "https://github.com/ferdium/ferdium-server",
"license": "MIT License",
Expand Down
2 changes: 1 addition & 1 deletion recipes
Loading