Skip to content

Commit cb7895a

Browse files
Merge branch 'dev' into 2571-feat-automating-documentation-versioning-on-release-using-github-action
2 parents 4b2b532 + 371803a commit cb7895a

File tree

390 files changed

+27276
-6888
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

390 files changed

+27276
-6888
lines changed

.dockerignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
Dockerfile
22
.dockerignore
33
node_modules
4+
**/node_modules
45
npm-debug.log
56
README.md
67
.next

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,14 @@ body:
3131
label: Version
3232
description: What version of Homarr are you running?
3333
options:
34+
- 1.20.0
35+
- 1.19.1
36+
- 1.19.0
37+
- 1.18.0
38+
- 1.17.0
39+
- 1.16.0
40+
- 1.15.0
41+
- 1.14.0
3442
- 1.13.1
3543
- 1.13.0
3644
- 1.12.0

.github/workflows/automatic-approval.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
jobs:
77
approve-automatic-prs:
88
runs-on: ubuntu-latest
9-
if: github.actor_id == 158783068 || github.actor_id == 190541745 # Id of renovate bot and crowdin bot see https://api.github.com/users/homarr-renovate%5Bbot%5D and https://api.github.com/users/homarr-crowdin%5Bbot%5D
9+
if: github.actor_id == 158783068 || github.actor_id == 190541745 || github.actor_id == 210161987 # Id of renovate bot and crowdin bot see https://api.github.com/users/homarr-renovate%5Bbot%5D and https://api.github.com/users/homarr-crowdin%5Bbot%5D and https://api.github.com/users/homarr-update-contributors%5Bbot%5D
1010
steps:
1111
- name: Checkout code
1212
uses: actions/checkout@v4
Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
name: Update Contributors
2+
3+
on:
4+
schedule:
5+
- cron: "0 12 * * FRI" # At 12:00 on Friday.
6+
workflow_dispatch:
7+
8+
env:
9+
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
10+
CROWDIN_TOKEN: "${{ secrets.CROWDIN_UPDATE_CONTRIBUTORS_TOKEN }}"
11+
12+
permissions:
13+
contents: write
14+
15+
jobs:
16+
update-contributors:
17+
runs-on: ubuntu-latest
18+
strategy:
19+
matrix:
20+
node-version: [22]
21+
steps:
22+
- name: Obtain token
23+
id: obtainToken
24+
uses: tibdex/github-app-token@v2
25+
with:
26+
private_key: ${{ secrets.HOMARR_UPDATE_CONTRIBUTORS_PRIVATE_KEY }}
27+
app_id: ${{ vars.HOMARR_UPDATE_CONTRIBUTORS_APP_ID }}
28+
29+
- name: Checkout repository
30+
uses: actions/checkout@v4
31+
env:
32+
GITHUB_TOKEN: ${{ steps.obtainToken.outputs.token }}
33+
34+
- name: Use Node.js ${{ matrix.node-version }}
35+
uses: actions/setup-node@v4
36+
with:
37+
node-version: ${{ matrix.node-version }}
38+
39+
- name: Run update script
40+
run: node ./scripts/update-contributors.mjs
41+
42+
- name: Commit changes
43+
env:
44+
GITHUB_TOKEN: ${{ steps.obtainToken.outputs.token }}
45+
run: |
46+
git config --global user.email "210161987+homarr-update-contributors[bot]@users.noreply.github.com"
47+
git config --global user.name "Homarr Update Contributors"
48+
git add .
49+
git commit -m "chore: update contributors"
50+
51+
- name: Create Pull Request
52+
id: create-pull-request
53+
uses: peter-evans/create-pull-request@v7
54+
with:
55+
token: ${{ steps.obtainToken.outputs.token }}
56+
branch: update-contributors
57+
base: dev
58+
title: "chore: update contributors"
59+
delete-branch: true
60+
body: |
61+
This PR updates the contributors list in the static-data directory.
62+
63+
- name: Install GitHub CLI
64+
run: sudo apt-get install -y gh
65+
66+
- name: Enable auto-merge
67+
env:
68+
GITHUB_TOKEN: ${{ steps.obtainToken.outputs.token }}
69+
run: |
70+
gh pr merge ${{steps.create-pull-request.outputs.pull-request-number}} --auto --squash

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
22.14.0
1+
22.15.1

.vscode/settings.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
"Sabnzbd",
2727
"SeDemal",
2828
"Sonarr",
29+
"sslverify",
2930
"superjson",
3031
"tabler",
3132
"trpc",

CHANGELOG.md

Lines changed: 240 additions & 0 deletions
Large diffs are not rendered by default.

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:22.14.0-alpine AS base
1+
FROM node:22.15.1-alpine AS base
22

33
FROM base AS builder
44
RUN apk add --no-cache libc6-compat

