diff --git a/packages/create/template/.dir-locals.el b/packages/create/template/.dir-locals.el
deleted file mode 100644
index 70ecb07..0000000
--- a/packages/create/template/.dir-locals.el
+++ /dev/null
@@ -1,22 +0,0 @@
-((typescript-mode
- . ((eval
- . (progn
- ;; For TIDE:
- (setq tide-tsserver-executable
- (concat
- (let ((d (dir-locals-find-file ".")))
- (if (stringp d) d (car d)))
- "node_modules/typescript/lib/tsserver.js"))
- ;; For LSP:
- (require 'lsp-javascript)
- (let ((node-modules (concat
- (let ((d (dir-locals-find-file ".")))
- (if (stringp d) d (car d)))
- "node_modules/")))
- (lsp-dependency 'typescript-language-server
- `(:system ,(concat node-modules
- "typescript-language-server/lib/cli.mjs")))
- (lsp-dependency 'typescript
- `(:system ,(concat node-modules
- "typescript/lib/tsserver.js")))))
- ))))
diff --git a/packages/create/template/index.html b/packages/create/template/index.html
index 70f0c22..94f55da 100644
--- a/packages/create/template/index.html
+++ b/packages/create/template/index.html
@@ -6,7 +6,7 @@
-
+
diff --git a/packages/create/template/package.json b/packages/create/template/package.json
index 06ce60b..49f74dc 100644
--- a/packages/create/template/package.json
+++ b/packages/create/template/package.json
@@ -14,7 +14,7 @@
"dependencies": {
"@preserves/core": "0.995.0",
"@syndicate-lang/core": "*",
- "@syndicate-lang/html": "*",
+ "@syndicate-lang/html2": "*",
"@syndicate-lang/ws-relay": "*"
},
"scripts": {
@@ -26,6 +26,6 @@
"rollup": "rollup -c",
"rollup:watch": "rollup -c -w",
"clean": "rm -rf lib/ src.ts/ src/gen/ index.js index.js.map",
- "serve": "python -m http.server"
+ "serve": "syndicate-server -c syndicate-server.config.pr"
}
}
diff --git a/packages/create/template/rollup.config.js b/packages/create/template/rollup.config.js
index 59c9999..3875b15 100644
--- a/packages/create/template/rollup.config.js
+++ b/packages/create/template/rollup.config.js
@@ -9,7 +9,7 @@ export default {
external: [
'@preserves/core',
'@syndicate-lang/core',
- '@syndicate-lang/html',
+ '@syndicate-lang/html2',
'@syndicate-lang/ws-relay',
],
output: {
@@ -20,7 +20,7 @@ export default {
globals: {
'@preserves/core': 'Preserves',
'@syndicate-lang/core': 'Syndicate',
- '@syndicate-lang/html': 'SyndicateHtml',
+ '@syndicate-lang/html2': 'SyndicateHtml2',
'@syndicate-lang/ws-relay': 'SyndicateWsRelay',
},
},
diff --git a/packages/create/template/src/index.ts b/packages/create/template/src/index.ts
index e9ae6a2..853fbf5 100644
--- a/packages/create/template/src/index.ts
+++ b/packages/create/template/src/index.ts
@@ -2,14 +2,14 @@
/// SPDX-FileCopyrightText: Copyright © 2023-2024 Tony Garnock-Jones
import { Dataspace, Ref, Sturdy, Reader, Schemas, Embedded, randomId, fromJS } from "@syndicate-lang/core";
-import html from "@syndicate-lang/html";
+import { boot as bootHtml, Widget } from "@syndicate-lang/html2";
import wsRelay from "@syndicate-lang/ws-relay";
import { ExampleDefinition } from './gen/example';
import G = Schemas.gatekeeper;
export function main() {
Dataspace.boot(ds => {
- html.boot(ds);
+ bootHtml(ds);
wsRelay.boot(ds, true /* remove this `true` to turn off client/server debug logging */);
bootApp(ds);
});
@@ -19,7 +19,7 @@ function bootApp(ds: Ref) {
spawn named 'app' {
at ds {
/*
- * This example expects a syndicate-server instance running on port 9001 on the
+ * This example expects a syndicate-server instance running on port 8000 on the
* server hosting index.html, exposing a dataspace entity via a capability called
* `"syndicate"` with empty "secret". See syndicate-server.config.pr.
*/
@@ -28,7 +28,7 @@ function bootApp(ds: Ref) {
const route = G.Route[({
"transports": [fromJS(Schemas.transportAddress.WebSocket(
- `ws://${document.location.hostname}:9001/`))],
+ `ws://${document.location.hostname}:8000/`))],
"pathSteps": [G.asPathStep(fromJS(Sturdy.asSturdyRef(
new Reader][(
'][').next())))],
@@ -42,13 +42,9 @@ function bootApp(ds: Ref) {
at remoteDs {
assert ExampleDefinition(this_instance);
during ExampleDefinition($who: string) => {
- const ui = new html.Anchor();
- at ds {
- assert ui.html(
- '#main',
- html.template`]We see ${who}
`,
- who);
- }
+ new Widget(t =>
+ t`We see ${who}
`)
+ .setParent('#main');
}
}
}
diff --git a/packages/create/template/syndicate-server.config.pr b/packages/create/template/syndicate-server.config.pr
index 4d461b2..37a3938 100644
--- a/packages/create/template/syndicate-server.config.pr
+++ b/packages/create/template/syndicate-server.config.pr
@@ -1,12 +1,18 @@
-; Start the server with
-;
-; syndicate-server -c ./syndicate-server.config.pr
-;---------------------------------------------------------------------------
+# Start the server with
+#
+# syndicate-server -c ./syndicate-server.config.pr
+# ---------------------------------------------------------------------------
-; Expose the gatekeeper on port 9001:
- $gatekeeper>>
+# Expose the gatekeeper and HTTP on port 8000:
+ $gatekeeper $config>>
+>
-; Create a dataspace entity, and register it with the gatekeeper with name `"syndicate"` and an
-; empty secret key:
+>
+? ?handler> [
+ $config +=
+]
+
+# Create a dataspace entity, and register it with the gatekeeper with name `"syndicate"` and an
+# empty secret key:
let ?ds = dataspace
$ds #f>