Skip to content

Commit fbf4a91

Browse files
authored
Merge branch 'main' into renovate/smithy-middleware-retry-4.x
2 parents 6d94efb + 95947a9 commit fbf4a91

File tree

11 files changed

+165
-161
lines changed

11 files changed

+165
-161
lines changed

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
24.11.0
1+
24.11.1

_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.56.1",
3939
"@stylistic/eslint-plugin": "5.5.0",
4040
"@types/express": "5.0.5",
41-
"@types/node": "24.10.0",
41+
"@types/node": "24.10.1",
4242
"@types/yargs": "17.0.34",
4343
"@vitest/coverage-v8": "3.2.4",
4444
"eslint": "9.39.1",

apps/build-docs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"keywords": [],
1010
"author": "Elian Doran <[email protected]>",
1111
"license": "AGPL-3.0-only",
12-
"packageManager": "pnpm@10.21.0",
12+
"packageManager": "pnpm@10.22.0",
1313
"devDependencies": {
1414
"@redocly/cli": "2.11.1",
1515
"archiver": "7.0.1",

apps/client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
"normalize.css": "8.0.1",
6060
"panzoom": "9.4.3",
6161
"preact": "10.27.2",
62-
"react-i18next": "16.2.4",
62+
"react-i18next": "16.3.1",
6363
"reveal.js": "5.2.1",
6464
"svg-pan-zoom": "3.6.2",
6565
"tabulator-tables": "6.3.1",

apps/server/Dockerfile

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

44
# Install native dependencies since we might be building cross-platform.
@@ -7,7 +7,7 @@ COPY ./docker/package.json ./docker/pnpm-workspace.yaml /usr/src/app/
77
# We have to use --no-frozen-lockfile due to CKEditor patches
88
RUN pnpm install --no-frozen-lockfile --prod && pnpm rebuild
99

10-
FROM node:24.11.0-bullseye-slim
10+
FROM node:24.11.1-bullseye-slim
1111
# Install only runtime dependencies
1212
RUN apt-get update && \
1313
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,4 +1,4 @@
1-
FROM node:24.11.0-alpine AS builder
1+
FROM node:24.11.1-alpine AS builder
22
RUN corepack enable
33

44
# Install native dependencies since we might be building cross-platform.
@@ -7,7 +7,7 @@ COPY ./docker/package.json ./docker/pnpm-workspace.yaml /usr/src/app/
77
# We have to use --no-frozen-lockfile due to CKEditor patches
88
RUN pnpm install --no-frozen-lockfile --prod && pnpm rebuild
99

10-
FROM node:24.11.0-alpine
10+
FROM node:24.11.1-alpine
1111
# Install runtime dependencies
1212
RUN apk add --no-cache su-exec shadow
1313

apps/server/Dockerfile.alpine.rootless

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

44
# Install native dependencies since we might be building cross-platform.
@@ -7,7 +7,7 @@ COPY ./docker/package.json ./docker/pnpm-workspace.yaml /usr/src/app/
77
# We have to use --no-frozen-lockfile due to CKEditor patches
88
RUN pnpm install --no-frozen-lockfile --prod && pnpm rebuild
99

10-
FROM node:24.11.0-alpine
10+
FROM node:24.11.1-alpine
1111
# Create a non-root user with configurable UID/GID
1212
ARG USER=trilium
1313
ARG UID=1001

apps/server/Dockerfile.rootless

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

44
# Install native dependencies since we might be building cross-platform.
@@ -7,7 +7,7 @@ COPY ./docker/package.json ./docker/pnpm-workspace.yaml /usr/src/app/
77
# We have to use --no-frozen-lockfile due to CKEditor patches
88
RUN pnpm install --no-frozen-lockfile --prod && pnpm rebuild
99

10-
FROM node:24.11.0-bullseye-slim
10+
FROM node:24.11.1-bullseye-slim
1111
# Create a non-root user with configurable UID/GID
1212
ARG USER=trilium
1313
ARG UID=1001

apps/website/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"preact": "10.27.2",
1515
"preact-iso": "2.11.0",
1616
"preact-render-to-string": "6.6.3",
17-
"react-i18next": "16.2.4"
17+
"react-i18next": "16.3.1"
1818
},
1919
"devDependencies": {
2020
"@preact/preset-vite": "2.10.2",

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"@playwright/test": "1.56.1",
4444
"@triliumnext/server": "workspace:*",
4545
"@types/express": "5.0.5",
46-
"@types/node": "24.10.0",
46+
"@types/node": "24.10.1",
4747
"@vitest/coverage-v8": "3.2.4",
4848
"@vitest/ui": "3.2.4",
4949
"chalk": "5.6.2",
@@ -83,7 +83,7 @@
8383
"url": "https://github.com/TriliumNext/Trilium/issues"
8484
},
8585
"homepage": "https://triliumnotes.org",
86-
"packageManager": "pnpm@10.21.0",
86+
"packageManager": "pnpm@10.22.0",
8787
"pnpm": {
8888
"patchedDependencies": {
8989
"@ckeditor/ckeditor5-mention": "patches/@ckeditor__ckeditor5-mention.patch",

0 commit comments

Comments
 (0)