[#66502] Use new hterm, import hterm as module

antmicro · Oct 22, 2024 · 8b0220d · 8b0220d
1 parent 9c2e944
commit 8b0220d
Show file tree

Hide file tree

Showing 5 changed files with 8,233 additions and 9,525 deletions.
diff --git a/Makefile b/Makefile
@@ -24,7 +24,7 @@ VERSION := $(shell cat $(project_dir)/src/VERSION)
 
 
 .PHONY: standalone
-standalone: embed $(resources_dist) $(index_dist) $(third_party_dist_dir)/hterm_all.js
+standalone: embed $(resources_dist) $(index_dist) $(third_party_dist_dir)/hterm.js
 
 .PHONY: embed
 embed: $(if $(MINIFY),$(dist_dir)/jswasi.js,$(subst $(work_dir),$(dist_dir),$(jswasi_compiled)) $(third_party_dist_dir)/vfs.js $(third_party_dist_dir)/idb-keyval.js $(third_party_dist_dir)/js-untar.js)

diff --git a/src/assets/index-module.html b/src/assets/index-module.html
@@ -7,6 +7,7 @@
   </head>
   <body style="margin: 0px; background: black">
     <script type="module">
+      import { hterm, lib } from "../third_party/hterm.js"
       import { Jswasi } from "./jswasi.js";
 
       window.buffer = "";
@@ -21,11 +22,9 @@
           }
         return null;
       };
-      const script = document.createElement("script");
-      script.type = "text/javascript";
-      script.src = "./third_party/hterm_all.js";
-      script.onload = async () => {
-        await lib.init();
+      Promise.all([hterm.initPromise, lib.initPromise]).then(async () => {
+        lib.antmicroStyle["screen-padding-size"] = "8";
+        lib.setAntmicroStyle();
         // hterm prints warnings that we don't really care about
         let tempWarnlog = console.warn;
         console.warn = () => {};
@@ -35,8 +34,7 @@
         const jswasi = new Jswasi();
         await jswasi.attachDevice({terminal}, 1);
         await jswasi.init();
-      };
-      document.body.appendChild(script);
+      });
     </script>
     <div id="terminal"></div>
   </body>

diff --git a/src/assets/index.html b/src/assets/index.html
@@ -8,6 +8,8 @@
   <body style="margin: 0px; background: black">
     <script src="./jswasi.js"></script>
     <script>
+      import { hterm, lib } from "../third_party/hterm.js"
+
       window.buffer = "";
       window.alive = true;
       window.exitCode = 0;
@@ -20,11 +22,9 @@
           }
         return null;
       };
-      const script = document.createElement("script");
-      script.type = "text/javascript";
-      script.src = "./third_party/hterm_all.js";
-      script.onload = async () => {
-        await lib.init();
+      Promise.all([hterm.initPromise, lib.initPromise]).then(async () => {
+        lib.antmicroStyle["screen-padding-size"] = "8";
+        lib.setAntmicroStyle();
         // hterm prints warnings that we don't really care about
         let tempWarnlog = console.warn;
         console.warn = () => {};
@@ -34,8 +34,7 @@
         const jswasi = new Jswasi();
         await jswasi.attachDevice({terminal}, 1);
         await jswasi.init();
-      };
-      document.body.appendChild(script);
+      });
     </script>
     <div id="terminal"></div>
   </body>

diff --git a/src/service-worker.ts b/src/service-worker.ts
@@ -29,7 +29,7 @@ const urlsToCache = [
   "./jswasi.js",
   "./constants.js",
   "./service-worker.js",
-  "./third_party/hterm_all.js",
+  "./third_party/hterm.js",
   "./third_party/vfs.js",
   "./third_party/idb-keyval.js",
 ];