@inkandswitch/patchwork 0.7.2 → 0.7.4

package/CHANGELOG.md

@@ -1,5 +1,41 @@
 # @inkandswitch/patchwork
 
+## 0.7.4
+
+### Patch Changes
+
+- 7339066: The dev importmap now names each builtin's pre-bundled dep URL
+  (`/node_modules/.vite/deps/…?v=…`) instead of `/@id/<dep>`. Both URLs resolve to
+  the same file, but a module fetched under two URLs is evaluated twice — the site
+  imported solid through the pre-bundled URL and tool code imported it through the
+  importmap, so tools ran against a second solid with its own owner stack and
+  logged "computations created outside a `createRoot`" for every effect they
+  created. Builtins that aren't pre-bundled still fall back to `/@id/<dep>`.
+- ebca53b: Move the automerge-repo subduction fork to 2.6.0-subduction.48, `@automerge/automerge-repo-keyhive` to 0.5.0-alpha.7, and `@keyhive/keyhive` to 0.1.0-alpha.8. These three are bumped together because the keyhive package pins its automerge-repo version exactly.
+
+  keyhive 0.5 renames the two hive flavours. The network-adapter hive is now `LegacyAutomergeRepoKeyhive`, built by `initializeLegacyAutomergeRepoKeyhive`; the subduction hive keeps the name `AutomergeRepoKeyhive` and is built by `initializeAutomergeRepoKeyhive`. Both extend `AutomergeRepoKeyhiveBase`, which is what Patchwork's `hive` fields are typed as, so a tool that only reads membership works against either.
+
+  `createKeyhiveNetworkAdapter` takes an options object instead of positional arguments, and `onlyShareWithHardcodedServerPeerId` is now `onlyShareWithSyncServer`.
+
+- Updated dependencies [ebca53b]
+- Updated dependencies [882eacd]
+  - @inkandswitch/patchwork-bootloader@0.6.3
+  - @inkandswitch/patchwork-elements@6.0.2
+  - @inkandswitch/patchwork-filesystem@0.2.8
+  - @inkandswitch/patchwork-plugins@1.2.3
+  - @inkandswitch/patchwork-providers@0.5.2
+
+## 0.7.3
+
+### Patch Changes
+
+- 8742cd2: Expose the individual vite plugins that `patchwork()` composes. Each one now has its own subpath — `@inkandswitch/patchwork/vite/importmap`, `/vite/service-worker`, `/vite/config`, `/vite/dev`, `/vite/icons`, `/vite/html`, `/vite/manifest`, `/vite/netlify`, `/vite/static`, `/vite/build-info` — and they are also re-exported from `@inkandswitch/patchwork/vite` as `importmap`, `serviceworker`, `config`, `dev`, `icons`, `html`, `manifest`, `netlify`, `statics` and `buildInfo`, so a site that wants its own composition can pick the pieces it needs instead of the whole default plugin array.
+- Updated dependencies [94f6299]
+- Updated dependencies [a96f250]
+  - @inkandswitch/patchwork-elements@6.0.1
+  - @inkandswitch/patchwork-plugins@1.2.1
+  - @inkandswitch/patchwork-filesystem@0.2.6
+
 ## 0.7.2
 
 ### Patch Changes

package/dist/index.d.ts

@@ -18,7 +18,7 @@
  * and the automerge-worker handoff and nothing else.
  */
 import { Repo } from "@automerge/vanillajs/slim";
