@gtkx/vitest 0.14.0 → 0.16.0

package/README.md

@@ -31,36 +31,36 @@ npm run dev
 
 ```tsx
 import {
- GtkApplicationWindow,
- GtkBox,
- GtkButton,
- GtkLabel,
- quit,
- render,
+  GtkApplicationWindow,
+  GtkBox,
+  GtkButton,
+  GtkLabel,
+  quit,
+  render,
 } from "@gtkx/react";
 import * as Gtk from "@gtkx/ffi/gtk";
 import { useState } from "react";
 
 const App = () => {
- const [count, setCount] = useState(0);
-
- return (
- <GtkApplicationWindow
- title="Counter"
- defaultWidth={300}
- defaultHeight={200}
- onClose={quit}
->
- <GtkBox
- orientation={Gtk.Orientation.VERTICAL}
- spacing={20}
- valign={Gtk.Align.CENTER}
->
- <GtkLabel label={`Count: ${count}`} cssClasses={["title-1"]} />
- <GtkButton label="Increment" onClicked={() => setCount((c) => c + 1)} />
- </GtkBox>
- </GtkApplicationWindow>
- );
+  const [count, setCount] = useState(0);
+
+  return (
+    <GtkApplicationWindow
+      title="Counter"
+      defaultWidth={300}
+      defaultHeight={200}
+      onClose={quit}
+    >
+      <GtkBox
+        orientation={Gtk.Orientation.VERTICAL}
+        spacing={20}
+        valign={Gtk.Align.CENTER}
+      >
+        <GtkLabel label={`Count: ${count}`} cssClasses={["title-1"]} />
+        <GtkButton label="Increment" onClicked={() => setCount((c) => c + 1)} />
+      </GtkBox>
+    </GtkApplicationWindow>
+  );
 };
 
 render(<App />, "com.example.counter");
@@ -71,6 +71,7 @@ render(<App />, "com.example.counter");
 - **React 19** — Hooks, concurrent features, and the component model you know
 - **Native GTK4 widgets** — Real native controls, not web components in a webview
 - **Adwaita support** — Modern GNOME styling with Libadwaita components
+- **Declarative animations** — Framer Motion-like API using native Adwaita animations
 - **Hot Module Replacement** — Fast refresh during development
 - **TypeScript first** — Full type safety with auto-generated bindings
 - **CSS-in-JS styling** — Familiar styling patterns adapted for GTK
@@ -80,11 +81,11 @@ render(<App />, "com.example.counter");
 
 Explore complete applications in the [`examples/`](./examples) directory:
 
-- **[browser](./examples/browser)** — Simple browser using WebKitWebView
 - **[gtk-demo](./examples/gtk-demo)** — Full replica of the official GTK demo app
 - **[hello-world](./examples/hello-world)** — Minimal application showing a counter
 - **[todo](./examples/todo)** — Full-featured todo application with Adwaita styling and testing
-- **[x-showcase](./examples/x-showcase)** — Showcase of all x.* virtual components
+- **[x-showcase](./examples/x-showcase)** — Showcase of all x.\* virtual components
+- **[browser](./examples/browser)** — Simple browser using WebKitWebView
 - **[deploying](./examples/deploying)** — Example of packaging and distributing a GTKX app
 
 ## Documentation

package/dist/plugin.d.ts

@@ -2,8 +2,7 @@ import type { Plugin } from "vitest/config";
 /**
  * Creates the GTKX Vitest plugin for running GTK tests.
  *
- * Manages Xvfb virtual display instances for headless GTK testing.
- * Each worker thread gets its own display to avoid interference.
+ * Each worker spawns its own Xvfb instance on a PID-based display number.
  *
  * @returns Vitest plugin configuration
  *

package/dist/plugin.js

@@ -1,47 +1,8 @@
-import { spawn } from "node:child_process";
-import { existsSync, mkdirSync, rmSync, writeFileSync } from "node:fs";
-import { availableParallelism, tmpdir } from "node:os";
 import { join } from "node:path";
-const getRuntimeDir = () => process.env.XDG_RUNTIME_DIR ?? tmpdir();
-const getStateDir = () => join(getRuntimeDir(), `gtkx-vitest-${process.pid}`);
-const getBaseDisplay = () => {
-    const slot = process.pid % 500;
-    return 50 + slot * 10;
-};
-const waitForDisplay = (display, timeout = 5000) => new Promise((resolve) => {
-    const start = Date.now();
-    const check = () => {
-        const lockFile = `/tmp/.X${display}-lock`;
-        if (existsSync(lockFile)) {
-            resolve(true);
-            return;
-        }
-        if (Date.now() - start > timeout) {
-            resolve(false);
-            return;
-        }
-        setTimeout(check, 50);
-    };
-    check();
-});
-const startXvfb = async (display) => {
-    const xvfb = spawn("Xvfb", [`:${display}`, "-screen", "0", "1024x768x24"], {
-        stdio: "ignore",
-        detached: true,
-    });
-    xvfb.unref();
-    const ready = await waitForDisplay(display);
-    if (!ready) {
-        xvfb.kill();
-        return null;
-    }
-    return xvfb;
-};
 /**
  * Creates the GTKX Vitest plugin for running GTK tests.
  *
- * Manages Xvfb virtual display instances for headless GTK testing.
- * Each worker thread gets its own display to avoid interference.
+ * Each worker spawns its own Xvfb instance on a PID-based display number.
  *
  * @returns Vitest plugin configuration
  *
@@ -58,74 +19,10 @@ const startXvfb = async (display) => {
  */
 const gtkx = () => {
     const workerSetupPath = join(import.meta.dirname, "setup.js");
-    const stateDir = getStateDir();
-    const xvfbProcesses = [];
-    let handlersRegistered = false;
-    let tornDown = false;
-    const setup = async (vitest) => {
-        const configuredWorkers = vitest.config.maxWorkers;
-        const maxWorkers = typeof configuredWorkers === "number" ? configuredWorkers : availableParallelism();
-        if (existsSync(stateDir)) {
-            rmSync(stateDir, { recursive: true, force: true });
-        }
-        mkdirSync(stateDir, { recursive: true });
-        const baseDisplay = getBaseDisplay();
-        const displays = [];
-        const results = await Promise.all(Array.from({ length: maxWorkers }, (_, i) => startXvfb(baseDisplay + i)));
-        for (let i = 0; i < results.length; i++) {
-            const xvfb = results[i];
-            if (xvfb) {
-                xvfbProcesses.push(xvfb);
-                displays.push(baseDisplay + i);
-            }
-        }
-        if (displays.length === 0) {
-            throw new Error("Failed to start any Xvfb instances");
-        }
-        for (const display of displays) {
-            writeFileSync(join(stateDir, `display-${display}.available`), "");
-        }
-    };
-    const teardown = () => {
-        if (tornDown) {
-            return;
-        }
-        tornDown = true;
-        for (const xvfb of xvfbProcesses) {
-            try {
-                xvfb.kill("SIGTERM");
-            }
-            catch { }
-        }
-        if (existsSync(stateDir)) {
-            rmSync(stateDir, { recursive: true, force: true });
-        }
-    };
-    const reporter = {
-        onInit() {
-            if (handlersRegistered) {
-                return;
-            }
-            handlersRegistered = true;
-            process.on("exit", teardown);
-            process.on("SIGTERM", teardown);
-            process.on("SIGINT", teardown);
-        },
-        async onTestRunStart(specifications) {
-            const firstSpec = specifications[0];
-            if (firstSpec && xvfbProcesses.length === 0) {
-                await setup(firstSpec.project.vitest);
-            }
-        },
-        onTestRunEnd() {
-            teardown();
-        },
-    };
     return {
         name: "gtkx",
         config(config) {
             const setupFiles = config.test?.setupFiles ?? [];
-            process.env.GTKX_STATE_DIR = stateDir;
             return {
                 test: {
                     setupFiles: [workerSetupPath, ...(Array.isArray(setupFiles) ? setupFiles : [setupFiles])],
@@ -133,9 +30,6 @@ const gtkx = () => {
                 },
             };
         },
-        configureVitest({ vitest }) {
-            vitest.config.reporters.push(reporter);
-        },
     };
 };
 export default gtkx;

package/dist/setup.js

@@ -1,61 +1,37 @@
-import { existsSync, readdirSync, renameSync } from "node:fs";
-import { join } from "node:path";
-const GTKX_STATE_DIR = process.env.GTKX_STATE_DIR;
-const MAX_CLAIM_ATTEMPTS = 100;
-const CLAIM_RETRY_DELAY_MS = 100;
-if (!GTKX_STATE_DIR) {
-    throw new Error("GTKX_STATE_DIR not set - gtkx plugin must be used");
-}
-const sleepBuffer = new Int32Array(new SharedArrayBuffer(4));
-const sleepSync = (ms) => {
-    Atomics.wait(sleepBuffer, 0, 0, ms);
-};
-const tryClaimDisplay = () => {
-    if (!existsSync(GTKX_STATE_DIR)) {
-        return null;
-    }
-    const files = readdirSync(GTKX_STATE_DIR).filter((f) => f.endsWith(".available"));
-    for (const file of files) {
-        const display = Number.parseInt(file.replace("display-", "").replace(".available", ""), 10);
-        const availablePath = join(GTKX_STATE_DIR, file);
-        const claimedPath = join(GTKX_STATE_DIR, `display-${display}.claimed-${process.pid}`);
+import { spawn } from "node:child_process";
+import { existsSync } from "node:fs";
+import { beforeAll } from "vitest";
+const display = 100 + (process.pid % 5000);
+const socketPath = `/tmp/.X11-unix/X${display}`;
+const xvfb = spawn("Xvfb", [`:${display}`, "-screen", "0", "1024x768x24"], {
+    stdio: "ignore",
+    detached: true,
+});
+const xvfbPid = xvfb.pid;
+xvfb.unref();
+const killXvfb = () => {
+    if (xvfbPid !== undefined) {
         try {
-            renameSync(availablePath, claimedPath);
-            return display;
+            process.kill(xvfbPid, "SIGTERM");
         }
         catch { }
     }
-    return null;
-};
-const claimDisplay = () => {
-    for (let attempt = 0; attempt < MAX_CLAIM_ATTEMPTS; attempt++) {
-        const display = tryClaimDisplay();
-        if (display !== null) {
-            return display;
-        }
-        sleepSync(CLAIM_RETRY_DELAY_MS);
-    }
-    return null;
 };
-const releaseDisplay = (display) => {
-    const claimedPath = join(GTKX_STATE_DIR, `display-${display}.claimed-${process.pid}`);
-    const availablePath = join(GTKX_STATE_DIR, `display-${display}.available`);
-    try {
-        renameSync(claimedPath, availablePath);
-    }
-    catch { }
-};
-const display = claimDisplay();
-if (display === null) {
-    throw new Error("Failed to claim display - ensure gtkx plugin is configured");
-}
+process.on("exit", killXvfb);
 process.env.GDK_BACKEND = "x11";
 process.env.GSK_RENDERER = "cairo";
 process.env.LIBGL_ALWAYS_SOFTWARE = "1";
 process.env.DISPLAY = `:${display}`;
-const cleanup = () => {
-    releaseDisplay(display);
+const waitForDisplay = async (timeout = 5000) => {
+    const start = Date.now();
+    while (Date.now() - start < timeout) {
+        if (existsSync(socketPath)) {
+            return;
+        }
+        await new Promise((resolve) => setTimeout(resolve, 50));
+    }
+    throw new Error(`Xvfb display :${display} did not become available within ${timeout}ms`);
 };
-process.on("exit", cleanup);
-process.on("SIGTERM", cleanup);
-process.on("SIGINT", cleanup);
+beforeAll(async () => {
+    await waitForDisplay();
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gtkx/vitest",
-  "version": "0.14.0",
+  "version": "0.16.0",
   "description": "Vitest plugin for GTKX applications with Xvfb display isolation",
   "keywords": [
     "gtkx",
@@ -36,7 +36,7 @@
     "dist"
   ],
   "devDependencies": {
-    "vitest": "^4.0.17"
+    "vitest": "^4.0.18"
   },
   "peerDependencies": {
     "vitest": ">=4"