From d873e8cc84e0ab01dbf60e7b513033c513223fda Mon Sep 17 00:00:00 2001
From: CanadaHonk <oj@oojmed.com>
Date: Sat, 10 Dec 2022 01:28:20 +0000
Subject: [PATCH] gluworld: rewrite to use new Gluon window object

---
 gluworld/index.html | 10 ++++++++--
 gluworld/index.js   | 13 +------------
 2 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/gluworld/index.html b/gluworld/index.html
index 1179251..6fa0c36 100644
--- a/gluworld/index.html
+++ b/gluworld/index.html
@@ -8,7 +8,7 @@
   <body>
     <h1>
       Gluon <code id="gluon_version"></code> <br>
-      built with <code id="glugun_version"></code>
+      built with <code id="builder"></code>
     </h1>
 
     <div id="versions">
@@ -24,7 +24,6 @@
     </div>
 
     <style>
-      /* @import url('https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600;700;800;900&family=Roboto:ital,wght@0,400;0,700;1,500&display=swap'); */
       @import url('https://fonts.googleapis.com/css2?family=Fira+Code:wght@300;400;500;600;700&family=Inter:wght@300;400;500;600;700;800;900');
 
       html, body {
@@ -74,5 +73,12 @@
         margin-top: 20vh;
       }
     </style>
+
+    <script>
+      chromium_version.textContent = Gluon.versions.chromium;
+      node_version.textContent = Gluon.versions.node;
+      gluon_version.textContent = Gluon.versions.gluon;
+      builder.textContent = Gluon.versions.builder;
+    </script>
   </body>
 </html>
\ No newline at end of file
diff --git a/gluworld/index.js b/gluworld/index.js
index eff4305..983539a 100644
--- a/gluworld/index.js
+++ b/gluworld/index.js
@@ -6,17 +6,6 @@ import { join, dirname } from 'path';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 
-Gluon.open(pathToFileURL(join(__dirname, 'index.html')).href, () => {
-  const setVersions = () => {
-    if (typeof chromium_version === 'undefined') return setTimeout(setVersions, 100);
-
-    chromium_version.textContent = CHROMIUM_VERSION;
-    node_version.textContent = NODE_VERSION;
-    gluon_version.textContent = GLUON_VERSION;
-    glugun_version.textContent = 'GLUGUN_VERSION' === 'G\LUGUN_VERSION' ? 'nothing' : 'Glugun GLUGUN_VERSION';
-  };
-
-  setVersions();
-}, {
+const Chromium = await Gluon.open(pathToFileURL(join(__dirname, 'index.html')).href, undefined, {
   windowSize: [ 800, 450 ]
 });
\ No newline at end of file
