Skip to content

Commit fe425a2

Browse files
krausestkrausest
committed
Merge branch 'simon-bourne-master'
2 parents e9b0968 + 2606c6f commit fe425a2

8 files changed

+440
-559
lines changed

‎frameworks/keyed/silkenweb/Cargo.lock

Lines changed: 338 additions & 465 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.6.0", features = ["weak-refs"] }
9+
silkenweb = { version = "0.8.0", features = ["weak-refs"] }
1010
futures-signals = "0.3.31"
1111
js-sys = "0.3.60"
12-
wasm-bindgen = { version = "=0.2.87", features = ["enable-interning"] }
12+
wasm-bindgen = { version = "=0.2.92", 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.87"
7-
wasm_opt = "version_114"
6+
wasm_bindgen = "0.2.92"
7+
wasm_opt = "version_116"

‎frameworks/keyed/silkenweb/bundled-dist/index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
<meta charset="UTF-8">
33
<title>Silkenweb</title>
44
<link href="/css/currentStyle.css" rel="stylesheet">
5-
<script type="module">import init from '/frameworks/keyed/silkenweb/bundled-dist/js-framework-benchmark-silkenweb-fa1762b6e678dcf6.js';init('/frameworks/keyed/silkenweb/bundled-dist/js-framework-benchmark-silkenweb-fa1762b6e678dcf6_bg.wasm');</script>
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>
66

7-
<link rel="preload" href="/frameworks/keyed/silkenweb/bundled-dist/js-framework-benchmark-silkenweb-fa1762b6e678dcf6_bg.wasm" as="fetch" type="application/wasm" crossorigin="">
8-
<link rel="modulepreload" href="/frameworks/keyed/silkenweb/bundled-dist/js-framework-benchmark-silkenweb-fa1762b6e678dcf6.js"></head>
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>
99

1010
<body>
1111
<span class="preloadicon glyphicon glyphicon-remove" aria-hidden="true"></span>

‎frameworks/keyed/silkenweb/bundled-dist/js-framework-benchmark-silkenweb-fa1762b6e678dcf6.js renamed to ‎frameworks/keyed/silkenweb/bundled-dist/js-framework-benchmark-silkenweb-f5f8ab44b95a6616.js

Lines changed: 94 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ function passStringToWasm0(arg, malloc, realloc) {
123123
const ret = encodeString(arg, view);
124124

125125
offset += ret.written;
126+
ptr = realloc(ptr, len, offset, 1) >>> 0;
126127
}
127128

128129
WASM_VECTOR_LEN = offset;
@@ -147,7 +148,9 @@ function getStringFromWasm0(ptr, len) {
147148
return cachedTextDecoder.decode(getUint8Memory0().subarray(ptr, ptr + len));
148149
}
149150

150-
const CLOSURE_DTORS = new FinalizationRegistry(state => {
151+
const CLOSURE_DTORS = (typeof FinalizationRegistry === 'undefined')
152+
? { register: () => {}, unregister: () => {} }
153+
: new FinalizationRegistry(state => {
151154
wasm.__wbindgen_export_3.get(state.dtor)(state.a, state.b)
152155
});
153156

@@ -165,7 +168,7 @@ function makeMutClosure(arg0, arg1, dtor, f) {
165168
} finally {
166169
if (--state.cnt === 0) {
167170
wasm.__wbindgen_export_3.get(state.dtor)(a, state.b);
168-
CLOSURE_DTORS.unregister(state)
171+
CLOSURE_DTORS.unregister(state);
169172
} else {
170173
state.a = a;
171174
}
@@ -175,8 +178,8 @@ function makeMutClosure(arg0, arg1, dtor, f) {
175178
CLOSURE_DTORS.register(real, state, state);
176179
return real;
177180
}
178-
function __wbg_adapter_18(arg0, arg1, arg2) {
179-
wasm.closure5_externref_shim(arg0, arg1, arg2);
181+
function __wbg_adapter_20(arg0, arg1, arg2) {
182+
wasm.closure7_externref_shim(arg0, arg1, arg2);
180183
}
181184

182185
function getFromExternrefTable0(idx) { return wasm.__wbindgen_export_2.get(idx); }
@@ -204,6 +207,8 @@ function handleError(f, args) {
204207
}
205208
}
206209

210+
function notDefined(what) { return () => { throw new Error(`${what} is not defined`); }; }
211+
207212
function isLikeNone(x) {
208213
return x === undefined || x === null;
209214
}
@@ -242,87 +247,120 @@ async function __wbg_load(module, imports) {
242247
function __wbg_get_imports() {
243248
const imports = {};
244249
imports.wbg = {};
245-
imports.wbg.__wbg_classList_c4ebb3813d3a2f5d = function(arg0) {
246-
const ret = arg0.classList;
247-
return ret;
248-
};
249-
imports.wbg.__wbg_remove_f021903057d23f5e = function() { return handleError(function (arg0, arg1, arg2) {
250+
imports.wbg.__wbg_settextContent_d271bab459cbb1ba = function(arg0, arg1, arg2) {
250251
var v0 = getCachedStringFromWasm0(arg1, arg2);
251-
arg0.remove(v0);
252-
}, arguments) };
253-
imports.wbg.__wbg_appendChild_b8199dc1655c852d = function() { return handleError(function (arg0, arg1) {
252+
arg0.textContent = v0;
253+
};
254+
imports.wbg.__wbg_appendChild_580ccb11a660db68 = function() { return handleError(function (arg0, arg1) {
254255
const ret = arg0.appendChild(arg1);
255256
return ret;
256257
}, arguments) };
257-
imports.wbg.__wbg_replaceChild_1a4aa5499fa85a63 = function() { return handleError(function (arg0, arg1, arg2) {
258+
imports.wbg.__wbg_replaceChild_b8c54d870e3cc9bf = function() { return handleError(function (arg0, arg1, arg2) {
258259
const ret = arg0.replaceChild(arg1, arg2);
259260
return ret;
260261
}, arguments) };
261-
imports.wbg.__wbg_removeChild_794db72cbb6f21d3 = function() { return handleError(function (arg0, arg1) {
262+
imports.wbg.__wbg_removeChild_96bbfefd2f5a0261 = function() { return handleError(function (arg0, arg1) {
262263
const ret = arg0.removeChild(arg1);
263264
return ret;
264265
}, arguments) };
265-
imports.wbg.__wbg_settextContent_19dc6a6146112f16 = function(arg0, arg1, arg2) {
266-
var v0 = getCachedStringFromWasm0(arg1, arg2);
267-
arg0.textContent = v0;
266+
imports.wbg.__wbg_classList_1f0528ee002e56d4 = function(arg0) {
267+
const ret = arg0.classList;
268+
return ret;
268269
};
269-
imports.wbg.__wbg_cloneNode_4c5e9ec3203eb137 = function() { return handleError(function (arg0, arg1) {
270+
imports.wbg.__wbg_remove_698118fb25ab8150 = function() { return handleError(function (arg0, arg1, arg2) {
271+
var v0 = getCachedStringFromWasm0(arg1, arg2);
272+
arg0.remove(v0);
273+
}, arguments) };
274+
imports.wbg.__wbg_add_dcb05a8ba423bdac = function() { return handleError(function (arg0, arg1, arg2) {
275+
var v0 = getCachedStringFromWasm0(arg1, arg2);
276+
arg0.add(v0);
277+
}, arguments) };
278+
imports.wbg.__wbg_cloneNode_4bc37fa355a53f27 = function() { return handleError(function (arg0, arg1) {
270279
const ret = arg0.cloneNode(arg1 !== 0);
271280
return ret;
272281
}, arguments) };
273-
imports.wbg.__wbg_currentTarget_6aa9bd5069eb82e8 = function(arg0) {
282+
imports.wbg.__wbg_currentTarget_43dc1faf7b3e3402 = function(arg0) {
274283
const ret = arg0.currentTarget;
275284
return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
276285
};
277-
imports.wbg.__wbg_setAttribute_79c9562d32d05e66 = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) {
278-
var v0 = getCachedStringFromWasm0(arg1, arg2);
279-
var v1 = getCachedStringFromWasm0(arg3, arg4);
280-
arg0.setAttribute(v0, v1);
281-
}, arguments) };
282-
imports.wbg.__wbg_firstChild_70ff6203aed4a148 = function(arg0) {
286+
imports.wbg.__wbg_firstChild_a10db88beca6812e = function(arg0) {
283287
const ret = arg0.firstChild;
284288
return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
285289
};
286-
imports.wbg.__wbg_nextSibling_653f43ab9380175f = function(arg0) {
290+
imports.wbg.__wbg_nextSibling_709614fdb0fb7a66 = function(arg0) {
287291
const ret = arg0.nextSibling;
288292
return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
289293
};
290-
imports.wbg.__wbg_insertBefore_77a7d032a91abf86 = function() { return handleError(function (arg0, arg1, arg2) {
294+
imports.wbg.__wbg_insertBefore_d2a001abf538c1f8 = function() { return handleError(function (arg0, arg1, arg2) {
291295
const ret = arg0.insertBefore(arg1, arg2);
292296
return ret;
293297
}, arguments) };
294-
imports.wbg.__wbg_addEventListener_615d4590d38da1c9 = function() { return handleError(function (arg0, arg1, arg2, arg3) {
298+
imports.wbg.__wbg_addEventListener_53b787075bd5e003 = function() { return handleError(function (arg0, arg1, arg2, arg3) {
295299
var v0 = getCachedStringFromWasm0(arg1, arg2);
296300
arg0.addEventListener(v0, arg3);
297301
}, arguments) };
298-
imports.wbg.__wbg_add_73f794d491a0e44f = function() { return handleError(function (arg0, arg1, arg2) {
302+
imports.wbg.__wbg_setAttribute_3c9f6c303b696daa = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) {
299303
var v0 = getCachedStringFromWasm0(arg1, arg2);
300-
arg0.add(v0);
304+
var v1 = getCachedStringFromWasm0(arg3, arg4);
305+
arg0.setAttribute(v0, v1);
301306
}, arguments) };
302-
imports.wbg.__wbg_document_950215a728589a2d = function(arg0) {
307+
imports.wbg.__wbg_instanceof_Window_f401953a2cf86220 = function(arg0) {
308+
let result;
309+
try {
310+
result = arg0 instanceof Window;
311+
} catch (_) {
312+
result = false;
313+
}
314+
const ret = result;
315+
return ret;
316+
};
317+
imports.wbg.__wbg_document_5100775d18896c16 = function(arg0) {
303318
const ret = arg0.document;
304319
return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
305320
};
306-
imports.wbg.__wbg_getElementById_eb93a47327bb5585 = function(arg0, arg1, arg2) {
321+
imports.wbg.__wbg_getElementById_c369ff43f0db99cf = function(arg0, arg1, arg2) {
307322
var v0 = getCachedStringFromWasm0(arg1, arg2);
308323
const ret = arg0.getElementById(v0);
309324
return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
310325
};
311-
imports.wbg.__wbg_replaceWith_047ccd5d5d7fe68c = function() { return handleError(function (arg0, arg1) {
326+
imports.wbg.__wbg_replaceWith_72e597a5990af8e0 = function() { return handleError(function (arg0, arg1) {
312327
arg0.replaceWith(arg1);
313328
}, arguments) };
314-
imports.wbg.__wbg_createElement_e2a0e21263eb5416 = function() { return handleError(function (arg0, arg1, arg2) {
315-
var v0 = getCachedStringFromWasm0(arg1, arg2);
316-
const ret = arg0.createElement(v0);
329+
imports.wbg.__wbg_self_ce0dbfc45cf2f5be = function() { return handleError(function () {
330+
const ret = self.self;
331+
return ret;
332+
}, arguments) };
333+
imports.wbg.__wbg_window_c6fb939a7f436783 = function() { return handleError(function () {
334+
const ret = window.window;
335+
return ret;
336+
}, arguments) };
337+
imports.wbg.__wbg_globalThis_d1e6af4856ba331b = function() { return handleError(function () {
338+
const ret = globalThis.globalThis;
339+
return ret;
340+
}, arguments) };
341+
imports.wbg.__wbg_global_207b558942527489 = function() { return handleError(function () {
342+
const ret = global.global;
343+
return ret;
344+
}, arguments) };
345+
imports.wbg.__wbindgen_is_undefined = function(arg0) {
346+
const ret = arg0 === undefined;
347+
return ret;
348+
};
349+
imports.wbg.__wbg_newnoargs_e258087cd0daa0ea = function(arg0, arg1) {
350+
var v0 = getCachedStringFromWasm0(arg0, arg1);
351+
const ret = new Function(v0);
352+
return ret;
353+
};
354+
imports.wbg.__wbg_call_27c0f87801dedf93 = function() { return handleError(function (arg0, arg1) {
355+
const ret = arg0.call(arg1);
317356
return ret;
318357
}, arguments) };
319-
imports.wbg.__wbg_createElementNS_0047de728927ea00 = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) {
358+
imports.wbg.__wbg_createElement_8bae7856a4bb7411 = function() { return handleError(function (arg0, arg1, arg2) {
320359
var v0 = getCachedStringFromWasm0(arg1, arg2);
321-
var v1 = getCachedStringFromWasm0(arg3, arg4);
322-
const ret = arg0.createElementNS(v0, v1);
360+
const ret = arg0.createElement(v0);
323361
return ret;
324362
}, arguments) };
325-
imports.wbg.__wbg_createTextNode_866e33a51b47f04c = function(arg0, arg1, arg2) {
363+
imports.wbg.__wbg_createTextNode_0c38fd80a5b2284d = function(arg0, arg1, arg2) {
326364
var v0 = getCachedStringFromWasm0(arg1, arg2);
327365
const ret = arg0.createTextNode(v0);
328366
return ret;
@@ -341,7 +379,15 @@ function __wbg_get_imports() {
341379
const ret = getStringFromWasm0(arg0, arg1);
342380
return ret;
343381
};
344-
imports.wbg.__wbg_resolve_fd40f858d9db1a04 = function(arg0) {
382+
imports.wbg.__wbg_queueMicrotask_3cbae2ec6b6cd3d6 = function(arg0) {
383+
const ret = arg0.queueMicrotask;
384+
return ret;
385+
};
386+
imports.wbg.__wbindgen_is_function = function(arg0) {
387+
const ret = typeof(arg0) === 'function';
388+
return ret;
389+
};
390+
imports.wbg.__wbg_resolve_b0083a7967828ec8 = function(arg0) {
345391
const ret = Promise.resolve(arg0);
346392
return ret;
347393
};
@@ -354,55 +400,17 @@ function __wbg_get_imports() {
354400
const ret = false;
355401
return ret;
356402
};
357-
imports.wbg.__wbg_then_ec5db6d509eb475f = function(arg0, arg1) {
403+
imports.wbg.__wbg_then_0c86a60e8fcfe9f6 = function(arg0, arg1) {
358404
const ret = arg0.then(arg1);
359405
return ret;
360406
};
361-
imports.wbg.__wbg_self_e7c1f827057f6584 = function() { return handleError(function () {
362-
const ret = self.self;
363-
return ret;
364-
}, arguments) };
365-
imports.wbg.__wbg_window_a09ec664e14b1b81 = function() { return handleError(function () {
366-
const ret = window.window;
367-
return ret;
368-
}, arguments) };
369-
imports.wbg.__wbg_globalThis_87cbb8506fecf3a9 = function() { return handleError(function () {
370-
const ret = globalThis.globalThis;
371-
return ret;
372-
}, arguments) };
373-
imports.wbg.__wbg_global_c85a9259e621f3db = function() { return handleError(function () {
374-
const ret = global.global;
375-
return ret;
376-
}, arguments) };
377-
imports.wbg.__wbindgen_is_undefined = function(arg0) {
378-
const ret = arg0 === undefined;
379-
return ret;
380-
};
381-
imports.wbg.__wbg_newnoargs_2b8b6bd7753c76ba = function(arg0, arg1) {
382-
var v0 = getCachedStringFromWasm0(arg0, arg1);
383-
const ret = new Function(v0);
384-
return ret;
385-
};
386-
imports.wbg.__wbg_call_95d1ea488d03e4e8 = function() { return handleError(function (arg0, arg1) {
387-
const ret = arg0.call(arg1);
388-
return ret;
389-
}, arguments) };
390-
imports.wbg.__wbg_instanceof_Window_e266f02eee43b570 = function(arg0) {
391-
let result;
392-
try {
393-
result = arg0 instanceof Window;
394-
} catch {
395-
result = false;
396-
}
397-
const ret = result;
398-
return ret;
399-
};
400-
imports.wbg.__wbindgen_closure_wrapper123 = function(arg0, arg1, arg2) {
401-
const ret = makeMutClosure(arg0, arg1, 6, __wbg_adapter_18);
407+
imports.wbg.__wbg_queueMicrotask_481971b0d87f3dd4 = typeof queueMicrotask == 'function' ? queueMicrotask : notDefined('queueMicrotask');
408+
imports.wbg.__wbindgen_closure_wrapper125 = function(arg0, arg1, arg2) {
409+
const ret = makeMutClosure(arg0, arg1, 8, __wbg_adapter_20);
402410
return ret;
403411
};
404-
imports.wbg.__wbindgen_closure_wrapper797 = function(arg0, arg1, arg2) {
405-
const ret = makeMutClosure(arg0, arg1, 6, __wbg_adapter_18);
412+
imports.wbg.__wbindgen_closure_wrapper810 = function(arg0, arg1, arg2) {
413+
const ret = makeMutClosure(arg0, arg1, 8, __wbg_adapter_20);
406414
return ret;
407415
};
408416
imports.wbg.__wbindgen_init_externref_table = function() {
@@ -453,7 +461,7 @@ async function __wbg_init(input) {
453461
if (wasm !== undefined) return wasm;
454462

455463
if (typeof input === 'undefined') {
456-
input = new URL('js-framework-benchmark-silkenweb-fa1762b6e678dcf6_bg.wasm', import.meta.url);
464+
input = new URL('js-framework-benchmark-silkenweb-f5f8ab44b95a6616_bg.wasm', import.meta.url);
457465
}
458466
const imports = __wbg_get_imports();
459467

‎frameworks/keyed/silkenweb/bundled-dist/js-framework-benchmark-silkenweb-f5f8ab44b95a6616_bg.wasm

156 KB
Binary file not shown.

‎frameworks/keyed/silkenweb/bundled-dist/js-framework-benchmark-silkenweb-fa1762b6e678dcf6_bg.wasm

-154 KB
Binary file not shown.

‎frameworks/keyed/silkenweb/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"description": "Benchmark for silkenweb",
55
"license": "ISC",
66
"js-framework-benchmark": {
7-
"frameworkVersion": "0.6.0",
7+
"frameworkVersion": "0.8.0",
88
"frameworkHomeURL": "https://github.com/silkenweb/silkenweb",
99
"customURL": "/bundled-dist",
1010
"issues": [

0 commit comments

Comments
 (0)