Merge pull request #2 from LyonSyonII/dev

Fix #1
LyonSyonII · Jun 16, 2024 · a901592 · a901592
2 parents 4933c4f + 9545528
commit a901592
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 5 deletions.
diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
@@ -20,10 +20,11 @@ jobs:
         with:
           node-version: latest
           cache: 'pnpm'
-          cache-dependency-path: frontend/pnpm-lock.yaml
+          cache-dependency-path: example/pnpm-lock.yaml
       - name: Install dependencies and Build
         run: | 
           cd example
+          mv astro.config.preview.mjs astro.config.mjs
           pnpm install
           pnpm build
       - uses: afc163/surge-preview@v1

diff --git a/example/astro.config.preview.mjs b/example/astro.config.preview.mjs
@@ -0,0 +1,14 @@
+import { defineConfig } from 'astro/config';
+import compress from "astro-compress";
+
+import compressor from "astro-compressor";
+
+// https://astro.build/config
+export default defineConfig({
+  // site: "https://garriga.dev",
+  // base: "/rubri",
+  integrations: [compress(), compressor({
+    brotli: false,
+    fileExtensions: [".css", ".js", ".html", ".xml", ".cjs", ".mjs", ".svg", ".txt"]
+  })]
+});
diff --git a/example/src/interpreter/interpreter.ts b/example/src/interpreter/interpreter.ts
@@ -39,7 +39,7 @@ export async function initInterpreter(): Promise<Interpreter> {
      "-Zmir-emit-retag=false",
      "-Zmiri-disable-isolation",
      "-Zmiri-panic-on-unsupported",
-     "--color=always"
+     "--color=always",
   ];
   const wasi = new WASI(args, env, fds, { debug: false });
 
@@ -150,7 +150,10 @@ async function load_external_file(path: string) {
 async function cached_or_fetch(path: string) {
   // Downloads or caches the file from `path`
   // Files of more than 10MB aren't cached by fetch, so it must be done manually
-  path = import.meta.env.BASE_URL + path;
+  const base = import.meta.env.BASE_URL === "/" ? "" : import.meta.env.BASE_URL;
+  console.log({base, url: import.meta.url, path});
+
+  path = base + path;
   try {
     caches
   } catch (e) {

diff --git a/example/src/pages/index.astro b/example/src/pages/index.astro
@@ -1,11 +1,12 @@
 ---
 
+const base = import.meta.env.BASE_URL === "/" ? "" : import.meta.env.BASE_URL;
 ---
 
 <html lang="en">
 	<head>
 		<meta charset="utf-8" />
-		<link rel="icon" type="image/svg+xml" href="/rubri/favicon.svg" />
+		<link rel="icon" type="image/svg+xml" href={ base + "/favicon.svg" } />
 		<meta name="viewport" content="width=device-width" />
 		<meta name="generator" content={Astro.generator} />
 		<title>Rust Browser Interpreter</title>
@@ -77,6 +78,7 @@
 	input.readOnly = true;
 
 	// Interpreter initialization
+	let lastInput = "";
 	const interpreter = new Interpreter();
 
 	// Add libraries downloaded to list
@@ -99,13 +101,17 @@
 	interpreter.onResult(result => {
 		termElement.innerHTML = ansiUp.ansi_to_html(result.replaceAll("\n", "\r"));
 		button.disabled = false;
+		if (lastInput && lastInput !== input.value) {
+			input.dispatchEvent(new Event("input"));
+		}
 	});
-
+	
 	// Run the Interpreter when on "Live Edit" or the "Run" button is clicked
 	input.addEventListener("input", async () => {
 		if (!liveEdit.checked || button.disabled) {
 			return;
 		}
+		lastInput = input.value;
 		interpreter.run(input.value || "");
 	});
 	button.addEventListener("click", async () => {