From fd8f0e772c7822c631cf0fc7099efaacb26b63d2 Mon Sep 17 00:00:00 2001 From: Sambo Chea Date: Thu, 20 Aug 2020 17:49:00 +0700 Subject: [PATCH] Updated the deps and package in www --- Cargo.toml | 3 +++ src/lib.rs | 11 ++++++++--- www/index.ts | 13 ++++++------- www/package.json | 3 +++ 4 files changed, 20 insertions(+), 10 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index e1ea313..44ca106 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -44,5 +44,8 @@ wasm-bindgen-test = "0.3.13" # Tell `rustc` to optimize for small code size. opt-level = "s" +[package.metadata.wasm-pack.profile.dev] +wasm-opt = false + [package.metadata.wasm-pack.profile.release] wasm-opt = false \ No newline at end of file diff --git a/src/lib.rs b/src/lib.rs index 10913e8..8289010 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,8 +1,8 @@ -use wasm_bindgen::prelude::*; -use math; - extern crate web_sys; +use math; +use wasm_bindgen::prelude::*; + mod utils; // When the `wee_alloc` feature is enabled, use `wee_alloc` as the global @@ -16,6 +16,11 @@ pub fn run() { log("[WASM] internal logging..."); } +#[wasm_bindgen] +pub fn sample() -> String { + "hello".into() +} + #[wasm_bindgen] extern { fn alert(s: &str); diff --git a/www/index.ts b/www/index.ts index fb43752..7ff4fb9 100644 --- a/www/index.ts +++ b/www/index.ts @@ -1,8 +1,7 @@ // import * as wasm from "hello-wasm-pack"; -// import * as wasm from 'wasmweb-sample' -// -// wasm.log("[WEB] external logging...") -// -// const greeting = wasm.greet() -// const sum = wasm.just_sum() -// console.log("Sum of number", sum) \ No newline at end of file +// @ts-ignore +import {just_sum,log} from 'wasmweb-sample' + +log("d") +const sum = just_sum() +console.log("Sum of number", sum) diff --git a/www/package.json b/www/package.json index 361e14e..b581b9b 100644 --- a/www/package.json +++ b/www/package.json @@ -33,5 +33,8 @@ "webpack": "^4.29.3", "webpack-cli": "^3.1.0", "webpack-dev-server": "^3.1.5" + }, + "dependencies": { + "wasmweb-sample": "file:../pkg" } }