From 0422cafc11aa61afb398d56577c5d72ecc17b4aa Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Wed, 20 Dec 2023 20:41:54 +1300 Subject: [PATCH] Tweaks for stdenv --- packages/browser-stdenv/.gitignore | 1 + packages/browser-stdenv/boot.js | 4 +++- packages/browser-stdenv/build-aggregate.sh | 14 ++++++++++++++ packages/html2/src/index.ts | 5 +++-- 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/packages/browser-stdenv/.gitignore b/packages/browser-stdenv/.gitignore index 39ee724..87499dc 100644 --- a/packages/browser-stdenv/.gitignore +++ b/packages/browser-stdenv/.gitignore @@ -1,2 +1,3 @@ index.js index.min.js +*.js.map diff --git a/packages/browser-stdenv/boot.js b/packages/browser-stdenv/boot.js index b5c0e60..1ccc0d1 100644 --- a/packages/browser-stdenv/boot.js +++ b/packages/browser-stdenv/boot.js @@ -10,7 +10,9 @@ const SyndicateBrowserStdenv = { }; window.addEventListener('DOMContentLoaded', () => { - if (SyndicateBrowserStdenv.autoboot) { + if (window.SyndicateBrowserStdenv_autoboot === void 0 || + window.SyndicateBrowserStdenv_autoboot) + { SyndicateBrowserStdenv.boot(); } }); diff --git a/packages/browser-stdenv/build-aggregate.sh b/packages/browser-stdenv/build-aggregate.sh index b14c480..2c81eff 100755 --- a/packages/browser-stdenv/build-aggregate.sh +++ b/packages/browser-stdenv/build-aggregate.sh @@ -14,6 +14,13 @@ cat \ boot.js \ > index.js +cp \ + $M/@syndicate-lang/core/dist/syndicate.js.map \ + $M/@syndicate-lang/html2/dist/syndicate-html2.js.map \ + $M/@syndicate-lang/ws-relay/dist/syndicate-ws-relay.js.map \ + $M/@syndicate-lang/compiler/dist/syndicate-compiler.js.map \ + . + cat \ $M/@preserves/core/dist/preserves.min.js \ $M/@preserves/schema/dist/preserves-schema.min.js \ @@ -25,3 +32,10 @@ cat \ $M/@syndicate-lang/compiler/dist/syndicate-browser-compiler.js \ boot.js \ > index.min.js + +cp \ + $M/@syndicate-lang/core/dist/syndicate.min.js.map \ + $M/@syndicate-lang/html2/dist/syndicate-html2.min.js.map \ + $M/@syndicate-lang/ws-relay/dist/syndicate-ws-relay.min.js.map \ + $M/@syndicate-lang/compiler/dist/syndicate-compiler.min.js.map \ + . diff --git a/packages/html2/src/index.ts b/packages/html2/src/index.ts index 5da51f1..4f5bfae 100644 --- a/packages/html2/src/index.ts +++ b/packages/html2/src/index.ts @@ -201,7 +201,6 @@ function spawnLocationHashTracker(ds: Ref) { spawn named 'LocationHashTracker' { at ds { field hashValue: string = '/'; - assert LocationHash(hashValue.value); const loadHash = () => { var h = window.location.hash; @@ -213,10 +212,12 @@ function spawnLocationHashTracker(ds: Ref) { const facet = Turn.activeFacet; const handlerClosure = () => facet.turn(loadHash); - loadHash(); window.addEventListener('hashchange', handlerClosure); on stop window.removeEventListener('hashchange', handlerClosure); + loadHash(); + assert LocationHash(hashValue.value); + on message LocationHash($newHash: string) => { window.location.hash = newHash; }