@inkandswitch/patchwork-bootloader 0.1.0 → 0.2.0

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @inkandswitch/patchwork-bootloader
 
+## 0.2.0
+
+### Minor Changes
+
+- 76db23e: Wire the new `@inkandswitch/patchwork-providers` element stack into
+  `bootPatchworkSite`:
+  - Register and mount `<repo-provider>` (backed by the booted repo) and a
+    top-level `<fallback-provider>` around the configured root element so
+    descendant `<patchwork-view>` / `<patchwork-view-legacy>` elements can
+    resolve their repo via the request/respond protocol.
+  - The single `registerPatchworkViewElement()` call now also registers
+    `<patchwork-view-legacy>` (the wrapper's delegation target), so no
+    separate registration is needed.
+  - Drop the `{ repo }` argument from `registerPatchworkViewLegacyElement`
+    (the repo now comes from the provider).
+  - Add `@inkandswitch/patchwork-providers` as a workspace dependency.
+
+### Patch Changes
+
+- Updated dependencies [76db23e]
+- Updated dependencies [76db23e]
+  - @inkandswitch/patchwork-elements@1.0.0
+  - @inkandswitch/patchwork-providers@0.1.0
+
 ## 0.1.0
 
 ### Minor Changes

package/dist/site.d.ts

@@ -63,8 +63,8 @@ export interface SiteConfig {
      */
     titleSuffix: string;
     /**
-     * DOM id of the `<patchwork-view>` element that will host the root tool.
-     * Defaults to `"root"`.
+     * DOM id of the `<patchwork-view>` element that will host the root
+     * tool. Defaults to `"root"`.
      */
     rootElementId?: string;
     /**

package/dist/site.js

@@ -19,6 +19,7 @@ import * as AutomergeRepo from "@automerge/automerge-repo/slim";
 import { initSync as initSubductionSync } from "@automerge/automerge-subduction/slim";
 import { ModuleWatcher } from "@inkandswitch/patchwork-filesystem";
 import { openDocument, registerPatchworkViewElement, } from "@inkandswitch/patchwork-elements";
+import { registerFallbackProviderElement, registerRepoProviderElement, } from "@inkandswitch/patchwork-providers";
 import { getRegistry, registerPlugins, resolveAccountHandle, unregisterPlugins, } from "@inkandswitch/patchwork-plugins";
 import * as plugins from "@inkandswitch/patchwork-plugins";
 import setupServiceWorker from "./setup.js";
@@ -70,7 +71,18 @@ export async function bootPatchworkSite(config) {
     };
     await sw.subscribeToRepoChannel(connectServiceWorkerPort);
     installDevConsoleGlobals(repo);
-    registerPatchworkViewElement({ repo });
+    registerRepoProviderElement(repo);
+    registerFallbackProviderElement();
+    const rootElement = document.getElementById(config.rootElementId ?? "root");
+    if (!rootElement) {
+        throw new Error(`bootPatchworkSite: no element with id="${config.rootElementId ?? "root"}"`);
+    }
+    const repoProvider = document.createElement("repo-provider");
+    const fallbackProvider = document.createElement("fallback-provider");
+    rootElement.parentElement.insertBefore(fallbackProvider, rootElement);
+    fallbackProvider.appendChild(repoProvider);
+    repoProvider.appendChild(rootElement);
+    registerPatchworkViewElement();
     // The watcher is started with the site's default-tools bundle alone so that
     // `resolveAccountHandle` below has something to await on (the `account`
     // datatype lives in that bundle today). The user's own module-settings URL
@@ -81,10 +93,6 @@ export async function bootPatchworkSite(config) {
     });
     window.accountDocHandle = accountDocHandle;
     wireModuleSettingsWhenReady(accountDocHandle, moduleWatcher);
-    const rootElement = document.getElementById(config.rootElementId ?? "root");
-    if (!rootElement) {
-        throw new Error(`bootPatchworkSite: no element with id="${config.rootElementId ?? "root"}"`);
-    }
     primeRootElement(rootElement, accountDocHandle);
     logToolRegistryWhenLoaded(moduleWatcher);
     window.patchwork = {
@@ -154,9 +162,10 @@ function wireModuleSettingsWhenReady(accountDocHandle, moduleWatcher) {
     }
 }
 /**
- * Set initial `tool-id` / `doc-url` attributes on the root `<patchwork-view>`
- * based on the URL hash (if it specifies a frame override) or the account
- * doc's configured frame tool + the account doc itself.
+ * Set initial `tool-id` / `doc-url` attributes on the root
+ * `<patchwork-view-legacy>` based on the URL hash (if it specifies a frame
+ * override) or the account doc's configured frame tool + the account doc
+ * itself.
  */
 function primeRootElement(rootElement, accountDocHandle) {
     rootElement.style.visibility = "hidden";

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@inkandswitch/patchwork-bootloader",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "author": "chee",
   "type": "module",
   "license": "MIT",
   "devDependencies": {
-    "@automerge/automerge-repo-keyhive": "0.2.0-alpha.1d",
+    "@automerge/automerge-repo-keyhive": "catalog:",
     "esbuild": "^0.23.1",
     "rollup": "^4.53.3"
   },
@@ -40,30 +40,31 @@
     }
   },
   "dependencies": {
-    "@automerge/automerge": "3.2.6",
-    "@automerge/automerge-repo": "2.6.0-subduction.19",
-    "@automerge/automerge-subduction": "0.12.0",
-    "@automerge/automerge-repo-network-messagechannel": "2.6.0-subduction.19",
-    "@automerge/automerge-repo-network-websocket": "2.6.0-subduction.19",
-    "@automerge/automerge-repo-storage-indexeddb": "2.6.0-subduction.19",
-    "@automerge/vanillajs": "2.6.0-subduction.19",
+    "@automerge/automerge": "catalog:",
+    "@automerge/automerge-repo": "catalog:",
+    "@automerge/automerge-subduction": "catalog:",
+    "@automerge/automerge-repo-network-messagechannel": "catalog:",
+    "@automerge/automerge-repo-network-websocket": "catalog:",
+    "@automerge/automerge-repo-storage-indexeddb": "catalog:",
+    "@automerge/vanillajs": "catalog:",
+    "@inkandswitch/patchwork-elements": "workspace:^",
+    "@inkandswitch/patchwork-filesystem": "workspace:^",
+    "@inkandswitch/patchwork-plugins": "workspace:^",
+    "@inkandswitch/patchwork-providers": "workspace:^",
     "@types/debug": "^4.1.12",
     "debug": "^4.4.3",
     "resolve.exports": "^2.0.3",
     "service-worker-types": "npm:@types/serviceworker@^0.0.153",
-    "tinyargs": "^0.1.4",
-    "@inkandswitch/patchwork-elements": "^0.0.8",
-    "@inkandswitch/patchwork-plugins": "^0.0.8",
-    "@inkandswitch/patchwork-filesystem": "^0.0.6"
+    "tinyargs": "^0.1.4"
   },
   "peerDependencies": {
-    "@automerge/automerge": "3.2.6",
-    "@automerge/automerge-repo": "2.6.0-subduction.19",
-    "@automerge/automerge-repo-keyhive": "0.2.0-alpha.1d",
-    "@automerge/vanillajs": "2.6.0-subduction.19"
+    "@automerge/automerge": "catalog:",
+    "@automerge/automerge-repo": "catalog:",
+    "@automerge/automerge-repo-keyhive": "catalog:",
+    "@automerge/vanillajs": "catalog:"
   },
   "scripts": {
     "build": "tsc",
     "dev": "tsc -w --preserveWatchOutput"
   }
-}
+}

