From e8a6bccdee62e936264d9f3a7f922ad3fe083e90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20Ciarcin=CC=81ski?= Date: Wed, 22 Apr 2026 09:05:19 +0200 Subject: [PATCH 01/10] Build packages with custom user --- .github/workflows/lint-web.yml | 28 ++- .github/workflows/release.yml | 64 +++++- Cargo.lock | 15 +- Cargo.toml | 2 +- .../defguard-proxy | 0 freebsd/postrm | 9 + freebsd/preinst | 9 + .../defguard-proxy.service | 4 +- linux/postinst | 22 ++ linux/postrm | 17 ++ linux/preinst | 8 + linux/prerm | 8 + web/package.json | 6 + web/pnpm-lock.yaml | 191 ++++++++++++++++++ 14 files changed, 353 insertions(+), 30 deletions(-) rename defguard-proxy.service.freebsd => freebsd/defguard-proxy (100%) create mode 100644 freebsd/postrm create mode 100644 freebsd/preinst rename defguard-proxy.service => linux/defguard-proxy.service (89%) create mode 100644 linux/postinst create mode 100644 linux/postrm create mode 100755 linux/preinst create mode 100644 linux/prerm diff --git a/.github/workflows/lint-web.yml b/.github/workflows/lint-web.yml index 300003c6..f4812458 100644 --- a/.github/workflows/lint-web.yml +++ b/.github/workflows/lint-web.yml @@ -28,20 +28,30 @@ jobs: uses: actions/checkout@v6 with: submodules: recursive - - uses: actions/setup-node@v6 + + - name: Install NodeJS + uses: actions/setup-node@v6 with: node-version: 25 - - name: install deps - working-directory: ./web - run: | - npm i -g pnpm - pnpm i --frozen-lockfile + + - name: Install pnpm + uses: pnpm/action-setup@v6 + with: + cache: true + version: 10 + + - name: Install deps + working-directory: web + run: pnpm install --frozen-lockfile + - name: Build translations - working-directory: ./web + working-directory: web run: pnpm dlx @inlang/paraglide-js compile --project ./project.inlang --outdir ./src/paraglide + - name: Lint - working-directory: ./web + working-directory: web run: pnpm lint + - name: Audit - working-directory: ./web + working-directory: web run: pnpm audit --prod --ignore-unfixable diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9b2946af..ce82b81a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,6 +1,8 @@ name: Make a new release on: push: + branches: + - pkg tags: - v*.*.* @@ -55,6 +57,8 @@ jobs: with: draft: true generate_release_notes: true + release_name: pkg + tag_name: pkg create-sbom: needs: @@ -141,45 +145,85 @@ jobs: with: fpm_args: "defguard-proxy-${{ env.VERSION }}-x86_64-unknown-linux-gnu=/usr/bin/defguard-proxy - defguard-proxy.service=/usr/lib/systemd/system/defguard-proxy.service + linux/defguard-proxy.service=/usr/lib/systemd/system/defguard-proxy.service example-config.toml=/etc/defguard/proxy.toml" - fpm_opts: "--architecture amd64 --output-type deb --version ${{ env.VERSION }} --package defguard-proxy-${{ env.VERSION }}-x86_64-unknown-linux-gnu.deb" + fpm_opts: + "--architecture amd64 + --output-type deb + --version ${{ env.VERSION }} + --package defguard-proxy-${{ env.VERSION }}-x86_64-unknown-linux-gnu.deb + --before-install linux/preinst + --after-install linux/postinst + --before-remove linux/prerm + --after-remove linux/postrm" - name: Build aarch64 DEB package uses: defGuard/fpm-action@main with: fpm_args: "defguard-proxy-${{ env.VERSION }}-aarch64-unknown-linux-gnu=/usr/bin/defguard-proxy - defguard-proxy.service=/usr/lib/systemd/system/defguard-proxy.service + linux/defguard-proxy.service=/usr/lib/systemd/system/defguard-proxy.service example-config.toml=/etc/defguard/proxy.toml" - fpm_opts: "--architecture arm64 --output-type deb --version ${{ env.VERSION }} --package defguard-proxy-${{ env.VERSION }}-aarch64-unknown-linux-gnu.deb" + fpm_opts: + "--architecture arm64 + --output-type deb + --version ${{ env.VERSION }} + --package defguard-proxy-${{ env.VERSION }}-aarch64-unknown-linux-gnu.deb + --before-install linux/preinst + --after-install linux/postinst + --before-remove linux/prerm + --after-remove linux/postrm" - name: Build x86_64 RPM package uses: defGuard/fpm-action@main with: fpm_args: "defguard-proxy-${{ env.VERSION }}-x86_64-unknown-linux-gnu=/usr/bin/defguard-proxy - defguard-proxy.service=/usr/lib/systemd/system/defguard-proxy.service + linux/defguard-proxy.service=/usr/lib/systemd/system/defguard-proxy.service example-config.toml=/etc/defguard/proxy.toml" - fpm_opts: "--architecture amd64 --output-type rpm --version ${{ env.VERSION }} --package defguard-proxy-${{ env.VERSION }}-x86_64-unknown-linux-gnu.rpm" + fpm_opts: + "--architecture amd64 + --output-type rpm + --version ${{ env.VERSION }} + --package defguard-proxy-${{ env.VERSION }}-x86_64-unknown-linux-gnu.rpm + --before-install linux/preinst + --after-install linux/postinst + --before-remove linux/prerm + --after-remove linux/postrm" - name: Build aarch64 RPM package uses: defGuard/fpm-action@main with: fpm_args: "defguard-proxy-${{ env.VERSION }}-aarch64-unknown-linux-gnu=/usr/bin/defguard-proxy - defguard-proxy.service=/usr/lib/systemd/system/defguard-proxy.service + linux/defguard-proxy.service=/usr/lib/systemd/system/defguard-proxy.service example-config.toml=/etc/defguard/proxy.toml" - fpm_opts: "--architecture arm64 --output-type rpm --version ${{ env.VERSION }} --package defguard-proxy-${{ env.VERSION }}-aarch64-unknown-linux-gnu.rpm" + fpm_opts: + "--architecture arm64 + --output-type rpm + --version ${{ env.VERSION }} + --package defguard-proxy-${{ env.VERSION }}-aarch64-unknown-linux-gnu.rpm + --before-install linux/preinst + --after-install linux/postinst + --before-remove linux/prerm + --after-remove linux/postrm" - name: Build FreeBSD package uses: defGuard/fpm-action@main with: fpm_args: "defguard-proxy-${{ env.VERSION }}-x86_64-unknown-freebsd=/usr/local/bin/defguard-proxy - defguard-proxy.service.freebsd=/usr/local/etc/rc.d/defguard-proxy + freebsd/defguard-proxy=/usr/local/etc/rc.d/defguard-proxy example-config.toml=/etc/defguard/proxy.toml" - fpm_opts: "--architecture amd64 --output-type freebsd --version ${{ env.VERSION }} --package defguard-proxy-${{ env.VERSION }}_x86_64-unknown-freebsd.pkg --freebsd-osversion '*' --depends openssl" + fpm_opts: + "--architecture amd64 + --output-type freebsd + --version ${{ env.VERSION }} + --package defguard-proxy-${{ env.VERSION }}_x86_64-unknown-freebsd.pkg + --freebsd-osversion '*' + --depends openssl + --before-install freebsd/preinst + --after-install freebsd/postinst" - name: Upload Linux x86_64 archive uses: shogo82148/actions-upload-release-asset@v1 diff --git a/Cargo.lock b/Cargo.lock index be35895b..bf761b38 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -347,14 +347,15 @@ dependencies = [ [[package]] name = "axum-extra" -version = "0.10.3" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9963ff19f40c6102c76756ef0a46004c0d58957d87259fc9208ff8441c12ab96" +checksum = "be44683b41ccb9ab2d23a5230015c9c3c55be97a25e4428366de8873103f7970" dependencies = [ "axum", "axum-core", "bytes", "cookie", + "futures-core", "futures-util", "headers", "http", @@ -362,8 +363,6 @@ dependencies = [ "http-body-util", "mime", "pin-project-lite", - "rustversion", - "serde_core", "tower-layer", "tower-service", "tracing", @@ -3803,9 +3802,9 @@ checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" [[package]] name = "rustls-webpki" -version = "0.103.12" +version = "0.103.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8279bb85272c9f10811ae6a6c547ff594d6a7f3c6c6b02ee9726d1d0dcfcdd06" +checksum = "61c429a8649f110dddef65e2a5ad240f747e85f7758a6bccc7e5777bd33f756e" dependencies = [ "aws-lc-rs", "ring", @@ -5803,9 +5802,9 @@ checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" [[package]] name = "winnow" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09dac053f1cd375980747450bfc7250c264eaae0583872e845c0c7cd578872b5" +checksum = "2ee1708bef14716a11bae175f579062d4554d95be2c6829f518df847b7b3fdd0" [[package]] name = "wit-bindgen" diff --git a/Cargo.toml b/Cargo.toml index d924a5fc..566e5204 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ rustls-pki-types = "1" # base `axum` deps axum = { version = "0.8", features = ["ws"] } axum-client-ip = "0.7" -axum-extra = { version = "0.10", features = [ +axum-extra = { version = "0.12", features = [ "cookie", "cookie-private", "typed-header", diff --git a/defguard-proxy.service.freebsd b/freebsd/defguard-proxy similarity index 100% rename from defguard-proxy.service.freebsd rename to freebsd/defguard-proxy diff --git a/freebsd/postrm b/freebsd/postrm new file mode 100644 index 00000000..ec5c15df --- /dev/null +++ b/freebsd/postrm @@ -0,0 +1,9 @@ +#!/bin/sh +set -e + +USERNAME=defguard + +if id -u ${USERNAME} >/dev/null 2>&1 +then + pw user del -n ${USERNAME} +fi diff --git a/freebsd/preinst b/freebsd/preinst new file mode 100644 index 00000000..d9b25a63 --- /dev/null +++ b/freebsd/preinst @@ -0,0 +1,9 @@ +#!/bin/sh +set -e + +USERNAME=defguard + +if ! id -u ${USERNAME} >/dev/null 2>&1 +then + pw -q user add -n ${USERNAME} -g nogroup -c "Defguard" -d /nonexistent -s /usr/sbin/nologin +fi diff --git a/defguard-proxy.service b/linux/defguard-proxy.service similarity index 89% rename from defguard-proxy.service rename to linux/defguard-proxy.service index cf215993..bcf03cb3 100644 --- a/defguard-proxy.service +++ b/linux/defguard-proxy.service @@ -1,12 +1,12 @@ [Unit] -Description=defguard proxy service +Description=Defguard Edge service Documentation=https://defguard.gitbook.io/defguard/ Wants=network-online.target After=network-online.target [Service] -DynamicUser=yes User=defguard +Group=defguard ExecReload=/bin/kill -HUP $MAINPID ExecStart=/usr/bin/defguard-proxy --config /etc/defguard/proxy.toml KillMode=process diff --git a/linux/postinst b/linux/postinst new file mode 100644 index 00000000..7ed34054 --- /dev/null +++ b/linux/postinst @@ -0,0 +1,22 @@ +#!/bin/sh +set -e + +SERVICE_NAME='defguard-proxy' + +case "${1}" in +1 | configure) + if [ -x /usr/bin/systemctl ]; then + /usr/bin/systemctl daemon-reload + /usr/bin/systemctl enable ${SERVICE_NAME} + /usr/bin/systemctl --no-block start ${SERVICE_NAME} + fi + ;; +abort-upgrade | abort-remove | abort-deconfigure) + if [ -x /usr/bin/systemctl ]; then + /usr/bin/systemctl daemon-reload + if /usr/bin/systemctl is-enabled ${SERVICE_NAME} >/dev/null 2>&1; then + /usr/bin/systemctl start ${SERVICE_NAME} || true + fi + fi + ;; +esac diff --git a/linux/postrm b/linux/postrm new file mode 100644 index 00000000..eefee79e --- /dev/null +++ b/linux/postrm @@ -0,0 +1,17 @@ +#!/bin/sh +set -e + +USERNAME=defguard + +case $1 in +0) + if [ "${1}" = 'purge' ]; then + userdel ${USERNAME} >/dev/null || true + fi + ;; +1) + if [ -x /usr/bin/systemctl ]; then + /usr/bin/systemctl daemon-reload >/dev/null 2>&1 || true + fi + ;; +esac diff --git a/linux/preinst b/linux/preinst new file mode 100755 index 00000000..71522c0a --- /dev/null +++ b/linux/preinst @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +USERNAME=defguard + +if ! id -u ${USERNAME} >/dev/null 2>&1; then + useradd --system --user-group --no-create-home ${USERNAME} +fi diff --git a/linux/prerm b/linux/prerm new file mode 100644 index 00000000..f691f94d --- /dev/null +++ b/linux/prerm @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +SERVICE_NAME='defguard-proxy' + +if [ -x /usr/bin/systemctl ]; then + /usr/bin/systemctl --no-block stop ${SERVICE_NAME} >/dev/null 2>&1 || true +fi diff --git a/web/package.json b/web/package.json index da58c18c..1155bacd 100644 --- a/web/package.json +++ b/web/package.json @@ -18,9 +18,15 @@ "@inlang/paraglide-js": "^2.16.0", "@tanstack/react-devtools": "^0.9.13", "@tanstack/react-form": "^1.29.0", +<<<<<<< Updated upstream "@tanstack/react-query": "^5.99.2", "@tanstack/react-query-devtools": "^5.99.2", "@tanstack/react-router": "^1.168.23", +======= + "@tanstack/react-query": "^5.99.0", + "@tanstack/react-query-devtools": "^5.99.0", + "@tanstack/react-router": "^1.168.22", +>>>>>>> Stashed changes "@tanstack/react-router-devtools": "^1.166.13", "@uidotdev/usehooks": "^2.4.1", "axios": "^1.15.1", diff --git a/web/pnpm-lock.yaml b/web/pnpm-lock.yaml index e4e46e3f..353a2b35 100644 --- a/web/pnpm-lock.yaml +++ b/web/pnpm-lock.yaml @@ -34,11 +34,19 @@ importers: specifier: ^5.99.2 version: 5.99.2(@tanstack/react-query@5.99.2(react@19.2.5))(react@19.2.5) '@tanstack/react-router': +<<<<<<< Updated upstream specifier: ^1.168.23 version: 1.168.23(react-dom@19.2.5(react@19.2.5))(react@19.2.5) '@tanstack/react-router-devtools': specifier: ^1.166.13 version: 1.166.13(@tanstack/react-router@1.168.23(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(@tanstack/router-core@1.168.15)(csstype@3.2.3)(react-dom@19.2.5(react@19.2.5))(react@19.2.5) +======= + specifier: ^1.168.22 + version: 1.168.22(react-dom@19.2.5(react@19.2.5))(react@19.2.5) + '@tanstack/react-router-devtools': + specifier: ^1.166.13 + version: 1.166.13(@tanstack/react-router@1.168.22(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(@tanstack/router-core@1.168.15)(csstype@3.2.3)(react-dom@19.2.5(react@19.2.5))(react@19.2.5) +>>>>>>> Stashed changes '@uidotdev/usehooks': specifier: ^2.4.1 version: 2.4.1(react-dom@19.2.5(react@19.2.5))(react@19.2.5) @@ -93,7 +101,11 @@ importers: version: 0.5.5(vite@7.3.2(@types/node@25.6.0)(sass@1.99.0)(tsx@4.21.0)) '@tanstack/router-plugin': specifier: ^1.167.22 +<<<<<<< Updated upstream version: 1.167.22(@tanstack/react-router@1.168.23(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(vite@7.3.2(@types/node@25.6.0)(sass@1.99.0)(tsx@4.21.0)) +======= + version: 1.167.22(@tanstack/react-router@1.168.22(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(vite@7.3.2(@types/node@25.6.0)(sass@1.99.0)(tsx@4.21.0)) +>>>>>>> Stashed changes '@types/lodash-es': specifier: ^4.17.12 version: 4.17.12 @@ -1064,86 +1076,151 @@ packages: resolution: {integrity: sha512-hI6twvUkzOmyGZhQMza1gpfqErZxXRw6JEsiVjUbo7tFanVD+8Oil0Ih3l2nGzHdxPI41zFmfUQG7GHqhciKZQ==} hasBin: true +<<<<<<< Updated upstream '@swc/core-darwin-arm64@1.15.30': resolution: {integrity: sha512-VvpP+vq08HmGYewMWvrdsxh9s2lthz/808zXm8Yu5kaqeR8Yia2b0eYXleHQ3VAjoStUDk6LzTheBW9KXYQdMA==} +======= + '@swc/core-darwin-arm64@1.15.26': + resolution: {integrity: sha512-OmcP96CFsNOwa65tamQayRcfqhNlcQ3YCWOq+0Wb+CAM4uB7kOMrXY41Gj4atthxrGhLQ9pg7Vk26iApb88idA==} +>>>>>>> Stashed changes engines: {node: '>=10'} cpu: [arm64] os: [darwin] +<<<<<<< Updated upstream '@swc/core-darwin-x64@1.15.30': resolution: {integrity: sha512-WiJA0hiZI3nwQAO6mu5RqigtWGDtth4Hiq6rbZxAaQyhIcqKIg5IoMRc1Y071lrNJn29eEDMC86Rq58xgUxlDg==} +======= + '@swc/core-darwin-x64@1.15.26': + resolution: {integrity: sha512-liTTTpKSv89ivIxcZ+iU1cRige9Y7JkOjVnJ2Ystzl+DsWNHqt7wLTTgm/u7gEqmmAS2JKryODLQn3q1UtFNPQ==} +>>>>>>> Stashed changes engines: {node: '>=10'} cpu: [x64] os: [darwin] +<<<<<<< Updated upstream '@swc/core-linux-arm-gnueabihf@1.15.30': resolution: {integrity: sha512-YANuFUo48kIT6plJgCD0keae9HFXfjxsbvsgevqc0hr/07X/p7sAWTFOGYEc2SXcASaK7UvuQqzlbW8pr7R79g==} +======= + '@swc/core-linux-arm-gnueabihf@1.15.26': + resolution: {integrity: sha512-Y/g+m3I8CeBof5A3kWWOS6QA2HOIUytF5EeTgfwcAK+GKT/tGe7Xqo5svBtaqflU5od2zzbMTWqkinPXgRWGgA==} +>>>>>>> Stashed changes engines: {node: '>=10'} cpu: [arm] os: [linux] +<<<<<<< Updated upstream '@swc/core-linux-arm64-gnu@1.15.30': resolution: {integrity: sha512-VndG8jaR4ugY6u+iVOT0Q+d2fZd7sLgjPgN8W/Le+3EbZKl+cRfFxV7Eoz4gfLqhmneZPdcIzf9T3LkgkmqNLg==} +======= + '@swc/core-linux-arm64-gnu@1.15.26': + resolution: {integrity: sha512-19IvwyPfBN/rz9s7qXhOTQmW0922+pjpRUUvIebu+CMM75nX6YuDzHsGx8hSmn5dS89SNaMCh1lgUuXqm++6jg==} +>>>>>>> Stashed changes engines: {node: '>=10'} cpu: [arm64] os: [linux] libc: [glibc] +<<<<<<< Updated upstream '@swc/core-linux-arm64-musl@1.15.30': resolution: {integrity: sha512-1SYGs2l0Yyyi0pR/P/NKz/x0kqxkoiw+BXeJjLUdecSk/KasncWlJrc6hOvFSgKHOBrzgM5jwuluKtlT8dnrcA==} +======= + '@swc/core-linux-arm64-musl@1.15.26': + resolution: {integrity: sha512-iNlbvTIo425rkKzDLLWFJGnFXr3myETUdIDHcjuiPNZE8b0ogmcAuilC4yEJX7FSHGbnlsoJcCT2xf4b3VJmmQ==} +>>>>>>> Stashed changes engines: {node: '>=10'} cpu: [arm64] os: [linux] libc: [musl] +<<<<<<< Updated upstream '@swc/core-linux-ppc64-gnu@1.15.30': resolution: {integrity: sha512-TXREtiXeRhbfDFbmhnkIsXpKfzbfT73YkV2ZF6w0sfxgjC5zI2ZAbaCOq25qxvegofj2K93DtOpm9RLaBgqR2g==} +======= + '@swc/core-linux-ppc64-gnu@1.15.26': + resolution: {integrity: sha512-AuuEOtG+YXKIjIUup4RsxYNklx6XVB3WKWfhxG6hnfPrn7vp89RNOLbbyyprgj6Sk7k9ulwGVTJElEvmBNPSCA==} +>>>>>>> Stashed changes engines: {node: '>=10'} cpu: [ppc64] os: [linux] libc: [glibc] +<<<<<<< Updated upstream '@swc/core-linux-s390x-gnu@1.15.30': resolution: {integrity: sha512-DCR2YYeyd6DQE4OuDhImouuNcjXEiEdnn1Y0DyGteugPEDvVuvYk8Xddi+4o2SgWH6jiW8/I+3emZvbep1NC+g==} +======= + '@swc/core-linux-s390x-gnu@1.15.26': + resolution: {integrity: sha512-JcMDWQvW1BchUyRg8E0jHiTx7CQYpUr5uDEL1dnPDECrEjBEGG2ynmJ3XX70sWXql0JagqR1t3VpANYFWdUnqA==} +>>>>>>> Stashed changes engines: {node: '>=10'} cpu: [s390x] os: [linux] libc: [glibc] +<<<<<<< Updated upstream '@swc/core-linux-x64-gnu@1.15.30': resolution: {integrity: sha512-5Pizw3NgfOJ5BJOBK8TIRa59xFW2avESTOBDPTAYwZYa1JNDs+KMF9lUfjJiJLM5HiMs/wPheA9eiT0q9m2AoA==} +======= + '@swc/core-linux-x64-gnu@1.15.26': + resolution: {integrity: sha512-FW7V7Mbpq4+PA7BiAq76LJs8MdNuUSylyuRVfQRkhIyeWadFroZ+KOPgjku8Z/fXzngxBRvsk+PGGB0t8mGcjA==} +>>>>>>> Stashed changes engines: {node: '>=10'} cpu: [x64] os: [linux] libc: [glibc] +<<<<<<< Updated upstream '@swc/core-linux-x64-musl@1.15.30': resolution: {integrity: sha512-qyqydP/wyH8alcIP4a2hnGSjHLJjm9H7yDFup+CPy9oTahFgLLwnNcv5UHXqO2Qs3AIND+cls5f/Bb6hqpxdgA==} +======= + '@swc/core-linux-x64-musl@1.15.26': + resolution: {integrity: sha512-w8erqMHsVcdGwUfJxF6LaiTuPoKnyLOcUbhLcxiXrlLt5MLjtlgcIeUY/NWK/oPoyqkgH+/i8pOJnMTxvl83ZQ==} +>>>>>>> Stashed changes engines: {node: '>=10'} cpu: [x64] os: [linux] libc: [musl] +<<<<<<< Updated upstream '@swc/core-win32-arm64-msvc@1.15.30': resolution: {integrity: sha512-CaQENgDHVGOg1mSF5sQVgvfFHG9kjMor2rkLMLeLOkfZYNj13ppnJ9+lfaBZLZUMMbnlGQnavCJb8PVBUOso7Q==} +======= + '@swc/core-win32-arm64-msvc@1.15.26': + resolution: {integrity: sha512-uDCWCNpUiqkbvPmsuPUTn/P7ag9SqNXD2JT/W3dUu7yZ2krzN+nmmoQ2xRX63/J6RYiHI7aT4jo7Z++lsljlPA==} +>>>>>>> Stashed changes engines: {node: '>=10'} cpu: [arm64] os: [win32] +<<<<<<< Updated upstream '@swc/core-win32-ia32-msvc@1.15.30': resolution: {integrity: sha512-30VdLeGk6fugiUs/kUdJ/pAg7z/zpvVbR11RH60jZ0Z42WIeIniYx0rLEWN7h/pKJ3CopqsQ3RsogCAkRKiA2g==} +======= + '@swc/core-win32-ia32-msvc@1.15.26': + resolution: {integrity: sha512-2k1ax1QmmqLEnpC0uRCw7OXhBfyvdPqERBXupDasjYbChT6ZSO/uha28Bp38cw0viKIG79L27aTDkbkABsMW3w==} +>>>>>>> Stashed changes engines: {node: '>=10'} cpu: [ia32] os: [win32] +<<<<<<< Updated upstream '@swc/core-win32-x64-msvc@1.15.30': resolution: {integrity: sha512-4iObHPR+Q4oDY110EF5SF5eIaaVJNpMdG9C0q3Q92BsJ5y467uHz7sYQhP60WYlLFsLQ1el2YrIPUItUAQGOKg==} +======= + '@swc/core-win32-x64-msvc@1.15.26': + resolution: {integrity: sha512-aUuYecSEGa4SUSdyCWaI/vk8jdseifYnsF1GZQx2+piL8GIuT/5QrVcFfmes4Iwy7FIVXxtzD063z/FfpZ7K7w==} +>>>>>>> Stashed changes engines: {node: '>=10'} cpu: [x64] os: [win32] +<<<<<<< Updated upstream '@swc/core@1.15.30': resolution: {integrity: sha512-R8VQbQY1BZcbIF2p3gjlTCwAQzx1A194ugWfwld5y+WgVVWqVKm7eURGGOVbQVubgKWzidP2agomBbg96rZilQ==} +======= + '@swc/core@1.15.26': + resolution: {integrity: sha512-tglZGyx8N5PC+x1Nd/JrZxqpqlcZoSuG9gTDKO6AuFToFiVB3uS8HvbKFuO7g3lJzvFf9riAb94xs9HU2UhAHQ==} +>>>>>>> Stashed changes engines: {node: '>=10'} peerDependencies: '@swc/helpers': '>=0.5.17' @@ -1248,8 +1325,13 @@ packages: '@tanstack/router-core': optional: true +<<<<<<< Updated upstream '@tanstack/react-router@1.168.23': resolution: {integrity: sha512-+GblieDnutG6oipJJPNtRJjrWF8QTZEG/l0532+BngFkVK48oHNOcvIkSoAFYftK1egAwM7KBxXsb0Ou+X6/MQ==} +======= + '@tanstack/react-router@1.168.22': + resolution: {integrity: sha512-W2LyfkfJtDCf//jOjZeUBWwOVl8iDRVTECpGHa2M28MT3T5/VVnjgicYNHR/ax0Filk1iU67MRjcjHheTYvK1Q==} +>>>>>>> Stashed changes engines: {node: '>=20.19'} peerDependencies: react: '>=18.0.0 || >=19.0.0' @@ -1505,8 +1587,13 @@ packages: resolution: {integrity: sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==} engines: {node: 18 || 20 || >=22} +<<<<<<< Updated upstream baseline-browser-mapping@2.10.20: resolution: {integrity: sha512-1AaXxEPfXT+GvTBJFuy4yXVHWJBXa4OdbIebGN/wX5DlsIkU0+wzGnd2lOzokSk51d5LUmqjgBLRLlypLUqInQ==} +======= + baseline-browser-mapping@2.10.19: + resolution: {integrity: sha512-qCkNLi2sfBOn8XhZQ0FXsT1Ki/Yo5P90hrkRamVFRS7/KV9hpfA4HkoWNU152+8w0zPjnxo5psx5NL3PSGgv5g==} +>>>>>>> Stashed changes engines: {node: '>=6.0.0'} hasBin: true @@ -1702,8 +1789,13 @@ packages: resolution: {integrity: sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==} engines: {node: '>= 0.4'} +<<<<<<< Updated upstream electron-to-chromium@1.5.340: resolution: {integrity: sha512-908qahOGocRMinT2nM3ajCEM99H4iPdv84eagPP3FfZy/1ZGeOy2CZYzjhms81ckOPCXPlW7LkY4XpxD8r1DrA==} +======= + electron-to-chromium@1.5.339: + resolution: {integrity: sha512-Is+0BBHJ4NrdpAYiperrmp53pLywG/yV/6lIMTAnhxvzj/Cmn5Q/ogSHC6AKe7X+8kPLxxFk0cs5oc/3j/fxIg==} +>>>>>>> Stashed changes emoji-regex@8.0.0: resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==} @@ -3635,6 +3727,7 @@ snapshots: '@sqlite.org/sqlite-wasm@3.48.0-build4': {} +<<<<<<< Updated upstream '@swc/core-darwin-arm64@1.15.30': optional: true @@ -3672,10 +3765,50 @@ snapshots: optional: true '@swc/core@1.15.30': +======= + '@swc/core-darwin-arm64@1.15.26': + optional: true + + '@swc/core-darwin-x64@1.15.26': + optional: true + + '@swc/core-linux-arm-gnueabihf@1.15.26': + optional: true + + '@swc/core-linux-arm64-gnu@1.15.26': + optional: true + + '@swc/core-linux-arm64-musl@1.15.26': + optional: true + + '@swc/core-linux-ppc64-gnu@1.15.26': + optional: true + + '@swc/core-linux-s390x-gnu@1.15.26': + optional: true + + '@swc/core-linux-x64-gnu@1.15.26': + optional: true + + '@swc/core-linux-x64-musl@1.15.26': + optional: true + + '@swc/core-win32-arm64-msvc@1.15.26': + optional: true + + '@swc/core-win32-ia32-msvc@1.15.26': + optional: true + + '@swc/core-win32-x64-msvc@1.15.26': + optional: true + + '@swc/core@1.15.26': +>>>>>>> Stashed changes dependencies: '@swc/counter': 0.1.3 '@swc/types': 0.1.26 optionalDependencies: +<<<<<<< Updated upstream '@swc/core-darwin-arm64': 1.15.30 '@swc/core-darwin-x64': 1.15.30 '@swc/core-linux-arm-gnueabihf': 1.15.30 @@ -3688,6 +3821,20 @@ snapshots: '@swc/core-win32-arm64-msvc': 1.15.30 '@swc/core-win32-ia32-msvc': 1.15.30 '@swc/core-win32-x64-msvc': 1.15.30 +======= + '@swc/core-darwin-arm64': 1.15.26 + '@swc/core-darwin-x64': 1.15.26 + '@swc/core-linux-arm-gnueabihf': 1.15.26 + '@swc/core-linux-arm64-gnu': 1.15.26 + '@swc/core-linux-arm64-musl': 1.15.26 + '@swc/core-linux-ppc64-gnu': 1.15.26 + '@swc/core-linux-s390x-gnu': 1.15.26 + '@swc/core-linux-x64-gnu': 1.15.26 + '@swc/core-linux-x64-musl': 1.15.26 + '@swc/core-win32-arm64-msvc': 1.15.26 + '@swc/core-win32-ia32-msvc': 1.15.26 + '@swc/core-win32-x64-msvc': 1.15.26 +>>>>>>> Stashed changes '@swc/counter@0.1.3': {} @@ -3797,9 +3944,15 @@ snapshots: '@tanstack/query-core': 5.99.2 react: 19.2.5 +<<<<<<< Updated upstream '@tanstack/react-router-devtools@1.166.13(@tanstack/react-router@1.168.23(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(@tanstack/router-core@1.168.15)(csstype@3.2.3)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)': dependencies: '@tanstack/react-router': 1.168.23(react-dom@19.2.5(react@19.2.5))(react@19.2.5) +======= + '@tanstack/react-router-devtools@1.166.13(@tanstack/react-router@1.168.22(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(@tanstack/router-core@1.168.15)(csstype@3.2.3)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)': + dependencies: + '@tanstack/react-router': 1.168.22(react-dom@19.2.5(react@19.2.5))(react@19.2.5) +>>>>>>> Stashed changes '@tanstack/router-devtools-core': 1.167.3(@tanstack/router-core@1.168.15)(csstype@3.2.3) react: 19.2.5 react-dom: 19.2.5(react@19.2.5) @@ -3808,12 +3961,20 @@ snapshots: transitivePeerDependencies: - csstype +<<<<<<< Updated upstream '@tanstack/react-router@1.168.23(react-dom@19.2.5(react@19.2.5))(react@19.2.5)': +======= + '@tanstack/react-router@1.168.22(react-dom@19.2.5(react@19.2.5))(react@19.2.5)': +>>>>>>> Stashed changes dependencies: '@tanstack/history': 1.161.6 '@tanstack/react-store': 0.9.3(react-dom@19.2.5(react@19.2.5))(react@19.2.5) '@tanstack/router-core': 1.168.15 +<<<<<<< Updated upstream isbot: 5.1.39 +======= + isbot: 5.1.38 +>>>>>>> Stashed changes react: 19.2.5 react-dom: 19.2.5(react@19.2.5) @@ -3852,7 +4013,11 @@ snapshots: transitivePeerDependencies: - supports-color +<<<<<<< Updated upstream '@tanstack/router-plugin@1.167.22(@tanstack/react-router@1.168.23(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(vite@7.3.2(@types/node@25.6.0)(sass@1.99.0)(tsx@4.21.0))': +======= + '@tanstack/router-plugin@1.167.22(@tanstack/react-router@1.168.22(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(vite@7.3.2(@types/node@25.6.0)(sass@1.99.0)(tsx@4.21.0))': +>>>>>>> Stashed changes dependencies: '@babel/core': 7.29.0 '@babel/plugin-syntax-jsx': 7.28.6(@babel/core@7.29.0) @@ -3868,7 +4033,11 @@ snapshots: unplugin: 2.3.11 zod: 3.25.76 optionalDependencies: +<<<<<<< Updated upstream '@tanstack/react-router': 1.168.23(react-dom@19.2.5(react@19.2.5))(react@19.2.5) +======= + '@tanstack/react-router': 1.168.22(react-dom@19.2.5(react@19.2.5))(react@19.2.5) +>>>>>>> Stashed changes vite: 7.3.2(@types/node@25.6.0)(sass@1.99.0)(tsx@4.21.0) transitivePeerDependencies: - supports-color @@ -4038,7 +4207,11 @@ snapshots: '@vitejs/plugin-react-swc@4.3.0(vite@7.3.2(@types/node@25.6.0)(sass@1.99.0)(tsx@4.21.0))': dependencies: '@rolldown/pluginutils': 1.0.0-rc.7 +<<<<<<< Updated upstream '@swc/core': 1.15.30 +======= + '@swc/core': 1.15.26 +>>>>>>> Stashed changes vite: 7.3.2(@types/node@25.6.0)(sass@1.99.0)(tsx@4.21.0) transitivePeerDependencies: - '@swc/helpers' @@ -4111,7 +4284,11 @@ snapshots: balanced-match@4.0.4: {} +<<<<<<< Updated upstream baseline-browser-mapping@2.10.20: {} +======= + baseline-browser-mapping@2.10.19: {} +>>>>>>> Stashed changes binary-extensions@2.3.0: {} @@ -4130,9 +4307,15 @@ snapshots: browserslist@4.28.2: dependencies: +<<<<<<< Updated upstream baseline-browser-mapping: 2.10.20 caniuse-lite: 1.0.30001788 electron-to-chromium: 1.5.340 +======= + baseline-browser-mapping: 2.10.19 + caniuse-lite: 1.0.30001788 + electron-to-chromium: 1.5.339 +>>>>>>> Stashed changes node-releases: 2.0.37 update-browserslist-db: 1.2.3(browserslist@4.28.2) @@ -4282,7 +4465,11 @@ snapshots: es-errors: 1.3.0 gopd: 1.2.0 +<<<<<<< Updated upstream electron-to-chromium@1.5.340: {} +======= + electron-to-chromium@1.5.339: {} +>>>>>>> Stashed changes emoji-regex@8.0.0: {} @@ -5597,7 +5784,11 @@ snapshots: fdir: 6.5.0(picomatch@4.0.4) picomatch: 4.0.4 postcss: 8.5.10 +<<<<<<< Updated upstream rollup: 4.60.2 +======= + rollup: 4.60.1 +>>>>>>> Stashed changes tinyglobby: 0.2.16 optionalDependencies: '@types/node': 25.6.0 From dc3367eafe9906188d03e8be4fbf4f0785b31fa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20Ciarcin=CC=81ski?= Date: Wed, 22 Apr 2026 09:09:07 +0200 Subject: [PATCH 02/10] Fix web --- web/package.json | 12 +- web/pnpm-lock.yaml | 371 +++++++++++---------------------------------- 2 files changed, 93 insertions(+), 290 deletions(-) diff --git a/web/package.json b/web/package.json index 1155bacd..5295a3c3 100644 --- a/web/package.json +++ b/web/package.json @@ -17,19 +17,13 @@ "@floating-ui/react": "^0.27.19", "@inlang/paraglide-js": "^2.16.0", "@tanstack/react-devtools": "^0.9.13", - "@tanstack/react-form": "^1.29.0", -<<<<<<< Updated upstream + "@tanstack/react-form": "^1.29.1", "@tanstack/react-query": "^5.99.2", "@tanstack/react-query-devtools": "^5.99.2", "@tanstack/react-router": "^1.168.23", -======= - "@tanstack/react-query": "^5.99.0", - "@tanstack/react-query-devtools": "^5.99.0", - "@tanstack/react-router": "^1.168.22", ->>>>>>> Stashed changes "@tanstack/react-router-devtools": "^1.166.13", "@uidotdev/usehooks": "^2.4.1", - "axios": "^1.15.1", + "axios": "^1.15.2", "change-case": "^5.4.4", "clsx": "^2.1.1", "dayjs": "^1.11.20", @@ -63,7 +57,7 @@ "stylelint-config-standard-scss": "^17.0.0", "stylelint-scss": "^7.0.0", "typescript": "~5.9.3", - "typescript-eslint": "^8.58.2", + "typescript-eslint": "^8.59.0", "vite": "^7.3.2", "vite-plugin-image-optimizer": "^2.0.3" }, diff --git a/web/pnpm-lock.yaml b/web/pnpm-lock.yaml index 353a2b35..6e9d4c84 100644 --- a/web/pnpm-lock.yaml +++ b/web/pnpm-lock.yaml @@ -25,8 +25,8 @@ importers: specifier: ^0.9.13 version: 0.9.13(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(csstype@3.2.3)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(solid-js@1.9.10) '@tanstack/react-form': - specifier: ^1.29.0 - version: 1.29.0(react-dom@19.2.5(react@19.2.5))(react@19.2.5) + specifier: ^1.29.1 + version: 1.29.1(react-dom@19.2.5(react@19.2.5))(react@19.2.5) '@tanstack/react-query': specifier: ^5.99.2 version: 5.99.2(react@19.2.5) @@ -34,25 +34,17 @@ importers: specifier: ^5.99.2 version: 5.99.2(@tanstack/react-query@5.99.2(react@19.2.5))(react@19.2.5) '@tanstack/react-router': -<<<<<<< Updated upstream specifier: ^1.168.23 version: 1.168.23(react-dom@19.2.5(react@19.2.5))(react@19.2.5) '@tanstack/react-router-devtools': specifier: ^1.166.13 version: 1.166.13(@tanstack/react-router@1.168.23(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(@tanstack/router-core@1.168.15)(csstype@3.2.3)(react-dom@19.2.5(react@19.2.5))(react@19.2.5) -======= - specifier: ^1.168.22 - version: 1.168.22(react-dom@19.2.5(react@19.2.5))(react@19.2.5) - '@tanstack/react-router-devtools': - specifier: ^1.166.13 - version: 1.166.13(@tanstack/react-router@1.168.22(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(@tanstack/router-core@1.168.15)(csstype@3.2.3)(react-dom@19.2.5(react@19.2.5))(react@19.2.5) ->>>>>>> Stashed changes '@uidotdev/usehooks': specifier: ^2.4.1 version: 2.4.1(react-dom@19.2.5(react@19.2.5))(react@19.2.5) axios: - specifier: ^1.15.1 - version: 1.15.1 + specifier: ^1.15.2 + version: 1.15.2 change-case: specifier: ^5.4.4 version: 5.4.4 @@ -101,11 +93,7 @@ importers: version: 0.5.5(vite@7.3.2(@types/node@25.6.0)(sass@1.99.0)(tsx@4.21.0)) '@tanstack/router-plugin': specifier: ^1.167.22 -<<<<<<< Updated upstream version: 1.167.22(@tanstack/react-router@1.168.23(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(vite@7.3.2(@types/node@25.6.0)(sass@1.99.0)(tsx@4.21.0)) -======= - version: 1.167.22(@tanstack/react-router@1.168.22(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(vite@7.3.2(@types/node@25.6.0)(sass@1.99.0)(tsx@4.21.0)) ->>>>>>> Stashed changes '@types/lodash-es': specifier: ^4.17.12 version: 4.17.12 @@ -149,8 +137,8 @@ importers: specifier: ~5.9.3 version: 5.9.3 typescript-eslint: - specifier: ^8.58.2 - version: 8.58.2(eslint@9.38.0)(typescript@5.9.3) + specifier: ^8.59.0 + version: 8.59.0(eslint@9.38.0)(typescript@5.9.3) vite: specifier: ^7.3.2 version: 7.3.2(@types/node@25.6.0)(sass@1.99.0)(tsx@4.21.0) @@ -1076,151 +1064,86 @@ packages: resolution: {integrity: sha512-hI6twvUkzOmyGZhQMza1gpfqErZxXRw6JEsiVjUbo7tFanVD+8Oil0Ih3l2nGzHdxPI41zFmfUQG7GHqhciKZQ==} hasBin: true -<<<<<<< Updated upstream '@swc/core-darwin-arm64@1.15.30': resolution: {integrity: sha512-VvpP+vq08HmGYewMWvrdsxh9s2lthz/808zXm8Yu5kaqeR8Yia2b0eYXleHQ3VAjoStUDk6LzTheBW9KXYQdMA==} -======= - '@swc/core-darwin-arm64@1.15.26': - resolution: {integrity: sha512-OmcP96CFsNOwa65tamQayRcfqhNlcQ3YCWOq+0Wb+CAM4uB7kOMrXY41Gj4atthxrGhLQ9pg7Vk26iApb88idA==} ->>>>>>> Stashed changes engines: {node: '>=10'} cpu: [arm64] os: [darwin] -<<<<<<< Updated upstream '@swc/core-darwin-x64@1.15.30': resolution: {integrity: sha512-WiJA0hiZI3nwQAO6mu5RqigtWGDtth4Hiq6rbZxAaQyhIcqKIg5IoMRc1Y071lrNJn29eEDMC86Rq58xgUxlDg==} -======= - '@swc/core-darwin-x64@1.15.26': - resolution: {integrity: sha512-liTTTpKSv89ivIxcZ+iU1cRige9Y7JkOjVnJ2Ystzl+DsWNHqt7wLTTgm/u7gEqmmAS2JKryODLQn3q1UtFNPQ==} ->>>>>>> Stashed changes engines: {node: '>=10'} cpu: [x64] os: [darwin] -<<<<<<< Updated upstream '@swc/core-linux-arm-gnueabihf@1.15.30': resolution: {integrity: sha512-YANuFUo48kIT6plJgCD0keae9HFXfjxsbvsgevqc0hr/07X/p7sAWTFOGYEc2SXcASaK7UvuQqzlbW8pr7R79g==} -======= - '@swc/core-linux-arm-gnueabihf@1.15.26': - resolution: {integrity: sha512-Y/g+m3I8CeBof5A3kWWOS6QA2HOIUytF5EeTgfwcAK+GKT/tGe7Xqo5svBtaqflU5od2zzbMTWqkinPXgRWGgA==} ->>>>>>> Stashed changes engines: {node: '>=10'} cpu: [arm] os: [linux] -<<<<<<< Updated upstream '@swc/core-linux-arm64-gnu@1.15.30': resolution: {integrity: sha512-VndG8jaR4ugY6u+iVOT0Q+d2fZd7sLgjPgN8W/Le+3EbZKl+cRfFxV7Eoz4gfLqhmneZPdcIzf9T3LkgkmqNLg==} -======= - '@swc/core-linux-arm64-gnu@1.15.26': - resolution: {integrity: sha512-19IvwyPfBN/rz9s7qXhOTQmW0922+pjpRUUvIebu+CMM75nX6YuDzHsGx8hSmn5dS89SNaMCh1lgUuXqm++6jg==} ->>>>>>> Stashed changes engines: {node: '>=10'} cpu: [arm64] os: [linux] libc: [glibc] -<<<<<<< Updated upstream '@swc/core-linux-arm64-musl@1.15.30': resolution: {integrity: sha512-1SYGs2l0Yyyi0pR/P/NKz/x0kqxkoiw+BXeJjLUdecSk/KasncWlJrc6hOvFSgKHOBrzgM5jwuluKtlT8dnrcA==} -======= - '@swc/core-linux-arm64-musl@1.15.26': - resolution: {integrity: sha512-iNlbvTIo425rkKzDLLWFJGnFXr3myETUdIDHcjuiPNZE8b0ogmcAuilC4yEJX7FSHGbnlsoJcCT2xf4b3VJmmQ==} ->>>>>>> Stashed changes engines: {node: '>=10'} cpu: [arm64] os: [linux] libc: [musl] -<<<<<<< Updated upstream '@swc/core-linux-ppc64-gnu@1.15.30': resolution: {integrity: sha512-TXREtiXeRhbfDFbmhnkIsXpKfzbfT73YkV2ZF6w0sfxgjC5zI2ZAbaCOq25qxvegofj2K93DtOpm9RLaBgqR2g==} -======= - '@swc/core-linux-ppc64-gnu@1.15.26': - resolution: {integrity: sha512-AuuEOtG+YXKIjIUup4RsxYNklx6XVB3WKWfhxG6hnfPrn7vp89RNOLbbyyprgj6Sk7k9ulwGVTJElEvmBNPSCA==} ->>>>>>> Stashed changes engines: {node: '>=10'} cpu: [ppc64] os: [linux] libc: [glibc] -<<<<<<< Updated upstream '@swc/core-linux-s390x-gnu@1.15.30': resolution: {integrity: sha512-DCR2YYeyd6DQE4OuDhImouuNcjXEiEdnn1Y0DyGteugPEDvVuvYk8Xddi+4o2SgWH6jiW8/I+3emZvbep1NC+g==} -======= - '@swc/core-linux-s390x-gnu@1.15.26': - resolution: {integrity: sha512-JcMDWQvW1BchUyRg8E0jHiTx7CQYpUr5uDEL1dnPDECrEjBEGG2ynmJ3XX70sWXql0JagqR1t3VpANYFWdUnqA==} ->>>>>>> Stashed changes engines: {node: '>=10'} cpu: [s390x] os: [linux] libc: [glibc] -<<<<<<< Updated upstream '@swc/core-linux-x64-gnu@1.15.30': resolution: {integrity: sha512-5Pizw3NgfOJ5BJOBK8TIRa59xFW2avESTOBDPTAYwZYa1JNDs+KMF9lUfjJiJLM5HiMs/wPheA9eiT0q9m2AoA==} -======= - '@swc/core-linux-x64-gnu@1.15.26': - resolution: {integrity: sha512-FW7V7Mbpq4+PA7BiAq76LJs8MdNuUSylyuRVfQRkhIyeWadFroZ+KOPgjku8Z/fXzngxBRvsk+PGGB0t8mGcjA==} ->>>>>>> Stashed changes engines: {node: '>=10'} cpu: [x64] os: [linux] libc: [glibc] -<<<<<<< Updated upstream '@swc/core-linux-x64-musl@1.15.30': resolution: {integrity: sha512-qyqydP/wyH8alcIP4a2hnGSjHLJjm9H7yDFup+CPy9oTahFgLLwnNcv5UHXqO2Qs3AIND+cls5f/Bb6hqpxdgA==} -======= - '@swc/core-linux-x64-musl@1.15.26': - resolution: {integrity: sha512-w8erqMHsVcdGwUfJxF6LaiTuPoKnyLOcUbhLcxiXrlLt5MLjtlgcIeUY/NWK/oPoyqkgH+/i8pOJnMTxvl83ZQ==} ->>>>>>> Stashed changes engines: {node: '>=10'} cpu: [x64] os: [linux] libc: [musl] -<<<<<<< Updated upstream '@swc/core-win32-arm64-msvc@1.15.30': resolution: {integrity: sha512-CaQENgDHVGOg1mSF5sQVgvfFHG9kjMor2rkLMLeLOkfZYNj13ppnJ9+lfaBZLZUMMbnlGQnavCJb8PVBUOso7Q==} -======= - '@swc/core-win32-arm64-msvc@1.15.26': - resolution: {integrity: sha512-uDCWCNpUiqkbvPmsuPUTn/P7ag9SqNXD2JT/W3dUu7yZ2krzN+nmmoQ2xRX63/J6RYiHI7aT4jo7Z++lsljlPA==} ->>>>>>> Stashed changes engines: {node: '>=10'} cpu: [arm64] os: [win32] -<<<<<<< Updated upstream '@swc/core-win32-ia32-msvc@1.15.30': resolution: {integrity: sha512-30VdLeGk6fugiUs/kUdJ/pAg7z/zpvVbR11RH60jZ0Z42WIeIniYx0rLEWN7h/pKJ3CopqsQ3RsogCAkRKiA2g==} -======= - '@swc/core-win32-ia32-msvc@1.15.26': - resolution: {integrity: sha512-2k1ax1QmmqLEnpC0uRCw7OXhBfyvdPqERBXupDasjYbChT6ZSO/uha28Bp38cw0viKIG79L27aTDkbkABsMW3w==} ->>>>>>> Stashed changes engines: {node: '>=10'} cpu: [ia32] os: [win32] -<<<<<<< Updated upstream '@swc/core-win32-x64-msvc@1.15.30': resolution: {integrity: sha512-4iObHPR+Q4oDY110EF5SF5eIaaVJNpMdG9C0q3Q92BsJ5y467uHz7sYQhP60WYlLFsLQ1el2YrIPUItUAQGOKg==} -======= - '@swc/core-win32-x64-msvc@1.15.26': - resolution: {integrity: sha512-aUuYecSEGa4SUSdyCWaI/vk8jdseifYnsF1GZQx2+piL8GIuT/5QrVcFfmes4Iwy7FIVXxtzD063z/FfpZ7K7w==} ->>>>>>> Stashed changes engines: {node: '>=10'} cpu: [x64] os: [win32] -<<<<<<< Updated upstream '@swc/core@1.15.30': resolution: {integrity: sha512-R8VQbQY1BZcbIF2p3gjlTCwAQzx1A194ugWfwld5y+WgVVWqVKm7eURGGOVbQVubgKWzidP2agomBbg96rZilQ==} -======= - '@swc/core@1.15.26': - resolution: {integrity: sha512-tglZGyx8N5PC+x1Nd/JrZxqpqlcZoSuG9gTDKO6AuFToFiVB3uS8HvbKFuO7g3lJzvFf9riAb94xs9HU2UhAHQ==} ->>>>>>> Stashed changes engines: {node: '>=10'} peerDependencies: '@swc/helpers': '>=0.5.17' @@ -1267,8 +1190,8 @@ packages: peerDependencies: solid-js: '>=1.9.7' - '@tanstack/form-core@1.29.0': - resolution: {integrity: sha512-uyeKEdJBfbj0bkBSwvSYVRtWLOaXvfNX3CeVw1HqGOXVLxpBBGAqWdYLc+UoX/9xcoFwFXrjR9QqMPzvwm2yyQ==} + '@tanstack/form-core@1.29.1': + resolution: {integrity: sha512-NIYPO36eEu7nSWvMpbFDQaBWyVtnH/C8fsZ3/XpJUT4uOWgmxsiUvHGbTbDNIQTXAKIkhwEl0sUrqBNn2SfUnw==} '@tanstack/history@1.161.6': resolution: {integrity: sha512-NaOGLRrddszbQj9upGat6HG/4TKvXLvu+osAIgfxPYA+eIvYKv8GKDJOrY2D3/U9MRnKfMWD7bU4jeD4xmqyIg==} @@ -1293,8 +1216,8 @@ packages: react: '>=16.8' react-dom: '>=16.8' - '@tanstack/react-form@1.29.0': - resolution: {integrity: sha512-jj425NNX0QKqbUzqSNiYI3HCPHSk2df47acXCJyXczWOTmG81ECZGkgofgqamFsSU9kMiH6Di5RLUnftrlhWSw==} + '@tanstack/react-form@1.29.1': + resolution: {integrity: sha512-hVHk4g0phd0HxRsv2ry6Xt8BqmalT55Q3cokhJBCC1St0hcGZhgwJJbohm9atao45BPG9e55DGvtbwExqZe35g==} peerDependencies: '@tanstack/react-start': '*' react: ^17.0.0 || ^18.0.0 || ^19.0.0 @@ -1325,13 +1248,8 @@ packages: '@tanstack/router-core': optional: true -<<<<<<< Updated upstream '@tanstack/react-router@1.168.23': resolution: {integrity: sha512-+GblieDnutG6oipJJPNtRJjrWF8QTZEG/l0532+BngFkVK48oHNOcvIkSoAFYftK1egAwM7KBxXsb0Ou+X6/MQ==} -======= - '@tanstack/react-router@1.168.22': - resolution: {integrity: sha512-W2LyfkfJtDCf//jOjZeUBWwOVl8iDRVTECpGHa2M28MT3T5/VVnjgicYNHR/ax0Filk1iU67MRjcjHheTYvK1Q==} ->>>>>>> Stashed changes engines: {node: '>=20.19'} peerDependencies: react: '>=18.0.0 || >=19.0.0' @@ -1443,63 +1361,63 @@ packages: '@types/unist@3.0.3': resolution: {integrity: sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==} - '@typescript-eslint/eslint-plugin@8.58.2': - resolution: {integrity: sha512-aC2qc5thQahutKjP+cl8cgN9DWe3ZUqVko30CMSZHnFEHyhOYoZSzkGtAI2mcwZ38xeImDucI4dnqsHiOYuuCw==} + '@typescript-eslint/eslint-plugin@8.59.0': + resolution: {integrity: sha512-HyAZtpdkgZwpq8Sz3FSUvCR4c+ScbuWa9AksK2Jweub7w4M3yTz4O11AqVJzLYjy/B9ZWPyc81I+mOdJU/bDQw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: - '@typescript-eslint/parser': ^8.58.2 + '@typescript-eslint/parser': ^8.59.0 eslint: ^8.57.0 || ^9.0.0 || ^10.0.0 typescript: '>=4.8.4 <6.1.0' - '@typescript-eslint/parser@8.58.2': - resolution: {integrity: sha512-/Zb/xaIDfxeJnvishjGdcR4jmr7S+bda8PKNhRGdljDM+elXhlvN0FyPSsMnLmJUrVG9aPO6dof80wjMawsASg==} + '@typescript-eslint/parser@8.59.0': + resolution: {integrity: sha512-TI1XGwKbDpo9tRW8UDIXCOeLk55qe9ZFGs8MTKU6/M08HWTw52DD/IYhfQtOEhEdPhLMT26Ka/x7p70nd3dzDg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 || ^10.0.0 typescript: '>=4.8.4 <6.1.0' - '@typescript-eslint/project-service@8.58.2': - resolution: {integrity: sha512-Cq6UfpZZk15+r87BkIh5rDpi38W4b+Sjnb8wQCPPDDweS/LRCFjCyViEbzHk5Ck3f2QDfgmlxqSa7S7clDtlfg==} + '@typescript-eslint/project-service@8.59.0': + resolution: {integrity: sha512-Lw5ITrR5s5TbC19YSvlr63ZfLaJoU6vtKTHyB0GQOpX0W7d5/Ir6vUahWi/8Sps/nOukZQ0IB3SmlxZnjaKVnw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '>=4.8.4 <6.1.0' - '@typescript-eslint/scope-manager@8.58.2': - resolution: {integrity: sha512-SgmyvDPexWETQek+qzZnrG6844IaO02UVyOLhI4wpo82dpZJY9+6YZCKAMFzXb7qhx37mFK1QcPQ18tud+vo6Q==} + '@typescript-eslint/scope-manager@8.59.0': + resolution: {integrity: sha512-UzR16Ut8IpA3Mc4DbgAShlPPkVm8xXMWafXxB0BocaVRHs8ZGakAxGRskF7FId3sdk9lgGD73GSFaWmWFDE4dg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/tsconfig-utils@8.58.2': - resolution: {integrity: sha512-3SR+RukipDvkkKp/d0jP0dyzuls3DbGmwDpVEc5wqk5f38KFThakqAAO0XMirWAE+kT00oTauTbzMFGPoAzB0A==} + '@typescript-eslint/tsconfig-utils@8.59.0': + resolution: {integrity: sha512-91Sbl3s4Kb3SybliIY6muFBmHVv+pYXfybC4Oolp3dvk8BvIE3wOPc+403CWIT7mJNkfQRGtdqghzs2+Z91Tqg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '>=4.8.4 <6.1.0' - '@typescript-eslint/type-utils@8.58.2': - resolution: {integrity: sha512-Z7EloNR/B389FvabdGeTo2XMs4W9TjtPiO9DAsmT0yom0bwlPyRjkJ1uCdW1DvrrrYP50AJZ9Xc3sByZA9+dcg==} + '@typescript-eslint/type-utils@8.59.0': + resolution: {integrity: sha512-3TRiZaQSltGqGeNrJzzr1+8YcEobKH9rHnqIp/1psfKFmhRQDNMGP5hBufanYTGznwShzVLs3Mz+gDN7HkWfXg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 || ^10.0.0 typescript: '>=4.8.4 <6.1.0' - '@typescript-eslint/types@8.58.2': - resolution: {integrity: sha512-9TukXyATBQf/Jq9AMQXfvurk+G5R2MwfqQGDR2GzGz28HvY/lXNKGhkY+6IOubwcquikWk5cjlgPvD2uAA7htQ==} + '@typescript-eslint/types@8.59.0': + resolution: {integrity: sha512-nLzdsT1gdOgFxxxwrlNVUBzSNBEEHJ86bblmk4QAS6stfig7rcJzWKqCyxFy3YRRHXDWEkb2NralA1nOYkkm/A==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/typescript-estree@8.58.2': - resolution: {integrity: sha512-ELGuoofuhhoCvNbQjFFiobFcGgcDCEm0ThWdmO4Z0UzLqPXS3KFvnEZ+SHewwOYHjM09tkzOWXNTv9u6Gqtyuw==} + '@typescript-eslint/typescript-estree@8.59.0': + resolution: {integrity: sha512-O9Re9P1BmBLFJyikRbQpLku/QA3/AueZNO9WePLBwQrvkixTmDe8u76B6CYUAITRl/rHawggEqUGn5QIkVRLMw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '>=4.8.4 <6.1.0' - '@typescript-eslint/utils@8.58.2': - resolution: {integrity: sha512-QZfjHNEzPY8+l0+fIXMvuQ2sJlplB4zgDZvA+NmvZsZv3EQwOcc1DuIU1VJUTWZ/RKouBMhDyNaBMx4sWvrzRA==} + '@typescript-eslint/utils@8.59.0': + resolution: {integrity: sha512-I1R/K7V07XsMJ12Oaxg/O9GfrysGTmCRhvZJBv0RE0NcULMzjqVpR5kRRQjHsz3J/bElU7HwCO7zkqL+MSUz+g==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 || ^10.0.0 typescript: '>=4.8.4 <6.1.0' - '@typescript-eslint/visitor-keys@8.58.2': - resolution: {integrity: sha512-f1WO2Lx8a9t8DARmcWAUPJbu0G20bJlj8L4z72K00TMeJAoyLr/tHhI/pzYBLrR4dXWkcxO1cWYZEOX8DKHTqA==} + '@typescript-eslint/visitor-keys@8.59.0': + resolution: {integrity: sha512-/uejZt4dSere1bx12WLlPfv8GktzcaDtuJ7s42/HEZ5zGj9oxRaD4bj7qwSunXkf+pbAhFt2zjpHYUiT5lHf0Q==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} '@uidotdev/usehooks@2.4.1': @@ -1571,8 +1489,8 @@ packages: asynckit@0.4.0: resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==} - axios@1.15.1: - resolution: {integrity: sha512-WOG+Jj8ZOvR0a3rAn+Tuf1UQJRxw5venr6DgdbJzngJE3qG7X0kL83CZGpdHMxEm+ZK3seAbvFsw4FfOfP9vxg==} + axios@1.15.2: + resolution: {integrity: sha512-wLrXxPtcrPTsNlJmKjkPnNPK2Ihe0hn0wGSaTEiHRPxwjvJwT3hKmXF4dpqxmPO9SoNb2FsYXj/xEo0gHN+D5A==} babel-dead-code-elimination@1.0.12: resolution: {integrity: sha512-GERT7L2TiYcYDtYk1IpD+ASAYXjKbLTDPhBtYj7X1NuRMDTMtAx9kyBenub1Ev41lo91OHCKdmP+egTDmfQ7Ig==} @@ -1587,13 +1505,8 @@ packages: resolution: {integrity: sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==} engines: {node: 18 || 20 || >=22} -<<<<<<< Updated upstream baseline-browser-mapping@2.10.20: resolution: {integrity: sha512-1AaXxEPfXT+GvTBJFuy4yXVHWJBXa4OdbIebGN/wX5DlsIkU0+wzGnd2lOzokSk51d5LUmqjgBLRLlypLUqInQ==} -======= - baseline-browser-mapping@2.10.19: - resolution: {integrity: sha512-qCkNLi2sfBOn8XhZQ0FXsT1Ki/Yo5P90hrkRamVFRS7/KV9hpfA4HkoWNU152+8w0zPjnxo5psx5NL3PSGgv5g==} ->>>>>>> Stashed changes engines: {node: '>=6.0.0'} hasBin: true @@ -1632,8 +1545,8 @@ packages: resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==} engines: {node: '>=6'} - caniuse-lite@1.0.30001788: - resolution: {integrity: sha512-6q8HFp+lOQtcf7wBK+uEenxymVWkGKkjFpCvw5W25cmMwEDU45p1xQFBQv8JDlMMry7eNxyBaR+qxgmTUZkIRQ==} + caniuse-lite@1.0.30001790: + resolution: {integrity: sha512-bOoxfJPyYo+ds6W0YfptaCWbFnJYjh2Y1Eow5lRv+vI2u8ganPZqNm1JwNh0t2ELQCqIWg4B3dWEusgAmsoyOw==} ccount@2.0.1: resolution: {integrity: sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==} @@ -1789,13 +1702,8 @@ packages: resolution: {integrity: sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==} engines: {node: '>= 0.4'} -<<<<<<< Updated upstream - electron-to-chromium@1.5.340: - resolution: {integrity: sha512-908qahOGocRMinT2nM3ajCEM99H4iPdv84eagPP3FfZy/1ZGeOy2CZYzjhms81ckOPCXPlW7LkY4XpxD8r1DrA==} -======= - electron-to-chromium@1.5.339: - resolution: {integrity: sha512-Is+0BBHJ4NrdpAYiperrmp53pLywG/yV/6lIMTAnhxvzj/Cmn5Q/ogSHC6AKe7X+8kPLxxFk0cs5oc/3j/fxIg==} ->>>>>>> Stashed changes + electron-to-chromium@1.5.343: + resolution: {integrity: sha512-YHnQ3MXI08icvL9ZKnEBy05F2EQ8ob01UaMOuMbM8l+4UcAq6MPPbBTJBbsBUg3H8JeZNt+O4fjsoWth3p6IFg==} emoji-regex@8.0.0: resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==} @@ -2418,8 +2326,8 @@ packages: node-addon-api@7.1.1: resolution: {integrity: sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==} - node-releases@2.0.37: - resolution: {integrity: sha512-1h5gKZCF+pO/o3Iqt5Jp7wc9rH3eJJ0+nh/CIoiRwjRxde/hAHyLPXYN4V3CqKAbiZPSeJFSWHmJsbkicta0Eg==} + node-releases@2.0.38: + resolution: {integrity: sha512-3qT/88Y3FbH/Kx4szpQQ4HzUbVrHPKTLVpVocKiLfoYvw9XSGOX2FmD2d6DrXbVYyAQTF2HeF6My8jmzx7/CRw==} normalize-path@3.0.0: resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==} @@ -2812,8 +2720,8 @@ packages: resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==} engines: {node: '>= 0.8.0'} - typescript-eslint@8.58.2: - resolution: {integrity: sha512-V8iSng9mRbdZjl54VJ9NKr6ZB+dW0J3TzRXRGcSbLIej9jV86ZRtlYeTKDR/QLxXykocJ5icNzbsl2+5TzIvcQ==} + typescript-eslint@8.59.0: + resolution: {integrity: sha512-BU3ONW9X+v90EcCH9ZS6LMackcVtxRLlI3XrYyqZIwVSHIk7Qf7bFw1z0M9Q0IUxhTMZCf8piY9hTYaNEIASrw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 || ^10.0.0 @@ -3727,7 +3635,6 @@ snapshots: '@sqlite.org/sqlite-wasm@3.48.0-build4': {} -<<<<<<< Updated upstream '@swc/core-darwin-arm64@1.15.30': optional: true @@ -3765,50 +3672,10 @@ snapshots: optional: true '@swc/core@1.15.30': -======= - '@swc/core-darwin-arm64@1.15.26': - optional: true - - '@swc/core-darwin-x64@1.15.26': - optional: true - - '@swc/core-linux-arm-gnueabihf@1.15.26': - optional: true - - '@swc/core-linux-arm64-gnu@1.15.26': - optional: true - - '@swc/core-linux-arm64-musl@1.15.26': - optional: true - - '@swc/core-linux-ppc64-gnu@1.15.26': - optional: true - - '@swc/core-linux-s390x-gnu@1.15.26': - optional: true - - '@swc/core-linux-x64-gnu@1.15.26': - optional: true - - '@swc/core-linux-x64-musl@1.15.26': - optional: true - - '@swc/core-win32-arm64-msvc@1.15.26': - optional: true - - '@swc/core-win32-ia32-msvc@1.15.26': - optional: true - - '@swc/core-win32-x64-msvc@1.15.26': - optional: true - - '@swc/core@1.15.26': ->>>>>>> Stashed changes dependencies: '@swc/counter': 0.1.3 '@swc/types': 0.1.26 optionalDependencies: -<<<<<<< Updated upstream '@swc/core-darwin-arm64': 1.15.30 '@swc/core-darwin-x64': 1.15.30 '@swc/core-linux-arm-gnueabihf': 1.15.30 @@ -3821,20 +3688,6 @@ snapshots: '@swc/core-win32-arm64-msvc': 1.15.30 '@swc/core-win32-ia32-msvc': 1.15.30 '@swc/core-win32-x64-msvc': 1.15.30 -======= - '@swc/core-darwin-arm64': 1.15.26 - '@swc/core-darwin-x64': 1.15.26 - '@swc/core-linux-arm-gnueabihf': 1.15.26 - '@swc/core-linux-arm64-gnu': 1.15.26 - '@swc/core-linux-arm64-musl': 1.15.26 - '@swc/core-linux-ppc64-gnu': 1.15.26 - '@swc/core-linux-s390x-gnu': 1.15.26 - '@swc/core-linux-x64-gnu': 1.15.26 - '@swc/core-linux-x64-musl': 1.15.26 - '@swc/core-win32-arm64-msvc': 1.15.26 - '@swc/core-win32-ia32-msvc': 1.15.26 - '@swc/core-win32-x64-msvc': 1.15.26 ->>>>>>> Stashed changes '@swc/counter@0.1.3': {} @@ -3898,7 +3751,7 @@ snapshots: - csstype - utf-8-validate - '@tanstack/form-core@1.29.0': + '@tanstack/form-core@1.29.1': dependencies: '@tanstack/devtools-event-client': 0.4.3 '@tanstack/pacer-lite': 0.1.1 @@ -3925,9 +3778,9 @@ snapshots: - solid-js - utf-8-validate - '@tanstack/react-form@1.29.0(react-dom@19.2.5(react@19.2.5))(react@19.2.5)': + '@tanstack/react-form@1.29.1(react-dom@19.2.5(react@19.2.5))(react@19.2.5)': dependencies: - '@tanstack/form-core': 1.29.0 + '@tanstack/form-core': 1.29.1 '@tanstack/react-store': 0.9.3(react-dom@19.2.5(react@19.2.5))(react@19.2.5) react: 19.2.5 transitivePeerDependencies: @@ -3944,15 +3797,9 @@ snapshots: '@tanstack/query-core': 5.99.2 react: 19.2.5 -<<<<<<< Updated upstream '@tanstack/react-router-devtools@1.166.13(@tanstack/react-router@1.168.23(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(@tanstack/router-core@1.168.15)(csstype@3.2.3)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)': dependencies: '@tanstack/react-router': 1.168.23(react-dom@19.2.5(react@19.2.5))(react@19.2.5) -======= - '@tanstack/react-router-devtools@1.166.13(@tanstack/react-router@1.168.22(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(@tanstack/router-core@1.168.15)(csstype@3.2.3)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)': - dependencies: - '@tanstack/react-router': 1.168.22(react-dom@19.2.5(react@19.2.5))(react@19.2.5) ->>>>>>> Stashed changes '@tanstack/router-devtools-core': 1.167.3(@tanstack/router-core@1.168.15)(csstype@3.2.3) react: 19.2.5 react-dom: 19.2.5(react@19.2.5) @@ -3961,20 +3808,12 @@ snapshots: transitivePeerDependencies: - csstype -<<<<<<< Updated upstream '@tanstack/react-router@1.168.23(react-dom@19.2.5(react@19.2.5))(react@19.2.5)': -======= - '@tanstack/react-router@1.168.22(react-dom@19.2.5(react@19.2.5))(react@19.2.5)': ->>>>>>> Stashed changes dependencies: '@tanstack/history': 1.161.6 '@tanstack/react-store': 0.9.3(react-dom@19.2.5(react@19.2.5))(react@19.2.5) '@tanstack/router-core': 1.168.15 -<<<<<<< Updated upstream isbot: 5.1.39 -======= - isbot: 5.1.38 ->>>>>>> Stashed changes react: 19.2.5 react-dom: 19.2.5(react@19.2.5) @@ -4013,11 +3852,7 @@ snapshots: transitivePeerDependencies: - supports-color -<<<<<<< Updated upstream '@tanstack/router-plugin@1.167.22(@tanstack/react-router@1.168.23(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(vite@7.3.2(@types/node@25.6.0)(sass@1.99.0)(tsx@4.21.0))': -======= - '@tanstack/router-plugin@1.167.22(@tanstack/react-router@1.168.22(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(vite@7.3.2(@types/node@25.6.0)(sass@1.99.0)(tsx@4.21.0))': ->>>>>>> Stashed changes dependencies: '@babel/core': 7.29.0 '@babel/plugin-syntax-jsx': 7.28.6(@babel/core@7.29.0) @@ -4033,11 +3868,7 @@ snapshots: unplugin: 2.3.11 zod: 3.25.76 optionalDependencies: -<<<<<<< Updated upstream '@tanstack/react-router': 1.168.23(react-dom@19.2.5(react@19.2.5))(react@19.2.5) -======= - '@tanstack/react-router': 1.168.22(react-dom@19.2.5(react@19.2.5))(react@19.2.5) ->>>>>>> Stashed changes vite: 7.3.2(@types/node@25.6.0)(sass@1.99.0)(tsx@4.21.0) transitivePeerDependencies: - supports-color @@ -4106,14 +3937,14 @@ snapshots: '@types/unist@3.0.3': {} - '@typescript-eslint/eslint-plugin@8.58.2(@typescript-eslint/parser@8.58.2(eslint@9.38.0)(typescript@5.9.3))(eslint@9.38.0)(typescript@5.9.3)': + '@typescript-eslint/eslint-plugin@8.59.0(@typescript-eslint/parser@8.59.0(eslint@9.38.0)(typescript@5.9.3))(eslint@9.38.0)(typescript@5.9.3)': dependencies: '@eslint-community/regexpp': 4.12.2 - '@typescript-eslint/parser': 8.58.2(eslint@9.38.0)(typescript@5.9.3) - '@typescript-eslint/scope-manager': 8.58.2 - '@typescript-eslint/type-utils': 8.58.2(eslint@9.38.0)(typescript@5.9.3) - '@typescript-eslint/utils': 8.58.2(eslint@9.38.0)(typescript@5.9.3) - '@typescript-eslint/visitor-keys': 8.58.2 + '@typescript-eslint/parser': 8.59.0(eslint@9.38.0)(typescript@5.9.3) + '@typescript-eslint/scope-manager': 8.59.0 + '@typescript-eslint/type-utils': 8.59.0(eslint@9.38.0)(typescript@5.9.3) + '@typescript-eslint/utils': 8.59.0(eslint@9.38.0)(typescript@5.9.3) + '@typescript-eslint/visitor-keys': 8.59.0 eslint: 9.38.0 ignore: 7.0.5 natural-compare: 1.4.0 @@ -4122,41 +3953,41 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/parser@8.58.2(eslint@9.38.0)(typescript@5.9.3)': + '@typescript-eslint/parser@8.59.0(eslint@9.38.0)(typescript@5.9.3)': dependencies: - '@typescript-eslint/scope-manager': 8.58.2 - '@typescript-eslint/types': 8.58.2 - '@typescript-eslint/typescript-estree': 8.58.2(typescript@5.9.3) - '@typescript-eslint/visitor-keys': 8.58.2 + '@typescript-eslint/scope-manager': 8.59.0 + '@typescript-eslint/types': 8.59.0 + '@typescript-eslint/typescript-estree': 8.59.0(typescript@5.9.3) + '@typescript-eslint/visitor-keys': 8.59.0 debug: 4.4.3 eslint: 9.38.0 typescript: 5.9.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/project-service@8.58.2(typescript@5.9.3)': + '@typescript-eslint/project-service@8.59.0(typescript@5.9.3)': dependencies: - '@typescript-eslint/tsconfig-utils': 8.58.2(typescript@5.9.3) - '@typescript-eslint/types': 8.58.2 + '@typescript-eslint/tsconfig-utils': 8.59.0(typescript@5.9.3) + '@typescript-eslint/types': 8.59.0 debug: 4.4.3 typescript: 5.9.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/scope-manager@8.58.2': + '@typescript-eslint/scope-manager@8.59.0': dependencies: - '@typescript-eslint/types': 8.58.2 - '@typescript-eslint/visitor-keys': 8.58.2 + '@typescript-eslint/types': 8.59.0 + '@typescript-eslint/visitor-keys': 8.59.0 - '@typescript-eslint/tsconfig-utils@8.58.2(typescript@5.9.3)': + '@typescript-eslint/tsconfig-utils@8.59.0(typescript@5.9.3)': dependencies: typescript: 5.9.3 - '@typescript-eslint/type-utils@8.58.2(eslint@9.38.0)(typescript@5.9.3)': + '@typescript-eslint/type-utils@8.59.0(eslint@9.38.0)(typescript@5.9.3)': dependencies: - '@typescript-eslint/types': 8.58.2 - '@typescript-eslint/typescript-estree': 8.58.2(typescript@5.9.3) - '@typescript-eslint/utils': 8.58.2(eslint@9.38.0)(typescript@5.9.3) + '@typescript-eslint/types': 8.59.0 + '@typescript-eslint/typescript-estree': 8.59.0(typescript@5.9.3) + '@typescript-eslint/utils': 8.59.0(eslint@9.38.0)(typescript@5.9.3) debug: 4.4.3 eslint: 9.38.0 ts-api-utils: 2.5.0(typescript@5.9.3) @@ -4164,14 +3995,14 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/types@8.58.2': {} + '@typescript-eslint/types@8.59.0': {} - '@typescript-eslint/typescript-estree@8.58.2(typescript@5.9.3)': + '@typescript-eslint/typescript-estree@8.59.0(typescript@5.9.3)': dependencies: - '@typescript-eslint/project-service': 8.58.2(typescript@5.9.3) - '@typescript-eslint/tsconfig-utils': 8.58.2(typescript@5.9.3) - '@typescript-eslint/types': 8.58.2 - '@typescript-eslint/visitor-keys': 8.58.2 + '@typescript-eslint/project-service': 8.59.0(typescript@5.9.3) + '@typescript-eslint/tsconfig-utils': 8.59.0(typescript@5.9.3) + '@typescript-eslint/types': 8.59.0 + '@typescript-eslint/visitor-keys': 8.59.0 debug: 4.4.3 minimatch: 10.2.5 semver: 7.7.4 @@ -4181,20 +4012,20 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@8.58.2(eslint@9.38.0)(typescript@5.9.3)': + '@typescript-eslint/utils@8.59.0(eslint@9.38.0)(typescript@5.9.3)': dependencies: '@eslint-community/eslint-utils': 4.9.1(eslint@9.38.0) - '@typescript-eslint/scope-manager': 8.58.2 - '@typescript-eslint/types': 8.58.2 - '@typescript-eslint/typescript-estree': 8.58.2(typescript@5.9.3) + '@typescript-eslint/scope-manager': 8.59.0 + '@typescript-eslint/types': 8.59.0 + '@typescript-eslint/typescript-estree': 8.59.0(typescript@5.9.3) eslint: 9.38.0 typescript: 5.9.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/visitor-keys@8.58.2': + '@typescript-eslint/visitor-keys@8.59.0': dependencies: - '@typescript-eslint/types': 8.58.2 + '@typescript-eslint/types': 8.59.0 eslint-visitor-keys: 5.0.1 '@uidotdev/usehooks@2.4.1(react-dom@19.2.5(react@19.2.5))(react@19.2.5)': @@ -4207,11 +4038,7 @@ snapshots: '@vitejs/plugin-react-swc@4.3.0(vite@7.3.2(@types/node@25.6.0)(sass@1.99.0)(tsx@4.21.0))': dependencies: '@rolldown/pluginutils': 1.0.0-rc.7 -<<<<<<< Updated upstream '@swc/core': 1.15.30 -======= - '@swc/core': 1.15.26 ->>>>>>> Stashed changes vite: 7.3.2(@types/node@25.6.0)(sass@1.99.0)(tsx@4.21.0) transitivePeerDependencies: - '@swc/helpers' @@ -4261,7 +4088,7 @@ snapshots: asynckit@0.4.0: {} - axios@1.15.1: + axios@1.15.2: dependencies: follow-redirects: 1.16.0 form-data: 4.0.5 @@ -4284,11 +4111,7 @@ snapshots: balanced-match@4.0.4: {} -<<<<<<< Updated upstream baseline-browser-mapping@2.10.20: {} -======= - baseline-browser-mapping@2.10.19: {} ->>>>>>> Stashed changes binary-extensions@2.3.0: {} @@ -4307,16 +4130,10 @@ snapshots: browserslist@4.28.2: dependencies: -<<<<<<< Updated upstream baseline-browser-mapping: 2.10.20 - caniuse-lite: 1.0.30001788 - electron-to-chromium: 1.5.340 -======= - baseline-browser-mapping: 2.10.19 - caniuse-lite: 1.0.30001788 - electron-to-chromium: 1.5.339 ->>>>>>> Stashed changes - node-releases: 2.0.37 + caniuse-lite: 1.0.30001790 + electron-to-chromium: 1.5.343 + node-releases: 2.0.38 update-browserslist-db: 1.2.3(browserslist@4.28.2) cacheable@2.3.4: @@ -4339,7 +4156,7 @@ snapshots: callsites@3.1.0: {} - caniuse-lite@1.0.30001788: {} + caniuse-lite@1.0.30001790: {} ccount@2.0.1: {} @@ -4465,11 +4282,7 @@ snapshots: es-errors: 1.3.0 gopd: 1.2.0 -<<<<<<< Updated upstream - electron-to-chromium@1.5.340: {} -======= - electron-to-chromium@1.5.339: {} ->>>>>>> Stashed changes + electron-to-chromium@1.5.343: {} emoji-regex@8.0.0: {} @@ -5198,7 +5011,7 @@ snapshots: node-addon-api@7.1.1: optional: true - node-releases@2.0.37: {} + node-releases@2.0.38: {} normalize-path@3.0.0: {} @@ -5681,12 +5494,12 @@ snapshots: dependencies: prelude-ls: 1.2.1 - typescript-eslint@8.58.2(eslint@9.38.0)(typescript@5.9.3): + typescript-eslint@8.59.0(eslint@9.38.0)(typescript@5.9.3): dependencies: - '@typescript-eslint/eslint-plugin': 8.58.2(@typescript-eslint/parser@8.58.2(eslint@9.38.0)(typescript@5.9.3))(eslint@9.38.0)(typescript@5.9.3) - '@typescript-eslint/parser': 8.58.2(eslint@9.38.0)(typescript@5.9.3) - '@typescript-eslint/typescript-estree': 8.58.2(typescript@5.9.3) - '@typescript-eslint/utils': 8.58.2(eslint@9.38.0)(typescript@5.9.3) + '@typescript-eslint/eslint-plugin': 8.59.0(@typescript-eslint/parser@8.59.0(eslint@9.38.0)(typescript@5.9.3))(eslint@9.38.0)(typescript@5.9.3) + '@typescript-eslint/parser': 8.59.0(eslint@9.38.0)(typescript@5.9.3) + '@typescript-eslint/typescript-estree': 8.59.0(typescript@5.9.3) + '@typescript-eslint/utils': 8.59.0(eslint@9.38.0)(typescript@5.9.3) eslint: 9.38.0 typescript: 5.9.3 transitivePeerDependencies: @@ -5784,11 +5597,7 @@ snapshots: fdir: 6.5.0(picomatch@4.0.4) picomatch: 4.0.4 postcss: 8.5.10 -<<<<<<< Updated upstream rollup: 4.60.2 -======= - rollup: 4.60.1 ->>>>>>> Stashed changes tinyglobby: 0.2.16 optionalDependencies: '@types/node': 25.6.0 From 89ec45e33b123b9e351789a4e709efa2686265b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20Ciarcin=CC=81ski?= Date: Wed, 22 Apr 2026 09:23:27 +0200 Subject: [PATCH 03/10] Fix FreeBSD pkg --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ce82b81a..4411db27 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -223,7 +223,7 @@ jobs: --freebsd-osversion '*' --depends openssl --before-install freebsd/preinst - --after-install freebsd/postinst" + --after-remove freebsd/postinst" - name: Upload Linux x86_64 archive uses: shogo82148/actions-upload-release-asset@v1 From a6e1f5c560be0349f6c15b8b4ac6353daed1f886 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20Ciarcin=CC=81ski?= Date: Wed, 22 Apr 2026 09:36:59 +0200 Subject: [PATCH 04/10] Fix FreeBSD pkg --- .github/workflows/release.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4411db27..d120385f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -99,12 +99,10 @@ jobs: cache: true version: 10 - # Change to '--frozen-lockfile' once this gets fixed: - # https://github.com/pnpm/action-setup/issues/40 - name: Build frontend working-directory: web run: | - pnpm install --ignore-scripts --no-frozen-lockfile + pnpm install --ignore-scripts --frozen-lockfile pnpm build - name: Install Rust stable @@ -223,7 +221,7 @@ jobs: --freebsd-osversion '*' --depends openssl --before-install freebsd/preinst - --after-remove freebsd/postinst" + --after-remove freebsd/postrm" - name: Upload Linux x86_64 archive uses: shogo82148/actions-upload-release-asset@v1 From 0da9b98701437df4f26c465763601f1d67c2cd0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20Ciarcin=CC=81ski?= Date: Wed, 22 Apr 2026 10:01:21 +0200 Subject: [PATCH 05/10] Set test package version --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d120385f..90e3fedc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -81,7 +81,7 @@ jobs: run: | VERSION=${GITHUB_REF_NAME#v} echo Version: $VERSION - echo "VERSION=$VERSION" >> $GITHUB_ENV + echo "VERSION=2.0.0" >> $GITHUB_ENV - name: Checkout uses: actions/checkout@v6 From 133b27f0fab6904b96b5d224138224c9b8f409f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20Ciarcin=CC=81ski?= Date: Wed, 22 Apr 2026 10:22:50 +0200 Subject: [PATCH 06/10] freebsd --- freebsd/preinst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freebsd/preinst b/freebsd/preinst index d9b25a63..ced14001 100644 --- a/freebsd/preinst +++ b/freebsd/preinst @@ -5,5 +5,5 @@ USERNAME=defguard if ! id -u ${USERNAME} >/dev/null 2>&1 then - pw -q user add -n ${USERNAME} -g nogroup -c "Defguard" -d /nonexistent -s /usr/sbin/nologin + pw user add -n ${USERNAME} -g nogroup -c "Defguard" -d /nonexistent -s /usr/sbin/nologin fi From 6efaeed372f5bf39f4a840c32d48c0e152429284 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20Ciarcin=CC=81ski?= Date: Wed, 22 Apr 2026 10:48:33 +0200 Subject: [PATCH 07/10] Manual user del --- freebsd/postrm | 2 +- linux/postrm | 17 +++++------------ 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/freebsd/postrm b/freebsd/postrm index ec5c15df..9cb6c88c 100644 --- a/freebsd/postrm +++ b/freebsd/postrm @@ -5,5 +5,5 @@ USERNAME=defguard if id -u ${USERNAME} >/dev/null 2>&1 then - pw user del -n ${USERNAME} + echo "If no longer needed, remove ${USERNAME} manually: pw user del -n ${USERNAME}" fi diff --git a/linux/postrm b/linux/postrm index eefee79e..a734dd5a 100644 --- a/linux/postrm +++ b/linux/postrm @@ -3,15 +3,8 @@ set -e USERNAME=defguard -case $1 in -0) - if [ "${1}" = 'purge' ]; then - userdel ${USERNAME} >/dev/null || true - fi - ;; -1) - if [ -x /usr/bin/systemctl ]; then - /usr/bin/systemctl daemon-reload >/dev/null 2>&1 || true - fi - ;; -esac +if [ -x /usr/bin/systemctl ]; then + /usr/bin/systemctl daemon-reload >/dev/null 2>&1 || true +fi + +echo "If no longer needed, remove ${USERNAME} manually: userdel ${USERNAME}" From ac27867b881a183b004615cb95cb25071d9490c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20Ciarcin=CC=81ski?= Date: Wed, 22 Apr 2026 10:49:17 +0200 Subject: [PATCH 08/10] Manual user del 2 --- linux/postrm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/linux/postrm b/linux/postrm index a734dd5a..3335ba37 100644 --- a/linux/postrm +++ b/linux/postrm @@ -7,4 +7,7 @@ if [ -x /usr/bin/systemctl ]; then /usr/bin/systemctl daemon-reload >/dev/null 2>&1 || true fi -echo "If no longer needed, remove ${USERNAME} manually: userdel ${USERNAME}" +if id -u ${USERNAME} >/dev/null 2>&1 +then + echo "If no longer needed, remove ${USERNAME} manually: userdel ${USERNAME}" +fi From 70a05bde4b562ea5bfc01b35430d96bfc0be97b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20Ciarcin=CC=81ski?= Date: Wed, 22 Apr 2026 13:08:42 +0200 Subject: [PATCH 09/10] chown/chmod --- freebsd/preinst | 4 ++++ linux/preinst | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/freebsd/preinst b/freebsd/preinst index ced14001..212683de 100644 --- a/freebsd/preinst +++ b/freebsd/preinst @@ -7,3 +7,7 @@ if ! id -u ${USERNAME} >/dev/null 2>&1 then pw user add -n ${USERNAME} -g nogroup -c "Defguard" -d /nonexistent -s /usr/sbin/nologin fi + +mkdir -p /etc/defguard +chown ${USERNAME}:${USERNAME} /etc/defguard +chmod 750 /etc/defguard diff --git a/linux/preinst b/linux/preinst index 71522c0a..a4b7852b 100755 --- a/linux/preinst +++ b/linux/preinst @@ -6,3 +6,7 @@ USERNAME=defguard if ! id -u ${USERNAME} >/dev/null 2>&1; then useradd --system --user-group --no-create-home ${USERNAME} fi + +mkdir -p /etc/defguard +chown ${USERNAME}:${USERNAME} /etc/defguard +chmod 750 /etc/defguard From a2c4593bae4ffd11e3acac60a977fc154f5ccaa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20Ciarcin=CC=81ski?= Date: Wed, 22 Apr 2026 13:40:54 +0200 Subject: [PATCH 10/10] cleanup --- .github/workflows/release.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 90e3fedc..4349d5f9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,8 +1,6 @@ name: Make a new release on: push: - branches: - - pkg tags: - v*.*.* @@ -57,8 +55,6 @@ jobs: with: draft: true generate_release_notes: true - release_name: pkg - tag_name: pkg create-sbom: needs: @@ -81,7 +77,7 @@ jobs: run: | VERSION=${GITHUB_REF_NAME#v} echo Version: $VERSION - echo "VERSION=2.0.0" >> $GITHUB_ENV + echo "VERSION=$VERSION" >> $GITHUB_ENV - name: Checkout uses: actions/checkout@v6