@gtkx/cli 2.0.0-beta.2 → 2.0.0-beta.4

package/dist/vite-plugins/native.js

@@ -3,7 +3,6 @@ import { createRequire } from "node:module";
 import { arch, platform } from "node:os";
 import { dirname, join } from "node:path";
 import { stripQuery } from "./strip-query.js";
-const EMITTED_BINDING_SPECIFIER = "./gtkx.node";
 const BINDING_FILENAME = "gtkx.node";
 function resolveBinaryPath(projectRequire, currentArch) {
     const nativeRoot = dirname(projectRequire.resolve("@gtkx/native/package.json"));
@@ -69,9 +68,6 @@ function gtkxNative(root) {
                 source: resolvePlatformBinary(projectRequire),
             });
         },
-        resolveId(id) {
-            return id === EMITTED_BINDING_SPECIFIER ? { id, external: true } : null;
-        },
         transform(code, id) {
             return transformLoader(code, id, loaderPath(), bindingReferenceId);
         },

package/dist/vite-plugins/native.js.map

@@ -1 +1 @@
-{"version":3,"file":"native.js","sourceRoot":"","sources":["../../src/vite-plugins/native.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Plugin } from \"vite\";\nimport { existsSync, readFileSync } from \"node:fs\";\nimport { createRequire } from \"node:module\";\nimport { arch, platform } from \"node:os\";\nimport { dirname, join } from \"node:path\";\nimport { stripQuery } from \"./strip-query.js\";\n\nconst EMITTED_BINDING_SPECIFIER = \"./gtkx.node\";\nconst BINDING_FILENAME = \"gtkx.node\";\n\nfunction resolveBinaryPath(projectRequire: ReturnType<typeof createRequire>, currentArch: string): string {\n    const nativeRoot = dirname(projectRequire.resolve(\"@gtkx/native/package.json\"));\n    const localBinary = join(nativeRoot, `native.linux-${currentArch}-gnu.node`);\n\n    return existsSync(localBinary) ? localBinary : projectRequire.resolve(`@gtkx/native-linux-${currentArch}-gnu`);\n}\n\nfunction resolvePlatformBinary(projectRequire: ReturnType<typeof createRequire>): Buffer {\n    const currentPlatform = platform();\n\n    if (currentPlatform !== \"linux\") {\n        throw new Error(`Unsupported build platform: ${currentPlatform}, only Linux is supported`);\n    }\n\n    const currentArch = arch();\n\n    if (currentArch !== \"x64\" && currentArch !== \"arm64\") {\n        throw new Error(`Unsupported build architecture: ${currentArch}, only x64 and arm64 are supported`);\n    }\n\n    return readFileSync(resolveBinaryPath(projectRequire, currentArch));\n}\n\nfunction rewriteLoader(code: string, bindingReferenceId: string): string {\n    const idents: string[] = [];\n\n    for (const match of code.matchAll(/export\\s*\\{\\s*([A-Za-z0-9_$]+)\\s*\\}/g)) {\n        const ident = match[1];\n\n        if (ident) {\n            idents.push(ident);\n        }\n    }\n\n    const bindings = idents.join(\", \");\n\n    return [\n        \"import { createRequire as __gtkxCreateRequire } from \\\"node:module\\\";\",\n        \"import { fileURLToPath as __gtkxFileURLToPath } from \\\"node:url\\\";\",\n        `const __gtkxNativeLocation = import.meta.ROLLUP_FILE_URL_${bindingReferenceId};`,\n        \"const __gtkxNativePath = __gtkxNativeLocation.startsWith(\\\"file:\\\") \" +\n        \"? __gtkxFileURLToPath(__gtkxNativeLocation) : __gtkxNativeLocation;\",\n        \"const __gtkxNative = __gtkxCreateRequire(import.meta.url)(__gtkxNativePath);\",\n        `const { ${bindings} } = __gtkxNative;`,\n        `export { ${bindings} };`,\n    ].join(\"\\n\");\n}\n\nconst transformLoader = (\n    code: string,\n    id: string,\n    loaderPath: string,\n    bindingReferenceId: string | null,\n): string | null => {\n    if (stripQuery(id) !== loaderPath) {\n        return null;\n    }\n\n    if (bindingReferenceId === null) {\n        throw new Error(\"Cannot render the native loader before its binary has been emitted\");\n    }\n\n    return rewriteLoader(code, bindingReferenceId);\n};\n\nfunction gtkxNative(root: string): Plugin {\n    const projectRequire = createRequire(join(root, \"package.json\"));\n    let cachedLoaderPath: string | undefined;\n    let bindingReferenceId: string | null = null;\n\n    const loaderPath = (): string => {\n        cachedLoaderPath ??= join(dirname(projectRequire.resolve(\"@gtkx/native/package.json\")), \"index.js\");\n\n        return cachedLoaderPath;\n    };\n\n    return {\n        name: \"gtkx:native\",\n        enforce: \"pre\",\n        apply: \"build\",\n\n        buildStart() {\n            bindingReferenceId = this.emitFile({\n                type: \"asset\",\n                fileName: BINDING_FILENAME,\n                source: resolvePlatformBinary(projectRequire),\n            });\n        },\n\n        resolveId(id) {\n            return id === EMITTED_BINDING_SPECIFIER ? { id, external: true } : null;\n        },\n\n        transform(code, id) {\n            return transformLoader(code, id, loaderPath(), bindingReferenceId);\n        },\n    };\n}\n\nexport { gtkxNative };\n"]}
+{"version":3,"file":"native.js","sourceRoot":"","sources":["../../src/vite-plugins/native.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Plugin } from \"vite\";\nimport { existsSync, readFileSync } from \"node:fs\";\nimport { createRequire } from \"node:module\";\nimport { arch, platform } from \"node:os\";\nimport { dirname, join } from \"node:path\";\nimport { stripQuery } from \"./strip-query.js\";\n\nconst BINDING_FILENAME = \"gtkx.node\";\n\nfunction resolveBinaryPath(projectRequire: ReturnType<typeof createRequire>, currentArch: string): string {\n    const nativeRoot = dirname(projectRequire.resolve(\"@gtkx/native/package.json\"));\n    const localBinary = join(nativeRoot, `native.linux-${currentArch}-gnu.node`);\n\n    return existsSync(localBinary) ? localBinary : projectRequire.resolve(`@gtkx/native-linux-${currentArch}-gnu`);\n}\n\nfunction resolvePlatformBinary(projectRequire: ReturnType<typeof createRequire>): Buffer {\n    const currentPlatform = platform();\n\n    if (currentPlatform !== \"linux\") {\n        throw new Error(`Unsupported build platform: ${currentPlatform}, only Linux is supported`);\n    }\n\n    const currentArch = arch();\n\n    if (currentArch !== \"x64\" && currentArch !== \"arm64\") {\n        throw new Error(`Unsupported build architecture: ${currentArch}, only x64 and arm64 are supported`);\n    }\n\n    return readFileSync(resolveBinaryPath(projectRequire, currentArch));\n}\n\nfunction rewriteLoader(code: string, bindingReferenceId: string): string {\n    const idents: string[] = [];\n\n    for (const match of code.matchAll(/export\\s*\\{\\s*([A-Za-z0-9_$]+)\\s*\\}/g)) {\n        const ident = match[1];\n\n        if (ident) {\n            idents.push(ident);\n        }\n    }\n\n    const bindings = idents.join(\", \");\n\n    return [\n        \"import { createRequire as __gtkxCreateRequire } from \\\"node:module\\\";\",\n        \"import { fileURLToPath as __gtkxFileURLToPath } from \\\"node:url\\\";\",\n        `const __gtkxNativeLocation = import.meta.ROLLUP_FILE_URL_${bindingReferenceId};`,\n        \"const __gtkxNativePath = __gtkxNativeLocation.startsWith(\\\"file:\\\") \" +\n        \"? __gtkxFileURLToPath(__gtkxNativeLocation) : __gtkxNativeLocation;\",\n        \"const __gtkxNative = __gtkxCreateRequire(import.meta.url)(__gtkxNativePath);\",\n        `const { ${bindings} } = __gtkxNative;`,\n        `export { ${bindings} };`,\n    ].join(\"\\n\");\n}\n\nconst transformLoader = (\n    code: string,\n    id: string,\n    loaderPath: string,\n    bindingReferenceId: string | null,\n): string | null => {\n    if (stripQuery(id) !== loaderPath) {\n        return null;\n    }\n\n    if (bindingReferenceId === null) {\n        throw new Error(\"Cannot render the native loader before its binary has been emitted\");\n    }\n\n    return rewriteLoader(code, bindingReferenceId);\n};\n\nfunction gtkxNative(root: string): Plugin {\n    const projectRequire = createRequire(join(root, \"package.json\"));\n    let cachedLoaderPath: string | undefined;\n    let bindingReferenceId: string | null = null;\n\n    const loaderPath = (): string => {\n        cachedLoaderPath ??= join(dirname(projectRequire.resolve(\"@gtkx/native/package.json\")), \"index.js\");\n\n        return cachedLoaderPath;\n    };\n\n    return {\n        name: \"gtkx:native\",\n        enforce: \"pre\",\n        apply: \"build\",\n\n        buildStart() {\n            bindingReferenceId = this.emitFile({\n                type: \"asset\",\n                fileName: BINDING_FILENAME,\n                source: resolvePlatformBinary(projectRequire),\n            });\n        },\n\n        transform(code, id) {\n            return transformLoader(code, id, loaderPath(), bindingReferenceId);\n        },\n    };\n}\n\nexport { gtkxNative };\n"]}

