Skip to content
This repository was archived by the owner on Mar 2, 2021. It is now read-only.

Commit 8c4eb4c

Browse files
fitzgenfitzgen
authored
Merge pull request #13 from fitzgen/events-registry
Events
2 parents 31d627f + 80c4d59 commit 8c4eb4c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1810
-18344
lines changed

‎Cargo.lock‎

Lines changed: 80 additions & 257 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,20 @@ edition = "2018"
88
default = []
99

1010
[dependencies]
11-
bumpalo = "1.0.2"
12-
wasm-bindgen = "0.2.32"
13-
js-sys = "0.3.9"
11+
bumpalo = "2.0.0"
12+
futures = "0.1"
13+
wasm-bindgen = "0.2.34"
14+
wasm-bindgen-futures = "0.3.10"
15+
js-sys = "0.3.10"
1416
log = "0.4.6"
1517

1618
[dependencies.web-sys]
17-
version = "0.3.9"
19+
version = "0.3.10"
1820
features = [
1921
"console",
2022
"Document",
2123
"Element",
24+
"Event",
2225
"Node",
2326
"Window",
2427
]
@@ -28,9 +31,11 @@ wasm-bindgen-test = "0.2"
2831
console_log = "0.1.2"
2932

3033
[dev-dependencies.web-sys]
31-
version = "0.3.9"
34+
version = "0.3.10"
3235
features = [
3336
"Attr",
37+
"EventTarget",
38+
"HtmlElement",
3439
"NamedNodeMap",
3540
"NodeList",
3641
]
@@ -41,8 +46,7 @@ opt-level = "s"
4146

4247
[workspace]
4348
members = [
44-
"./compile-tests",
45-
"./examples/counter/crate",
46-
"./examples/hello-world/crate",
47-
"./examples/input-form/crate",
49+
"./examples/counter",
50+
"./examples/hello-world",
51+
"./examples/input-form",
4852
]

‎build.sh‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
cd $(dirname $0)
44
set -eux
55

6-
INSTALL=${INSTALL:-""}
7-
86
function with_dir {
97
pushd $1
108
shift
@@ -15,20 +13,6 @@ function with_dir {
1513
cargo fmt --all
1614
cargo check --all --target wasm32-unknown-unknown
1715

18-
if test "$INSTALL" != ""; then
19-
with_dir ./js npm link
20-
fi
21-
2216
for x in ./examples/*; do
23-
wasm-pack build "$x/crate"
24-
25-
if test "$INSTALL" != ""; then
26-
with_dir "$x/crate/pkg" npm link
27-
with_dir "$x/crate/pkg" npm link dodrio
28-
with_dir "$x/js" npm audit fix
29-
with_dir "$x/js" npm install
30-
with_dir "$x/js" npm link dodrio
31-
fi
32-
33-
with_dir "$x/js/" npm run build
17+
wasm-pack build --target no-modules "$x"
3418
done

‎compile-tests/Cargo.toml‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎compile-tests/compile-fail/cached_uaf.rs‎

Lines changed: 0 additions & 58 deletions
This file was deleted.

‎compile-tests/src/main.rs‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

examples/counter/crate/Cargo.toml renamed to examples/counter/Cargo.toml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@ crate-type = ["cdylib", "rlib"]
1010
[features]
1111

1212
[dependencies]
13-
dodrio = { path = "../../.." }
14-
wasm-bindgen = "0.2"
1513
console_error_panic_hook = "0.1.1"
14+
console_log = "0.1.2"
15+
dodrio = { path = "../.." }
16+
log = "0.4.6"
17+
wasm-bindgen = "0.2"
1618

1719
[dependencies.web-sys]
1820
version = "0.3.8"

‎examples/counter/crate/src/lib.rs‎

Lines changed: 0 additions & 86 deletions
This file was deleted.

‎examples/counter/index.html‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,9 @@
55
<title>Counter</title>
66
</head>
77
<body>
8+
<script src="pkg/dodrio_counter.js"></script>
9+
<script>
10+
wasm_bindgen("pkg/dodrio_counter_bg.wasm");
11+
</script>
812
</body>
913
</html>

‎examples/counter/js/index.js‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)