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
9 changes: 4 additions & 5 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,21 @@ charset = utf-8
end_of_line = lf
insert_final_newline = true
indent_style = space
indent_size = 2

[*.{ts,tsx}]
indent_style = space
indent_size = 2
rulers = 90
rulers = 100

[*.{scss}]
indent_style = space
indent_size = 2
rulers = 90
rulers = 100

[*.{html}]
indent_style = space
indent_size = 2
rulers = 90
rulers = 100

[*.{json,yaml}]
indent_style = space
Expand All @@ -30,4 +29,4 @@ rulers = 80
[*.{rs}]
indent_style = space
indent_size = 4
rulers = 90
rulers = 100
34 changes: 17 additions & 17 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 'Build app and create release'
name: "Build app and create release"
on:
push:
tags:
Expand All @@ -20,7 +20,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: '1.24'
go-version: "1.24"
- name: Build wireguard-go binary
run: make
env:
Expand Down Expand Up @@ -73,15 +73,15 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
submodules: 'recursive'
submodules: "recursive"
- name: Write release version
run: |
VERSION=$(echo ${GITHUB_REF_NAME#v} | cut -d '-' -f1)
echo Version: $VERSION
echo "VERSION=$VERSION" >> $GITHUB_ENV
- uses: actions/setup-node@v3
with:
node-version: '20'
node-version: "20"
- uses: pnpm/action-setup@v2
with:
version: 9
Expand All @@ -103,7 +103,7 @@ jobs:
- name: Install Linux dependencies
run: |
sudo apt-get update
sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf libssl-dev unzip protobuf-compiler libprotobuf-dev rpm
sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.1-dev libayatana-appindicator3-dev librsvg2-dev patchelf libssl-dev libxdo-dev unzip protobuf-compiler libprotobuf-dev rpm
- name: Build packages
uses: tauri-apps/tauri-action@v0
env:
Expand Down Expand Up @@ -187,8 +187,8 @@ jobs:
- name: Build dg deb
uses: defGuard/fpm-action@main
with:
fpm_args: 'dg-linux-${{ matrix.binary_arch }}-${{ github.ref_name }}=/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-${{ matrix.binary_arch }}-${{ github.ref_name }}.deb'
fpm_args: "dg-linux-${{ matrix.binary_arch }}-${{ github.ref_name }}=/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-${{ matrix.binary_arch }}-${{ github.ref_name }}.deb"
- name: Upload DEB
uses: actions/upload-release-asset@v1.0.2
env:
Expand All @@ -201,8 +201,8 @@ jobs:
- name: Build dg rpm
uses: defGuard/fpm-action@main
with:
fpm_args: 'dg-linux-${{ matrix.binary_arch }}-${{ github.ref_name }}=/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 rpm --version ${{ env.VERSION }} --package dg-linux-${{ matrix.binary_arch }}-${{ github.ref_name }}.rpm'
fpm_args: "dg-linux-${{ matrix.binary_arch }}-${{ github.ref_name }}=/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 rpm --version ${{ env.VERSION }} --package dg-linux-${{ matrix.binary_arch }}-${{ github.ref_name }}.rpm"
- name: Upload RPM
uses: actions/upload-release-asset@v1.0.2
env:
Expand All @@ -225,22 +225,22 @@ jobs:
- self-hosted
- macOS
env:
APPLE_SIGNING_IDENTITY_APPLICATION: 'Developer ID Application: defguard sp. z o.o. (82GZ7KN29J)'
APPLE_SIGNING_IDENTITY_INSTALLER: 'Developer ID Installer: defguard sp. z o.o. (82GZ7KN29J)'
APPLE_ID: 'kamil@defguard.net'
APPLE_TEAM_ID: '82GZ7KN29J'
APPLE_SIGNING_IDENTITY_APPLICATION: "Developer ID Application: defguard sp. z o.o. (82GZ7KN29J)"
APPLE_SIGNING_IDENTITY_INSTALLER: "Developer ID Installer: defguard sp. z o.o. (82GZ7KN29J)"
APPLE_ID: "kamil@defguard.net"
APPLE_TEAM_ID: "82GZ7KN29J"
steps:
- uses: actions/checkout@v4
with:
submodules: 'recursive'
submodules: "recursive"
- name: Write release version
run: |
VERSION=$(echo ${GITHUB_REF_NAME#v} | cut -d '-' -f1)
echo Version: $VERSION
echo "VERSION=$VERSION" >> $GITHUB_ENV
- uses: actions/setup-node@v3
with:
node-version: '20'
node-version: "20"
- uses: pnpm/action-setup@v2
with:
version: 9
Expand Down Expand Up @@ -314,15 +314,15 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
submodules: 'recursive'
submodules: "recursive"
- name: Write release version
run: |
$env:VERSION=echo ($env:GITHUB_REF_NAME.Substring(1) -Split "-")[0]
echo Version: $env:VERSION
echo "VERSION=$env:VERSION" >> $env:GITHUB_ENV
- uses: actions/setup-node@v3
with:
node-version: '20'
node-version: "20"
- uses: pnpm/action-setup@v2
with:
version: 9
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ on:
branches:
- main
- dev
- 'release/**'
- "release/**"
paths-ignore:
- '*.md'
- 'LICENSE'
- "*.md"
- "LICENSE"
pull_request:
branches:
- main
- dev
- 'release/**'
- "release/**"
paths-ignore:
- '*.md'
- 'LICENSE'
- "*.md"
- "LICENSE"

env:
CARGO_TERM_COLOR: always
Expand All @@ -41,7 +41,7 @@ jobs:
- name: Install required packages
run: |
apt-get update
apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf libssl-dev unzip
apt-get install -y libgtk-3-dev libwebkit2gtk-4.1-dev libayatana-appindicator3-dev librsvg2-dev patchelf libssl-dev libxdo-dev unzip
- name: Install protobuf compiler
run: |
PB_REL='https://github.com/protocolbuffers/protobuf/releases'
Expand Down
45 changes: 25 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"type": "module",
"scripts": {
"dev": "npm-run-all --parallel vite typesafe-i18n",
"typecheck": "tsc --project ./tsconfig.node.json",
"typecheck": "tsc --project ./tsconfig.app.json",
"build": "pnpm run typecheck && vite build",
"preview": "vite preview",
"typesafe-i18n": "typesafe-i18n",
Expand Down Expand Up @@ -46,14 +46,21 @@
]
},
"dependencies": {
"@floating-ui/react": "^0.27.13",
"@hookform/resolvers": "^5.1.1",
"@floating-ui/react": "^0.27.15",
"@hookform/resolvers": "^3.10.0",
"@react-hook/resize-observer": "^2.0.2",
"@stablelib/base64": "^2.0.1",
"@stablelib/x25519": "^2.0.1",
"@tanstack/query-core": "^5.83.0",
"@tanstack/query-core": "^5.83.1",
"@tanstack/react-virtual": "3.13.12",
"@tauri-apps/api": "^1.6.0",
"@tauri-apps/api": "^2.7.0",
"@tauri-apps/plugin-clipboard-manager": "^2.3.0",
"@tauri-apps/plugin-dialog": "^2.3.2",
"@tauri-apps/plugin-fs": "^2.4.1",
"@tauri-apps/plugin-http": "^2.5.1",
"@tauri-apps/plugin-log": "^2.6.0",
"@tauri-apps/plugin-notification": "^2.3.0",
"@tauri-apps/plugin-window-state": "^2.4.0",
"@types/byte-size": "^8.1.2",
"@use-gesture/react": "^10.3.1",
"byte-size": "^9.0.1",
Expand All @@ -65,7 +72,7 @@
"detect-browser": "^5.3.0",
"fast-deep-equal": "^3.1.3",
"file-saver": "^2.0.5",
"framer-motion": "^12.23.9",
"framer-motion": "^12.23.12",
"get-text-width": "^1.0.3",
"html-react-parser": "^5.2.6",
"itertools": "^2.4.1",
Expand All @@ -79,31 +86,29 @@
"react-auth-code-input": "^3.2.1",
"react-click-away-listener": "^2.4.0",
"react-dom": "^18.3.1",
"react-hook-form": "^7.61.0",
"react-hook-form": "^7.62.0",
"react-loading-skeleton": "^3.5.0",
"react-markdown": "^10.1.0",
"react-qr-code": "^2.0.18",
"react-router-dom": "^6.30.1",
"react-virtualized-auto-sizer": "^1.0.26",
"recharts": "^3.1.0",
"recharts": "^3.1.2",
"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": "^4.0.8",
"zustand": "^5.0.6"
"zod": "^3.25.76",
"zustand": "^5.0.7"
},
"devDependencies": {
"@biomejs/biome": "2.1.2",
"@biomejs/biome": "^2.1.4",
"@hookform/devtools": "^4.4.0",
"@svgr/cli": "^8.1.0",
"@tanstack/react-query": "^5.83.0",
"@tanstack/react-query-devtools": "^5.83.0",
"@tauri-apps/cli": "^1.6.3",
"@tanstack/react-query": "^5.84.2",
"@tanstack/react-query-devtools": "^5.84.2",
"@tauri-apps/cli": "^2.7.1",
"@types/file-saver": "^2.0.7",
"@types/lodash-es": "^4.17.12",
"@types/node": "^24.1.0",
"@types/node": "^24.2.1",
"@types/react": "^18.3.23",
"@types/react-dom": "^18.3.7",
"@vitejs/plugin-react": "^4.7.0",
Expand All @@ -113,10 +118,10 @@
"postcss": "^8.5.6",
"prettier": "^3.6.2",
"sass": "~1.70.0",
"typedoc": "^0.25.13",
"typedoc": "^0.28.10",
"typesafe-i18n": "^5.26.2",
"typescript": "^5.8.3",
"vite": "^7.0.6"
"typescript": "^5.9.2",
"vite": "^7.1.2"
},
"volta": {
"node": "20.5.1"
Expand Down
Loading
Loading