Skip to content

Commit 08c005c

Browse files
filipslezaklabfilipslezaklab
authored
alpha client v2 (#866)
1 parent af67991 commit 08c005c

322 files changed

Lines changed: 14258 additions & 855 deletions

File tree

Some content is hidden

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

‎.github/workflows/build-macos.yaml‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ on:
1111
tags:
1212
- v*.*.*
1313

14+
env:
15+
SQLX_OFFLINE: "1"
16+
1417
jobs:
1518
build-macos:
1619
runs-on:
@@ -38,18 +41,23 @@ jobs:
3841
3942
- uses: actions/setup-node@v6
4043
with:
41-
node-version: 25
44+
node-version: 26
4245

4346
- uses: pnpm/action-setup@v6
4447
with:
4548
cache: true
46-
version: 10
49+
version: 11
4750

4851
# Change to '--frozen-lockfile' once this gets fixed:
4952
# https://github.com/pnpm/action-setup/issues/40
5053
- name: Install Node dependencies
5154
run: pnpm install --no-frozen-lockfile
5255

56+
- name: Install Node dependencies for New UI
57+
run: |
58+
cd new-ui
59+
pnpm install --no-frozen-lockfile
60+
5361
- name: Install Rust stable
5462
uses: dtolnay/rust-toolchain@stable
5563
with:
@@ -63,6 +71,11 @@ jobs:
6371
- name: Unlock keychain
6472
run: security -v unlock-keychain -p "${{ secrets.KEYCHAIN_PASSWORD }}" login.keychain
6573

74+
- name: Build new UI
75+
run: |
76+
cd new-ui
77+
pnpm build
78+
6679
- name: Build app
6780
uses: tauri-apps/tauri-action@v0
6881
env:

‎.github/workflows/lint.yaml‎

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,34 +30,41 @@ jobs:
3030

3131
- uses: actions/setup-node@v6
3232
with:
33-
node-version: 25
33+
node-version: 26
3434

3535
- uses: pnpm/action-setup@v6
3636
with:
37-
version: 10
37+
cache: true
38+
version: 11
3839
run_install: false
3940

4041
- name: Get pnpm store directory
4142
shell: bash
4243
run: |
4344
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
4445
45-
- name: Setup pnpm cache
46-
uses: actions/cache@v5
47-
with:
48-
path: ${{ env.STORE_PATH }}
49-
key: ${{ runner.os }}-pnpm-lint-store-${{ hashFiles('**/pnpm-lock.yaml') }}
50-
restore-keys: |
51-
${{ runner.os }}-pnpm-lint-store-
52-
5346
# Change to '--frozen-lockfile' once this gets fixed:
5447
# https://github.com/pnpm/action-setup/issues/40
5548
- name: Install Node dependencies
5649
run: pnpm install --no-frozen-lockfile
5750

51+
- name: Install Node dependencies for new UI
52+
run: |
53+
cd new-ui
54+
pnpm install --no-frozen-lockfile
55+
5856
- name: Run Biome and Prettier Lint
5957
run: pnpm lint
6058

61-
# TODO: Restore when it works again: https://github.com/pnpm/pnpm/issues/11265
62-
# - name: Audit
63-
# run: pnpm audit --prod
59+
- name: Audit
60+
run: pnpm audit --prod
61+
62+
- name: Run Biome and Prettier Lint for new UI
63+
run: |
64+
cd new-ui
65+
pnpm lint
66+
67+
- name: Audit new UI
68+
run: |
69+
cd new-ui
70+
pnpm audit --prod

‎.github/workflows/release.yaml‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,12 @@ jobs:
6262
- name: Install pnpm
6363
uses: pnpm/action-setup@v6
6464
with:
65-
version: 10
65+
cache: true
66+
version: 11
6667

6768
- uses: actions/setup-node@v6
6869
with:
69-
node-version: 25
70+
node-version: 26
7071

7172
- name: Get pnpm store directory
7273
run: |
@@ -78,26 +79,29 @@ jobs:
7879
echo Version: $VERSION
7980
echo "VERSION=$VERSION" >> ${GITHUB_ENV}
8081
echo "DEFGUARD_CLIENT_BUILD_VERSION=${GITHUB_REF_NAME#v}" >> ${GITHUB_ENV}
81-
- uses: actions/cache@v5
82-
name: Setup pnpm cache
83-
with:
84-
path: ${{ env.STORE_PATH }}
85-
key: ${{ runner.os }}-pnpm-build-store-${{ hashFiles('**/pnpm-lock.yaml') }}
86-
restore-keys: |
87-
${{ runner.os }}-pnpm-build-store-
8882
8983
# Change to '--frozen-lockfile' once this gets fixed:
9084
# https://github.com/pnpm/action-setup/issues/40
9185
- name: Install Node dependencies
9286
run: pnpm install --no-frozen-lockfile
9387

88+
- name: Install Node dependencies for new UI
89+
run: |
90+
cd new-ui
91+
pnpm install --no-frozen-lockfile
92+
9493
- name: Install Rust stable
9594
uses: dtolnay/rust-toolchain@stable
9695

9796
- name: Install dependencies
9897
run: |
9998
apt-get install -y build-essential libgtk-3-dev libwebkit2gtk-4.1-dev libayatana-appindicator3-dev librsvg2-dev patchelf libssl-dev libxdo-dev unzip protobuf-compiler libprotobuf-dev rpm
10099
100+
- name: Build new UI
101+
run: |
102+
cd new-ui
103+
pnpm build
104+
101105
- name: Build packages
102106
uses: tauri-apps/tauri-action@v0.5.23
103107
env:
@@ -166,31 +170,29 @@ jobs:
166170
echo "DEFGUARD_CLIENT_BUILD_VERSION=${GITHUB_REF_NAME#v}" >> ${GITHUB_ENV}
167171
- uses: actions/setup-node@v6
168172
with:
169-
node-version: 25
173+
node-version: 26
170174

171175
- uses: pnpm/action-setup@v6
172176
with:
173-
version: 10
177+
cache: true
178+
version: 11
174179
run_install: false
175180

176181
- name: Get pnpm store directory
177182
shell: bash
178183
run: |
179184
echo "STORE_PATH=$(pnpm store path --silent)" >> ${GITHUB_ENV}
180185
181-
- name: Setup pnpm cache
182-
uses: actions/cache@v5
183-
with:
184-
path: ${{ env.STORE_PATH }}
185-
key: ${{ runner.os }}-pnpm-build-store-${{ hashFiles('**/pnpm-lock.yaml') }}
186-
restore-keys: |
187-
${{ runner.os }}-pnpm-build-store-
188-
189186
# Change to '--frozen-lockfile' once this gets fixed:
190187
# https://github.com/pnpm/action-setup/issues/40
191188
- name: Install Node dependencies
192189
run: pnpm install --no-frozen-lockfile
193190

191+
- name: Install Node dependencies for new UI
192+
run: |
193+
cd new-ui
194+
pnpm install --no-frozen-lockfile
195+
194196
- name: Install Rust stable
195197
uses: dtolnay/rust-toolchain@stable
196198

@@ -199,6 +201,11 @@ jobs:
199201
sudo apt-get update
200202
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
201203
204+
- name: Build new UI
205+
run: |
206+
cd new-ui
207+
pnpm build
208+
202209
- name: Build packages
203210
uses: tauri-apps/tauri-action@v0.5.23 # .24 seems broken, TODO: update when fixed
204211
env:
@@ -343,21 +350,14 @@ jobs:
343350
# echo "VERSION=$env:VERSION" >> $env:GITHUB_ENV
344351
# - uses: actions/setup-node@v6
345352
# with:
346-
# node-version: 25
353+
# node-version: 26
347354
# - uses: pnpm/action-setup@v6
348355
# with:
349-
# version: 10
356+
# version: 11
350357
# run_install: false
351358
# - name: Get pnpm store directory
352359
# shell: bash
353360
# run: echo "STORE_PATH=$(pnpm store path --silent)" >> ${GITHUB_ENV}
354-
# - uses: actions/cache@v5
355-
# name: Setup pnpm cache
356-
# with:
357-
# path: ${{ env.STORE_PATH }}
358-
# key: ${{ runner.os }}-pnpm-build-store-${{ hashFiles('**/pnpm-lock.yaml') }}
359-
# restore-keys: |
360-
# ${{ runner.os }}-pnpm-build-store-
361361
# - name: Install deps
362362
# run: pnpm install --frozen-lockfile
363363
# - uses: dtolnay/rust-toolchain@stable

‎.github/workflows/test.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ on:
2020

2121
env:
2222
CARGO_TERM_COLOR: always
23+
SQLX_OFFLINE: "1"
2324
# sccache
2425
SCCACHE_GHA_ENABLED: "true"
2526
RUSTC_WRAPPER: "sccache"

‎.trivyignore.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
vulnerabilities:
22
- id: GHSA-wrw7-89jp-8q8g
3-
expired_at: 2026-05-16
3+
expired_at: 2026-06-16
44
statement: 'glib is a transitive dependency of Tauri which we cannot update ourselves. Waiting for tauri to finish migration to gtk4-rs: https://github.com/tauri-apps/tauri/issues/12563'

‎.typesafe-i18n.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"adapter": "react",
3-
"$schema": "https://unpkg.com/typesafe-i18n@5.26.2/schema/typesafe-i18n.json"
3+
"$schema": "https://unpkg.com/typesafe-i18n@5.27.1/schema/typesafe-i18n.json"
44
}

