change name, fix deps, add ci

linebender · May 26, 2020 · 7c58f15 · 7c58f15
1 parent d4ad7aa
commit 7c58f15
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -298,3 +298,12 @@ jobs:
         with:
           command: rustc
           args: --manifest-path=druid/examples/wasm/Cargo.toml -- -D warnings
+
+      - name: wasm-pack build hello_wasm_web example
+        run: wasm-pack build --target web druid/examples/hello_wasm_web
+
+      - name: Run rustc -D warnings in druid/examples/hello_wasm_web
+        uses: actions-rs/cargo@v1
+        with:
+          command: rustc
+          args: --manifest-path=druid/examples/hello_wasm_web/Cargo.toml -- -D warnings
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -5,5 +5,5 @@ members = [
     "druid-derive",
     "docs/book_examples",
     "druid/examples/wasm",
-    "druid/examples/hello_wasm",
+    "druid/examples/hello_wasm_web",
 ]
diff --git a/druid/examples/hello_wasm/Cargo.toml → druid/examples/hello_wasm_web/Cargo.toml b/druid/examples/hello_wasm/Cargo.toml → druid/examples/hello_wasm_web/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
-name = "hello-wasm"
+name = "hello-wasm-web"
 version = "0.1.0"
 license = "Apache-2.0"
-description = "Minimal wasm example"
+description = "Minimal wasm example for web"
 repository = "https://github.com/xi-editor/druid"
 edition = "2018"
 publish = false
@@ -14,8 +14,3 @@ crate-type = ["cdylib", "rlib"]
 druid = { path="../.."}
 wasm-bindgen = "0.2.60"
 console_error_panic_hook = { version = "0.1.6" }
-log = "0.4.8"
-instant = { version = "0.1", features = [ "wasm-bindgen" ] }
-
-[target.'cfg(not(target_arch="wasm32"))'.dependencies]
-simple_logger = { version = "1.6.0", default-features = false }
diff --git a/druid/examples/hello_wasm/README.md → druid/examples/hello_wasm_web/README.md b/druid/examples/hello_wasm/README.md → druid/examples/hello_wasm_web/README.md
diff --git a/druid/examples/hello_wasm/index.html → druid/examples/hello_wasm_web/index.html b/druid/examples/hello_wasm/index.html → druid/examples/hello_wasm_web/index.html
diff --git a/druid/examples/hello_wasm/index.js → druid/examples/hello_wasm_web/index.js b/druid/examples/hello_wasm/index.js → druid/examples/hello_wasm_web/index.js
diff --git a/druid/examples/hello_wasm/src/lib.rs → druid/examples/hello_wasm_web/src/lib.rs b/druid/examples/hello_wasm/src/lib.rs → druid/examples/hello_wasm_web/src/lib.rs