Small setup impovements

.eslintrc.yaml

@@ -0,0 +1,3 @@
+root: true
+extends:
+  - ./troll/.eslintrc.yaml

data/meson.build

@@ -18,6 +18,13 @@ if desktop_utils.found()
   )
 endif
 
+configure_file(
+  input: 'app.service',
+  output: '@[email protected]'.format(app_id),
+  configuration: { 'app_id': app_id, 'bindir': bindir },
+  install_dir: join_paths(get_option('datadir'), 'dbus-1/services')
+)
+
 appstream_file = i18n.merge_file(
   input: configure_file(
     input: 'app.metainfo.xml',
@@ -37,13 +44,6 @@ if appstream_cli.found()
   )
 endif
 
-configure_file(
-  input: 'app.service',
-  output: '@[email protected]'.format(app_id),
-  configuration: { 'app_id': app_id, 'bindir': bindir },
-  install_dir: join_paths(get_option('datadir'), 'dbus-1/services')
-)
-
 appstream_util = find_program('appstream-util', required: false)
 if appstream_util.found()
   test('Validate appstream file', appstream_util,

jsconfig.json

@@ -3,7 +3,7 @@
     "strict": true,
     "typeRoots": ["./node_modules/@types", "./node_modules/@gi-types"],
     "types": ["gjs-environment", "base-types", "gtk4-types", "adw1"],
-    "lib": ["ES2021"],
+    "lib": ["ES2022"],
     "allowSyntheticDefaultImports": true
   },
   "exclude": ["./src/lib", "node_modules"]

src/about.js

@@ -43,7 +43,11 @@ ${getBlueprintVersion()}
       "Sonny Piers https://sonny.re",
       "Lorenz Wildberg https://gitlab.gnome.org/lwildberg",
     ],
-    designers: ["Tobias Bernard <[email protected]>"],
+    designers: [
+      "Sonny Piers https://sonny.re",
+      "Tobias Bernard <[email protected]>",
+    ],
+    artists: ["Tobias Bernard <[email protected]>"],
   });
 
   dialog.add_credit_section(_("Contributors"), [

src/re.sonny.Workbench → src/bin.js

@@ -1,7 +1,5 @@
 #!@GJS@ -m
 
-// -*- mode: js; -*-
-
 import { exit } from "system";
 import GLib from "gi://GLib";
 import { setConsoleLogDomain } from "console";
@@ -21,7 +19,6 @@ const resource = Gio.resource_load("@pkgdatadir@/@[email protected]");
 Gio.resources_register(resource);
 
 const loop = new GLib.MainLoop(null, false);
-// eslint-disable-next-line import/no-unresolved
 import("resource:///re/sonny/Workbench/src/main.js")
   .then((main) => {
     // Workaround for issue

src/meson.build

@@ -1,5 +1,5 @@
 bin_conf = configuration_data()
-bin_conf.set('GJS', find_program('gjs').path())
+bin_conf.set('GJS', find_program('gjs').full_path())
 bin_conf.set('version', meson.project_version() + version_suffix)
 bin_conf.set('app_id', app_id)
 bin_conf.set('prefix', prefix)
@@ -41,7 +41,7 @@ gnome.compile_resources(app_id,
 )
 
 configure_file(
-  input: 're.sonny.Workbench',
+  input: 'bin.js',
   output: app_id,
   configuration: bin_conf,
   install: true,

src/style.css

@@ -17,14 +17,8 @@
   border-bottom: solid 1px @borders;
 }
 
-#panel_code {
-  border-right: solid 1px @borders;
-}
-
-#panel_style {
-  border-right: solid 1px @borders;
-}
-
+#panel_code,
+#panel_style,
 #panel_ui {
   border-right: solid 1px @borders;
 }

src/window.blp

@@ -170,8 +170,7 @@ Gtk.ApplicationWindow window {
               child: ScrolledWindow {
                 vexpand: true;
                 GtkSource.View source_view_javascript {
-                  buffer: GtkSource.Buffer {
-                  };
+                  buffer: GtkSource.Buffer {};
                   monospace: true;
                   auto-indent: true;
                   highlight-current-line: true;
@@ -190,8 +189,7 @@ Gtk.ApplicationWindow window {
               child: ScrolledWindow {
                 vexpand: true;
                 GtkSource.View source_view_vala {
-                  buffer: GtkSource.Buffer {
-                  };
+                  buffer: GtkSource.Buffer {};
                   monospace: true;
                   auto-indent: true;
                   highlight-current-line: true;
@@ -231,8 +229,7 @@ Gtk.ApplicationWindow window {
             hexpand: true;
 
             GtkSource.View source_view_css {
-              buffer: GtkSource.Buffer {
-              };
+              buffer: GtkSource.Buffer {};
               monospace: true;
               auto-indent: true;
               highlight-current-line: true;
@@ -319,8 +316,7 @@ Gtk.ApplicationWindow window {
                 vexpand: true;
 
                 GtkSource.View source_view_blueprint {
-                  buffer: GtkSource.Buffer {
-                  };
+                  buffer: GtkSource.Buffer {};
                   monospace: true;
                   auto-indent: true;
                   highlight-current-line: true;
@@ -340,8 +336,7 @@ Gtk.ApplicationWindow window {
                 vexpand: true;
 
                 GtkSource.View source_view_xml {
-                  buffer: GtkSource.Buffer {
-                  };
+                  buffer: GtkSource.Buffer {};
                   monospace: true;
                   auto-indent: true;
                   highlight-current-line: true;