Skip to content

Commit 588b65d

Browse files
authored
Merge pull request #1787 from TriliumNext/renovate/node-22.x
chore(deps): update node.js to v22.15.0
2 parents 7822d2e + fa48d90 commit 588b65d

File tree

7 files changed

+81
-74
lines changed

7 files changed

+81
-74
lines changed

_regroup/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"@playwright/test": "1.51.1",
3939
"@stylistic/eslint-plugin": "4.2.0",
4040
"@types/express": "5.0.1",
41-
"@types/node": "22.14.1",
41+
"@types/node": "22.15.3",
4242
"@types/yargs": "17.0.33",
4343
"@vitest/coverage-v8": "3.1.2",
4444
"eslint": "9.24.0",

_regroup_monorepo/apps/server/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ RUN npm ci && \
2222
# as we install necessary dependencies in runtime buildstage anyways
2323

2424
# Runtime stage
25-
FROM node:22.14.0-bullseye-slim
25+
FROM node:22.15.0-bullseye-slim
2626

2727
WORKDIR /usr/src/app
2828

_regroup_monorepo/apps/server/Dockerfile.alpine

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build stage
2-
FROM node:22.14.0-alpine AS builder
2+
FROM node:22.15.0-alpine AS builder
33

44
WORKDIR /usr/src/app/build
55

apps/server/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
FROM node:22.14.0-bullseye-slim AS builder
1+
FROM node:22.15.0-bullseye-slim AS builder
22
RUN corepack enable
33

44
# Install native dependencies since we might be building cross-platform.
55
WORKDIR /usr/src/app/build
66
COPY ./dist/package.json ./dist/pnpm-lock.yaml ./docker/pnpm-workspace.yaml /usr/src/app/
77
RUN pnpm install --frozen-lockfile --prod && pnpm rebuild
88

9-
FROM node:22.14.0-bullseye-slim
9+
FROM node:22.15.0-bullseye-slim
1010
# Install only runtime dependencies
1111
RUN apt-get update && \
1212
apt-get install -y --no-install-recommends \

apps/server/Dockerfile.alpine

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
FROM node:22.14.0-alpine AS builder
1+
FROM node:22.15.0-alpine AS builder
22
RUN corepack enable
33

44
# Install native dependencies since we might be building cross-platform.
55
WORKDIR /usr/src/app
66
COPY ./dist/package.json ./dist/pnpm-lock.yaml ./docker/pnpm-workspace.yaml /usr/src/app/
77
RUN pnpm install --frozen-lockfile --prod && pnpm rebuild
88

9-
FROM node:22.14.0-alpine
9+
FROM node:22.15.0-alpine
1010
# Install runtime dependencies
1111
RUN apk add --no-cache su-exec shadow
1212

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"@swc/helpers": "~0.5.11",
4040
"@triliumnext/server": "workspace:*",
4141
"@types/express": "^4.17.21",
42-
"@types/node": "18.16.9",
42+
"@types/node": "22.15.3",
4343
"@vitest/coverage-v8": "^3.0.5",
4444
"@vitest/ui": "^3.0.0",
4545
"cross-env": "7.0.3",

pnpm-lock.yaml

Lines changed: 73 additions & 66 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)