Align branch with main: switch to vite-plus and reformat

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-03-30 14:12:07 +02:00 · 2026-03-13 13:20:06 -07:00
parent d0f1708017
commit 903f57a415
7 changed files with 1665 additions and 312 deletions
--- a/apps/yaak-client/components/DynamicForm.tsx
+++ b/apps/yaak-client/components/DynamicForm.tsx
@@ -512,13 +512,13 @@ function HttpRequestArg({
      value={value}
      disabled={arg.disabled}
      options={httpRequests.map((r) => {
-          return {
-            label:
-              buildRequestBreadcrumbs(r, folders).join(" / ") +
-              (r.id === activeHttpRequest?.id ? " (current)" : ""),
-            value: r.id,
-          };
-        })}
+        return {
+          label:
+            buildRequestBreadcrumbs(r, folders).join(" / ") +
+            (r.id === activeHttpRequest?.id ? " (current)" : ""),
+          value: r.id,
+        };
+      })}
    />
  );
 }
--- a/apps/yaak-client/components/core/SegmentedControl.tsx
+++ b/apps/yaak-client/components/core/SegmentedControl.tsx
@@ -62,13 +62,17 @@ export function SegmentedControl<T extends string>({
          if (e.key === "ArrowRight") {
            e.preventDefault();
            const newIndex = Math.abs((selectedIndex + 1) % options.length);
-            if (options[newIndex]) { setSelectedValue(options[newIndex].value); }
+            if (options[newIndex]) {
+              setSelectedValue(options[newIndex].value);
+            }
            const child = containerRef.current?.children[newIndex] as HTMLButtonElement;
            child.focus();
          } else if (e.key === "ArrowLeft") {
            e.preventDefault();
            const newIndex = Math.abs((selectedIndex - 1) % options.length);
-            if (options[newIndex]) { setSelectedValue(options[newIndex].value); }
+            if (options[newIndex]) {
+              setSelectedValue(options[newIndex].value);
+            }
            const child = containerRef.current?.children[newIndex] as HTMLButtonElement;
            child.focus();
          }
--- a/apps/yaak-client/components/responseViewers/PdfViewer.tsx
+++ b/apps/yaak-client/components/responseViewers/PdfViewer.tsx
@@ -8,12 +8,14 @@ import { Document, Page } from "react-pdf";
 import { useContainerSize } from "@yaakapp-internal/ui";
 import { fireAndForget } from "../../lib/fireAndForget";

-fireAndForget(import("react-pdf").then(({ pdfjs }) => {
-  pdfjs.GlobalWorkerOptions.workerSrc = new URL(
-    "pdfjs-dist/build/pdf.worker.min.mjs",
-    import.meta.url,
-  ).toString();
-}));
+fireAndForget(
+  import("react-pdf").then(({ pdfjs }) => {
+    pdfjs.GlobalWorkerOptions.workerSrc = new URL(
+      "pdfjs-dist/build/pdf.worker.min.mjs",
+      import.meta.url,
+    ).toString();
+  }),
+);

 interface Props {
  bodyPath?: string;
--- a/apps/yaak-client/routeTree.gen.ts
+++ b/apps/yaak-client/routeTree.gen.ts
@@ -8,133 +8,131 @@
 // You should NOT make any changes in this file as it will be overwritten.
 // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified.

-import { Route as rootRouteImport } from './routes/__root'
-import { Route as IndexRouteImport } from './routes/index'
-import { Route as WorkspacesIndexRouteImport } from './routes/workspaces/index'
-import { Route as WorkspacesWorkspaceIdIndexRouteImport } from './routes/workspaces/$workspaceId/index'
-import { Route as WorkspacesWorkspaceIdSettingsRouteImport } from './routes/workspaces/$workspaceId/settings'
-import { Route as WorkspacesWorkspaceIdRequestsRequestIdRouteImport } from './routes/workspaces/$workspaceId/requests/$requestId'
+import { Route as rootRouteImport } from "./routes/__root";
+import { Route as IndexRouteImport } from "./routes/index";
+import { Route as WorkspacesIndexRouteImport } from "./routes/workspaces/index";
+import { Route as WorkspacesWorkspaceIdIndexRouteImport } from "./routes/workspaces/$workspaceId/index";
+import { Route as WorkspacesWorkspaceIdSettingsRouteImport } from "./routes/workspaces/$workspaceId/settings";
+import { Route as WorkspacesWorkspaceIdRequestsRequestIdRouteImport } from "./routes/workspaces/$workspaceId/requests/$requestId";

 const IndexRoute = IndexRouteImport.update({
-  id: '/',
-  path: '/',
+  id: "/",
+  path: "/",
  getParentRoute: () => rootRouteImport,
-} as any)
+} as any);
 const WorkspacesIndexRoute = WorkspacesIndexRouteImport.update({
-  id: '/workspaces/',
-  path: '/workspaces/',
+  id: "/workspaces/",
+  path: "/workspaces/",
  getParentRoute: () => rootRouteImport,
-} as any)
-const WorkspacesWorkspaceIdIndexRoute =
-  WorkspacesWorkspaceIdIndexRouteImport.update({
-    id: '/workspaces/$workspaceId/',
-    path: '/workspaces/$workspaceId/',
-    getParentRoute: () => rootRouteImport,
-  } as any)
-const WorkspacesWorkspaceIdSettingsRoute =
-  WorkspacesWorkspaceIdSettingsRouteImport.update({
-    id: '/workspaces/$workspaceId/settings',
-    path: '/workspaces/$workspaceId/settings',
-    getParentRoute: () => rootRouteImport,
-  } as any)
+} as any);
+const WorkspacesWorkspaceIdIndexRoute = WorkspacesWorkspaceIdIndexRouteImport.update({
+  id: "/workspaces/$workspaceId/",
+  path: "/workspaces/$workspaceId/",
+  getParentRoute: () => rootRouteImport,
+} as any);
+const WorkspacesWorkspaceIdSettingsRoute = WorkspacesWorkspaceIdSettingsRouteImport.update({
+  id: "/workspaces/$workspaceId/settings",
+  path: "/workspaces/$workspaceId/settings",
+  getParentRoute: () => rootRouteImport,
+} as any);
 const WorkspacesWorkspaceIdRequestsRequestIdRoute =
  WorkspacesWorkspaceIdRequestsRequestIdRouteImport.update({
-    id: '/workspaces/$workspaceId/requests/$requestId',
-    path: '/workspaces/$workspaceId/requests/$requestId',
+    id: "/workspaces/$workspaceId/requests/$requestId",
+    path: "/workspaces/$workspaceId/requests/$requestId",
    getParentRoute: () => rootRouteImport,
-  } as any)
+  } as any);

 export interface FileRoutesByFullPath {
-  '/': typeof IndexRoute
-  '/workspaces': typeof WorkspacesIndexRoute
-  '/workspaces/$workspaceId/settings': typeof WorkspacesWorkspaceIdSettingsRoute
-  '/workspaces/$workspaceId': typeof WorkspacesWorkspaceIdIndexRoute
-  '/workspaces/$workspaceId/requests/$requestId': typeof WorkspacesWorkspaceIdRequestsRequestIdRoute
+  "/": typeof IndexRoute;
+  "/workspaces": typeof WorkspacesIndexRoute;
+  "/workspaces/$workspaceId/settings": typeof WorkspacesWorkspaceIdSettingsRoute;
+  "/workspaces/$workspaceId": typeof WorkspacesWorkspaceIdIndexRoute;
+  "/workspaces/$workspaceId/requests/$requestId": typeof WorkspacesWorkspaceIdRequestsRequestIdRoute;
 }
 export interface FileRoutesByTo {
-  '/': typeof IndexRoute
-  '/workspaces': typeof WorkspacesIndexRoute
-  '/workspaces/$workspaceId/settings': typeof WorkspacesWorkspaceIdSettingsRoute
-  '/workspaces/$workspaceId': typeof WorkspacesWorkspaceIdIndexRoute
-  '/workspaces/$workspaceId/requests/$requestId': typeof WorkspacesWorkspaceIdRequestsRequestIdRoute
+  "/": typeof IndexRoute;
+  "/workspaces": typeof WorkspacesIndexRoute;
+  "/workspaces/$workspaceId/settings": typeof WorkspacesWorkspaceIdSettingsRoute;
+  "/workspaces/$workspaceId": typeof WorkspacesWorkspaceIdIndexRoute;
+  "/workspaces/$workspaceId/requests/$requestId": typeof WorkspacesWorkspaceIdRequestsRequestIdRoute;
 }
 export interface FileRoutesById {
-  __root__: typeof rootRouteImport
-  '/': typeof IndexRoute
-  '/workspaces/': typeof WorkspacesIndexRoute
-  '/workspaces/$workspaceId/settings': typeof WorkspacesWorkspaceIdSettingsRoute
-  '/workspaces/$workspaceId/': typeof WorkspacesWorkspaceIdIndexRoute
-  '/workspaces/$workspaceId/requests/$requestId': typeof WorkspacesWorkspaceIdRequestsRequestIdRoute
+  __root__: typeof rootRouteImport;
+  "/": typeof IndexRoute;
+  "/workspaces/": typeof WorkspacesIndexRoute;
+  "/workspaces/$workspaceId/settings": typeof WorkspacesWorkspaceIdSettingsRoute;
+  "/workspaces/$workspaceId/": typeof WorkspacesWorkspaceIdIndexRoute;
+  "/workspaces/$workspaceId/requests/$requestId": typeof WorkspacesWorkspaceIdRequestsRequestIdRoute;
 }
 export interface FileRouteTypes {
-  fileRoutesByFullPath: FileRoutesByFullPath
+  fileRoutesByFullPath: FileRoutesByFullPath;
  fullPaths:
-    | '/'
-    | '/workspaces'
-    | '/workspaces/$workspaceId/settings'
-    | '/workspaces/$workspaceId'
-    | '/workspaces/$workspaceId/requests/$requestId'
-  fileRoutesByTo: FileRoutesByTo
+    | "/"
+    | "/workspaces"
+    | "/workspaces/$workspaceId/settings"
+    | "/workspaces/$workspaceId"
+    | "/workspaces/$workspaceId/requests/$requestId";
+  fileRoutesByTo: FileRoutesByTo;
  to:
-    | '/'
-    | '/workspaces'
-    | '/workspaces/$workspaceId/settings'
-    | '/workspaces/$workspaceId'
-    | '/workspaces/$workspaceId/requests/$requestId'
+    | "/"
+    | "/workspaces"
+    | "/workspaces/$workspaceId/settings"
+    | "/workspaces/$workspaceId"
+    | "/workspaces/$workspaceId/requests/$requestId";
  id:
-    | '__root__'
-    | '/'
-    | '/workspaces/'
-    | '/workspaces/$workspaceId/settings'
-    | '/workspaces/$workspaceId/'
-    | '/workspaces/$workspaceId/requests/$requestId'
-  fileRoutesById: FileRoutesById
+    | "__root__"
+    | "/"
+    | "/workspaces/"
+    | "/workspaces/$workspaceId/settings"
+    | "/workspaces/$workspaceId/"
+    | "/workspaces/$workspaceId/requests/$requestId";
+  fileRoutesById: FileRoutesById;
 }
 export interface RootRouteChildren {
-  IndexRoute: typeof IndexRoute
-  WorkspacesIndexRoute: typeof WorkspacesIndexRoute
-  WorkspacesWorkspaceIdSettingsRoute: typeof WorkspacesWorkspaceIdSettingsRoute
-  WorkspacesWorkspaceIdIndexRoute: typeof WorkspacesWorkspaceIdIndexRoute
-  WorkspacesWorkspaceIdRequestsRequestIdRoute: typeof WorkspacesWorkspaceIdRequestsRequestIdRoute
+  IndexRoute: typeof IndexRoute;
+  WorkspacesIndexRoute: typeof WorkspacesIndexRoute;
+  WorkspacesWorkspaceIdSettingsRoute: typeof WorkspacesWorkspaceIdSettingsRoute;
+  WorkspacesWorkspaceIdIndexRoute: typeof WorkspacesWorkspaceIdIndexRoute;
+  WorkspacesWorkspaceIdRequestsRequestIdRoute: typeof WorkspacesWorkspaceIdRequestsRequestIdRoute;
 }

