gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-03 21:19:01 +01:00
Code Issues Actions 20 Packages Projects Releases Wiki Activity

Merge pull request #639 from TriliumNext/renovate/node-22.x

Browse Source 
chore(deps): update node.js to v22
This commit is contained in:
Elian Doran 2024-12-10 21:33:34 +02:00 committed by GitHub
commit 567664a2a3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -1,5 +1,5 @@
# Build stage # Build stage
FROM node:20.18.1-bullseye-slim AS builder FROM node:22.12.0-bullseye-slim AS builder
# Configure build dependencies in a single layer # Configure build dependencies in a single layer
RUN apt-get update && apt-get install -y --no-install-recommends \ RUN apt-get update && apt-get install -y --no-install-recommends \
@ -35,7 +35,7 @@ RUN cp -R build/src/* src/. && \
rm src/services/asset_path.ts rm src/services/asset_path.ts
# Runtime stage # Runtime stage
FROM node:20.18.1-bullseye-slim FROM node:22.12.0-bullseye-slim
# Install only runtime dependencies # Install only runtime dependencies
RUN apt-get update && apt-get install -y --no-install-recommends \ RUN apt-get update && apt-get install -y --no-install-recommends \

4
Dockerfile.alpine
View File

@ -1,5 +1,5 @@
# Build stage # Build stage
FROM node:20.18.1-alpine AS builder FROM node:22.12.0-alpine AS builder
# Configure build dependencies # Configure build dependencies
RUN apk add --no-cache --virtual .build-dependencies \ RUN apk add --no-cache --virtual .build-dependencies \
@ -34,7 +34,7 @@ RUN cp -R build/src/* src/. && \
rm src/services/asset_path.ts rm src/services/asset_path.ts
# Runtime stage # Runtime stage
FROM node:20.18.1-alpine FROM node:22.12.0-alpine
# Install runtime dependencies # Install runtime dependencies
RUN apk add --no-cache su-exec shadow RUN apk add --no-cache su-exec shadow

20
package-lock.json generated
View File

@ -128,7 +128,7 @@
"@types/jsdom": "21.1.7", "@types/jsdom": "21.1.7",
"@types/mime-types": "2.1.4", "@types/mime-types": "2.1.4",
"@types/multer": "1.4.12", "@types/multer": "1.4.12",
"@types/node": "22.7.8", "@types/node": "22.10.1",
"@types/safe-compare": "1.1.2", "@types/safe-compare": "1.1.2",
"@types/sanitize-html": "2.13.0", "@types/sanitize-html": "2.13.0",
"@types/sax": "1.2.7", "@types/sax": "1.2.7",
@ -3988,12 +3988,13 @@
} }
}, },
"node_modules/@types/node": { "node_modules/@types/node": {
"version": "22.7.8", "version": "22.10.1",
"resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.8.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.1.tgz",
"integrity": "sha512-a922jJy31vqR5sk+kAdIENJjHblqcZ4RmERviFsER4WJcEONqxKcjNOlk0q7OUfrF5sddT+vng070cdfMlrPLg==", "integrity": "sha512-qKgsUwfHZV2WCWLAnVP1JqnpE6Im6h3Y0+fYgMTasNQ7V++CBX5OT1as0g0f+OyubbFqhf6XVNIsmN4IIhEgGQ==",
"dev": true, "dev": true,
"license": "MIT",
"dependencies": { "dependencies": {
"undici-types": "~6.19.2" "undici-types": "~6.20.0"
} }
}, },
"node_modules/@types/qs": { "node_modules/@types/qs": {
@ -16381,10 +16382,11 @@
"dev": true "dev": true
}, },
"node_modules/undici-types": { "node_modules/undici-types": {
"version": "6.19.8", "version": "6.20.0",
"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz", "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
"integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==", "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
"dev": true "dev": true,
"license": "MIT"
}, },
"node_modules/unescape": { "node_modules/unescape": {
"version": "1.0.1", "version": "1.0.1",

2
package.json
View File

@ -168,7 +168,7 @@
"@types/jsdom": "21.1.7", "@types/jsdom": "21.1.7",
"@types/mime-types": "2.1.4", "@types/mime-types": "2.1.4",
"@types/multer": "1.4.12", "@types/multer": "1.4.12",
"@types/node": "22.7.8", "@types/node": "22.10.1",
"@types/safe-compare": "1.1.2", "@types/safe-compare": "1.1.2",
"@types/sanitize-html": "2.13.0", "@types/sanitize-html": "2.13.0",
"@types/sax": "1.2.7", "@types/sax": "1.2.7",