create-gtkx 1.6.0 → 2.0.0-beta.10

package/src/templates/gtkx.config.ts.ejs

@@ -3,21 +3,11 @@ import { defineConfig } from "@gtkx/config";
 export default defineConfig({
     applicationId: "<%= applicationId %>",
     applicationIcon: "data/icons",
-    future: {
-        v2ByteArrays: true,
-        v2ValueReturns: true,
-        v2FinishResults: true,
-        v2InoutReturns: true,
-        v2ResourceImports: true,
-        v2DefaultLibraries: true,
-        v2TreeShaking: true,
-    },
     deploy: {
-        name: "<%= title %>",
-        summary: "A GTK4 application built with GTKX",
+        name: <%- sourceStringLiteral(displayName) %>,
+        summary: "A GNOME application built with GTKX",
         description: [
-            "<%= title %> is a GTK4 and Adwaita application built with GTKX, which renders native GObject "
-            + "widgets from React. Replace this paragraph with a description of what your application does.",
+            <%- sourceStringLiteral(`${displayName} is a GNOME application built with GTKX on Adwaita and GTK4, with native GObject widgets rendered from React. Replace this paragraph with a description of what your application does.`) %>,
         ],
         categories: ["Utility"],
     },

package/src/templates/package.json.ejs

@@ -2,7 +2,7 @@
     "name": "<%= name %>",
     "version": "0.0.1",
     "private": true,
-    "description": "A GTK4 application built with GTKX",
+    "description": "A GNOME application built with GTKX",
     "license": "MIT",
 <% if (developerEmail) { -%>
     "author": <%- sourceStringLiteral(`${developerName} <${developerEmail}>`) %>,
@@ -10,6 +10,9 @@
     "author": <%- sourceStringLiteral(developerName) %>,
 <% } -%>
     "type": "module",
+    "engines": {
+        "node": ">=26.7.0"
+    },
     "scripts": {
         "dev": "gtkx dev",
         "build": "gtkx build",

package/src/templates/src/app.tsx.ejs

@@ -1,5 +1,6 @@
 import * as Gtk from "@gtkx/gi/gtk";
-import { GtkApplication, GtkApplicationWindow, GtkBox, GtkButton, GtkLabel } from "@gtkx/jsx/gtk";
+import { AdwApplication, AdwApplicationWindow, AdwHeaderBar, AdwToolbarView } from "@gtkx/jsx/adw";
+import { GtkBox, GtkButton, GtkLabel } from "@gtkx/jsx/gtk";
 import { quit } from "@gtkx/react";
 import { useState } from "react";
 
@@ -7,38 +8,40 @@ const MainWindow = () => {
     const [count, setCount] = useState(0);
 
     return (
-        <GtkApplicationWindow
-            title="<%= title %>"
+        <AdwApplicationWindow
+            title={<%- sourceStringLiteral(displayName) %>}
             defaultWidth={400}
             defaultHeight={300}
             onCloseRequest={quit}
         >
-            <GtkBox
-                orientation={Gtk.Orientation.VERTICAL}
-                spacing={20}
-                marginTop={40}
-                marginBottom={40}
-                marginStart={40}
-                marginEnd={40}
-                valign={Gtk.Align.CENTER}
-                halign={Gtk.Align.CENTER}
-            >
-                <GtkLabel cssClasses={["title-1"]}>Welcome to GTKX!</GtkLabel>
-                <GtkLabel cssClasses={["title-2"]}>Count: {count}</GtkLabel>
-                <GtkButton
-                    label="Increment"
-                    onClicked={() => setCount((c) => c + 1)}
-                    cssClasses={["suggested-action", "pill"]}
-                />
-            </GtkBox>
-        </GtkApplicationWindow>
+            <AdwToolbarView topBar={<AdwHeaderBar />}>
+                <GtkBox
+                    orientation={Gtk.Orientation.VERTICAL}
+                    spacing={20}
+                    marginTop={40}
+                    marginBottom={40}
+                    marginStart={40}
+                    marginEnd={40}
+                    valign={Gtk.Align.CENTER}
+                    halign={Gtk.Align.CENTER}
+                >
+                    <GtkLabel cssClasses={["title-1"]}>Welcome to GTKX!</GtkLabel>
+                    <GtkLabel cssClasses={["title-2"]}>Count: {count}</GtkLabel>
+                    <GtkButton
+                        label="Increment"
+                        onClicked={() => setCount((c) => c + 1)}
+                        cssClasses={["suggested-action", "pill"]}
+                    />
+                </GtkBox>
+            </AdwToolbarView>
+        </AdwApplicationWindow>
     );
 };
 
 export const App = () => (
-    <GtkApplication>
+    <AdwApplication>
         <MainWindow />
-    </GtkApplication>
+    </AdwApplication>
 );
 
 export default App;

package/src/templates.ts

@@ -1,4 +1,4 @@
-import { sortStrings, sourceStringLiteral } from "@gtkx/utils";
+import { sortStrings, sourceStringLiteral, toPosixPath } from "@gtkx/utils";
 import ejs from "ejs";
 import { readdirSync } from "node:fs";
 import { join } from "node:path";
@@ -6,7 +6,7 @@ import { join } from "node:path";
 type TemplateContext = {
     name: string;
     applicationId: string;
-    title: string;
+    displayName: string;
     shouldIncludeTesting: boolean;
     isTypescript: boolean;
     importExtension: string;
@@ -14,20 +14,18 @@ type TemplateContext = {
     developerEmail: string | null;
 };
 
-const getTemplatesDir = (): string => {
-    return join(import.meta.dirname, "templates");
-};
+const TEMPLATES_DIR = join(import.meta.dirname, "templates");
 
 const listTemplates = (): string[] =>
     sortStrings(
-        readdirSync(getTemplatesDir(), { recursive: true, withFileTypes: true })
+        readdirSync(TEMPLATES_DIR, { recursive: true, withFileTypes: true })
             .filter((entry) => entry.isFile())
             .map((entry) => join(entry.parentPath, entry.name))
-            .map((absolute) => absolute.slice(getTemplatesDir().length + 1).replaceAll(/[/\\]/g, "/"))
+            .map((absolute) => toPosixPath(absolute.slice(TEMPLATES_DIR.length + 1)))
             .map((relative) => relative.replace(/\.ejs$/, "")),
     );
 
 const renderFile = async (templateName: string, context: TemplateContext): Promise<string> =>
-    ejs.renderFile(join(getTemplatesDir(), `${templateName}.ejs`), { ...context, sourceStringLiteral });
+    ejs.renderFile(join(TEMPLATES_DIR, `${templateName}.ejs`), { ...context, sourceStringLiteral });
 
 export { listTemplates, renderFile, type TemplateContext };