package/src/service-worker.ts

@@ -124,7 +124,7 @@ function getRepo() {
         },
         enableRemoteHeadsGossiping: true,
         subductionWebsocketEndpoints: SUBDUCTION_ENDPOINTS,
-        //network: [new WebSocketClientAdapter("wss://sync3.automerge.org")],
+        network: [new WebSocketClientAdapter("wss://sync3.automerge.org")],
       });
 
       (self as any).repo = repo;

package/src/site.ts

@@ -37,6 +37,10 @@ import {
   openDocument,
   registerPatchworkViewElement,
 } from "@inkandswitch/patchwork-elements";
+import {
+  registerFallbackProviderElement,
+  registerRepoProviderElement,
+} from "@inkandswitch/patchwork-providers";
 import {
   type AccountDoc,
   type DatatypeDescription,
@@ -182,7 +186,25 @@ export async function bootPatchworkSite(
   await sw.subscribeToRepoChannel(connectServiceWorkerPort);
 
   installDevConsoleGlobals(repo);
-  registerPatchworkViewElement({ repo });
+
+  registerRepoProviderElement(repo);
+  registerFallbackProviderElement();
+
+  const rootElement = document.getElementById(config.rootElementId ?? "root");
+  if (!rootElement) {
+    throw new Error(
+      `bootPatchworkSite: no element with id="${config.rootElementId ?? "root"}"`
+    );
+  }
+  const repoProvider = document.createElement("repo-provider");
+  const fallbackProvider = document.createElement("fallback-provider");
+  rootElement.parentElement!.insertBefore(fallbackProvider, rootElement);
+  fallbackProvider.appendChild(repoProvider);
+  repoProvider.appendChild(rootElement);
+
+  // Registers `<patchwork-view>` and the `<patchwork-view-legacy>` it
+  // delegates to in one go.
+  registerPatchworkViewElement();
 
   // The watcher is started with the site's default-tools bundle alone so that
   // `resolveAccountHandle` below has something to await on (the `account`
@@ -203,13 +225,6 @@ export async function bootPatchworkSite(
 
   wireModuleSettingsWhenReady(accountDocHandle, moduleWatcher);
 
-  const rootElement = document.getElementById(config.rootElementId ?? "root");
-  if (!rootElement) {
-    throw new Error(
-      `bootPatchworkSite: no element with id="${config.rootElementId ?? "root"}"`
-    );
-  }
-
   primeRootElement(rootElement, accountDocHandle);
   logToolRegistryWhenLoaded(moduleWatcher);
 
@@ -298,9 +313,10 @@ function wireModuleSettingsWhenReady(
 }
 
 /**
- * Set initial `tool-id` / `doc-url` attributes on the root `<patchwork-view>`
- * based on the URL hash (if it specifies a frame override) or the account
- * doc's configured frame tool + the account doc itself.
+ * Set initial `tool-id` / `doc-url` attributes on the root
+ * `<patchwork-view>` based on the URL hash (if it specifies a frame
+ * override) or the account doc's configured frame tool + the account doc
+ * itself.
  */
 function primeRootElement(
   rootElement: HTMLElement,