-declare module '@tanstack/react-router' {
+declare module "@tanstack/react-router" {
  interface FileRoutesByPath {
-    '/': {
-      id: '/'
-      path: '/'
-      fullPath: '/'
-      preLoaderRoute: typeof IndexRouteImport
-      parentRoute: typeof rootRouteImport
-    }
-    '/workspaces/': {
-      id: '/workspaces/'
-      path: '/workspaces'
-      fullPath: '/workspaces'
-      preLoaderRoute: typeof WorkspacesIndexRouteImport
-      parentRoute: typeof rootRouteImport
-    }
-    '/workspaces/$workspaceId/': {
-      id: '/workspaces/$workspaceId/'
-      path: '/workspaces/$workspaceId'
-      fullPath: '/workspaces/$workspaceId'
-      preLoaderRoute: typeof WorkspacesWorkspaceIdIndexRouteImport
-      parentRoute: typeof rootRouteImport
-    }
-    '/workspaces/$workspaceId/settings': {
-      id: '/workspaces/$workspaceId/settings'
-      path: '/workspaces/$workspaceId/settings'
-      fullPath: '/workspaces/$workspaceId/settings'
-      preLoaderRoute: typeof WorkspacesWorkspaceIdSettingsRouteImport
-      parentRoute: typeof rootRouteImport
-    }
-    '/workspaces/$workspaceId/requests/$requestId': {
-      id: '/workspaces/$workspaceId/requests/$requestId'
-      path: '/workspaces/$workspaceId/requests/$requestId'
-      fullPath: '/workspaces/$workspaceId/requests/$requestId'
-      preLoaderRoute: typeof WorkspacesWorkspaceIdRequestsRequestIdRouteImport
-      parentRoute: typeof rootRouteImport
-    }
+    "/": {
+      id: "/";
+      path: "/";
+      fullPath: "/";
+      preLoaderRoute: typeof IndexRouteImport;
+      parentRoute: typeof rootRouteImport;
+    };
+    "/workspaces/": {
+      id: "/workspaces/";
+      path: "/workspaces";
+      fullPath: "/workspaces";
+      preLoaderRoute: typeof WorkspacesIndexRouteImport;
+      parentRoute: typeof rootRouteImport;
+    };
+    "/workspaces/$workspaceId/": {
+      id: "/workspaces/$workspaceId/";
+      path: "/workspaces/$workspaceId";
+      fullPath: "/workspaces/$workspaceId";
+      preLoaderRoute: typeof WorkspacesWorkspaceIdIndexRouteImport;
+      parentRoute: typeof rootRouteImport;
+    };
+    "/workspaces/$workspaceId/settings": {
+      id: "/workspaces/$workspaceId/settings";
+      path: "/workspaces/$workspaceId/settings";
+      fullPath: "/workspaces/$workspaceId/settings";
+      preLoaderRoute: typeof WorkspacesWorkspaceIdSettingsRouteImport;
+      parentRoute: typeof rootRouteImport;
+    };
+    "/workspaces/$workspaceId/requests/$requestId": {
+      id: "/workspaces/$workspaceId/requests/$requestId";
+      path: "/workspaces/$workspaceId/requests/$requestId";
+      fullPath: "/workspaces/$workspaceId/requests/$requestId";
+      preLoaderRoute: typeof WorkspacesWorkspaceIdRequestsRequestIdRouteImport;
+      parentRoute: typeof rootRouteImport;
+    };
  }
 }

@@ -143,9 +141,8 @@ const rootRouteChildren: RootRouteChildren = {
  WorkspacesIndexRoute: WorkspacesIndexRoute,
  WorkspacesWorkspaceIdSettingsRoute: WorkspacesWorkspaceIdSettingsRoute,
  WorkspacesWorkspaceIdIndexRoute: WorkspacesWorkspaceIdIndexRoute,
-  WorkspacesWorkspaceIdRequestsRequestIdRoute:
-    WorkspacesWorkspaceIdRequestsRequestIdRoute,
-}
+  WorkspacesWorkspaceIdRequestsRequestIdRoute: WorkspacesWorkspaceIdRequestsRequestIdRoute,
+};
 export const routeTree = rootRouteImport
  ._addFileChildren(rootRouteChildren)