package/dist/vite-plugins/settings-worker-env.d.ts

@@ -1,4 +1,4 @@
 import type { Plugin } from "vitest/config";
-declare function gtkxSettingsWorkerEnv(): Plugin;
+declare function gtkxSettingsWorkerEnv(configFile?: string): Plugin;
 export { gtkxSettingsWorkerEnv };
 //# sourceMappingURL=settings-worker-env.d.ts.map

package/dist/vite-plugins/settings-worker-env.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"settings-worker-env.d.ts","sourceRoot":"","sources":["../../src/vite-plugins/settings-worker-env.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAI5C,iBAAS,qBAAqB,IAAI,MAAM,CAwBvC;AAED,OAAO,EAAE,qBAAqB,EAAE,CAAC"}
+{"version":3,"file":"settings-worker-env.d.ts","sourceRoot":"","sources":["../../src/vite-plugins/settings-worker-env.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAI5C,iBAAS,qBAAqB,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,CAwB1D;AAED,OAAO,EAAE,qBAAqB,EAAE,CAAC"}

package/dist/vite-plugins/settings-worker-env.js

@@ -1,7 +1,7 @@
 import { createConfigLoader } from "@gtkx/config/internal";
 import { prependSchemaDir, stageAndCompileProjectSchemas } from "../settings/schema.js";
-function gtkxSettingsWorkerEnv() {
-    const loadConfig = createConfigLoader();
+function gtkxSettingsWorkerEnv(configFile) {
+    const loadConfig = createConfigLoader({ configFile });
     return {
         name: "gtkx:settings-worker-env",
         enforce: "pre",

package/dist/vite-plugins/settings-worker-env.js.map

@@ -1 +1 @@
-{"version":3,"file":"settings-worker-env.js","sourceRoot":"","sources":["../../src/vite-plugins/settings-worker-env.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,6BAA6B,EAAE,MAAM,uBAAuB,CAAC;AAExF,SAAS,qBAAqB;IAC1B,MAAM,UAAU,GAAG,kBAAkB,EAAE,CAAC;IAExC,OAAO;QACH,IAAI,EAAE,0BAA0B;QAChC,OAAO,EAAE,KAAK;QAEd,KAAK,CAAC,MAAM,CAAC,MAAkB;YAC3B,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;YACnE,MAAM,GAAG,GAAG,6BAA6B,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAEvD,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;gBACf,OAAO;YACX,CAAC;YAED,OAAO,CAAC,GAAG,CAAC,mBAAmB,GAAG,GAAG,CAAC;YAEtC,OAAO;gBACH,IAAI,EAAE;oBACF,GAAG,EAAE,EAAE,oBAAoB,EAAE,gBAAgB,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,EAAE;iBACzF;aACJ,CAAC;QACN,CAAC;KACJ,CAAC;AACN,CAAC;AAED,OAAO,EAAE,qBAAqB,EAAE,CAAC","sourcesContent":["import type { UserConfig } from \"vite\";\nimport type { Plugin } from \"vitest/config\";\nimport { createConfigLoader } from \"@gtkx/config/internal\";\nimport { prependSchemaDir, stageAndCompileProjectSchemas } from \"../settings/schema.js\";\n\nfunction gtkxSettingsWorkerEnv(): Plugin {\n    const loadConfig = createConfigLoader();\n\n    return {\n        name: \"gtkx:settings-worker-env\",\n        enforce: \"pre\",\n\n        async config(config: UserConfig) {\n            const loaded = await loadConfig.load(config.root ?? process.cwd());\n            const dir = stageAndCompileProjectSchemas(loaded.root);\n\n            if (dir === null) {\n                return;\n            }\n\n            process.env.GTKX_DEV_SCHEMA_DIR = dir;\n\n            return {\n                test: {\n                    env: { GSETTINGS_SCHEMA_DIR: prependSchemaDir(dir, process.env.GSETTINGS_SCHEMA_DIR) },\n                },\n            };\n        },\n    };\n}\n\nexport { gtkxSettingsWorkerEnv };\n"]}
+{"version":3,"file":"settings-worker-env.js","sourceRoot":"","sources":["../../src/vite-plugins/settings-worker-env.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,6BAA6B,EAAE,MAAM,uBAAuB,CAAC;AAExF,SAAS,qBAAqB,CAAC,UAAmB;IAC9C,MAAM,UAAU,GAAG,kBAAkB,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC;IAEtD,OAAO;QACH,IAAI,EAAE,0BAA0B;QAChC,OAAO,EAAE,KAAK;QAEd,KAAK,CAAC,MAAM,CAAC,MAAkB;YAC3B,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;YACnE,MAAM,GAAG,GAAG,6BAA6B,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAEvD,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;gBACf,OAAO;YACX,CAAC;YAED,OAAO,CAAC,GAAG,CAAC,mBAAmB,GAAG,GAAG,CAAC;YAEtC,OAAO;gBACH,IAAI,EAAE;oBACF,GAAG,EAAE,EAAE,oBAAoB,EAAE,gBAAgB,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,EAAE;iBACzF;aACJ,CAAC;QACN,CAAC;KACJ,CAAC;AACN,CAAC;AAED,OAAO,EAAE,qBAAqB,EAAE,CAAC","sourcesContent":["import type { UserConfig } from \"vite\";\nimport type { Plugin } from \"vitest/config\";\nimport { createConfigLoader } from \"@gtkx/config/internal\";\nimport { prependSchemaDir, stageAndCompileProjectSchemas } from \"../settings/schema.js\";\n\nfunction gtkxSettingsWorkerEnv(configFile?: string): Plugin {\n    const loadConfig = createConfigLoader({ configFile });\n\n    return {\n        name: \"gtkx:settings-worker-env\",\n        enforce: \"pre\",\n\n        async config(config: UserConfig) {\n            const loaded = await loadConfig.load(config.root ?? process.cwd());\n            const dir = stageAndCompileProjectSchemas(loaded.root);\n\n            if (dir === null) {\n                return;\n            }\n\n            process.env.GTKX_DEV_SCHEMA_DIR = dir;\n\n            return {\n                test: {\n                    env: { GSETTINGS_SCHEMA_DIR: prependSchemaDir(dir, process.env.GSETTINGS_SCHEMA_DIR) },\n                },\n            };\n        },\n    };\n}\n\nexport { gtkxSettingsWorkerEnv };\n"]}

package/dist/vitest-plugin.d.ts

@@ -1,4 +1,5 @@
 import type { Plugin } from "vite";
+import { type PluginOptions } from "@gtkx/vitest";
 /**
  * Vite plugin stack for testing a GTKX application: the generated bindings the tests import,
  * the plugins the app is built with, the project's compiled GSettings schemas exposed to every
@@ -6,6 +7,6 @@ import type { Plugin } from "vite";
  *
  * @returns The plugins to spread into a Vitest config.
  */
-declare const gtkx: () => Plugin[];
+declare const gtkx: (options?: PluginOptions) => Plugin[];
 export default gtkx;
 //# sourceMappingURL=vitest-plugin.d.ts.map

package/dist/vitest-plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vitest-plugin.d.ts","sourceRoot":"","sources":["../src/vitest-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAMnC;;;;;;GAMG;AACH,QAAA,MAAM,IAAI,QAAO,MAAM,EAKtB,CAAC;AAEF,eAAe,IAAI,CAAC"}
+{"version":3,"file":"vitest-plugin.d.ts","sourceRoot":"","sources":["../src/vitest-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AACnC,OAAmB,EAAE,KAAK,aAAa,EAAE,MAAM,cAAc,CAAC;AAK9D;;;;;;GAMG;AACH,QAAA,MAAM,IAAI,GAAI,UAAS,aAAkB,KAAG,MAAM,EAKjD,CAAC;AAEF,eAAe,IAAI,CAAC"}

package/dist/vitest-plugin.js

@@ -1,4 +1,4 @@
-import gtkxVitest from "@gtkx/vitest";
+import gtkxVitest, {} from "@gtkx/vitest";
 import { gtkxEnsureStore } from "./vite-plugins/ensure-store.js";
 import { gtkxVitePlugins } from "./vite-plugins/index.js";
 import { gtkxSettingsWorkerEnv } from "./vite-plugins/settings-worker-env.js";
@@ -9,11 +9,11 @@ import { gtkxSettingsWorkerEnv } from "./vite-plugins/settings-worker-env.js";
  *
  * @returns The plugins to spread into a Vitest config.
  */
-const gtkx = () => [
-    gtkxEnsureStore(),
-    ...gtkxVitePlugins(),
-    gtkxSettingsWorkerEnv(),
-    gtkxVitest(),
+const gtkx = (options = {}) => [
+    gtkxEnsureStore(options.configFile),
+    ...gtkxVitePlugins({ configFile: options.configFile }),
+    gtkxSettingsWorkerEnv(options.configFile),
+    gtkxVitest(options),
 ];
 export default gtkx;
 //# sourceMappingURL=vitest-plugin.js.map

package/dist/vitest-plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"vitest-plugin.js","sourceRoot":"","sources":["../src/vitest-plugin.ts"],"names":[],"mappings":"AACA,OAAO,UAAU,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAC;AAE9E;;;;;;GAMG;AACH,MAAM,IAAI,GAAG,GAAa,EAAE,CAAC;IACzB,eAAe,EAAE;IACjB,GAAG,eAAe,EAAE;IACpB,qBAAqB,EAAE;IACvB,UAAU,EAAE;CACf,CAAC;AAEF,eAAe,IAAI,CAAC","sourcesContent":["import type { Plugin } from \"vite\";\nimport gtkxVitest from \"@gtkx/vitest\";\nimport { gtkxEnsureStore } from \"./vite-plugins/ensure-store.js\";\nimport { gtkxVitePlugins } from \"./vite-plugins/index.js\";\nimport { gtkxSettingsWorkerEnv } from \"./vite-plugins/settings-worker-env.js\";\n\n/**\n * Vite plugin stack for testing a GTKX application: the generated bindings the tests import,\n * the plugins the app is built with, the project's compiled GSettings schemas exposed to every\n * test worker, and a headless display per worker.\n *\n * @returns The plugins to spread into a Vitest config.\n */\nconst gtkx = (): Plugin[] => [\n    gtkxEnsureStore(),\n    ...gtkxVitePlugins(),\n    gtkxSettingsWorkerEnv(),\n    gtkxVitest(),\n];\n\nexport default gtkx;\n"]}
+{"version":3,"file":"vitest-plugin.js","sourceRoot":"","sources":["../src/vitest-plugin.ts"],"names":[],"mappings":"AACA,OAAO,UAAU,EAAE,EAAsB,MAAM,cAAc,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAC;AAE9E;;;;;;GAMG;AACH,MAAM,IAAI,GAAG,CAAC,UAAyB,EAAE,EAAY,EAAE,CAAC;IACpD,eAAe,CAAC,OAAO,CAAC,UAAU,CAAC;IACnC,GAAG,eAAe,CAAC,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,CAAC;IACtD,qBAAqB,CAAC,OAAO,CAAC,UAAU,CAAC;IACzC,UAAU,CAAC,OAAO,CAAC;CACtB,CAAC;AAEF,eAAe,IAAI,CAAC","sourcesContent":["import type { Plugin } from \"vite\";\nimport gtkxVitest, { type PluginOptions } from \"@gtkx/vitest\";\nimport { gtkxEnsureStore } from \"./vite-plugins/ensure-store.js\";\nimport { gtkxVitePlugins } from \"./vite-plugins/index.js\";\nimport { gtkxSettingsWorkerEnv } from \"./vite-plugins/settings-worker-env.js\";\n\n/**\n * Vite plugin stack for testing a GTKX application: the generated bindings the tests import,\n * the plugins the app is built with, the project's compiled GSettings schemas exposed to every\n * test worker, and a headless display per worker.\n *\n * @returns The plugins to spread into a Vitest config.\n */\nconst gtkx = (options: PluginOptions = {}): Plugin[] => [\n    gtkxEnsureStore(options.configFile),\n    ...gtkxVitePlugins({ configFile: options.configFile }),\n    gtkxSettingsWorkerEnv(options.configFile),\n    gtkxVitest(options),\n];\n\nexport default gtkx;\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gtkx/cli",
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-beta.4",
   "description": "GTK app toolchain for React: scaffold, dev server, build, docs.",
   "keywords": [
     "gtkx",
@@ -70,26 +70,29 @@
   "dependencies": {
     "@babel/core": "^8.0.1",
     "@babel/preset-typescript": "^8.0.1",
-    "@gtkx/codegen": "2.0.0-beta.2",
-    "@gtkx/config": "2.0.0-beta.2",
-    "@gtkx/mcp": "2.0.0-beta.2",
-    "@gtkx/runtime": "2.0.0-beta.2",
-    "@gtkx/utils": "2.0.0-beta.2",
-    "@gtkx/vitest": "2.0.0-beta.2",
+    "@gtkx/codegen": "2.0.0-beta.4",
+    "@gtkx/config": "2.0.0-beta.4",
+    "@gtkx/mcp": "2.0.0-beta.4",
+    "@gtkx/native": "2.0.0-beta.4",
+    "@gtkx/runtime": "2.0.0-beta.4",
+    "@gtkx/utils": "2.0.0-beta.4",
+    "@gtkx/vitest": "2.0.0-beta.4",
     "@swc/core": "^1.16.1",
     "babel-plugin-react-compiler": "^1.0.0",
     "citty": "^0.2.2",
-    "create-gtkx": "2.0.0-beta.2",
+    "confbox": "^0.2.4",
+    "create-gtkx": "2.0.0-beta.4",
     "fast-xml-builder": "^1.3.1",
     "fast-xml-parser": "^5.11.1",
     "hosted-git-info": "^10.1.1",
     "i18next-cli": "1.72.1",
+    "jiti": "^2.7.0",
     "react-refresh": "^0.18.0",
     "vite": "^8.2.2",
     "yaml": "^2.9.0"
   },
   "devDependencies": {
-    "@gtkx/testing": "2.0.0-beta.2",
+    "@gtkx/testing": "2.0.0-beta.4",
     "@types/babel__core": "^7.20.5",
     "@types/hosted-git-info": "^3.0.5",
     "@types/react-refresh": "^0.14.7",

package/src/cli.ts

@@ -2,9 +2,14 @@ import { assertSupportedNodeVersion } from "@gtkx/config/internal";
 import { defineCommand, runMain } from "citty";
 import packageManifest from "../package.json" with { type: "json" };
 import { splitApplicationArgs } from "./internal/application-args.js";
-import { withErrorBoundary } from "./internal/errors.js";
+import { printError, withErrorBoundary } from "./internal/errors.js";
+import "./internal/parent-process.js";
 
-assertSupportedNodeVersion();
+try {
+    assertSupportedNodeVersion();
+} catch (error) {
+    printError(error);
+}
 
 const version = packageManifest.version;
 const { cliArgs } = splitApplicationArgs(process.argv.slice(2));
@@ -51,6 +56,11 @@ const main = defineCommand({
 
             return withErrorBoundary(scaffoldCommand);
         },
+        cleanup: async () => {
+            const { cleanup } = await import("./commands/cleanup.js");
+
+            return withErrorBoundary(cleanup);
+        },
     },
 });