Do not init twice!

lynnagara · Apr 16, 2019 · 99bd28b · 99bd28b
1 parent 3a92a5d
commit 99bd28b
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,5 @@
 build-gh-pages:
+	wasm-pack build --target web
 	rm -rf docs
 	mkdir docs
 	cp static/index.html docs
@@ -7,4 +8,5 @@ build-gh-pages:
 	cp pkg/d0_bg.wasm docs/pkg
 
 build-static:
+	wasm-pack build --target web
 	cp -r pkg static/pkg
diff --git a/pkg/d0.js b/pkg/d0.js
@@ -561,7 +561,7 @@ function init(module_or_path, maybe_memory) {
     return result.then(({instance, module}) => {
         wasm = instance.exports;
         init.__wbindgen_wasm_module = module;
-        wasm.__wbindgen_start();
+
         return wasm;
     });
 }

diff --git a/pkg/d0_bg.d.ts b/pkg/d0_bg.d.ts
@@ -3,5 +3,4 @@ export const memory: WebAssembly.Memory;
 export function init_app(): void;
 export function __wbindgen_malloc(a: number): number;
 export function __wbindgen_realloc(a: number, b: number, c: number): number;
-export function __wbindgen_start(): void;
 export const __wbg_function_table: WebAssembly.Table;
diff --git a/pkg/d0_bg.wasm b/pkg/d0_bg.wasm
diff --git a/src/lib.rs b/src/lib.rs
@@ -13,7 +13,7 @@ mod toolbar;
 
 static TOOLBAR_WIDTH: u32 = 50;
 
-#[wasm_bindgen(start)]
+#[wasm_bindgen]
 pub fn init_app() -> Result<(), JsValue> {
     let window = window().expect("Could not find `window`");
     let document = window.document().expect("Could not find `document`");

diff --git a/static/index.html b/static/index.html
@@ -10,10 +10,9 @@
   </head>
   <body>
     <script type="module">
-        import { init_app, default as init } from './pkg/d0.js';
+        import { default as init } from './pkg/d0.js';
         async function run() {
           await init('./pkg/d0_bg.wasm');
-          init_app()
         }
         run();
       </script>