diff options
-rw-r--r-- | .nvmrc | 2 | ||||
-rw-r--r-- | CONTRIBUTING.md | 6 | ||||
-rw-r--r-- | Dockerfile | 4 | ||||
-rw-r--r-- | app/Controllers/Http/ServiceController.ts | 7 | ||||
-rw-r--r-- | app/Controllers/Http/WorkspaceController.ts | 7 | ||||
-rw-r--r-- | package.json | 12 | ||||
m--------- | recipes | 0 |
7 files changed, 24 insertions, 14 deletions
@@ -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 | ||
@@ -1,4 +1,4 @@ | |||
1 | FROM node:20.9.0-alpine as build | 1 | FROM node:20.11.0-alpine as build |
2 | 2 | ||
3 | WORKDIR /server-build | 3 | WORKDIR /server-build |
4 | 4 | ||
@@ -12,7 +12,7 @@ RUN pnpm install --config.build-from-source=sqlite --config.sqlite=/usr/local | |||
12 | RUN pnpm build | 12 | RUN pnpm build |
13 | 13 | ||
14 | # ---- RUNTIME IMAGE ---------------------------------------------------------- | 14 | # ---- RUNTIME IMAGE ---------------------------------------------------------- |
15 | FROM node:20.9.0-alpine | 15 | FROM node:20.11.0-alpine |
16 | 16 | ||
17 | WORKDIR /app | 17 | WORKDIR /app |
18 | LABEL maintainer="ferdium" | 18 | 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 { | |||
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 | ||