Web next wip

.dockerignore

@@ -1,6 +1,8 @@
 target/
 web/node_modules
 web/dist
+webnext/node_modules
+webnext/dist
 .volumes/
 .github/
 docs/

.github/workflows/lint-web.yml

@@ -32,13 +32,13 @@ jobs:
         with:
           node-version: 24
       - name: install deps
-        working-directory: ./web
+        working-directory: ./webnext
         run: |
           npm i -g pnpm
           pnpm i --frozen-lockfile
       - name: Lint
-        working-directory: ./web
+        working-directory: ./webnext
         run: pnpm lint
       - name: Audit
-        working-directory: ./web
+        working-directory: ./webnext
         run: pnpm audit --prod

.github/workflows/release.yml

@@ -111,18 +111,20 @@ jobs:
         with:
           version: 10
 
-      - name: Use Node.js 24
+      - name: Use Node.js
         uses: actions/setup-node@v4
         with:
           node-version: 24
+          cache: "pnpm"
+          cache-dependency-path: ./webnext/pnpm-lock.yaml
 
       - name: Install frontend dependencies
         run: pnpm install --ignore-scripts --frozen-lockfile
-        working-directory: web
+        working-directory: webnext
 
       - name: Build frontend
         run: pnpm build
-        working-directory: web
+        working-directory: webnext
 
       - name: Build release binary
         uses: actions-rs/cargo@v1

Dockerfile

@@ -1,12 +1,10 @@
 FROM node:24-alpine AS web
 
 WORKDIR /app
-COPY web/package.json .
-COPY web/pnpm-lock.yaml .
-COPY web/.npmrc .
+COPY webnext/package.json webnext/pnpm-lock.yaml webnext/.npmrc ./
 RUN npm i -g pnpm
 RUN pnpm install --ignore-scripts --frozen-lockfile
-COPY web/ .
+COPY webnext/ .
 RUN pnpm run generate-translation-types
 RUN pnpm build
 
@@ -31,8 +29,7 @@ COPY --from=planner /build/recipe.json recipe.json
 RUN cargo chef cook --release --recipe-path recipe.json
 
 # build project
-COPY --from=web /app/dist ./web/dist
-COPY web/src/shared/images/svg ./web/src/shared/images/svg
+COPY --from=web /app/dist ./webnext/dist
 RUN apt-get update && apt-get -y install protobuf-compiler libprotobuf-dev
 COPY Cargo.toml Cargo.lock build.rs ./
 # for vergen

README.md

