@gtkx/cli 0.10.4 → 0.10.5

package/dist/cli.js

@@ -60,11 +60,11 @@ const create = defineCommand({
         },
         pm: {
             type: "string",
-            description: "Package manager (pnpm, npm, yarn, bun)",
+            description: "Package manager (pnpm, npm, yarn)",
         },
         testing: {
             type: "string",
-            description: "Testing framework (vitest, jest, node, none)",
+            description: "Testing setup (vitest, none)",
         },
         "claude-skills": {
             type: "boolean",

package/dist/create.d.ts

@@ -1,11 +1,11 @@
 /**
  * Supported package managers for GTKX projects.
  */
-export type PackageManager = "pnpm" | "npm" | "yarn" | "bun";
+export type PackageManager = "pnpm" | "npm" | "yarn";
 /**
- * Supported testing frameworks for GTKX projects.
+ * Whether to include testing setup in GTKX projects.
  */
-export type TestingFramework = "vitest" | "jest" | "node" | "none";
+export type TestingOption = "vitest" | "none";
 /**
  * Options for creating a new GTKX project.
  *
@@ -15,7 +15,7 @@ export type CreateOptions = {
     name?: string;
     appId?: string;
     packageManager?: PackageManager;
-    testing?: TestingFramework;
+    testing?: TestingOption;
     claudeSkills?: boolean;
 };
 export declare const getAddCommand: (pm: PackageManager, deps: string[], dev: boolean) => string;

package/dist/create.js

@@ -5,11 +5,7 @@ import * as p from "@clack/prompts";
 import { renderFile } from "./templates.js";
 const DEPENDENCIES = ["@gtkx/css", "@gtkx/ffi", "@gtkx/react", "react"];
 const DEV_DEPENDENCIES = ["@gtkx/cli", "@types/react", "typescript"];
-const TESTING_DEV_DEPENDENCIES = {
-    vitest: ["@gtkx/testing", "vitest"],
-    jest: ["@gtkx/testing", "jest", "@types/jest", "ts-jest"],
-    node: ["@gtkx/testing", "@types/node"],
-};
+const TESTING_DEV_DEPENDENCIES = ["@gtkx/testing", "@gtkx/vitest", "vitest"];
 const createTemplateContext = (name, appId, testing) => {
     const title = name
         .split("-")
@@ -27,8 +23,6 @@ export const getAddCommand = (pm, deps, dev) => {
             return `yarn add ${parts}`;
         case "pnpm":
             return `pnpm add ${parts}`;
-        case "bun":
-            return `bun add ${parts}`;
     }
 };
 export const getRunCommand = (pm) => {
@@ -39,8 +33,6 @@ export const getRunCommand = (pm) => {
             return "yarn dev";
         case "pnpm":
             return "pnpm dev";
-        case "bun":
-            return "bun dev";
     }
 };
 export const isValidProjectName = (name) => {
@@ -104,21 +96,16 @@ const promptForOptions = async (options) => {
                 { value: "pnpm", label: "pnpm", hint: "recommended" },
                 { value: "npm", label: "npm" },
                 { value: "yarn", label: "yarn" },
-                { value: "bun", label: "bun" },
             ],
             initialValue: "pnpm",
         }));
     const testing = options.testing ??
-        checkCancelled(await p.select({
-            message: "Testing framework",
-            options: [
-                { value: "vitest", label: "Vitest", hint: "recommended" },
-                { value: "jest", label: "Jest" },
-                { value: "node", label: "Node.js Test Runner" },
-                { value: "none", label: "None" },
-            ],
-            initialValue: "vitest",
-        }));
+        (checkCancelled(await p.confirm({
+            message: "Include testing setup (Vitest)?",
+            initialValue: true,
+        }))
+            ? "vitest"
+            : "none");
     const claudeSkills = options.claudeSkills ??
         checkCancelled(await p.confirm({
             message: "Include Claude Code skills?",
@@ -151,21 +138,11 @@ const scaffoldProject = (projectPath, resolved) => {
         writeFileSync(join(projectPath, "vitest.config.ts"), renderFile("config/vitest.config.ts.ejs", context));
         writeFileSync(join(projectPath, "tests", "app.test.tsx"), renderFile("tests/app.test.tsx.ejs", context));
     }
-    else if (testing === "jest") {
-        writeFileSync(join(projectPath, "jest.config.js"), renderFile("config/jest.config.js.ejs", context));
-        writeFileSync(join(projectPath, "tests", "app.test.tsx"), renderFile("tests/app.test.tsx.ejs", context));
-    }
-    else if (testing === "node") {
-        writeFileSync(join(projectPath, "tests", "app.test.tsx"), renderFile("tests/app.test.tsx.ejs", context));
-    }
 };
 const getDevDependencies = (testing) => {
     const devDeps = [...DEV_DEPENDENCIES];
-    if (testing !== "none") {
-        devDeps.push(...TESTING_DEV_DEPENDENCIES[testing]);
-        if (testing === "node") {
-            devDeps.push("tsx");
-        }
+    if (testing === "vitest") {
+        devDeps.push(...TESTING_DEV_DEPENDENCIES);
     }
     return devDeps;
 };

package/dist/templates.d.ts

@@ -1,8 +1,8 @@
-import type { TestingFramework } from "./create.js";
+import type { TestingOption } from "./create.js";
 export interface TemplateContext {
     name: string;
     appId: string;
     title: string;
-    testing: TestingFramework;
+    testing: TestingOption;
 }
 export declare const renderFile: (templateName: string, context: TemplateContext) => string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gtkx/cli",
-  "version": "0.10.4",
+  "version": "0.10.5",
   "description": "CLI for GTKX - create and develop GTK4 React applications",
   "keywords": [
     "gtk",
@@ -49,13 +49,13 @@
   ],
   "dependencies": {
     "@clack/prompts": "^0.11.0",
-    "@swc/core": "^1.15.7",
+    "@swc/core": "^1.15.8",
     "citty": "^0.1.6",
     "ejs": "^3.1.10",
     "react-refresh": "^0.18.0",
     "vite": "^7.3.0",
-    "@gtkx/ffi": "0.10.4",
-    "@gtkx/react": "0.10.4"
+    "@gtkx/ffi": "0.10.5",
+    "@gtkx/react": "0.10.5"
   },
   "devDependencies": {
     "@types/ejs": "^3.1.5",

package/templates/config/vitest.config.ts.ejs

@@ -1,13 +1,11 @@
+import gtkx from "@gtkx/vitest";
 import { defineConfig } from "vitest/config";
 
 export default defineConfig({
+    plugins: [gtkx()],
     test: {
         include: ["tests/**/*.test.{ts,tsx}"],
         globals: false,
         bail: 1,
-        pool: "forks",
-    },
-    esbuild: {
-        jsx: "automatic",
     },
 });