-  ._addFileTypes<FileRouteTypes>()
+  ._addFileTypes<FileRouteTypes>();
--- a/apps/yaak-proxy/main.tsx
+++ b/apps/yaak-proxy/main.tsx
@@ -7,24 +7,21 @@ import { ProxyLayout } from "./components/ProxyLayout";
 import { listen, rpc } from "./lib/rpc";
 import { initHotkeys } from "./lib/hotkeys";
 import { applyChange, dataAtom, replaceAll } from "./lib/store";
-import { fireAndForget } from "./lib/fireAndForget";
 import "./main.css";

 const queryClient = new QueryClient();
 const jotaiStore = createStore();

 // Load initial models from the database
-fireAndForget(
-  rpc("list_models", {}).then((res) => {
-    jotaiStore.set(dataAtom, (prev) => replaceAll(prev, "http_exchange", res.httpExchanges));
-  }),
-);
+void rpc("list_models", {}).then((res) => {
+  jotaiStore.set(dataAtom, (prev) => replaceAll(prev, "http_exchange", res.httpExchanges));
+});

 // Register hotkeys from action metadata
-fireAndForget(initHotkeys());
+void initHotkeys();

 // Subscribe to model change events from the backend
-listen("model_write", (payload) => {
+void listen("model_write", (payload) => {
  jotaiStore.set(dataAtom, (prev) =>
    applyChange(prev, "http_exchange", payload.model, payload.change),
  );
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -70,7 +70,7 @@
    "apps/yaak-proxy"
  ],
  "scripts": {
-    "prepare": "husky",
+    "prepare": "vp config",
    "init": "npm install && npm run bootstrap",
    "start": "npm run client:dev",
    "client:build": "tauri build --config crates-tauri/yaak-app-client/tauri.conf.json",
@@ -92,10 +92,10 @@
    "vendor:vendor-protoc": "node scripts/vendor-protoc.cjs",
    "vendor:vendor-node": "node scripts/vendor-node.cjs",
    "lint": "run-p lint:*",
-    "lint:biome": "biome lint",
-    "lint:extra": "npm run --workspaces --if-present lint",
-    "format": "biome format --write .",
+    "lint:vp": "vp lint",
+    "lint:workspaces": "npm run --workspaces --if-present lint",
    "replace-version": "node scripts/replace-version.cjs",
+    "format": "vp fmt --ignore-path .oxfmtignore",
    "tauri": "tauri",
    "client:tauri-before-build": "npm run bootstrap",
    "client:tauri-before-dev": "node scripts/run-workspaces-dev.mjs apps/yaak-client",
@@ -110,17 +110,19 @@
    "@codemirror/legacy-modes": "^6.5.2"
  },
  "devDependencies": {
-    "@biomejs/biome": "^2.4.6",
    "@tauri-apps/cli": "^2.9.6",
    "@yaakapp/cli": "^0.5.1",
    "dotenv-cli": "^11.0.0",
-    "husky": "^9.1.7",
    "nodejs-file-downloader": "^4.13.0",
    "npm-run-all": "^4.1.5",
    "typescript": "^5.8.3",
-    "vitest": "^3.2.4"
+    "vite-plus": "latest",
+    "vitest": "npm:@voidzero-dev/vite-plus-test@latest"
  },
  "overrides": {
-    "js-yaml": "^4.1.1"
-  }
+    "js-yaml": "^4.1.1",
+    "vite": "npm:@voidzero-dev/vite-plus-core@latest",
+    "vitest": "npm:@voidzero-dev/vite-plus-test@latest"
+  },
+  "packageManager": "npm@11.11.1"
 }