Skip to content

Commit 796129b

Browse files
Merge pull request #464 from DefGuard/release/1.4
Release/1.4
2 parents 02be5d5 + fc5cb13 commit 796129b

File tree

23 files changed

+868
-2987
lines changed

23 files changed

+868
-2987
lines changed

.github/workflows/lint.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,6 @@ jobs:
4848

4949
- name: Check TSC
5050
run: pnpm tsc
51+
52+
- name: Audit
53+
run: pnpm audit --prod

.github/workflows/release.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ jobs:
3838
with:
3939
name: wireguard-go-x86_64-apple-darwin
4040
path: wireguard-go
41+
4142
create-release:
4243
name: create-release
4344
runs-on: self-hosted
@@ -50,6 +51,7 @@ jobs:
5051
with:
5152
draft: true
5253
generate_release_notes: true
54+
5355
build-linux:
5456
needs:
5557
- create-release

.github/workflows/test.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,5 +54,9 @@ jobs:
5454
mkdir ../dist
5555
rustup component add clippy
5656
cargo clippy --all-targets --all-features -- -D warnings
57+
- name: Run cargo deny
58+
uses: EmbarkStudios/cargo-deny-action@v2
59+
with:
60+
manifest-path: ./src-tauri/Cargo.toml
5761
- name: Run tests
5862
run: cargo test --locked --no-fail-fast

flake.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@
6565
export OPENSSL_INCLUDE_DIR="${openssl.dev}/include/openssl"
6666
export OPENSSL_LIB_DIR="${openssl.out}/lib"
6767
export OPENSSL_ROOT_DIR="${openssl.out}"
68+
# https://discourse.nixos.org/t/which-package-includes-org-gtk-gtk4-settings-filechooser/38063/12
69+
export XDG_DATA_DIRS="${gtk3}/share/gsettings-schemas/gtk+3-${gtk3.dev.version}:$XDG_DATA_DIRS"
6870
export RUST_SRC_PATH="${toolchain}/lib/rustlib/src/rust/library"
6971
'';
7072
};

package.json

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "defguard-client",
33
"private": false,
4-
"version": "1.2.4",
4+
"version": "1.4.0",
55
"type": "module",
66
"scripts": {
77
"dev": "npm-run-all --parallel vite typesafe-i18n",
@@ -42,11 +42,10 @@
4242
"dependencies": {
4343
"@floating-ui/react": "^0.26.28",
4444
"@hookform/resolvers": "^3.10.0",
45-
"@ladle/react": "^4.1.2",
4645
"@react-hook/resize-observer": "^2.0.2",
4746
"@stablelib/base64": "^1.0.1",
4847
"@stablelib/x25519": "^1.0.3",
49-
"@tanstack/query-core": "^5.74.3",
48+
"@tanstack/query-core": "^5.76.0",
5049
"@tanstack/react-virtual": "3.0.0-beta.54",
5150
"@tauri-apps/api": "^1.6.0",
5251
"@types/byte-size": "^8.1.2",
@@ -61,7 +60,7 @@
6160
"file-saver": "^2.0.5",
6261
"framer-motion": "^10.18.0",
6362
"get-text-width": "^1.0.3",
64-
"html-react-parser": "^5.2.3",
63+
"html-react-parser": "^5.2.5",
6564
"itertools": "^2.4.1",
6665
"lodash-es": "^4.17.21",
6766
"merge-refs": "^1.3.0",
@@ -72,55 +71,56 @@
7271
"react-auth-code-input": "^3.2.1",
7372
"react-click-away-listener": "^2.4.0",
7473
"react-dom": "^18.3.1",
75-
"react-hook-form": "^7.55.0",
74+
"react-hook-form": "^7.56.4",
7675
"react-loading-skeleton": "^3.5.0",
7776
"react-markdown": "^9.1.0",
7877
"react-qr-code": "^2.0.15",
7978
"react-router-dom": "^6.30.0",
8079
"react-virtualized-auto-sizer": "^1.0.26",
81-
"recharts": "^2.15.2",
80+
"recharts": "^2.15.3",
8281
"rehype-sanitize": "^6.0.0",
8382
"rxjs": "^7.8.2",
8483
"tauri-plugin-log-api": "github:tauri-apps/tauri-plugin-log",
8584
"tauri-plugin-window-state-api": "github:tauri-apps/tauri-plugin-window-state#v1",
8685
"use-breakpoint": "^4.0.6",
87-
"zod": "^3.24.2",
88-
"zustand": "^5.0.3"
86+
"zod": "^3.24.4",
87+
"zustand": "^5.0.4"
8988
},
9089
"devDependencies": {
9190
"@hookform/devtools": "^4.4.0",
9291
"@svgr/cli": "^8.1.0",
93-
"@tanstack/react-query": "^5.74.3",
94-
"@tanstack/react-query-devtools": "^5.74.3",
92+
"@tanstack/react-query": "^5.76.1",
93+
"@tanstack/react-query-devtools": "^5.76.1",
9594
"@tauri-apps/cli": "^1.6.3",
9695
"@types/file-saver": "^2.0.7",
9796
"@types/lodash-es": "^4.17.12",
98-
"@types/node": "^20.17.30",
99-
"@types/react": "^18.3.20",
100-
"@types/react-dom": "^18.3.6",
97+
"@types/node": "^20.17.48",
98+
"@types/react": "^18.3.21",
99+
"@types/react-dom": "^18.3.7",
101100
"@typescript-eslint/eslint-plugin": "^6.21.0",
102101
"@typescript-eslint/parser": "^6.21.0",
103-
"@vitejs/plugin-react": "^4.4.0",
102+
"@vitejs/plugin-react": "^4.4.1",
104103
"@vitejs/plugin-react-swc": "^3.9.0",
105104
"autoprefixer": "^10.4.21",
106105
"eslint": "^8.57.1",
107106
"eslint-config-prettier": "^9.1.0",
108107
"eslint-plugin-import": "^2.31.0",
109-
"eslint-plugin-prettier": "^5.2.6",
108+
"eslint-plugin-prettier": "^5.4.0",
110109
"eslint-plugin-react": "^7.37.5",
111110
"eslint-plugin-react-hooks": "^4.6.2",
112-
"eslint-plugin-react-refresh": "^0.4.19",
111+
"eslint-plugin-react-refresh": "^0.4.20",
113112
"eslint-plugin-simple-import-sort": "^10.0.0",
114113
"npm-run-all": "^4.1.5",
115114
"postcss": "^8.5.3",
116-
"sass": "^1.86.3",
115+
"prettier": "^3.5.3",
116+
"sass": "~1.70.0",
117117
"typedoc": "^0.25.13",
118118
"typesafe-i18n": "^5.26.2",
119119
"typescript": "^5.8.3",
120120
"typescript-eslint-language-service": "^5.0.5",
121-
"vite": "^4.5.13"
121+
"vite": "^4.5.14"
122122
},
123123
"volta": {
124124
"node": "20.5.1"
125125
}
126-
}
126+
}

0 commit comments

Comments
 (0)