diff options
author | Vijay A <vraravam@users.noreply.github.com> | 2023-01-28 08:55:42 +0530 |
---|---|---|
committer | Vijay A <vraravam@users.noreply.github.com> | 2023-01-28 08:55:42 +0530 |
commit | 170a3b01e6fda4bc2688e8e9a567777226073324 (patch) | |
tree | 0f97e858cbbd3664812bceb51ff0277d5c77d342 | |
parent | Upgrade 'pnpm' to '7.19.0'; Upgrade submodules (diff) | |
download | ferdium-server-170a3b01e6fda4bc2688e8e9a567777226073324.tar.gz ferdium-server-170a3b01e6fda4bc2688e8e9a567777226073324.tar.zst ferdium-server-170a3b01e6fda4bc2688e8e9a567777226073324.zip |
Upgrade 'nodejs' to '18.13.0', 'pnpm' to '7.25.1' and the recipes submodule
-rwxr-xr-x | .husky/pre-commit | 2 | ||||
-rw-r--r-- | .nvmrc | 2 | ||||
-rw-r--r-- | CONTRIBUTING.md | 4 | ||||
-rw-r--r-- | Dockerfile | 4 | ||||
-rw-r--r-- | package.json | 4 | ||||
m--------- | recipes | 0 | ||||
-rwxr-xr-x | scripts/build-unix.sh | 2 | ||||
-rw-r--r-- | scripts/build-windows.ps1 | 2 |
8 files changed, 10 insertions, 10 deletions
diff --git a/.husky/pre-commit b/.husky/pre-commit index 5bdf80f..d1505ba 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit | |||
@@ -5,6 +5,6 @@ FILE_NAME="$(dirname "$0")/_/husky.sh" | |||
5 | # Conditionally invoke so as to avoid running npm commands if this is a clean checkout (ie before installing npm modules) | 5 | # Conditionally invoke so as to avoid running npm commands if this is a clean checkout (ie before installing npm modules) |
6 | if [ -f $FILE_NAME ]; then | 6 | if [ -f $FILE_NAME ]; then |
7 | . $FILE_NAME | 7 | . $FILE_NAME |
8 | pnpm prepare-code | 8 | pnpm prepare |
9 | pnpm lint | 9 | pnpm lint |
10 | fi | 10 | fi |
@@ -1 +1 @@ | |||
16.18.1 | 18.13.0 | ||
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 72fbd35..99abe81 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md | |||
@@ -49,8 +49,8 @@ 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": "16.18.1", | 52 | "node": "18.13.0", |
53 | "pnpm": "7.19.0", | 53 | "pnpm": "7.25.1", |
54 | "python": "3.11.1" | 54 | "python": "3.11.1" |
55 | } | 55 | } |
56 | ``` | 56 | ``` |
@@ -1,4 +1,4 @@ | |||
1 | FROM node:16.18.1-alpine as build | 1 | FROM node:18.13.0-alpine as build |
2 | 2 | ||
3 | WORKDIR /server-build | 3 | WORKDIR /server-build |
4 | 4 | ||
@@ -11,7 +11,7 @@ RUN PNPM_VERSION=$(node -p 'require("./package.json").engines.pnpm'); npm i -g p | |||
11 | RUN pnpm install --config.build-from-source=sqlite --config.sqlite=/usr/local | 11 | RUN pnpm install --config.build-from-source=sqlite --config.sqlite=/usr/local |
12 | 12 | ||
13 | # ---- RUNTIME IMAGE ---------------------------------------------------------- | 13 | # ---- RUNTIME IMAGE ---------------------------------------------------------- |
14 | FROM node:16.18.1-alpine | 14 | FROM node:18.13.0-alpine |
15 | 15 | ||
16 | WORKDIR /app | 16 | WORKDIR /app |
17 | LABEL maintainer="ferdium" | 17 | LABEL maintainer="ferdium" |
diff --git a/package.json b/package.json index 1cda0a4..6e5c03b 100644 --- a/package.json +++ b/package.json | |||
@@ -5,8 +5,8 @@ | |||
5 | "description": "Ferdium server to replace the default Franz/Ferdi server.", | 5 | "description": "Ferdium server to replace the default Franz/Ferdi server.", |
6 | "main": "index.js", | 6 | "main": "index.js", |
7 | "engines": { | 7 | "engines": { |
8 | "node": "16.18.1", | 8 | "node": "18.13.0", |
9 | "pnpm": "7.19.0", | 9 | "pnpm": "7.25.1", |
10 | "python": "3.11.1" | 10 | "python": "3.11.1" |
11 | }, | 11 | }, |
12 | "scripts": { | 12 | "scripts": { |
diff --git a/recipes b/recipes | |||
Subproject b1cdbd3dacba1049a6e21583d0baa74061d15c3 | Subproject 786d50d0c69bf865a01fad086fb6e10db1e6dff | ||
diff --git a/scripts/build-unix.sh b/scripts/build-unix.sh index a7cb003..94720aa 100755 --- a/scripts/build-unix.sh +++ b/scripts/build-unix.sh | |||
@@ -110,7 +110,7 @@ popd | |||
110 | # ----------------------------------------------------------------------------- | 110 | # ----------------------------------------------------------------------------- |
111 | # Now the meat..... | 111 | # Now the meat..... |
112 | pnpm i | 112 | pnpm i |
113 | pnpm prepare-code | 113 | pnpm prepare |
114 | pnpm lint | 114 | pnpm lint |
115 | # TODO: Uncomment after fixing tests | 115 | # TODO: Uncomment after fixing tests |
116 | # pnpm test | 116 | # pnpm test |
diff --git a/scripts/build-windows.ps1 b/scripts/build-windows.ps1 index 7a5004e..71b27b8 100644 --- a/scripts/build-windows.ps1 +++ b/scripts/build-windows.ps1 | |||
@@ -160,7 +160,7 @@ Pop-Location | |||
160 | # ----------------------------------------------------------------------------- | 160 | # ----------------------------------------------------------------------------- |
161 | # Now the meat..... | 161 | # Now the meat..... |
162 | & pnpm i | 162 | & pnpm i |
163 | & pnpm prepare-code | 163 | & pnpm prepare |
164 | & pnpm lint | 164 | & pnpm lint |
165 | # TODO: Uncomment after fixing tests | 165 | # TODO: Uncomment after fixing tests |
166 | # & pnpm test | 166 | # & pnpm test |