Fix the wasm2js example (#1750)

This needed and update now that we're explicitly importing `*.wasm` to import `*.js` instead. Additionally this was moved over to the `web` target to avoid needing Webpack Closes #1743
rustwasm · Sep 3, 2019 · 4e19ead · 4e19ead
1 parent 1f39a30
commit 4e19ead
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 47 deletions.
diff --git a/examples/wasm2js/README.md b/examples/wasm2js/README.md
@@ -14,4 +14,4 @@ $ ./build.sh
 
 (or running the commands on Windows manually)
 
-and then visiting http://localhost:8080 in a browser should run the example!
+and then visiting http://localhost:8000 in a browser should run the example!
diff --git a/examples/wasm2js/build.sh b/examples/wasm2js/build.sh
@@ -3,13 +3,12 @@
 set -ex
 
 # Compile our wasm module and run `wasm-bindgen`
-wasm-pack build
+wasm-pack build --target web
 
 # Run the `wasm2js` tool from `binaryen`
 wasm2js pkg/wasm2js_bg.wasm -o pkg/wasm2js_bg.js
 
-# Move our original wasm out of the way to avoid cofusing Webpack.
-mv pkg/wasm2js_bg.wasm pkg/wasm2js_bg.bak.wasm
+# Update our JS shim to require the JS file instead
+sed -i 's/wasm2js_bg.wasm/wasm2js_bg.js/' pkg/wasm2js.js
 
-npm install
-npm run serve
+http
diff --git a/examples/wasm2js/index.html b/examples/wasm2js/index.html
@@ -5,4 +5,5 @@
   <body>
     <p>Open up the developer console to see "Hello, World!"</p>
   </body>
+  <script src=index.js type=module></script>
 </html>
diff --git a/examples/wasm2js/index.js b/examples/wasm2js/index.js
@@ -1,4 +1,4 @@
-// Note that since we're not using `WebAssembly` we can do a synchronous import
-// here!
-import { run } from './pkg/wasm2js';
-run();
+// Import our JS shim and initialize it, executing the start function when it's
+// ready.
+import init from './pkg/wasm2js.js';
+init();
diff --git a/examples/wasm2js/package.json b/examples/wasm2js/package.json
diff --git a/examples/wasm2js/src/lib.rs b/examples/wasm2js/src/lib.rs
@@ -7,7 +7,7 @@ extern "C" {
     fn log(s: &str);
 }
 
-#[wasm_bindgen]
+#[wasm_bindgen(start)]
 pub fn run() {
     log("Hello, World!");
 }
diff --git a/examples/wasm2js/webpack.config.js b/examples/wasm2js/webpack.config.js
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,4 +14,4 @@ $ ./build.sh

		(or running the commands on Windows manually)

		and then visiting http://localhost:8080 in a browser should run the example!
		and then visiting http://localhost:8000 in a browser should run the example!
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,4 +5,5 @@ @@
       <body>
         <p>Open up the developer console to see "Hello, World!"</p>
       </body>
+      <script src=index.js type=module></script>
     </html>