create-gtkx 2.0.0-beta.1 → 2.0.0-beta.11

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

@@ -4,11 +4,10 @@ export default defineConfig({
     applicationId: "<%= applicationId %>",
     applicationIcon: "data/icons",
     deploy: {
-        name: "<%= title %>",
-        summary: "A GTK4 application built with GTKX",
+        name: <%- sourceStringLiteral(displayName) %>,
+        summary: "A Linux 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 built with GTKX. 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 Linux application built with GTKX",
     "license": "MIT",
 <% if (developerEmail) { -%>
     "author": <%- sourceStringLiteral(`${developerName} <${developerEmail}>`) %>,
@@ -17,6 +17,9 @@
         "dev": "gtkx dev",
         "build": "gtkx build",
         "codegen": "gtkx codegen",
+<% if (shouldIncludeTesting) { -%>
+        "test": "vitest run",
+<% } -%>
 <% if (isTypescript) { -%>
         "typecheck": "gtkx codegen && tsc",
 <% } -%>

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

@@ -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;

package/dist/install-hints.d.ts

@@ -1,3 +0,0 @@
-declare const getInstallHint: (message: string) => string | undefined;
-export { getInstallHint };
-//# sourceMappingURL=install-hints.d.ts.map

package/dist/install-hints.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"install-hints.d.ts","sourceRoot":"","sources":["../src/install-hints.ts"],"names":[],"mappings":"AAkDA,QAAA,MAAM,cAAc,GAAI,SAAS,MAAM,KAAG,MAAM,GAAG,SAC4B,CAAC;AAEhF,OAAO,EAAE,cAAc,EAAE,CAAC"}

package/dist/install-hints.js

@@ -1,35 +0,0 @@
-const RELEASE_AGE_PATTERN = /ERR_PNPM_(?:MINIMUM_RELEASE_AGE_VIOLATION|NO_MATURE_MATCHING_VERSION)/;
-const BLOCKED_VERSION_PATTERN = /^[ \t]*(\S+) was published at .+ within the minimumReleaseAge cutoff/gm;
-const RELEASE_AGE_POLICY = "pnpm refused the install under its minimumReleaseAge policy, which by default holds back every package " +
-    "published in the last 24 hours so a compromised release has time to be caught and pulled. Nothing is wrong " +
-    "with these versions other than their age.";
-const RELEASE_AGE_REMEDY = "Wait for them to clear that window and install again, or allow the versions pnpm named. They belong at the " +
-    "top level of pnpm-workspace.yaml, as a sibling of packages: and allowBuilds: rather than nested inside " +
-    "either of them:";
-const RELEASE_AGE_REMEDY_WITHOUT_VERSIONS = "Wait for them to clear that window and install again, or list the versions pnpm reported under a top-level " +
-    "minimumReleaseAgeExclude key in pnpm-workspace.yaml.";
-const RELEASE_AGE_PARTIAL_LIST = "pnpm reports only the versions the command it stopped on had to resolve, so a later install can name more. " +
-    "Add each one to the same list.";
-const RELEASE_AGE_OPT_OUT = 'Listing exact versions keeps the policy on for every other package. Setting "minimumReleaseAge: 0" in the ' +
-    "same file turns it off for all of them, so prefer the list above. npm and yarn apply no such policy.";
-const getBlockedVersions = (message) => {
-    const matches = Array.from(message.matchAll(BLOCKED_VERSION_PATTERN), (match) => match[1] ?? "");
-    return [...new Set(matches.filter(Boolean))];
-};
-const formatExcludeBlock = (versions) => ["minimumReleaseAgeExclude:", ...versions.map((version) => `  - '${version}'`)].join("\n");
-const describeReleaseAge = (message) => {
-    const versions = getBlockedVersions(message);
-    if (versions.length === 0) {
-        return [RELEASE_AGE_POLICY, RELEASE_AGE_REMEDY_WITHOUT_VERSIONS].join("\n\n");
-    }
-    return [
-        RELEASE_AGE_POLICY,
-        RELEASE_AGE_REMEDY,
-        formatExcludeBlock(versions),
-        RELEASE_AGE_PARTIAL_LIST,
-        RELEASE_AGE_OPT_OUT,
-    ].join("\n\n");
-};
-const getInstallHint = (message) => RELEASE_AGE_PATTERN.test(message) ? describeReleaseAge(message) : undefined;
-export { getInstallHint };
-//# sourceMappingURL=install-hints.js.map

package/dist/install-hints.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"install-hints.js","sourceRoot":"","sources":["../src/install-hints.ts"],"names":[],"mappings":"AAAA,MAAM,mBAAmB,GAAG,uEAAuE,CAAC;AACpG,MAAM,uBAAuB,GAAG,wEAAwE,CAAC;AAEzG,MAAM,kBAAkB,GACpB,yGAAyG;IACzG,6GAA6G;IAC7G,2CAA2C,CAAC;AAEhD,MAAM,kBAAkB,GACpB,6GAA6G;IAC7G,yGAAyG;IACzG,iBAAiB,CAAC;AAEtB,MAAM,mCAAmC,GACrC,6GAA6G;IAC7G,sDAAsD,CAAC;AAE3D,MAAM,wBAAwB,GAC1B,6GAA6G;IAC7G,gCAAgC,CAAC;AAErC,MAAM,mBAAmB,GACrB,4GAA4G;IAC5G,sGAAsG,CAAC;AAE3G,MAAM,kBAAkB,GAAG,CAAC,OAAe,EAAY,EAAE;IACrD,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IAEjG,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;AACjD,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,CAAC,QAAkB,EAAU,EAAE,CACtD,CAAC,2BAA2B,EAAE,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,QAAQ,OAAO,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAE/F,MAAM,kBAAkB,GAAG,CAAC,OAAe,EAAU,EAAE;IACnD,MAAM,QAAQ,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC;IAE7C,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,OAAO,CAAC,kBAAkB,EAAE,mCAAmC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAClF,CAAC;IAED,OAAO;QACH,kBAAkB;QAClB,kBAAkB;QAClB,kBAAkB,CAAC,QAAQ,CAAC;QAC5B,wBAAwB;QACxB,mBAAmB;KACtB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AACnB,CAAC,CAAC;AAEF,MAAM,cAAc,GAAG,CAAC,OAAe,EAAsB,EAAE,CAC3D,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AAEhF,OAAO,EAAE,cAAc,EAAE,CAAC","sourcesContent":["const RELEASE_AGE_PATTERN = /ERR_PNPM_(?:MINIMUM_RELEASE_AGE_VIOLATION|NO_MATURE_MATCHING_VERSION)/;\nconst BLOCKED_VERSION_PATTERN = /^[ \\t]*(\\S+) was published at .+ within the minimumReleaseAge cutoff/gm;\n\nconst RELEASE_AGE_POLICY =\n    \"pnpm refused the install under its minimumReleaseAge policy, which by default holds back every package \" +\n    \"published in the last 24 hours so a compromised release has time to be caught and pulled. Nothing is wrong \" +\n    \"with these versions other than their age.\";\n\nconst RELEASE_AGE_REMEDY =\n    \"Wait for them to clear that window and install again, or allow the versions pnpm named. They belong at the \" +\n    \"top level of pnpm-workspace.yaml, as a sibling of packages: and allowBuilds: rather than nested inside \" +\n    \"either of them:\";\n\nconst RELEASE_AGE_REMEDY_WITHOUT_VERSIONS =\n    \"Wait for them to clear that window and install again, or list the versions pnpm reported under a top-level \" +\n    \"minimumReleaseAgeExclude key in pnpm-workspace.yaml.\";\n\nconst RELEASE_AGE_PARTIAL_LIST =\n    \"pnpm reports only the versions the command it stopped on had to resolve, so a later install can name more. \" +\n    \"Add each one to the same list.\";\n\nconst RELEASE_AGE_OPT_OUT =\n    'Listing exact versions keeps the policy on for every other package. Setting \"minimumReleaseAge: 0\" in the ' +\n    \"same file turns it off for all of them, so prefer the list above. npm and yarn apply no such policy.\";\n\nconst getBlockedVersions = (message: string): string[] => {\n    const matches = Array.from(message.matchAll(BLOCKED_VERSION_PATTERN), (match) => match[1] ?? \"\");\n\n    return [...new Set(matches.filter(Boolean))];\n};\n\nconst formatExcludeBlock = (versions: string[]): string =>\n    [\"minimumReleaseAgeExclude:\", ...versions.map((version) => `  - '${version}'`)].join(\"\\n\");\n\nconst describeReleaseAge = (message: string): string => {\n    const versions = getBlockedVersions(message);\n\n    if (versions.length === 0) {\n        return [RELEASE_AGE_POLICY, RELEASE_AGE_REMEDY_WITHOUT_VERSIONS].join(\"\\n\\n\");\n    }\n\n    return [\n        RELEASE_AGE_POLICY,\n        RELEASE_AGE_REMEDY,\n        formatExcludeBlock(versions),\n        RELEASE_AGE_PARTIAL_LIST,\n        RELEASE_AGE_OPT_OUT,\n    ].join(\"\\n\\n\");\n};\n\nconst getInstallHint = (message: string): string | undefined =>\n    RELEASE_AGE_PATTERN.test(message) ? describeReleaseAge(message) : undefined;\n\nexport { getInstallHint };\n"]}

package/src/install-hints.ts

@@ -1,54 +0,0 @@
-const RELEASE_AGE_PATTERN = /ERR_PNPM_(?:MINIMUM_RELEASE_AGE_VIOLATION|NO_MATURE_MATCHING_VERSION)/;
-const BLOCKED_VERSION_PATTERN = /^[ \t]*(\S+) was published at .+ within the minimumReleaseAge cutoff/gm;
-
-const RELEASE_AGE_POLICY =
-    "pnpm refused the install under its minimumReleaseAge policy, which by default holds back every package " +
-    "published in the last 24 hours so a compromised release has time to be caught and pulled. Nothing is wrong " +
-    "with these versions other than their age.";
-
-const RELEASE_AGE_REMEDY =
-    "Wait for them to clear that window and install again, or allow the versions pnpm named. They belong at the " +
-    "top level of pnpm-workspace.yaml, as a sibling of packages: and allowBuilds: rather than nested inside " +
-    "either of them:";
-
-const RELEASE_AGE_REMEDY_WITHOUT_VERSIONS =
-    "Wait for them to clear that window and install again, or list the versions pnpm reported under a top-level " +
-    "minimumReleaseAgeExclude key in pnpm-workspace.yaml.";
-
-const RELEASE_AGE_PARTIAL_LIST =
-    "pnpm reports only the versions the command it stopped on had to resolve, so a later install can name more. " +
-    "Add each one to the same list.";
-
-const RELEASE_AGE_OPT_OUT =
-    'Listing exact versions keeps the policy on for every other package. Setting "minimumReleaseAge: 0" in the ' +
-    "same file turns it off for all of them, so prefer the list above. npm and yarn apply no such policy.";
-
-const getBlockedVersions = (message: string): string[] => {
-    const matches = Array.from(message.matchAll(BLOCKED_VERSION_PATTERN), (match) => match[1] ?? "");
-
-    return [...new Set(matches.filter(Boolean))];
-};
-
-const formatExcludeBlock = (versions: string[]): string =>
-    ["minimumReleaseAgeExclude:", ...versions.map((version) => `  - '${version}'`)].join("\n");
-
-const describeReleaseAge = (message: string): string => {
-    const versions = getBlockedVersions(message);
-
-    if (versions.length === 0) {
-        return [RELEASE_AGE_POLICY, RELEASE_AGE_REMEDY_WITHOUT_VERSIONS].join("\n\n");
-    }
-
-    return [
-        RELEASE_AGE_POLICY,
-        RELEASE_AGE_REMEDY,
-        formatExcludeBlock(versions),
-        RELEASE_AGE_PARTIAL_LIST,
-        RELEASE_AGE_OPT_OUT,
-    ].join("\n\n");
-};
-
-const getInstallHint = (message: string): string | undefined =>
-    RELEASE_AGE_PATTERN.test(message) ? describeReleaseAge(message) : undefined;
-
-export { getInstallHint };