‎biome.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"ignoreUnknown": false,
1010
"includes": [
1111
"src/**",
12+
"!new-ui",
1213
"!src/i18n/*.ts",
1314
"!src/i18n/*.tsx",
1415
"!src/i18n/i18n-util",

‎justfile‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
set shell := ["powershell.exe", "-c"]
2+
3+
dev:
4+
npx concurrently \
5+
-n "NEW,OLD,TAURI" \
6+
"cd new-ui && pnpm dev" \
7+
"pnpm dev" \
8+
"cargo tauri dev"
9+
10+
build:
11+
cd new-ui; pnpm build
12+
pnpm build
13+
cargo tauri build --config .\src-tauri\tauri.local.conf.json

‎new-ui/.gitignore‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# Logs
2+
logs
3+
*.log
4+
npm-debug.log*
5+
yarn-debug.log*
6+
yarn-error.log*
7+
pnpm-debug.log*
8+
lerna-debug.log*
9+
10+
node_modules
11+
dist
12+
dist-ssr
13+
*.local
14+
15+
# Editor directories and files
16+
.vscode/*
17+
!.vscode/extensions.json
18+
.idea
19+
.DS_Store
20+
*.suo
21+
*.ntvs*
22+
*.njsproj
23+
*.sln
24+
*.sw?

‎new-ui/.nvmrc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
v25

0 commit comments

Comments
 (0)