[gnome-shell/ewlsh/console-domain-fix: 19/19] init: Set console log domain

[Marge Bot <marge-bot src gnome org>]

commit 0d8e0025d6688d845a8631f6bff3964b968d7c3b
Author: Evan Welsh <contact evanwelsh com>
Date:   Fri Aug 20 20:42:27 2021 -0500

    init: Set console log domain
    
    GJS added a console module that extensions may start using. To ensure that
    extensions using console.log() and similar functions don't show up as
    'Gjs-Console' in users' system logs, we should call setConsoleLogdomain()
    with 'GNOME Shell'.
    
    This GJS API addition is only accessible using ECMAScript Modules (ESM),
    this commit moves shell startup to a small init.js module and adapts
    CI jobs to either handle or ignore it.
    
    We can drop the .jscheckignore file when future versions of SpiderMonkey
    allow for compile checks without validating module specifiers.
    
    Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1958>

 .eslintrc.yml                 |  5 +++++
 .gitlab-ci.yml                |  2 +-
 .jscheckignore                |  1 +
 js/js-resources.gresource.xml |  1 +
 js/ui/init.js                 |  6 ++++++
 po/POTFILES.skip              |  1 +
 src/gnome-shell-plugin.c      | 13 +++++--------
 7 files changed, 20 insertions(+), 9 deletions(-)
---
diff --git a/.eslintrc.yml b/.eslintrc.yml
index 5e3347d3a8..018e857f79 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -1,3 +1,8 @@
 extends:
  - ./lint/eslintrc-gjs.yml
  - ./lint/eslintrc-shell.yml
+overrides:
+  - files:
+      - js/ui/init.js
+    parserOptions:
+      sourceType: module
\ No newline at end of file
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 97aff40271..38c3df836c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -123,7 +123,7 @@ js_check:
         - .gnome-shell.fedora:34
     stage: review
     script:
-        - find js -name '*.js' -exec js78 -c '{}' ';' 2>&1 | tee $JS_LOG
+        - find js -name '*.js' $(printf "! -wholename %s " $(cat .jscheckignore)) -exec js78 -c '{}' ';' 
2>&1 | tee $JS_LOG
         - (! grep -q . $JS_LOG)
     artifacts:
         paths:
diff --git a/.jscheckignore b/.jscheckignore
new file mode 100644
index 0000000000..7313eb4af6
--- /dev/null
+++ b/.jscheckignore
@@ -0,0 +1 @@
+js/ui/init.js
\ No newline at end of file
diff --git a/js/js-resources.gresource.xml b/js/js-resources.gresource.xml
index 6dc01b9240..93d5932f52 100644
--- a/js/js-resources.gresource.xml
+++ b/js/js-resources.gresource.xml
@@ -64,6 +64,7 @@
     <file>ui/ibusCandidatePopup.js</file>
     <file>ui/iconGrid.js</file>
     <file>ui/inhibitShortcutsDialog.js</file>
+    <file>ui/init.js</file>
     <file>ui/kbdA11yDialog.js</file>
     <file>ui/keyboard.js</file>
     <file>ui/layout.js</file>
diff --git a/js/ui/init.js b/js/ui/init.js
new file mode 100644
index 0000000000..a0fe63343f
--- /dev/null
+++ b/js/ui/init.js
@@ -0,0 +1,6 @@
+import { setConsoleLogDomain } from 'console';
+
+setConsoleLogDomain('GNOME Shell');
+
+imports.ui.environment.init();
+imports.ui.main.start();
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 4bc89ab493..0c8451d648 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,3 +1,4 @@
 data/org gnome Shell wayland service in
 data/org gnome Shell x11 service in
+js/ui/init.js
 subprojects/extensions-tool/src/templates/indicator/extension.js
diff --git a/src/gnome-shell-plugin.c b/src/gnome-shell-plugin.c
index 39af545ace..5364f043a0 100644
--- a/src/gnome-shell-plugin.c
+++ b/src/gnome-shell-plugin.c
@@ -106,7 +106,7 @@ gnome_shell_plugin_start (MetaPlugin *plugin)
 {
   GnomeShellPlugin *shell_plugin = GNOME_SHELL_PLUGIN (plugin);
   GError *error = NULL;
-  int status;
+  uint8_t status;
   GjsContext *gjs_context;
   ClutterBackend *backend;
 
@@ -126,13 +126,10 @@ gnome_shell_plugin_start (MetaPlugin *plugin)
 
   gjs_context = _shell_global_get_gjs_context (shell_plugin->global);
 
-  if (!gjs_context_eval (gjs_context,
-                         "imports.ui.environment.init();"
-                         "imports.ui.main.start();",
-                         -1,
-                         "<main>",
-                         &status,
-                         &error))
+  if (!gjs_context_eval_module_file (gjs_context,
+                                     "resource:///org/gnome/shell/ui/init.js",
+                                     &status,
+                                     &error))
     {
       g_message ("Execution of main.js threw exception: %s", error->message);
       g_error_free (error);