aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Vijay Aravamudhan <vraravam@users.noreply.github.com>2024-01-14 15:27:41 +0000
committerLibravatar GitHub <noreply@github.com>2024-01-14 15:27:41 +0000
commiteeb7251e297a2c38b0e1b99e3736efaa85cb5fea (patch)
tree78f3c42e417f8364b874179b5d55af5880d969fb
parent2.0.5 [skip ci] (diff)
downloadferdium-server-eeb7251e297a2c38b0e1b99e3736efaa85cb5fea.tar.gz
ferdium-server-eeb7251e297a2c38b0e1b99e3736efaa85cb5fea.tar.zst
ferdium-server-eeb7251e297a2c38b0e1b99e3736efaa85cb5fea.zip
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
-rw-r--r--.nvmrc2
-rw-r--r--CONTRIBUTING.md6
-rw-r--r--Dockerfile4
-rw-r--r--app/Controllers/Http/ServiceController.ts7
-rw-r--r--app/Controllers/Http/WorkspaceController.ts7
-rw-r--r--package.json12
m---------recipes0
7 files changed, 24 insertions, 14 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
49```bash 49```bash
50$ jq --null-input '[inputs.engines] | add' < ./package.json < ./recipes/package.json 50$ jq --null-input '[inputs.engines] | add' < ./package.json < ./recipes/package.json
51{ 51{
52 "node": "20.9.0", 52 "node": "20.11.0",
53 "pnpm": "8.7.6", 53 "pnpm": "8.14.1",
54 "python": "3.11.1" 54 "python": "3.12.1"
55} 55}
56``` 56```
57 57
diff --git a/Dockerfile b/Dockerfile
index a53c0c5..df1c96a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
1FROM node:20.9.0-alpine as build 1FROM node:20.11.0-alpine as build
2 2
3WORKDIR /server-build 3WORKDIR /server-build
4 4
@@ -12,7 +12,7 @@ RUN pnpm install --config.build-from-source=sqlite --config.sqlite=/usr/local
12RUN pnpm build 12RUN pnpm build
13 13
14# ---- RUNTIME IMAGE ---------------------------------------------------------- 14# ---- RUNTIME IMAGE ----------------------------------------------------------
15FROM node:20.9.0-alpine 15FROM node:20.11.0-alpine
16 16
17WORKDIR /app 17WORKDIR /app
18LABEL maintainer="ferdium" 18LABEL 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 {
120 return response.send(servicesArray); 120 return response.send(servicesArray);
121 } 121 }
122 122
123 public async delete({ request, params, auth, response }: HttpContextContract) { 123 public async delete({
124 request,
125 params,
126 auth,
127 response,
128 }: HttpContextContract) {
124 // @ts-expect-error Property 'user' does not exist on type 'HttpContextContract'. 129 // @ts-expect-error Property 'user' does not exist on type 'HttpContextContract'.
125 const user = auth.user ?? request.user; 130 const user = auth.user ?? request.user;
126 131
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 {
113 }); 113 });
114 } 114 }
115 115
116 public async delete({ request, response, auth, params }: HttpContextContract) { 116 public async delete({
117 request,
118 response,
119 auth,
120 params,
121 }: HttpContextContract) {
117 // @ts-expect-error Property 'user' does not exist on type 'HttpContextContract'. 122 // @ts-expect-error Property 'user' does not exist on type 'HttpContextContract'.
118 const user = auth.user ?? request.user; 123 const user = auth.user ?? request.user;
119 124
diff --git a/package.json b/package.json
index 1e2854d..8968f33 100644
--- a/package.json
+++ b/package.json
@@ -3,15 +3,15 @@
3 "version": "2.0.5", 3 "version": "2.0.5",
4 "description": "Ferdium server to replace the default Franz/Ferdi server.", 4 "description": "Ferdium server to replace the default Franz/Ferdi server.",
5 "engines": { 5 "engines": {
6 "node": "20.9.0", 6 "node": "20.11.0",
7 "pnpm": "^8.10.0", 7 "pnpm": "8.14.1",
8 "python": "3.11.1" 8 "python": "3.12.1"
9 }, 9 },
10 "engine-strict": true, 10 "engine-strict": true,
11 "volta": { 11 "volta": {
12 "node": "20.9.0", 12 "node": "20.11.0",
13 "pnpm": "^8.10.0", 13 "pnpm": "8.14.1",
14 "python": "3.11.1" 14 "python": "3.12.1"
15 }, 15 },
16 "homepage": "https://github.com/ferdium/ferdium-server", 16 "homepage": "https://github.com/ferdium/ferdium-server",
17 "license": "MIT License", 17 "license": "MIT License",
diff --git a/recipes b/recipes
Subproject 25485614631616fe91382d129ee8bcdebcd6e69 Subproject 3f3e7be9487380694e008d1342a0163bd2e80da