apps/nextjs/package.json

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"scripts": {
77
"build": "pnpm with-env next build",
88
"clean": "git clean -xdf .next .turbo node_modules",
9-
"dev": "pnpm with-env next dev --turbopack",
9+
"dev": "pnpm with-env next dev",
1010
"format": "prettier --check . --ignore-path ../../.gitignore",
1111
"lint": "eslint",
1212
"start": "pnpm with-env next start",
@@ -48,59 +48,59 @@
4848
"@homarr/ui": "workspace:^0.1.0",
4949
"@homarr/validation": "workspace:^0.1.0",
5050
"@homarr/widgets": "workspace:^0.1.0",
51-
"@mantine/colors-generator": "^7.17.3",
52-
"@mantine/core": "^7.17.3",
53-
"@mantine/dropzone": "^7.17.3",
54-
"@mantine/hooks": "^7.17.3",
55-
"@mantine/modals": "^7.17.3",
56-
"@mantine/tiptap": "^7.17.3",
51+
"@mantine/colors-generator": "^8.0.1",
52+
"@mantine/core": "^8.0.1",
53+
"@mantine/dropzone": "^8.0.1",
54+
"@mantine/hooks": "^8.0.1",
55+
"@mantine/modals": "^8.0.1",
56+
"@mantine/tiptap": "^8.0.1",
5757
"@million/lint": "1.0.14",
58-
"@tabler/icons-react": "^3.31.0",
59-
"@tanstack/react-query": "^5.71.5",
60-
"@tanstack/react-query-devtools": "^5.71.5",
61-
"@tanstack/react-query-next-experimental": "^5.71.5",
62-
"@trpc/client": "^11.0.2",
63-
"@trpc/next": "^11.0.2",
64-
"@trpc/react-query": "^11.0.2",
65-
"@trpc/server": "^11.0.2",
58+
"@tabler/icons-react": "^3.33.0",
59+
"@tanstack/react-query": "^5.76.1",
60+
"@tanstack/react-query-devtools": "^5.76.1",
61+
"@tanstack/react-query-next-experimental": "^5.76.1",
62+
"@trpc/client": "^11.1.2",
63+
"@trpc/next": "^11.1.2",
64+
"@trpc/react-query": "^11.1.2",
65+
"@trpc/server": "^11.1.2",
6666
"@xterm/addon-canvas": "^0.7.0",
6767
"@xterm/addon-fit": "0.10.0",
6868
"@xterm/xterm": "^5.5.0",
6969
"chroma-js": "^3.1.2",
7070
"clsx": "^2.1.1",
7171
"dayjs": "^1.11.13",
72-
"dotenv": "^16.4.7",
72+
"dotenv": "^16.5.0",
7373
"flag-icons": "^7.3.2",
74-
"glob": "^11.0.1",
75-
"jotai": "^2.12.2",
74+
"glob": "^11.0.2",
75+
"jotai": "^2.12.4",
7676
"mantine-react-table": "2.0.0-beta.9",
77-
"next": "15.2.4",
77+
"next": "15.3.2",
7878
"postcss-preset-mantine": "^1.17.0",
7979
"prismjs": "^1.30.0",
8080
"react": "19.1.0",
8181
"react-dom": "19.1.0",
82-
"react-error-boundary": "^5.0.0",
82+
"react-error-boundary": "^6.0.0",
8383
"react-simple-code-editor": "^0.14.1",
84-
"sass": "^1.86.3",
84+
"sass": "^1.89.0",
8585
"superjson": "2.2.2",
86-
"swagger-ui-react": "^5.20.5",
86+
"swagger-ui-react": "^5.21.0",
8787
"use-deep-compare-effect": "^1.8.1",
88-
"zod": "^3.24.2"
88+
"zod": "^3.25.17"
8989
},
9090
"devDependencies": {
9191
"@homarr/eslint-config": "workspace:^0.2.0",
9292
"@homarr/prettier-config": "workspace:^0.1.0",
9393
"@homarr/tsconfig": "workspace:^0.1.0",
9494
"@types/chroma-js": "3.1.1",
95-
"@types/node": "^22.14.0",
95+
"@types/node": "^22.15.21",
9696
"@types/prismjs": "^1.26.5",
97-
"@types/react": "19.1.0",
98-
"@types/react-dom": "19.1.1",
97+
"@types/react": "19.1.5",
98+
"@types/react-dom": "19.1.5",
9999
"@types/swagger-ui-react": "^5.18.0",
100100
"concurrently": "^9.1.2",
101-
"eslint": "^9.23.0",
101+
"eslint": "^9.27.0",
102102
"node-loader": "^2.1.0",
103103
"prettier": "^3.5.3",
104-
"typescript": "^5.8.2"
104+
"typescript": "^5.8.3"
105105
}
106106
}

apps/nextjs/src/app/[locale]/auth/invite/[id]/_registration-form.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { useZodForm } from "@homarr/form";
99
import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
1010
import { useScopedI18n } from "@homarr/translation/client";
1111
import { CustomPasswordInput } from "@homarr/ui";
12-
import { validation } from "@homarr/validation";
12+
import { userRegistrationSchema } from "@homarr/validation/user";
1313

1414
interface RegistrationFormProps {
1515
invite: {
@@ -22,15 +22,15 @@ export const RegistrationForm = ({ invite }: RegistrationFormProps) => {
2222
const t = useScopedI18n("user");
2323
const router = useRouter();
2424
const { mutate, isPending } = clientApi.user.register.useMutation();
25-
const form = useZodForm(validation.user.registration, {
25+
const form = useZodForm(userRegistrationSchema, {
2626
initialValues: {
2727
username: "",
2828
password: "",
2929
confirmPassword: "",
3030
},
3131
});
3232

33-
const handleSubmit = (values: z.infer<typeof validation.user.registration>) => {
33+
const handleSubmit = (values: z.infer<typeof userRegistrationSchema>) => {
3434
mutate(
3535
{
3636
...values,

0 commit comments

Comments
 (0)