-import type { AutomergeRepoKeyhive } from "@automerge/automerge-repo-keyhive";
+import type { AutomergeRepoKeyhiveBase as AutomergeRepoKeyhive } from "@automerge/automerge-repo-keyhive";
 import type { Patchwork, PatchworkOptions } from "./types.js";
 declare global {
     interface Window {

package/dist/index.js

@@ -94,7 +94,11 @@ async function doSetup(options) {
             // Mirror the boot wiring: a keyhive repo talks to the worker through a
             // keyhive adapter wrapped around the message channel.
             const registered = bootHive
-                ? bootHive.createKeyhiveNetworkAdapter(fresh, false, false, 2000)
+                ? bootHive.createKeyhiveNetworkAdapter(fresh, {
+                    onlyShareWithSyncServer: false,
+                    periodicallyRequestSync: false,
+                    syncRequestInterval: 2000,
+                })
                 : fresh;
             repo.networkSubsystem.addNetworkAdapter(registered);
             removeAdapterFor(repo, workerAdapter, registered);

package/dist/repo.d.ts

@@ -1,11 +1,11 @@
 import { MessageChannelNetworkAdapter, Repo } from "@automerge/vanillajs/slim";
-import { type AutomergeRepoKeyhive } from "@automerge/automerge-repo-keyhive";
+import { type AutomergeRepoKeyhiveBase } from "@automerge/automerge-repo-keyhive";
 import setupServiceWorker from "@inkandswitch/patchwork-bootloader";
 import type { SignerIdentity } from "./types.js";
 export declare function initWasm(): Promise<void>;
 export declare function createRepo(workerAdapter: MessageChannelNetworkAdapter): Promise<{
     repo: Repo;
-    hive?: AutomergeRepoKeyhive;
+    hive?: AutomergeRepoKeyhiveBase;
     signerIdentity?: SignerIdentity;
 }>;
 /**

package/dist/repo.js

@@ -1,6 +1,6 @@
 import { initializeWasm, Repo, } from "@automerge/vanillajs/slim";
 import { IndexedDBWorkerStorageAdapter } from "@automerge/automerge-repo-storage-indexeddb/IndexedDBWorkerStorageAdapter";
-import { initKeyhiveWasm, initializeAutomergeRepoKeyhiveWithRepo, } from "@automerge/automerge-repo-keyhive";
+import { initKeyhiveWasm, initializeLegacyAutomergeRepoKeyhive, } from "@automerge/automerge-repo-keyhive";
 // eslint-disable-next-line
 // @ts-ignore — initSync is a wasm-bindgen runtime helper not in the .d.ts
 import { initSync as initSubductionSync } from "@automerge/automerge-subduction/slim";
@@ -32,14 +32,14 @@ export async function createRepo(workerAdapter) {
     if (syncServer.keyhive) {
         log("setting up keyhive");
         initKeyhiveWasm();
-        const { hive, repo } = await initializeAutomergeRepoKeyhiveWithRepo({
+        const { hive, repo } = await initializeLegacyAutomergeRepoKeyhive({
             createRepo: (repoConfig) => new Repo(repoConfig),
             storage: new IndexedDBWorkerStorageAdapter(keyhiveStorageName),
             peerIdSuffix: storagePrefix + Math.random().toString(36).slice(2),
             networkAdapter: workerAdapter,
             automaticArchiveIngestion: true,
             cachingMode: "periodic",
-            onlyShareWithHardcodedServerPeerId: false,
+            onlyShareWithSyncServer: false,
             // ARK selects the relay via `syncServer`, defaulting to "subduction".
             syncServer: syncServer.keyhive,
             repo: {

package/dist/site-kit/html.js

@@ -15,6 +15,10 @@ export function escapeHtml(value) {
 export function buildHtml(options) {
     const title = options.title ?? DEFAULT_TITLE;
     const lang = (options.html && options.html.lang) || "en";
+    const attributes = Object.entries((options.html && options.html.attributes) || {})
+        .filter(([name]) => name !== "lang" && /^[a-z][a-z0-9-]*$/i.test(name))
+        .map(([name, value]) => ` ${name}="${escapeHtml(value)}"`)
+        .join("");
     const entry = options.entry ?? "/src/main.ts";
     const syncServers = resolveSyncServers(options);
     const head = [
@@ -61,11 +65,17 @@ export function buildHtml(options) {
     if (options.html && options.html.extraHead) {
         head.push(options.html.extraHead);
     }
+    const body = [
+        `<repo-provider><patchwork-view id="root"></patchwork-view></repo-provider>`,
+        `<script type="module" src="${entry}"></script>`,
+    ];
+    if (options.html && options.html.extraBody) {
+        body.push(options.html.extraBody);
+    }
     return `<!doctype html>
-<html lang="${lang}">
+<html lang="${lang}"${attributes}>
 ${head.join("\n")}
-<repo-provider><patchwork-view id="root"></patchwork-view></repo-provider>
-<script type="module" src="${entry}"></script>
+${body.join("\n")}
 </html>
 `;
 }

package/dist/site-kit/options.d.ts

@@ -16,8 +16,16 @@ export interface PatchworkIconsOptions {
 }
 export interface PatchworkHtmlOptions {
     lang?: string;
-    /** Raw HTML appended just before </html> — e.g. extra <link>/<meta> tags. */
+    /** Raw HTML appended after the generated head — e.g. extra <link>/<meta> tags. */
     extraHead?: string;
+    /** Raw HTML appended after the app root and entry script. */
+    extraBody?: string;
+    /**
+     * Attributes set on the root `<html>` element. How a site states its own
+     * configuration to the packages it loads: a package reads the attribute
+     * instead of guessing from load order. `lang` stays its own option.
+     */
+    attributes?: Record<string, string>;
 }
 export interface PatchworkNetlifyOptions {
     /** Cache-Control: immutable on /assets/*. Default true. */

package/dist/types.d.ts

@@ -1,5 +1,5 @@
 import type { AutomergeUrl, DocHandle, Repo } from "@automerge/vanillajs/slim";
-import type { AutomergeRepoKeyhive } from "@automerge/automerge-repo-keyhive";
+import type { AutomergeRepoKeyhiveBase as AutomergeRepoKeyhive } from "@automerge/automerge-repo-keyhive";
 import type { ModuleWatcher, HasPatchworkMetadata } from "@inkandswitch/patchwork-filesystem";
 import type { AccountCreator, AccountDoc } from "@inkandswitch/patchwork-plugins";
 import type { ServiceWorkerRepoChannelListener, SyncStateDocMessage } from "@inkandswitch/patchwork-bootloader/types";

package/dist/vite/build-info-plugin.d.ts

@@ -5,4 +5,4 @@ import type { PatchworkVitePluginOptions } from "./patchwork-plugin.js";
  * revision, the version of patchwork that built it, and every `static` source,
  * plus whatever extra fields the site passes as the option value.
  */
-export declare function buildInfoPlugin(options?: PatchworkVitePluginOptions): Plugin | null;
+export declare function buildInfo(options?: PatchworkVitePluginOptions): Plugin | null;

package/dist/vite/build-info-plugin.js

@@ -37,7 +37,7 @@ function describe(directory) {
  * revision, the version of patchwork that built it, and every `static` source,
  * plus whatever extra fields the site passes as the option value.
  */
-export function buildInfoPlugin(options = {}) {
+export function buildInfo(options = {}) {
     if (!options.buildInfo)
         return null;
     let root;

package/dist/vite/config-plugin.d.ts

@@ -15,5 +15,5 @@ export declare function buildDefines(options?: PatchworkVitePluginOptions): Reco
  * used to hand-write in its own vite.config.ts. Each is switched off
  * individually via the matching `false` option.
  */
-export declare function configPlugin(options?: PatchworkVitePluginOptions): Plugin;
+export declare function config(options?: PatchworkVitePluginOptions): Plugin;
 export { wasm };

package/dist/vite/config-plugin.js

@@ -27,7 +27,7 @@ export function buildDefines(options = {}) {
  * used to hand-write in its own vite.config.ts. Each is switched off
  * individually via the matching `false` option.
  */
-export function configPlugin(options = {}) {
+export function config(options = {}) {
     return {
         name: "@patchwork/config",
         config() {

package/dist/vite/dev-plugin.d.ts

@@ -1,3 +1,3 @@
 import type { Plugin } from "vite";
 import type { PatchworkVitePluginOptions } from "./patchwork-plugin.js";
-export declare function devPlugin(options?: PatchworkVitePluginOptions): Plugin;
+export declare function dev(options?: PatchworkVitePluginOptions): Plugin;

package/dist/vite/dev-plugin.js

@@ -53,7 +53,7 @@ function workerContexts(options) {
     }
     return contexts;
 }
-export function devPlugin(options = {}) {
+export function dev(options = {}) {
     let serve = false;
     let contexts;
     const wasm = new Map(wasmAssets().map(({ fileName, path }) => [`/${fileName}`, path]));

package/dist/vite/html-plugin.d.ts

@@ -8,4 +8,4 @@ import type { PatchworkVitePluginOptions } from "./patchwork-plugin.js";
  * virtual module: `resolveId` claims the one id we care about, `load`
  * returns the generated string — nothing ever touches disk.
  */
-export declare function htmlPlugin(options?: PatchworkVitePluginOptions): Plugin | null;
+export declare function html(options?: PatchworkVitePluginOptions): Plugin | null;

package/dist/vite/html-plugin.js

@@ -9,7 +9,7 @@ const GENERATED_PATH = "index.html";
  * virtual module: `resolveId` claims the one id we care about, `load`
  * returns the generated string — nothing ever touches disk.
  */
-export function htmlPlugin(options = {}) {
+export function html(options = {}) {
     if (options.html === false)
         return null;
     const html = buildHtml(options);

package/dist/vite/icons.d.ts

@@ -1,4 +1,4 @@
 import type { Plugin } from "vite";
 import type { PatchworkVitePluginOptions } from "./patchwork-plugin.js";
 /** Emits the rendered icon PNGs for build, and serves the same buffers for dev. */
-export declare function iconsPlugin(options?: PatchworkVitePluginOptions): Plugin | null;
+export declare function icons(options?: PatchworkVitePluginOptions): Plugin | null;

package/dist/vite/icons.js

@@ -1,7 +1,7 @@
 import { resolve } from "node:path";
 import { getIcons } from "../site-kit/icons.js";
 /** Emits the rendered icon PNGs for build, and serves the same buffers for dev. */
-export function iconsPlugin(options = {}) {
+export function icons(options = {}) {
     if (!options.icons)
         return null;
     const { source } = options.icons;

package/dist/vite/importmap-plugin.js

@@ -1,4 +1,5 @@
 import { fileURLToPath } from "node:url";
+import { relative } from "node:path";
 /**
  * bootloader owns resolving/emitting its own dependencies (it's the one that
  * actually has automerge/keyhive/codemirror/solid/the other patchwork-*
@@ -87,11 +88,22 @@ export function importmap(options) {
         },
         transformIndexHtml: {
             order: "pre",
-            handler(html, context) {
+            async handler(html, context) {
                 const activeImportmap = structuredClone(importmap);
                 if (context.server) {
+                    // The importmap has to name the same URL the site's own imports get
+                    // rewritten to, which is the pre-bundled dep. `/@id/<dep>` resolves
+                    // to the same file but is a second URL, and a module fetched under
+                    // two URLs is evaluated twice — two solids, two automerges.
+                    const optimizer = context.server.environments.client.depsOptimizer;
+                    await optimizer?.init();
+                    const root = context.server.config.root;
                     for (const id of Object.keys(builtins)) {
-                        activeImportmap.imports[id] = `/@id/${devDependencyId(id)}`;
+                        const dependency = devDependencyId(id);
+                        const optimized = optimizer?.metadata.optimized[dependency];
+                        activeImportmap.imports[id] = optimized
+                            ? `/${relative(root, optimized.file)}?v=${optimized.browserHash}`
+                            : `/@id/${dependency}`;
                     }
                 }
                 return {

package/dist/vite/manifest-plugin.d.ts

@@ -1,4 +1,4 @@
 import type { Plugin } from "vite";
 import type { PatchworkVitePluginOptions } from "./patchwork-plugin.js";
 /** Emits manifest.webmanifest for build and serves it for dev, from the same generated object. */
-export declare function manifestPlugin(options?: PatchworkVitePluginOptions): Plugin | null;
+export declare function manifest(options?: PatchworkVitePluginOptions): Plugin | null;

package/dist/vite/manifest-plugin.js

@@ -1,6 +1,6 @@
 import { buildManifest } from "../site-kit/manifest.js";
 /** Emits manifest.webmanifest for build and serves it for dev, from the same generated object. */
-export function manifestPlugin(options = {}) {
+export function manifest(options = {}) {
     if (options.manifest === false)
         return null;
     const manifest = buildManifest(options);

package/dist/vite/netlify-plugin.d.ts

@@ -6,4 +6,4 @@ import type { PatchworkVitePluginOptions } from "./patchwork-plugin.js";
  * The Link header shares its sync-server/wasm-asset lists with html-plugin
  * so the two never drift out of sync with each other.
  */
-export declare function netlifyPlugin(options?: PatchworkVitePluginOptions): Plugin | null;
+export declare function netlify(options?: PatchworkVitePluginOptions): Plugin | null;

package/dist/vite/netlify-plugin.js

@@ -5,7 +5,7 @@ import { buildHeaders, REDIRECTS } from "../site-kit/netlify.js";
  * The Link header shares its sync-server/wasm-asset lists with html-plugin
  * so the two never drift out of sync with each other.
  */
-export function netlifyPlugin(options = {}) {
+export function netlify(options = {}) {
     if (options.netlify === false)
         return null;
     const headers = buildHeaders(options);

package/dist/vite/patchwork-plugin.d.ts

@@ -23,6 +23,16 @@ import type { PatchworkSiteOptions } from "../site-kit/options.js";
  * a different bundler adapter.
  */
 export default function patchwork(options?: PatchworkVitePluginOptions): Plugin<any>[];
+export { importmap, builtins, devDependencyId } from "./importmap-plugin.js";
+export { serviceworker, workers } from "./service-worker-plugin.js";
+export { config, buildDefines, wasm } from "./config-plugin.js";
+export { dev } from "./dev-plugin.js";
+export { icons } from "./icons.js";
+export { html } from "./html-plugin.js";
+export { manifest } from "./manifest-plugin.js";
+export { netlify } from "./netlify-plugin.js";
+export { statics, resolveStatic } from "./static-plugin.js";
+export { buildInfo } from "./build-info-plugin.js";
 type Imports = {
     [name: string]: string;
 };

package/dist/vite/patchwork-plugin.js

@@ -1,13 +1,13 @@
 import { importmap } from "./importmap-plugin.js";
 import { serviceworker } from "./service-worker-plugin.js";
-import { configPlugin, wasm } from "./config-plugin.js";
-import { devPlugin } from "./dev-plugin.js";
-import { iconsPlugin } from "./icons.js";
-import { htmlPlugin } from "./html-plugin.js";
-import { manifestPlugin } from "./manifest-plugin.js";
-import { netlifyPlugin } from "./netlify-plugin.js";
-import { staticPlugin } from "./static-plugin.js";
-import { buildInfoPlugin } from "./build-info-plugin.js";
+import { config, wasm } from "./config-plugin.js";
+import { dev } from "./dev-plugin.js";
+import { icons } from "./icons.js";
+import { html } from "./html-plugin.js";
+import { manifest } from "./manifest-plugin.js";
+import { netlify } from "./netlify-plugin.js";
+import { statics } from "./static-plugin.js";
+import { buildInfo } from "./build-info-plugin.js";
 /**
  * The patchwork vite plugin. A site's vite.config.ts can shrink down to
  * `plugins: [patchwork({...})]` plus a single source icon file — this plugin
@@ -32,15 +32,25 @@ import { buildInfoPlugin } from "./build-info-plugin.js";
 export default function patchwork(options) {
     return [
         wasm(),
-        configPlugin(options),
-        iconsPlugin(options),
-        htmlPlugin(options),
-        manifestPlugin(options),
-        netlifyPlugin(options),
+        config(options),
+        icons(options),
+        html(options),
+        manifest(options),
+        netlify(options),
         importmap(options),
         serviceworker(),
-        devPlugin(options),
-        staticPlugin(options),
-        buildInfoPlugin(options),
+        dev(options),
+        statics(options),
+        buildInfo(options),
     ].filter((plugin) => plugin != null);
 }
+export { importmap, builtins, devDependencyId } from "./importmap-plugin.js";
+export { serviceworker, workers } from "./service-worker-plugin.js";
+export { config, buildDefines, wasm } from "./config-plugin.js";
+export { dev } from "./dev-plugin.js";
+export { icons } from "./icons.js";
+export { html } from "./html-plugin.js";
+export { manifest } from "./manifest-plugin.js";
+export { netlify } from "./netlify-plugin.js";
+export { statics, resolveStatic } from "./static-plugin.js";
+export { buildInfo } from "./build-info-plugin.js";

package/dist/vite/static-plugin.d.ts

@@ -44,4 +44,4 @@ export declare function resolveStatic(options: PatchworkVitePluginOptions, root:
  * order, and a site keeps its own `modules.json` by listing it before the
  * package it borrows the rest of the packages from.
  */
-export declare function staticPlugin(options?: PatchworkVitePluginOptions): Plugin | null;
+export declare function statics(options?: PatchworkVitePluginOptions): Plugin | null;

package/dist/vite/static-plugin.js

@@ -116,7 +116,7 @@ async function files(source, directory = source) {
  * order, and a site keeps its own `modules.json` by listing it before the
  * package it borrows the rest of the packages from.
  */
-export function staticPlugin(options = {}) {
+export function statics(options = {}) {
     if (!options.static?.length)
         return null;
     let sources = [];

package/package.json

@@ -5,7 +5,7 @@
     "url": "git+https://github.com/inkandswitch/patchwork-system.git",
     "directory": "core/patchwork"
   },
-  "version": "0.7.2",
+  "version": "0.7.4",
   "author": "Ink & Switch",
   "type": "module",
   "license": "MIT",
@@ -19,6 +19,46 @@
       "import": "./dist/vite/patchwork-plugin.js",
       "types": "./dist/vite/patchwork-plugin.d.ts"
     },
+    "./vite/build-info": {
+      "import": "./dist/vite/build-info-plugin.js",
+      "types": "./dist/vite/build-info-plugin.d.ts"
+    },
+    "./vite/config": {
+      "import": "./dist/vite/config-plugin.js",
+      "types": "./dist/vite/config-plugin.d.ts"
+    },
+    "./vite/dev": {
+      "import": "./dist/vite/dev-plugin.js",
+      "types": "./dist/vite/dev-plugin.d.ts"
+    },
+    "./vite/html": {
+      "import": "./dist/vite/html-plugin.js",
+      "types": "./dist/vite/html-plugin.d.ts"
+    },
+    "./vite/icons": {
+      "import": "./dist/vite/icons.js",
+      "types": "./dist/vite/icons.d.ts"
+    },
+    "./vite/importmap": {
+      "import": "./dist/vite/importmap-plugin.js",
+      "types": "./dist/vite/importmap-plugin.d.ts"
+    },
+    "./vite/manifest": {
+      "import": "./dist/vite/manifest-plugin.js",
+      "types": "./dist/vite/manifest-plugin.d.ts"
+    },
+    "./vite/netlify": {
+      "import": "./dist/vite/netlify-plugin.js",
+      "types": "./dist/vite/netlify-plugin.d.ts"
+    },
+    "./vite/service-worker": {
+      "import": "./dist/vite/service-worker-plugin.js",
+      "types": "./dist/vite/service-worker-plugin.d.ts"
+    },
+    "./vite/static": {
+      "import": "./dist/vite/static-plugin.js",
+      "types": "./dist/vite/static-plugin.d.ts"
+    },
     "./head": {
       "import": "./dist/head.js"
     },
@@ -33,21 +73,21 @@
   },
   "dependencies": {
     "@automerge/automerge": "3.3.2",
-    "@automerge/automerge-repo": "2.6.0-subduction.47",
-    "@automerge/automerge-repo-keyhive": "0.3.0-alpha.sub.8b",
-    "@automerge/automerge-repo-storage-indexeddb": "2.6.0-subduction.47",
+    "@automerge/automerge-repo": "2.6.0-subduction.48",
+    "@automerge/automerge-repo-keyhive": "0.5.0-alpha.7",
+    "@automerge/automerge-repo-storage-indexeddb": "2.6.0-subduction.48",
     "@automerge/automerge-subduction": "0.16.1",
-    "@automerge/vanillajs": "2.6.0-subduction.47",
+    "@automerge/vanillajs": "2.6.0-subduction.48",
     "@types/debug": "^4.1.13",
     "debug": "^4.4.3",
     "esbuild": "^0.23.1",
     "sharp": "^0.35.3",
     "vite-plugin-wasm": "^3.6.0",
-    "@inkandswitch/patchwork-bootloader": "^0.6.2",
-    "@inkandswitch/patchwork-elements": "^6.0.0",
-    "@inkandswitch/patchwork-filesystem": "^0.2.5",
-    "@inkandswitch/patchwork-providers": "^0.5.0",
-    "@inkandswitch/patchwork-plugins": "^1.2.0"
+    "@inkandswitch/patchwork-bootloader": "^0.6.3",
+    "@inkandswitch/patchwork-elements": "^6.0.2",
+    "@inkandswitch/patchwork-filesystem": "^0.2.8",
+    "@inkandswitch/patchwork-plugins": "^1.2.3",
+    "@inkandswitch/patchwork-providers": "^0.5.2"
   },
   "devDependencies": {
     "rollup": "^4.61.1",

package/src/index.ts

@@ -25,7 +25,7 @@ import {
 } from "@automerge/vanillajs/slim";
 import * as Automerge from "@automerge/automerge/slim";
 import * as AutomergeRepo from "@automerge/automerge-repo/slim";
-import type { AutomergeRepoKeyhive } from "@automerge/automerge-repo-keyhive";
+import type { AutomergeRepoKeyhiveBase as AutomergeRepoKeyhive } from "@automerge/automerge-repo-keyhive";
 
 import { ModuleWatcher } from "@inkandswitch/patchwork-filesystem";
 import { importAutomergePackageViaWorker } from "@inkandswitch/patchwork-bootloader/module-loader";
@@ -97,9 +97,7 @@ export function setup(options: PatchworkOptions = {}): Promise<Patchwork> {
     timer = setTimeout(
       () =>
         reject(
-          new Error(
-            `patchwork.setup: boot did not finish within ${timeout}ms`
-          )
+          new Error(`patchwork.setup: boot did not finish within ${timeout}ms`)
         ),
       timeout
     );
@@ -161,7 +159,11 @@ async function doSetup(options: PatchworkOptions): Promise<Patchwork> {
       // Mirror the boot wiring: a keyhive repo talks to the worker through a
       // keyhive adapter wrapped around the message channel.
       const registered = bootHive
-        ? bootHive.createKeyhiveNetworkAdapter(fresh, false, false, 2000)
+        ? bootHive.createKeyhiveNetworkAdapter(fresh, {
+            onlyShareWithSyncServer: false,
+            periodicallyRequestSync: false,
+            syncRequestInterval: 2000,
+          })
         : fresh;
       repo.networkSubsystem.addNetworkAdapter(registered as any);
       removeAdapterFor(repo, workerAdapter, registered);
@@ -264,9 +266,8 @@ async function doSetup(options: PatchworkOptions): Promise<Patchwork> {
     },
 
     async create<D>(type: string, init?: (doc: D) => void) {
-      const datatype = await getRegistry<DatatypeDescription>(
-        "patchwork:datatype"
-      ).load(type);
+      const datatype =
+        await getRegistry<DatatypeDescription>("patchwork:datatype").load(type);
       if (!datatype) {
         throw new Error(
           `patchwork.create: no datatype registered for "${type}"`

package/src/repo.ts

@@ -8,8 +8,8 @@ import { IndexedDBWorkerStorageAdapter } from "@automerge/automerge-repo-storage
 import * as AutomergeRepo from "@automerge/automerge-repo/slim";
 import {
   initKeyhiveWasm,
-  initializeAutomergeRepoKeyhiveWithRepo,
-  type AutomergeRepoKeyhive,
+  initializeLegacyAutomergeRepoKeyhive,
+  type AutomergeRepoKeyhiveBase,
   type SyncServerSelection,
 } from "@automerge/automerge-repo-keyhive";
 // eslint-disable-next-line
@@ -57,20 +57,20 @@ export async function createRepo(
   workerAdapter: MessageChannelNetworkAdapter
 ): Promise<{
   repo: Repo;
-  hive?: AutomergeRepoKeyhive;
+  hive?: AutomergeRepoKeyhiveBase;
   signerIdentity?: SignerIdentity;
 }> {
   if (syncServer.keyhive) {
     log("setting up keyhive");
     initKeyhiveWasm();
-    const { hive, repo } = await initializeAutomergeRepoKeyhiveWithRepo({
+    const { hive, repo } = await initializeLegacyAutomergeRepoKeyhive({
       createRepo: (repoConfig) => new Repo(repoConfig),
       storage: new IndexedDBWorkerStorageAdapter(keyhiveStorageName),
       peerIdSuffix: storagePrefix + Math.random().toString(36).slice(2),
       networkAdapter: workerAdapter,
       automaticArchiveIngestion: true,
       cachingMode: "periodic",
-      onlyShareWithHardcodedServerPeerId: false,
+      onlyShareWithSyncServer: false,
       // ARK selects the relay via `syncServer`, defaulting to "subduction".
       syncServer: syncServer.keyhive,
       repo: {

package/src/site-kit/html.ts

@@ -18,6 +18,12 @@ export function escapeHtml(value: string): string {
 export function buildHtml(options: PatchworkSiteOptions): string {
   const title = options.title ?? DEFAULT_TITLE;
   const lang = (options.html && options.html.lang) || "en";
+  const attributes = Object.entries(
+    (options.html && options.html.attributes) || {}
+  )
+    .filter(([name]) => name !== "lang" && /^[a-z][a-z0-9-]*$/i.test(name))
+    .map(([name, value]) => ` ${name}="${escapeHtml(value)}"`)
+    .join("");
   const entry = options.entry ?? "/src/main.ts";
   const syncServers = resolveSyncServers(options);
 
@@ -90,11 +96,19 @@ export function buildHtml(options: PatchworkSiteOptions): string {
     head.push(options.html.extraHead);
   }
 
+  const body = [
+    `<repo-provider><patchwork-view id="root"></patchwork-view></repo-provider>`,
+    `<script type="module" src="${entry}"></script>`,
+  ];
+
+  if (options.html && options.html.extraBody) {
+    body.push(options.html.extraBody);
+  }
+
   return `<!doctype html>
-<html lang="${lang}">
+<html lang="${lang}"${attributes}>
 ${head.join("\n")}
-<repo-provider><patchwork-view id="root"></patchwork-view></repo-provider>
-<script type="module" src="${entry}"></script>
+${body.join("\n")}
 </html>
 `;
 }

package/src/site-kit/options.ts

@@ -19,8 +19,16 @@ export interface PatchworkIconsOptions {
 
 export interface PatchworkHtmlOptions {
   lang?: string;
-  /** Raw HTML appended just before </html> — e.g. extra <link>/<meta> tags. */
+  /** Raw HTML appended after the generated head — e.g. extra <link>/<meta> tags. */
   extraHead?: string;
+  /** Raw HTML appended after the app root and entry script. */
+  extraBody?: string;
+  /**
+   * Attributes set on the root `<html>` element. How a site states its own
+   * configuration to the packages it loads: a package reads the attribute
+   * instead of guessing from load order. `lang` stays its own option.
+   */
+  attributes?: Record<string, string>;
 }
 
 export interface PatchworkNetlifyOptions {

package/src/types.ts

@@ -1,5 +1,5 @@
 import type { AutomergeUrl, DocHandle, Repo } from "@automerge/vanillajs/slim";
-import type { AutomergeRepoKeyhive } from "@automerge/automerge-repo-keyhive";
+import type { AutomergeRepoKeyhiveBase as AutomergeRepoKeyhive } from "@automerge/automerge-repo-keyhive";
 import type {
   ModuleWatcher,
   HasPatchworkMetadata,

package/src/vite/build-info-plugin.ts

@@ -43,7 +43,7 @@ function describe(directory: string) {
  * revision, the version of patchwork that built it, and every `static` source,
  * plus whatever extra fields the site passes as the option value.
  */
-export function buildInfoPlugin(
+export function buildInfo(
   options: PatchworkVitePluginOptions = {}
 ): Plugin | null {
   if (!options.buildInfo) return null;

package/src/vite/config-plugin.ts

@@ -40,7 +40,7 @@ export function buildDefines(
  * used to hand-write in its own vite.config.ts. Each is switched off
  * individually via the matching `false` option.
  */
-export function configPlugin(
+export function config(
   options: PatchworkVitePluginOptions = {}
 ): Plugin {
   return {

package/src/vite/dev-plugin.ts

@@ -71,7 +71,7 @@ function workerContexts(
   return contexts;
 }
 
-export function devPlugin(options: PatchworkVitePluginOptions = {}): Plugin {
+export function dev(options: PatchworkVitePluginOptions = {}): Plugin {
   let serve = false;
   let contexts: Map<string, Promise<esbuild.BuildContext>> | undefined;
   const wasm = new Map(

package/src/vite/html-plugin.ts

@@ -13,7 +13,7 @@ const GENERATED_PATH = "index.html";
  * virtual module: `resolveId` claims the one id we care about, `load`
  * returns the generated string — nothing ever touches disk.
  */
-export function htmlPlugin(
+export function html(
   options: PatchworkVitePluginOptions = {}
 ): Plugin | null {
   if (options.html === false) return null;

package/src/vite/icons.ts

@@ -4,7 +4,7 @@ import type { PatchworkVitePluginOptions } from "./patchwork-plugin.js";
 import { getIcons } from "../site-kit/icons.js";
 
 /** Emits the rendered icon PNGs for build, and serves the same buffers for dev. */
-export function iconsPlugin(
+export function icons(
   options: PatchworkVitePluginOptions = {}
 ): Plugin | null {
   if (!options.icons) return null;

package/src/vite/importmap-plugin.ts

@@ -4,6 +4,7 @@ import type {
   PatchworkVitePluginOptions,
 } from "./patchwork-plugin.js";
 import { fileURLToPath } from "node:url";
+import { relative } from "node:path";
 
 /**
  * bootloader owns resolving/emitting its own dependencies (it's the one that
@@ -115,11 +116,22 @@ export function importmap(options?: PatchworkVitePluginOptions): Plugin {
     },
     transformIndexHtml: {
       order: "pre",
-      handler(html, context) {
+      async handler(html, context) {
         const activeImportmap = structuredClone(importmap);
         if (context.server) {
+          // The importmap has to name the same URL the site's own imports get
+          // rewritten to, which is the pre-bundled dep. `/@id/<dep>` resolves
+          // to the same file but is a second URL, and a module fetched under
+          // two URLs is evaluated twice — two solids, two automerges.
+          const optimizer = context.server.environments.client.depsOptimizer;
+          await optimizer?.init();
+          const root = context.server.config.root;
           for (const id of Object.keys(builtins)) {
-            activeImportmap.imports[id] = `/@id/${devDependencyId(id)}`;
+            const dependency = devDependencyId(id);
+            const optimized = optimizer?.metadata.optimized[dependency];
+            activeImportmap.imports[id] = optimized
+              ? `/${relative(root, optimized.file)}?v=${optimized.browserHash}`
+              : `/@id/${dependency}`;
           }
         }
         return {

package/src/vite/manifest-plugin.ts

@@ -3,7 +3,7 @@ import type { PatchworkVitePluginOptions } from "./patchwork-plugin.js";
 import { buildManifest } from "../site-kit/manifest.js";
 
 /** Emits manifest.webmanifest for build and serves it for dev, from the same generated object. */
-export function manifestPlugin(
+export function manifest(
   options: PatchworkVitePluginOptions = {}
 ): Plugin | null {
   if (options.manifest === false) return null;

package/src/vite/netlify-plugin.ts

@@ -8,7 +8,7 @@ import { buildHeaders, REDIRECTS } from "../site-kit/netlify.js";
  * The Link header shares its sync-server/wasm-asset lists with html-plugin
  * so the two never drift out of sync with each other.
  */
-export function netlifyPlugin(
+export function netlify(
   options: PatchworkVitePluginOptions = {}
 ): Plugin | null {
   if (options.netlify === false) return null;

package/src/vite/patchwork-plugin.ts

@@ -2,14 +2,14 @@ import type { Plugin, ServerOptions, PreviewOptions, BuildOptions } from "vite";
 
 import { importmap } from "./importmap-plugin.js";
 import { serviceworker } from "./service-worker-plugin.js";
-import { configPlugin, wasm } from "./config-plugin.js";
-import { devPlugin } from "./dev-plugin.js";
-import { iconsPlugin } from "./icons.js";
-import { htmlPlugin } from "./html-plugin.js";
-import { manifestPlugin } from "./manifest-plugin.js";
-import { netlifyPlugin } from "./netlify-plugin.js";
-import { staticPlugin, type PatchworkStaticSource } from "./static-plugin.js";
-import { buildInfoPlugin } from "./build-info-plugin.js";
+import { config, wasm } from "./config-plugin.js";
+import { dev } from "./dev-plugin.js";
+import { icons } from "./icons.js";
+import { html } from "./html-plugin.js";
+import { manifest } from "./manifest-plugin.js";
+import { netlify } from "./netlify-plugin.js";
+import { statics, type PatchworkStaticSource } from "./static-plugin.js";
+import { buildInfo } from "./build-info-plugin.js";
 import type { PatchworkSiteOptions } from "../site-kit/options.js";
 
 /**
@@ -36,19 +36,30 @@ import type { PatchworkSiteOptions } from "../site-kit/options.js";
 export default function patchwork(options?: PatchworkVitePluginOptions) {
   return [
     wasm(),
-    configPlugin(options),
-    iconsPlugin(options),
-    htmlPlugin(options),
-    manifestPlugin(options),
-    netlifyPlugin(options),
+    config(options),
+    icons(options),
+    html(options),
+    manifest(options),
+    netlify(options),
     importmap(options),
     serviceworker(),
-    devPlugin(options),
-    staticPlugin(options),
-    buildInfoPlugin(options),
+    dev(options),
+    statics(options),
+    buildInfo(options),
   ].filter((plugin): plugin is Plugin => plugin != null);
 }
 
+export { importmap, builtins, devDependencyId } from "./importmap-plugin.js";
+export { serviceworker, workers } from "./service-worker-plugin.js";
+export { config, buildDefines, wasm } from "./config-plugin.js";
+export { dev } from "./dev-plugin.js";
+export { icons } from "./icons.js";
+export { html } from "./html-plugin.js";
+export { manifest } from "./manifest-plugin.js";
+export { netlify } from "./netlify-plugin.js";
+export { statics, resolveStatic } from "./static-plugin.js";
+export { buildInfo } from "./build-info-plugin.js";
+
 type Imports = { [name: string]: string };
 export type ImportMap = {
   imports: Imports;

package/src/vite/static-plugin.ts

@@ -177,7 +177,7 @@ async function files(source: string, directory = source): Promise<string[]> {
  * order, and a site keeps its own `modules.json` by listing it before the
  * package it borrows the rest of the packages from.
  */
-export function staticPlugin(
+export function statics(
   options: PatchworkVitePluginOptions = {}
 ): Plugin | null {
   if (!options.static?.length) return null;