fix: move initial wasm into app

1 year ago · 554f93eccc
parent 79227021f5
commit 554f93eccc
3 changed files with 17 additions and 8 deletions
--- a/web/index.html
+++ b/web/index.html
@ -18,12 +18,6 @@
      }
    </script>
    <script src="wasm_exec.js"></script>
    <script>
      const go = new Go();
      WebAssembly.instantiateStreaming(fetch("gomark.wasm"), go.importObject).then((result) => {
        go.run(result.instance);
      });
    </script>
  </head>
  <body>
    <div id="root"></div>
--- a/web/src/App.tsx
+++ b/web/src/App.tsx
@ -26,16 +26,20 @@ const App = () => {
  }, [systemStatus.host]);
  useEffect(() => {
    const initialGoWASMExec = async () => {
      const go = new window.Go();
      const result = await WebAssembly.instantiateStreaming(fetch("/gomark.wasm"), go.importObject);
      go.run(result.instance);
    };
    const initialState = async () => {
      try {
        await userStore.fetchCurrentUser();
      } catch (error) {
        // Do nothing.
      }
      setLoading(false);
    };
-    initialState();
+    Promise.all([initialGoWASMExec(), initialState()]).then(() => setLoading(false));
  }, []);
  useEffect(() => {
--- a/web/src/types/global.d.ts
+++ b/web/src/types/global.d.ts
@ -1,7 +1,18 @@
 import { Node } from "./node";
 declare class Go {
  argv: string[];
  env: { [envKey: string]: string };
  exit: (code: number) => void;
  importObject: WebAssembly.Imports;
  exited: boolean;
  mem: DataView;
  run(instance: WebAssembly.Instance): Promise<void>;
 }
 declare global {
  interface Window {
    Go: typeof Go;
    parse: (content: string) => Node[];
    restore: (input: Node[]) => string;
  }