Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-macos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
node-version: "24"
cache: "pnpm"

- uses: pnpm/action-setup@v4
- uses: pnpm/action-setup@v5
with:
version: 10
run_install: false
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,12 @@ jobs:
- uses: actions/checkout@v6
with:
submodules: recursive
- uses: actions/setup-node@v4

- uses: actions/setup-node@v6
with:
node-version: "22"
node-version: "24"

- uses: pnpm/action-setup@v4
- uses: pnpm/action-setup@v5
with:
version: 10
run_install: false
Expand All @@ -41,7 +42,7 @@ jobs:
run: |
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV

- uses: actions/cache@v4
- uses: actions/cache@v5
name: Setup pnpm cache
with:
path: ${{ env.STORE_PATH }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/make-binary.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: Rename client binary
run: mv src-tauri/target/release/${{ inputs.flavor }} ${{ inputs.flavor }}-${{ inputs.system }}-${{ inputs.binary_arch }}-${{ github.ref_name }}
- name: Tar client binary
uses: a7ul/tar-action@v1.1.0
uses: a7ul/tar-action@v1.2.0
with:
command: c
files: |
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ jobs:
- uses: actions/checkout@v6
with:
submodules: recursive
- uses: pnpm/action-setup@v4
- uses: pnpm/action-setup@v5
with:
version: 10.17
version: 10
run_install: false
- uses: actions/setup-node@v5
- uses: actions/setup-node@v6
with:
node-version: "24"
- name: Get pnpm store directory
Expand All @@ -73,7 +73,7 @@ jobs:
VERSION=$(echo ${GITHUB_REF_NAME#v} | cut -d '-' -f1)
echo Version: $VERSION
echo "VERSION=$VERSION" >> ${GITHUB_ENV}
- uses: actions/cache@v4
- uses: actions/cache@v5
name: Setup pnpm cache
with:
path: ${{ env.STORE_PATH }}
Expand Down Expand Up @@ -109,7 +109,7 @@ jobs:
fpm_args: "dg-linux-${{ env.VERSION }}_${{ matrix.deb_arch }}=/usr/sbin/dg dg.service=/usr/lib/systemd/system/dg.service src-tauri/cli/.env=/etc/defguard/dg.conf"
fpm_opts: "--architecture ${{ matrix.binary_arch }} --debug --output-type deb --version ${{ env.VERSION }} --package dg-linux-${{ env.VERSION }}_${{ matrix.deb_arch }}_ubuntu-22-04-lts.deb"
- name: Upload DEB
uses: actions/upload-release-asset@v1.0.2
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
Expand Down Expand Up @@ -147,18 +147,18 @@ jobs:
VERSION=$(echo ${GITHUB_REF_NAME#v} | cut -d '-' -f1)
echo Version: $VERSION
echo "VERSION=$VERSION" >> ${GITHUB_ENV}
- uses: actions/setup-node@v5
- uses: actions/setup-node@v6
with:
node-version: "24"
- uses: pnpm/action-setup@v4
- uses: pnpm/action-setup@v5
with:
version: 10.17
version: 10
run_install: false
- name: Get pnpm store directory
shell: bash
run: |
echo "STORE_PATH=$(pnpm store path --silent)" >> ${GITHUB_ENV}
- uses: actions/cache@v4
- uses: actions/cache@v5
name: Setup pnpm cache
with:
path: ${{ env.STORE_PATH }}
Expand Down Expand Up @@ -317,14 +317,14 @@ jobs:
- uses: actions/setup-node@v6
with:
node-version: "24"
- uses: pnpm/action-setup@v4
- uses: pnpm/action-setup@v5
with:
version: 10
run_install: false
- name: Get pnpm store directory
shell: bash
run: echo "STORE_PATH=$(pnpm store path --silent)" >> ${GITHUB_ENV}
- uses: actions/cache@v4
- uses: actions/cache@v5
name: Setup pnpm cache
with:
path: ${{ env.STORE_PATH }}
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,14 @@ jobs:
rustup component add clippy
cargo clippy --all-targets --all-features -- -D warnings

- name: Install cargo extensions
uses: taiki-e/install-action@v2
with:
tool: cargo-deny

- name: Run cargo deny
working-directory: ./src-tauri
run: |
cargo install cargo-deny --version 0.18.6
cargo deny check
run: cargo deny check

- name: Run tests
run: cargo test --locked --no-fail-fast
14 changes: 10 additions & 4 deletions biome.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://biomejs.dev/schemas/2.4.4/schema.json",
"$schema": "https://biomejs.dev/schemas/2.4.10/schema.json",
"vcs": {
"enabled": false,
"clientKind": "git",
Expand Down Expand Up @@ -27,7 +27,9 @@
"bracketSpacing": true,
"expand": "auto",
"useEditorconfig": true,
"includes": ["./src/**"]
"includes": [
"./src/**"
]
},
"linter": {
"enabled": true,
Expand Down Expand Up @@ -68,7 +70,9 @@
"noArrayIndexKey": "off"
}
},
"includes": ["src/**"]
"includes": [
"src/**"
]
},
"javascript": {
"formatter": {
Expand All @@ -90,7 +94,9 @@
},
"overrides": [
{
"includes": ["**/*.js"]
"includes": [
"**/*.js"
]
}
],
"assist": {
Expand Down
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@
"@react-hook/resize-observer": "^2.0.2",
"@stablelib/base64": "^2.0.1",
"@stablelib/x25519": "^2.0.1",
"@tanstack/query-core": "^5.91.2",
"@tanstack/react-virtual": "3.13.18",
"@tanstack/query-core": "^5.95.2",
"@tanstack/react-virtual": "^3.13.23",
"@tauri-apps/api": "^2.10.1",
"@tauri-apps/plugin-clipboard-manager": "^2.3.2",
"@tauri-apps/plugin-deep-link": "^2.4.7",
Expand Down Expand Up @@ -96,27 +96,27 @@
"react-auth-code-input": "^3.2.1",
"react-click-away-listener": "^2.4.0",
"react-dom": "^19.2.4",
"react-hook-form": "^7.71.2",
"react-hook-form": "^7.72.0",
"react-hotkeys-hook": "^5.2.4",
"react-loading-skeleton": "^3.5.0",
"react-markdown": "^10.1.0",
"react-qr-code": "^2.0.18",
"react-router-dom": "^6.30.3",
"react-use-websocket": "^4.13.0",
"react-virtualized-auto-sizer": "^1.0.26",
"recharts": "^3.8.0",
"recharts": "^3.8.1",
"rehype-sanitize": "^6.0.0",
"rxjs": "^7.8.2",
"use-breakpoint": "^4.0.10",
"zod": "^3.25.76",
"zustand": "^5.0.12"
},
"devDependencies": {
"@biomejs/biome": "^2.4.8",
"@biomejs/biome": "^2.4.10",
"@hookform/devtools": "^4.4.0",
"@svgr/cli": "^8.1.0",
"@tanstack/react-query": "^5.91.2",
"@tanstack/react-query-devtools": "^5.91.3",
"@tanstack/react-query": "^5.95.2",
"@tanstack/react-query-devtools": "^5.95.2",
"@tauri-apps/cli": "^2.10.1",
"@types/file-saver": "^2.0.7",
"@types/lodash-es": "^4.17.12",
Expand All @@ -130,7 +130,7 @@
"postcss": "^8.5.8",
"prettier": "^3.8.1",
"sass": "~1.92.1",
"typedoc": "^0.28.17",
"typedoc": "^0.28.18",
"typesafe-i18n": "^5.27.1",
"typescript": "^5.9.3",
"vite": "^7.3.1"
Expand Down
Loading
Loading