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
3 changes: 3 additions & 0 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,6 @@ jobs:

- name: Check TSC
run: pnpm tsc

- name: Audit
run: pnpm audit --prod
2 changes: 2 additions & 0 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ jobs:
with:
name: wireguard-go-x86_64-apple-darwin
path: wireguard-go

create-release:
name: create-release
runs-on: self-hosted
Expand All @@ -50,6 +51,7 @@ jobs:
with:
draft: true
generate_release_notes: true

build-linux:
needs:
- create-release
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,9 @@ jobs:
mkdir ../dist
rustup component add clippy
cargo clippy --all-targets --all-features -- -D warnings
- name: Run cargo deny
uses: EmbarkStudios/cargo-deny-action@v2
with:
manifest-path: ./src-tauri/Cargo.toml
- name: Run tests
run: cargo test --locked --no-fail-fast
2 changes: 2 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@
export OPENSSL_INCLUDE_DIR="${openssl.dev}/include/openssl"
export OPENSSL_LIB_DIR="${openssl.out}/lib"
export OPENSSL_ROOT_DIR="${openssl.out}"
# https://discourse.nixos.org/t/which-package-includes-org-gtk-gtk4-settings-filechooser/38063/12
export XDG_DATA_DIRS="${gtk3}/share/gsettings-schemas/gtk+3-${gtk3.dev.version}:$XDG_DATA_DIRS"
export RUST_SRC_PATH="${toolchain}/lib/rustlib/src/rust/library"
'';
};
Expand Down
38 changes: 19 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "defguard-client",
"private": false,
"version": "1.2.4",
"version": "1.4.0",
"type": "module",
"scripts": {
"dev": "npm-run-all --parallel vite typesafe-i18n",
Expand Down Expand Up @@ -42,11 +42,10 @@
"dependencies": {
"@floating-ui/react": "^0.26.28",
"@hookform/resolvers": "^3.10.0",
"@ladle/react": "^4.1.2",
"@react-hook/resize-observer": "^2.0.2",
"@stablelib/base64": "^1.0.1",
"@stablelib/x25519": "^1.0.3",
"@tanstack/query-core": "^5.74.3",
"@tanstack/query-core": "^5.76.0",
"@tanstack/react-virtual": "3.0.0-beta.54",
"@tauri-apps/api": "^1.6.0",
"@types/byte-size": "^8.1.2",
Expand All @@ -61,7 +60,7 @@
"file-saver": "^2.0.5",
"framer-motion": "^10.18.0",
"get-text-width": "^1.0.3",
"html-react-parser": "^5.2.3",
"html-react-parser": "^5.2.5",
"itertools": "^2.4.1",
"lodash-es": "^4.17.21",
"merge-refs": "^1.3.0",
Expand All @@ -72,55 +71,56 @@
"react-auth-code-input": "^3.2.1",
"react-click-away-listener": "^2.4.0",
"react-dom": "^18.3.1",
"react-hook-form": "^7.55.0",
"react-hook-form": "^7.56.4",
"react-loading-skeleton": "^3.5.0",
"react-markdown": "^9.1.0",
"react-qr-code": "^2.0.15",
"react-router-dom": "^6.30.0",
"react-virtualized-auto-sizer": "^1.0.26",
"recharts": "^2.15.2",
"recharts": "^2.15.3",
"rehype-sanitize": "^6.0.0",
"rxjs": "^7.8.2",
"tauri-plugin-log-api": "github:tauri-apps/tauri-plugin-log",
"tauri-plugin-window-state-api": "github:tauri-apps/tauri-plugin-window-state#v1",
"use-breakpoint": "^4.0.6",
"zod": "^3.24.2",
"zustand": "^5.0.3"
"zod": "^3.24.4",
"zustand": "^5.0.4"
},
"devDependencies": {
"@hookform/devtools": "^4.4.0",
"@svgr/cli": "^8.1.0",
"@tanstack/react-query": "^5.74.3",
"@tanstack/react-query-devtools": "^5.74.3",
"@tanstack/react-query": "^5.76.1",
"@tanstack/react-query-devtools": "^5.76.1",
"@tauri-apps/cli": "^1.6.3",
"@types/file-saver": "^2.0.7",
"@types/lodash-es": "^4.17.12",
"@types/node": "^20.17.30",
"@types/react": "^18.3.20",
"@types/react-dom": "^18.3.6",
"@types/node": "^20.17.48",
"@types/react": "^18.3.21",
"@types/react-dom": "^18.3.7",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
"@vitejs/plugin-react": "^4.4.0",
"@vitejs/plugin-react": "^4.4.1",
"@vitejs/plugin-react-swc": "^3.9.0",
"autoprefixer": "^10.4.21",
"eslint": "^8.57.1",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-prettier": "^5.2.6",
"eslint-plugin-prettier": "^5.4.0",
"eslint-plugin-react": "^7.37.5",
"eslint-plugin-react-hooks": "^4.6.2",
"eslint-plugin-react-refresh": "^0.4.19",
"eslint-plugin-react-refresh": "^0.4.20",
"eslint-plugin-simple-import-sort": "^10.0.0",
"npm-run-all": "^4.1.5",
"postcss": "^8.5.3",
"sass": "^1.86.3",
"prettier": "^3.5.3",
"sass": "~1.70.0",
"typedoc": "^0.25.13",
"typesafe-i18n": "^5.26.2",
"typescript": "^5.8.3",
"typescript-eslint-language-service": "^5.0.5",
"vite": "^4.5.13"
"vite": "^4.5.14"
},
"volta": {
"node": "20.5.1"
}
}
}
Loading