From 53c65039b90306be076ae9f61c7668b7638b3e8a Mon Sep 17 00:00:00 2001 From: Daniel Schindler Date: Mon, 3 Dec 2018 11:37:30 +0100 Subject: [PATCH] Change module import --- examples/todomvc/build.sh | 2 -- examples/todomvc/index.html | 1 - examples/todomvc/index.js | 7 ++++--- examples/todomvc/src/lib.rs | 4 +++- examples/todomvc/webpack.config.js | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/examples/todomvc/build.sh b/examples/todomvc/build.sh index 018ae71c..055784b2 100755 --- a/examples/todomvc/build.sh +++ b/examples/todomvc/build.sh @@ -3,10 +3,8 @@ # For more comments about what's going on here, see the `hello_world` example set -ex -cd "$(dirname $0)" cargo build --target wasm32-unknown-unknown - cargo run --manifest-path ../../crates/cli/Cargo.toml \ --bin wasm-bindgen -- \ ../../target/wasm32-unknown-unknown/debug/todomvc.wasm --out-dir . diff --git a/examples/todomvc/index.html b/examples/todomvc/index.html index a5ac7ca1..302a28da 100644 --- a/examples/todomvc/index.html +++ b/examples/todomvc/index.html @@ -37,6 +37,5 @@

Written by Jonathan Kingston

Part of TodoMVC

- diff --git a/examples/todomvc/index.js b/examples/todomvc/index.js index cf999191..7190d16b 100644 --- a/examples/todomvc/index.js +++ b/examples/todomvc/index.js @@ -1,3 +1,4 @@ -import('./todomvc').then(todomvc => { - todomvc.run(); -}); +// For more comments about what's going on here, check out the `hello_world` +// example +import('./todomvc') + .catch(console.error); diff --git a/examples/todomvc/src/lib.rs b/examples/todomvc/src/lib.rs index 93719db1..4a88e39c 100644 --- a/examples/todomvc/src/lib.rs +++ b/examples/todomvc/src/lib.rs @@ -64,7 +64,9 @@ fn app(name: &str) { /// Entry point into the program from JavaScript #[wasm_bindgen(start)] -pub fn run() { +pub fn run() -> Result<(), JsValue> { console_error_panic_hook::set_once(); app("todos-wasmbindgen"); + + Ok(()) } diff --git a/examples/todomvc/webpack.config.js b/examples/todomvc/webpack.config.js index 54b5b27a..bfd5d8a5 100644 --- a/examples/todomvc/webpack.config.js +++ b/examples/todomvc/webpack.config.js @@ -1,7 +1,7 @@ -const webpack = require('webpack'); const path = require('path'); const HtmlWebpackPlugin = require('html-webpack-plugin'); const CopyWebpackPlugin = require('copy-webpack-plugin'); +const webpack = require('webpack'); module.exports = { entry: './index.js',