Skip to content

Commit 23aeee0

Browse files
committed
Merge branch 'simon-bourne-master'
2 parents e0b8b67 + e22a325 commit 23aeee0

9 files changed

+381
-378
lines changed

frameworks/keyed/silkenweb/Cargo.lock

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

frameworks/keyed/silkenweb/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ edition = "2021"
66
publish = false
77

88
[dependencies]
9-
silkenweb = { version = "0.8.0", features = ["weak-refs"] }
9+
silkenweb = { version = "0.9.0", features = ["weak-refs"] }
1010
futures-signals = "0.3.31"
1111
js-sys = "0.3.60"
12-
wasm-bindgen = { version = "=0.2.92", features = ["enable-interning"] }
12+
wasm-bindgen = { version = "=0.2.99", features = ["enable-interning"] }
1313
rand = { version = "0.8.5", features = ["small_rng"] }
1414
getrandom = { version = "0.2.7", features = ["js"] }
1515

frameworks/keyed/silkenweb/Trunk.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ public_url = "/frameworks/keyed/silkenweb/bundled-dist/"
33
dist = "bundled-dist"
44

55
[tools]
6-
wasm_bindgen = "0.2.92"
7-
wasm_opt = "version_116"
6+
wasm_bindgen = "0.2.99"
7+
wasm_opt = "version_121"
Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,29 @@
1-
<!DOCTYPE html><html lang="en"><head>
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
4+
<head>
25
<meta charset="UTF-8">
36
<title>Silkenweb</title>
4-
<link href="/css/currentStyle.css" rel="stylesheet">
5-
<script type="module">import init from '/frameworks/keyed/silkenweb/bundled-dist/js-framework-benchmark-silkenweb-f5f8ab44b95a6616.js';init('/frameworks/keyed/silkenweb/bundled-dist/js-framework-benchmark-silkenweb-f5f8ab44b95a6616_bg.wasm');</script>
7+
<link href="/css/currentStyle.css" rel="stylesheet" />
8+
9+
<script type="module" nonce="OrnX43lmtAAq45rzfjP1mw==">
10+
import init, * as bindings from '/frameworks/keyed/silkenweb/bundled-dist/js-framework-benchmark-silkenweb-3fe0a7efb0dd4880.js';
11+
const wasm = await init({ module_or_path: '/frameworks/keyed/silkenweb/bundled-dist/js-framework-benchmark-silkenweb-3fe0a7efb0dd4880_bg.wasm' });
12+
13+
14+
window.wasmBindings = bindings;
615

7-
<link rel="preload" href="/frameworks/keyed/silkenweb/bundled-dist/js-framework-benchmark-silkenweb-f5f8ab44b95a6616_bg.wasm" as="fetch" type="application/wasm" crossorigin="">
8-
<link rel="modulepreload" href="/frameworks/keyed/silkenweb/bundled-dist/js-framework-benchmark-silkenweb-f5f8ab44b95a6616.js"></head>
16+
17+
dispatchEvent(new CustomEvent("TrunkApplicationStarted", {detail: {wasm}}));
18+
19+
</script>
20+
<link rel="modulepreload" href="/frameworks/keyed/silkenweb/bundled-dist/js-framework-benchmark-silkenweb-3fe0a7efb0dd4880.js" crossorigin=anonymous integrity="sha384-WzQ5Ji3BqIdtSYqX+zjiYkgImehOTcLsqkM5+H+EoSXfg5oXl1oFXeY7RPtO7vll"><link rel="preload" href="/frameworks/keyed/silkenweb/bundled-dist/js-framework-benchmark-silkenweb-3fe0a7efb0dd4880_bg.wasm" crossorigin=anonymous integrity="sha384-OpVkkKW7JK9FU1217qKY9H6FdV9YTB4mM+D74bW88G/K+HPxOCvLat0OqExJU+qc" as="fetch" type="application/wasm"></head>
921

1022
<body>
1123
<span class="preloadicon glyphicon glyphicon-remove" aria-hidden="true"></span>
1224
<div id="main">
1325
<div id="app"></div>
1426
</div>
27+
</body>
1528

16-
17-
</body></html>
29+
</html>

0 commit comments

Comments
 (0)