summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaphael <mail@raphaelkabo.com>2023-09-28 14:57:00 +0100
committerGitHub <noreply@github.com>2023-09-28 14:57:00 +0100
commit558329cd608e75a8b0417f0b3592609edc5ef907 (patch)
tree2f37873dfeb051cbfe01c698d7ac1d192696aa7e
parentce14c7897988176a00f9fa1530801378ad6db9f4 (diff)
parentd3f92b76a8a6261e450673b01d3af8cee776a79d (diff)
Merge branch 'main' into patch-1
-rw-r--r--Dockerfile2
-rw-r--r--package.json2
-rw-r--r--pnpm-lock.yaml19
3 files changed, 14 insertions, 9 deletions
diff --git a/Dockerfile b/Dockerfile
index 88b33f3..4f2e42b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,5 +6,5 @@ RUN npm install -g pnpm
RUN pnpm install
COPY . /app/
RUN cp config/config.example.toml config/config.toml
-CMD pnpm run build
+RUN pnpm run build
CMD pnpm run start
diff --git a/package.json b/package.json
index 90047c3..afbca27 100644
--- a/package.json
+++ b/package.json
@@ -45,6 +45,6 @@
"eslint": "^8.40.0",
"nodemon": "^2.0.22",
"prettier": "^2.8.8",
- "typescript": "^5.0.4"
+ "typescript": "5.1.6"
}
}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e310e2f..4441b66 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1,5 +1,9 @@
lockfileVersion: '6.0'
+settings:
+ autoInstallPeers: true
+ excludeLinksFromLockfile: false
+
dependencies:
'@sendgrid/mail':
specifier: ^6.5.5
@@ -33,7 +37,7 @@ dependencies:
version: 0.6.0
ical-generator:
specifier: ^1.15.4
- version: 1.15.4
+ version: 1.15.4(@types/node@20.1.3)
jimp:
specifier: ^0.16.13
version: 0.16.13
@@ -82,8 +86,8 @@ devDependencies:
specifier: ^2.8.8
version: 2.8.8
typescript:
- specifier: ^5.0.4
- version: 5.0.4
+ specifier: 5.1.6
+ version: 5.1.6
packages:
@@ -1623,12 +1627,13 @@ packages:
sshpk: 1.17.0
dev: false
- /ical-generator@1.15.4:
+ /ical-generator@1.15.4(@types/node@20.1.3):
resolution: {integrity: sha512-drXe4RLkfNlvDvdy/E6BUI9p+01L3ySK1ufNEYI9TxNKG9ZA3G60QWoZvD1dtmH4scwDxYu6/sZBPJvYVNrj8A==}
engines: {node: '>=6.0.0'}
peerDependencies:
'@types/node': '>= 8.0.0'
dependencies:
+ '@types/node': 20.1.3
moment-timezone: 0.5.43
dev: false
@@ -2783,9 +2788,9 @@ packages:
mime-types: 2.1.35
dev: false
- /typescript@5.0.4:
- resolution: {integrity: sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==}
- engines: {node: '>=12.20'}
+ /typescript@5.1.6:
+ resolution: {integrity: sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==}
+ engines: {node: '>=14.17'}
hasBin: true
dev: true