Pandore/homarr
Public Access
1
0 Fork 0
Code Actions Activity

merge: resolve conflicts with origin/dev

Browse Source 
Take dev's newer dependency versions (tiptap 3.27.1, testcontainers 12.0.3).
Resolve beszel widget conflicts by keeping our approach (no per-widget
staleTime/refetchInterval/subscriptions, globals handle it).
This commit is contained in:
Thomas Camlong committed 2026-06-24 15:10:10 +02:00
2 parents 6416080b79 b6b7bea1dd
commit 18d6013f3f
11 files changed
+932 -804
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.github/workflows/deployment-docker-image.yml
+1 -1
View File
@@ -66,7 +66,7 @@ jobs:
- uses: actions/setup-node@v6
if: env.SKIP_RELEASE == 'false'
with:
node-version: 24.16.0
node-version: 24.17.0
package-manager-cache: false
- run: npm i -g pnpm
if: env.SKIP_RELEASE == 'false'
.mise.toml
+1 -1
View File
@@ -1,2 +1,2 @@
[tools]
node = "24.16.0"
node = "24.17.0"
.nvmrc
+1 -1
View File
@@ -1 +1 @@
24.16.0
24.17.0
Dockerfile
+1 -1
View File
@@ -1,4 +1,4 @@
FROM node:24.16.0-alpine AS base
FROM node:24.17.0-alpine AS base
FROM base AS builder
RUN apk add --no-cache libc6-compat
deployments/prebuilt-debian/Dockerfile
+1 -1
View File
@@ -1,4 +1,4 @@
FROM node:24.16.0-trixie AS base
FROM node:24.17.0-trixie AS base
WORKDIR /app
COPY package.json .
COPY pnpm-lock.yaml .
deployments/prebuilt-debian/package.json
+3 -3
View File
@@ -5,8 +5,8 @@
"better-sqlite3": "^12.10.0"
},
"engines": {
"node": ">=24.16.0",
"pnpm": ">=11.7.0"
"node": ">=24.17.0",
"pnpm": ">=11.8.0"
},
"packageManager": "pnpm@11.7.0"
"packageManager": "pnpm@11.8.0"
}
package.json
+3 -3
View File
@@ -61,10 +61,10 @@
"vitest": "catalog:"
},
"engines": {
"node": ">=24.16.0",
"pnpm": ">=11.7.0"
"node": ">=24.17.0",
"pnpm": ">=11.8.0"
},
"packageManager": "pnpm@11.7.0",
"packageManager": "pnpm@11.8.0",
"dependencies": {
"jsonpath-plus": "catalog:"
}
packages/request-handler/src/beszel.ts
+8 -8
View File
@@ -104,13 +104,13 @@ export const beszelAlertsRequestHandler = createIntegrationRequestHandler<
queryKey: "beszelAlerts",
});
const timePeriodConfig: Record<string, { type: string; perPage: number; cacheSeconds: number }> = {
"1m": { type: "1m", perPage: 60, cacheSeconds: 5 },
"1h": { type: "1m", perPage: 60, cacheSeconds: 60 },
"12h": { type: "10m", perPage: 72, cacheSeconds: 300 },
"24h": { type: "20m", perPage: 72, cacheSeconds: 600 },
"1w": { type: "1440m", perPage: 9, cacheSeconds: 1800 },
"30d": { type: "1440m", perPage: 32, cacheSeconds: 3600 },
const timePeriodConfig: Record<string, { type: string; perPage: number }> = {
"1m": { type: "1m", perPage: 60 },
"1h": { type: "1m", perPage: 60 },
"12h": { type: "10m", perPage: 72 },
"24h": { type: "20m", perPage: 72 },
"1w": { type: "480m", perPage: 21 },
"30d": { type: "480m", perPage: 90 },
};
export interface BeszelStatsData {
@@ -125,7 +125,7 @@ export const beszelStatsRequestHandler = createIntegrationRequestHandler<
>({
async requestAsync(integration, input) {
const start = performance.now();
const config = timePeriodConfig[input.timePeriod] ?? { type: "1m", perPage: 60, cacheSeconds: 60 };
const config = timePeriodConfig[input.timePeriod] ?? { type: "1m", perPage: 60 };
const instance = await createIntegrationAsync(integration);
const systemStats = await instance.getSystemStatsAsync(input.systemId, config.type, config.perPage);
const containerStats = input.includeDocker
pnpm-lock.yaml
Generated
+865 -737
View File
File diff suppressed because it is too large. Load diff
pnpm-workspace.yaml
+47 -47
View File
@@ -6,7 +6,7 @@ catalog:
"@auth/core": ^0.41.2
"@auth/drizzle-adapter": ^1.11.2
"@ctrl/deluge": ^8.0.0
"@ctrl/qbittorrent": ^9.12.2
"@ctrl/qbittorrent": ^9.14.0
"@ctrl/transmission": ^7.4.0
"@dnd-kit/core": ^6.3.1
"@dnd-kit/modifiers": ^9.0.0
@@ -14,7 +14,7 @@ catalog:
"@dnd-kit/utilities": ^3.2.2
"@drizzle-team/brocli": ^0.12.0
"@extractus/feed-extractor": 7.2.1
'@gfazioli/mantine-onboarding-tour': ^4.0.4
'@gfazioli/mantine-onboarding-tour': ^4.0.5
"@gitbeaker/rest": ^43.8.0
"@homarr/gridstack": ^1.12.0
"@homarr/node-unifi": ^2.6.0
@@ -22,21 +22,21 @@ catalog:
"@jellyfin/sdk": ^0.13.0
"@kubernetes/client-node": ^1.4.0
"@modelcontextprotocol/sdk": 1.29.0
"@mantine/charts": ^9.3.1
"@mantine/colors-generator": ^9.3.1
"@mantine/core": ^9.3.1
"@mantine/dates": ^9.3.1
"@mantine/dropzone": ^9.3.1
"@mantine/form": ^9.3.1
"@mantine/hooks": ^9.3.1
"@mantine/modals": ^9.3.1
"@mantine/notifications": ^9.3.1
"@mantine/spotlight": ^9.3.1
"@mantine/tiptap": ^9.3.1
"@mantine/charts": ^9.3.2
"@mantine/colors-generator": ^9.3.2
"@mantine/core": ^9.3.2
"@mantine/dates": ^9.3.2
"@mantine/dropzone": ^9.3.2
"@mantine/form": ^9.3.2
"@mantine/hooks": ^9.3.2
"@mantine/modals": ^9.3.2
"@mantine/notifications": ^9.3.2
"@mantine/spotlight": ^9.3.2
"@mantine/tiptap": ^9.3.2
"@next/eslint-plugin-next": 16.2.9
"@octokit/auth-app": ^8.2.0
"@paralleldrive/cuid2": ^3.3.0
"@playwright/test": ^1.60.0
"@playwright/test": ^1.61.0
"@semantic-release/changelog": ^6.0.3
"@semantic-release/commit-analyzer": ^13.0.1
"@semantic-release/git": ^10.0.1
@@ -50,25 +50,25 @@ catalog:
"@tanstack/react-query-devtools": ^5.101.0
"@tanstack/react-query-next-experimental": ^5.101.0
"@tanstack/react-query-persist-client": ^5.101.0
"@testcontainers/mysql": ^12.0.2
"@testcontainers/postgresql": ^12.0.2
"@testcontainers/redis": ^12.0.2
"@tiptap/extension-color": 3.27.0
"@tiptap/extension-highlight": 3.27.0
"@tiptap/extension-image": 3.27.0
"@tiptap/extension-link": ^3.27.0
"@tiptap/extension-placeholder": ^3.27.0
"@tiptap/extension-table": 3.27.0
"@tiptap/extension-table-cell": 3.27.0
"@tiptap/extension-table-header": 3.27.0
"@tiptap/extension-table-row": 3.27.0
"@tiptap/extension-task-item": 3.27.0
"@tiptap/extension-task-list": 3.27.0
"@tiptap/extension-text-align": 3.27.0
"@tiptap/extension-text-style": 3.27.0
"@tiptap/extension-underline": 3.27.0
"@tiptap/react": ^3.27.0
"@tiptap/starter-kit": ^3.27.0
"@testcontainers/mysql": ^12.0.3
"@testcontainers/postgresql": ^12.0.3
"@testcontainers/redis": ^12.0.3
"@tiptap/extension-color": 3.27.1
"@tiptap/extension-highlight": 3.27.1
"@tiptap/extension-image": 3.27.1
"@tiptap/extension-link": ^3.27.1
"@tiptap/extension-placeholder": ^3.27.1
"@tiptap/extension-table": 3.27.1
"@tiptap/extension-table-cell": 3.27.1
"@tiptap/extension-table-header": 3.27.1
"@tiptap/extension-table-row": 3.27.1
"@tiptap/extension-task-item": 3.27.1
"@tiptap/extension-task-list": 3.27.1
"@tiptap/extension-text-align": 3.27.1
"@tiptap/extension-text-style": 3.27.1
"@tiptap/extension-underline": 3.27.1
"@tiptap/react": ^3.27.1
"@tiptap/starter-kit": ^3.27.1
"@trpc/client": ^11.17.0
"@trpc/next": ^11.17.0
"@trpc/react-query": ^11.17.0
@@ -89,15 +89,15 @@ catalog:
"@types/prismjs": ^1.26.6
"@types/react": 19.2.17
"@types/react-dom": 19.2.3
"@scalar/api-reference-react": ^0.9.46
"@scalar/api-reference-react": ^0.9.47
"@types/video.js": ^7.3.58
"@types/ws": ^8.18.1
"@types/xml2js": ^0.4.14
posthog-js: ^1.255.0
posthog-js: ^1.390.2
posthog-node: ^4.18.0
"@vitejs/plugin-react": ^6.0.2
"@vitest/coverage-v8": ^4.1.8
"@vitest/ui": ^4.1.8
"@vitest/coverage-v8": ^4.1.9
"@vitest/ui": ^4.1.9
"@xterm/addon-canvas": ^0.7.0
"@xterm/addon-fit": 0.11.0
"@xterm/xterm": ^6.0.0
@@ -126,7 +126,7 @@ catalog:
drizzle-orm: ^0.45.2
drizzle-zod: ^0.8.3
esbuild: ^0.28.0
fast-xml-parser: ^5.8.0
fast-xml-parser: ^5.9.2
fastify: ^5.8.5
flag-icons: ^7.5.0
glob: ^13.0.6
@@ -139,8 +139,8 @@ catalog:
jsonpath-plus: ^10.4.0
ldapts: 8.1.8
lodash.clonedeep: ^4.5.0
lucide-react: ^1.20.0
"mantine-contextmenu": ^9.3.0
lucide-react: ^1.21.0
"mantine-contextmenu": ^9.3.1
mantine-datatable: ^9.3.0
mantine-react-table: npm:mantine-react-table-open@9.0.3
mcp-handler: ^1.1.0
@@ -151,9 +151,9 @@ catalog:
next-intl: 4.13.0
node-loader: ^2.1.0
octokit: ^5.0.5
oxfmt: ^0.54.0
oxlint: ^1.69.0
pg: ^8.21.0
oxfmt: ^0.55.0
oxlint: ^1.70.0
pg: ^8.22.0
postcss-preset-mantine: ^1.18.0
prismjs: ^1.30.0
proxmox-api: 1.1.1
@@ -170,7 +170,7 @@ catalog:
semver-parser: ^4.2.1
superjson: 2.2.6
svgson: ^5.3.1
testcontainers: ^12.0.2
testcontainers: ^12.0.3
timezones-ical-library: ^2.2.0
trpc-to-mcp: ^1.3.2
trpc-to-openapi: ^3.3.0
@@ -183,7 +183,7 @@ catalog:
use-deep-compare-effect: ^1.8.1
video.js: ^8.23.8
vite-tsconfig-paths: ^6.1.1
vitest: ^4.1.8
vitest: ^4.1.9
winston: 3.19.0
ws: ^8.21.0
xml2js: ^0.6.2
@@ -212,9 +212,9 @@ overrides:
"brace-expansion@>=1.0.0 <=1.1.11": ">=5.0.6"
"esbuild@<=0.24.2": ">=0.28.0"
"form-data@>=4.0.0 <4.0.4": ">=4.0.6"
"hono@<4.6.5": ">=4.12.25"
"hono@<4.6.5": ">=4.12.26"
"linkifyjs@<4.3.2": ">=4.3.3"
"nanoid@>=4.0.0 <5.0.9": ">=5.1.11"
"nanoid@>=4.0.0 <5.0.9": ">=5.1.14"
"prismjs@<1.30.0": ">=1.30.0"
"proxmox-api>undici": "7.27.1"
"react-is": "^19.2.7"
tooling/github/setup/action.yml
+1 -1
View File
@@ -7,7 +7,7 @@ runs:
- uses: pnpm/action-setup@v6
- uses: actions/setup-node@v6
with:
node-version: 24.16.0
node-version: 24.17.0
cache: "pnpm"
- shell: bash