coop/rose-ash
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build-all.sh: deploy platform JS to shared/static/wasm/

Browse Source 
build-all.sh was missing the sx-platform.js → sx-platform-2.js copy,
so the served file was stale (still requesting .sxbc.json instead of
.sxbc).

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
giles
2026-03-31 17:05:31 +00:00
parent 4eeb7777aa
commit 6550e9b2e4
2 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
hosts/ocaml/browser/build-all.sh
View File

@@ -26,6 +26,7 @@ cp dist/sx_browser.bc.wasm.js "$DEST/"
cp dist/sx_browser.bc.js "$DEST/" cp dist/sx_browser.bc.js "$DEST/"
rm -rf "$DEST/sx_browser.bc.wasm.assets" rm -rf "$DEST/sx_browser.bc.wasm.assets"
cp -r dist/sx_browser.bc.wasm.assets "$DEST/" cp -r dist/sx_browser.bc.wasm.assets "$DEST/"
cp dist/sx-platform.js "$DEST/sx-platform-2.js"
cp dist/sx/*.sx "$DEST/sx/" cp dist/sx/*.sx "$DEST/sx/"
cp dist/sx/*.sxbc "$DEST/sx/" 2>/dev/null || true cp dist/sx/*.sxbc "$DEST/sx/" 2>/dev/null || true
# Keep assets dir for Node.js WASM tests # Keep assets dir for Node.js WASM tests

21
shared/static/wasm/sx-platform-2.js
View File

@@ -234,35 +234,28 @@
} }
/** /**
* Try loading a pre-compiled .sxbc.json bytecode module. * Try loading a pre-compiled .sxbc bytecode module (SX text format).
* Returns true on success, null on failure (caller falls back to .sx source). * Returns true on success, null on failure (caller falls back to .sx source).
*/ */
function loadBytecodeFile(path) { function loadBytecodeFile(path) {
var bcPath = path.replace(/\.sx$/, '.sxbc.json'); var sxbcPath = path.replace(/\.sx$/, '.sxbc');
var url = _baseUrl + bcPath + _sxbcCacheBust; var url = _baseUrl + sxbcPath + _sxbcCacheBust;
try { try {
var xhr = new XMLHttpRequest(); var xhr = new XMLHttpRequest();
xhr.open("GET", url, false); xhr.open("GET", url, false);
xhr.send(); xhr.send();
if (xhr.status !== 200) return null; if (xhr.status !== 200) return null;
var json = JSON.parse(xhr.responseText); window.__sxbcText = xhr.responseText;
if (!json.module || json.magic !== 'SXBC') return null; var result = K.eval('(load-sxbc (first (parse (host-global "__sxbcText"))))');
delete window.__sxbcText;
var module = {
_type: 'dict',
bytecode: { _type: 'list', items: json.module.bytecode },
constants: { _type: 'list', items: json.module.constants.map(deserializeConstant) },
};
var result = K.loadModule(module);
if (typeof result === 'string' && result.indexOf('Error') === 0) { if (typeof result === 'string' && result.indexOf('Error') === 0) {
console.warn("[sx-platform] bytecode FAIL " + path + ":", result); console.warn("[sx-platform] bytecode FAIL " + path + ":", result);
return null; return null;
} }
console.log("[sx-platform] ok " + path + " (bytecode)");
return true; return true;
} catch(e) { } catch(e) {
delete window.__sxbcText;
return null; return null;
} }
} }