package/templates/package.json.ejs

@@ -6,8 +6,8 @@
     "scripts": {
         "dev": "gtkx dev src/dev.tsx",
         "build": "tsc -b",
-        "start": "node dist/index.js"<% if (testing !== 'none') { %>,
-        "test": "<% if (testing === 'vitest') { %>GDK_BACKEND=x11 GSK_RENDERER=cairo LIBGL_ALWAYS_SOFTWARE=1 xvfb-run -a vitest<% } else if (testing === 'jest') { %>GDK_BACKEND=x11 GSK_RENDERER=cairo LIBGL_ALWAYS_SOFTWARE=1 xvfb-run -a jest<% } else if (testing === 'node') { %>GDK_BACKEND=x11 GSK_RENDERER=cairo LIBGL_ALWAYS_SOFTWARE=1 xvfb-run -a node --import tsx --test tests/**/*.test.ts<% } %>"<% } %>
+        "start": "node dist/index.js"<% if (testing === 'vitest') { %>,
+        "test": "vitest"<% } %>
     },
     "gtkx": {
         "appId": "<%= appId %>"

package/templates/tests/app.test.tsx.ejs

@@ -1,16 +1,9 @@
-<% if (testing === 'vitest') { -%>
 import { describe, it, expect, afterEach } from "vitest";
-<% } else if (testing === 'jest') { -%>
-import { describe, it, expect, afterEach } from "@jest/globals";
-<% } else { -%>
-import { describe, it, after } from "node:test";
-import { strict as assert } from "node:assert";
-<% } -%>
 import * as Gtk from "@gtkx/ffi/gtk";
 import { cleanup, render, screen } from "@gtkx/testing";
 import App from "../src/app.js";
 
-<%= testing === 'node' ? 'after' : 'afterEach' %>(async () => {
+afterEach(async () => {
     await cleanup();
 });
 
@@ -18,10 +11,6 @@ describe("App", () => {
     it("renders the increment button", async () => {
         await render(<App />, { wrapper: false });
         const button = await screen.findByRole(Gtk.AccessibleRole.BUTTON, { name: "Increment" });
-<% if (testing === 'node') { -%>
-        assert.ok(button, "Button should be rendered");
-<% } else { -%>
         expect(button).toBeDefined();
-<% } -%>
     });
 });

package/templates/config/jest.config.js.ejs

@@ -1,19 +0,0 @@
-/** @type {import('jest').Config} */
-export default {
-    preset: "ts-jest/presets/default-esm",
-    testEnvironment: "node",
-    testMatch: ["**/tests/**/*.test.ts"],
-    extensionsToTreatAsEsm: [".ts", ".tsx"],
-    moduleNameMapper: {
-        "^(\\.{1,2}/.*)\\.js$": "$1",
-    },
-    transform: {
-        "^.+\\.tsx?$": [
-            "ts-jest",
-            {
-                useESM: true,
-                tsconfig: "tsconfig.json",
-            },
-        ],
-    },
-};