From eeb7251e297a2c38b0e1b99e3736efaa85cb5fea Mon Sep 17 00:00:00 2001 From: Vijay Aravamudhan Date: Sun, 14 Jan 2024 15:27:41 +0000 Subject: Upgrade node to the latest LTS (20.11.0) and pnpm to the latest (8.14.1) (#93) * Upgrade node to latest LTS (20.11.0) and pnpm to latest (8.14.1) * Upgrade node to latest LTS (20.11.0) and pnpm to latest (8.14.1) * Fix formatting --- .nvmrc | 2 +- CONTRIBUTING.md | 6 +++--- Dockerfile | 4 ++-- app/Controllers/Http/ServiceController.ts | 7 ++++++- app/Controllers/Http/WorkspaceController.ts | 7 ++++++- package.json | 12 ++++++------ recipes | 2 +- 7 files changed, 25 insertions(+), 15 deletions(-) diff --git a/.nvmrc b/.nvmrc index f3f52b4..8b0beab 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -20.9.0 +20.11.0 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2e93c39..817583c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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" } ``` diff --git a/Dockerfile b/Dockerfile index a53c0c5..df1c96a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:20.9.0-alpine as build +FROM node:20.11.0-alpine as build WORKDIR /server-build @@ -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" diff --git a/app/Controllers/Http/ServiceController.ts b/app/Controllers/Http/ServiceController.ts index 3ebc246..e58ce33 100644 --- a/app/Controllers/Http/ServiceController.ts +++ b/app/Controllers/Http/ServiceController.ts @@ -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; diff --git a/app/Controllers/Http/WorkspaceController.ts b/app/Controllers/Http/WorkspaceController.ts index 8eba697..70af343 100644 --- a/app/Controllers/Http/WorkspaceController.ts +++ b/app/Controllers/Http/WorkspaceController.ts @@ -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; diff --git a/package.json b/package.json index 1e2854d..8968f33 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/recipes b/recipes index 2548561..3f3e7be 160000 --- a/recipes +++ b/recipes @@ -1 +1 @@ -Subproject commit 25485614631616fe91382d129ee8bcdebcd6e697 +Subproject commit 3f3e7be9487380694e008d1342a0163bd2e80daf -- cgit v1.2.3-54-g00ecf