@@ -23,27 +23,30 @@ Find us on Matrix: [#defguard:teonite.com](https://matrix.to/#/#defguard:teonite
 
 Please review the [Contributing guide](https://defguard.gitbook.io/defguard/for-developers/contributing) for information on how to get started contributing to the project. You might also find our [environment setup guide](https://defguard.gitbook.io/defguard/for-developers/dev-env-setup) handy.
 
-
 ## Development
 
 Clone repository:
+
 ```bash
 git@github.com:DefGuard/client.git
 ```
 
 Initialize `proto` submodule:
+
 ```bash
 git submodule update --init --recursive
 ```
 
 To run API server:
+
 ```bash
 cargo run
 ```
 
 To run webapp dev server:
+
 ```bash
-cd web/
+cd webnext/
 pnpm install
 pnpm run dev
 ```
@@ -76,5 +79,3 @@ All release assets (binaries, packages, etc.) include SHA256 checksums that are
    # Linux/macOS
    echo known_sha256_checksum_of_the_file path/to/file | sha256sum --check
    ```
-
-

src/assets.rs

@@ -15,17 +15,9 @@ pub async fn index() -> impl IntoResponse {
     web_asset(Uri::from_static("/index.html")).await
 }
 
-pub async fn svg(uri: Uri) -> impl IntoResponse {
-    let mut path = uri.path().trim_start_matches('/').to_string();
-    // Rewrite the path to match the structure of the embedded files
-    path.insert_str(0, "src/shared/images/");
-    StaticFile(path)
-}
-
 #[derive(Embed)]
-#[folder = "web/"]
+#[folder = "webnext/"]
 #[include = "dist/*"]
-#[include = "src/shared/images/*"]
 struct WebAsset;
 
 pub struct StaticFile<T>(pub T);

src/http.rs

@@ -33,7 +33,7 @@ use tracing::{info_span, Level};
 use url::Url;
 
 use crate::{
-    assets::{index, svg, web_asset},
+    assets::{index, web_asset},
     config::Config,
     enterprise::handlers::openid_login::{self, FlowType},
     error::ApiError,
@@ -265,7 +265,6 @@ pub async fn run_server(config: Config) -> anyhow::Result<()> {
         .route("/{*path}", get(index))
         .route("/fonts/{*path}", get(web_asset))
         .route("/assets/{*path}", get(web_asset))
-        .route("/svg/{*path}", get(svg))
         .nest(
             "/api/v1",
             Router::new()

webnext/.editorconfig

@@ -0,0 +1,11 @@
+root = false
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+
+[*.{ts,tsx,js,jsx,scss,html,json,yaml}]
+rulers = 90

webnext/.gitattributes

@@ -0,0 +1,36 @@
+* text=auto eol=lf
+
+*.js     text eol=lf
+*.jsx    text eol=lf
+*.ts     text eol=lf
+*.tsx    text eol=lf
+*.css    text eol=lf
+*.scss   text eol=lf
+*.json   text eol=lf
+*.html   text eol=lf
+*.md     text eol=lf
+*.yml    text eol=lf
+*.yaml   text eol=lf
+*.lock   text eol=lf
+
+*.woff   binary
+*.woff2  binary
+*.ttf    binary
+*.otf    binary
+*.eot    binary
+*.png    binary
+*.jpg    binary
+*.jpeg   binary
+*.gif    binary
+*.webp   binary
+*.avif   binary
+*.ico    binary
+*.mp4    binary
+*.webm   binary
+*.ogg    binary
+*.mp3    binary
+*.wav    binary
+*.pdf    binary
+*.zip    binary
+*.tar    binary
+*.gz     binary

webnext/.gitignore

@@ -0,0 +1,26 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dist
+dist-ssr
+*.local
+project.inlang/cache
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
+.tanstack

webnext/.prettierignore

@@ -0,0 +1,4 @@
+/src/i18n/*.ts
+/src/i18n/*.tsx
+/src/**/*.tsx
+/src/**/*.ts

webnext/.prettierrc

@@ -0,0 +1,8 @@
+{
+  "semi": true,
+  "tabWidth": 2,
+  "singleQuote": true,
+  "useTabs": false,
+  "printWidth": 90,
+  "endOfLine": "lf"
+}

webnext/.stylelintrc.json

@@ -0,0 +1,10 @@
+{
+  "extends": ["stylelint-config-standard-scss"],
+  "plugins": ["stylelint-scss"],
+  "rules": {
+    "at-rule-no-unknown": null,
+    "scss/at-rule-no-unknown": true,
+    "custom-property-empty-line-before": null,
+    "value-keyword-case": null
+  }
+}

webnext/.vscode/extensions.json

@@ -0,0 +1,5 @@
+{
+  "recommendations": [
+    "inlang.vs-code-extension"
+  ]
+}

webnext/biome.json

@@ -0,0 +1,67 @@
+{
+  "$schema": "https://biomejs.dev/schemas/2.2.4/schema.json",
+  "vcs": {
+    "enabled": false,
+    "clientKind": "git",
+    "useIgnoreFile": false
+  },
+  "files": {
+    "ignoreUnknown": false,
+    "includes": [
+      "src/**",
+      "!src/messages",
+      "!src/paraglide/**/*.js",
+      "!src/routeTree.gen.ts"
+    ]
+  },
+  "formatter": {
+    "enabled": true,
+    "formatWithErrors": false,
+    "attributePosition": "auto",
+    "bracketSameLine": false,
+    "bracketSpacing": true,
+    "expand": "auto",
+    "lineEnding": "lf",
+    "lineWidth": 90,
+    "indentStyle": "space",
+    "useEditorconfig": true
+  },
+  "linter": {
+    "enabled": true,
+    "rules": {
+      "recommended": true,
+      "a11y": "off",
+      "correctness": {
+        "useUniqueElementIds": "off"
+      },
+      "style": {
+        "useLiteralEnumMembers": "off",
+        "useBlockStatements": "off"
+      },
+      "suspicious": {
+        "noArrayIndexKey": "off"
+      }
+    }
+  },
+  "javascript": {
+    "formatter": {
+      "quoteStyle": "single",
+      "jsxQuoteStyle": "double",
+      "quoteProperties": "asNeeded",
+      "trailingCommas": "all",
+      "semicolons": "always",
+      "arrowParentheses": "always",
+      "attributePosition": "auto",
+      "bracketSameLine": false,
+      "bracketSpacing": true
+    }
+  },
+  "assist": {
+    "enabled": true,
+    "actions": {
+      "source": {
+        "organizeImports": "on"
+      }
+    }
+  }
+}

webnext/index.html

@@ -0,0 +1,16 @@
+<!doctype html>
+<html lang="en" data-theme="light">
+
+<head>
+  <meta charset="UTF-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <title>Defguard</title>
+</head>
+
+<body>
+  <div id="root"></div>
+  <div id="modals-root"></div>
+  <script type="module" src="/src/main.tsx"></script>
+</body>
+
+</html>

webnext/messages/de.json

@@ -0,0 +1,3 @@
+{
+  "$schema": "https://inlang.com/schema/inlang-message-format"
+}