@inkandswitch/patchwork-bootloader 0.4.2 → 0.4.4

package/dist/types.d.ts

@@ -133,7 +133,24 @@ export interface HandoffResponseMessage {
     type: "response";
     response: HandoffResponse;
 }
-export type HandoffReplyMessage = HandoffCachedMessage | HandoffResponseMessage;
+/**
+ * Automerge worker → service worker: fail the request as a network error
+ * rather than serving any response at all.
+ *
+ * "Heads haven't arrived yet" is not a 404 — the document may well exist, so
+ * a status implying it doesn't is a lie any HTTP cache is entitled to store.
+ * A network error is the honest answer and isn't storable as a response.
+ *
+ * This does *not* help with `import()`: the ES module map memoizes failed
+ * fetches, network errors included, so a retry needs a distinct URL either
+ * way (see `importModule` in patchwork-filesystem).
+ */
+export interface HandoffAbortMessage {
+    id: string;
+    type: "abort";
+    reason: string;
+}
+export type HandoffReplyMessage = HandoffCachedMessage | HandoffResponseMessage | HandoffAbortMessage;
 /**
  * Automerge worker → world: broadcast once on startup so the service worker
  * can re-send any handoff requests that raced the worker's boot.

package/dist/vite/importmap-plugin.js

@@ -1,5 +1,6 @@
 import { readFileSync } from "node:fs";
 import { createRequire } from "node:module";
+import { fileURLToPath } from "node:url";
 const require = createRequire(import.meta.url);
 /**
  * these dependencies will be built into the outdir,
@@ -8,8 +9,28 @@ const require = createRequire(import.meta.url);
 import externals from "../externals.js";
 export const builtins = externals.reduce((builtins, name) => ((builtins[name] = `/packages/${name}.js`), builtins), {});
 /**
- * merge the importmap option with our builtins
+ * pretend the import came from inside this package, so node_modules resolution
+ * walks up from *our* directory and finds our copy of each external. that's why
+ * a consuming site never has to install them or agree with us about versions.
  */
+const self = fileURLToPath(import.meta.url);
+/**
+ * resolve an external from our node_modules rather than the site's.
+ *
+ * this goes through rollup's resolver rather than import.meta.resolve or
+ * require.resolve because those apply node's conditions: subduction (and
+ * others) would hand us `dist/esm/node.js`, which imports node:path and blows
+ * up at bundle time. rollup applies the browser conditions vite configured.
+ */
+async function resolveExternal(name) {
+    const resolved = await this.resolve(name, self, { skipSelf: true });
+    if (!resolved) {
+        throw new Error(`@patchwork/vite: couldn't resolve the external "${name}" from ` +
+            `@inkandswitch/patchwork-bootloader. it should be one of the ` +
+            `bootloader's own dependencies.`);
+    }
+    return resolved.id;
+}
 function createImportMap(options) {
     const importmap = structuredClone(options?.importmap ?? { imports: {}, scopes: {} });
     importmap.imports ??= {};
@@ -26,11 +47,11 @@ export function importmap(options) {
                 this.emitFile({
                     type: "chunk",
                     fileName: fileName.slice(1),
-                    id,
+                    id: await resolveExternal.call(this, id),
                     preserveSignature: "strict",
                 });
             }
-            // Emit automerge, keyhive, and subduction wasm so the service worker can fetch them
+            // Emitted so the service worker can fetch them
             const automergeWasmPath = require.resolve("@automerge/automerge/automerge.wasm");
             this.emitFile({
                 type: "asset",
@@ -43,7 +64,6 @@ export function importmap(options) {
                 fileName: "keyhive_wasm.wasm",
                 source: readFileSync(keyhiveWasmPath),
             });
-            // Emit subduction wasm so the service worker can fetch it
             const subdWasmPath = require.resolve("@automerge/automerge-subduction/wasm");
             this.emitFile({
                 type: "asset",
@@ -51,8 +71,14 @@ export function importmap(options) {
                 source: readFileSync(subdWasmPath),
             });
         },
-        resolveId(id) {
-            if (id in importmap.imports && !(id in builtins)) {
+        async resolveId(id) {
+            if (id in builtins) {
+                // point the site's own imports at the same copy we emit as a chunk,
+                // otherwise rollup bundles a second one out of the site's node_modules
+                // and you end up with two automerges racing to init the same wasm
+                return resolveExternal.call(this, id);
+            }
+            if (id in importmap.imports) {
                 return { id: importmap.imports[id], external: true };
             }
         },

package/package.json

@@ -1,11 +1,10 @@
 {
   "name": "@inkandswitch/patchwork-bootloader",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "author": "chee",
   "type": "module",
   "license": "MIT",
   "devDependencies": {
-    "@automerge/automerge-repo-keyhive": "0.3.0-alpha.sub.8b",
     "esbuild": "^0.23.1",
     "rollup": "^4.61.1"
   },
@@ -46,27 +45,47 @@
   "dependencies": {
     "@automerge/automerge": "3.3.2",
     "@automerge/automerge-repo": "2.6.0-subduction.46",
-    "@automerge/automerge-repo-network-messagechannel": "2.6.0-subduction.45",
-    "@automerge/automerge-repo-network-websocket": "2.6.0-subduction.45",
-    "@automerge/automerge-repo-storage-indexeddb": "2.6.0-subduction.45",
+    "@automerge/automerge-repo-keyhive": "0.3.0-alpha.sub.8b",
+    "@automerge/automerge-repo-network-messagechannel": "2.6.0-subduction.46",
+    "@automerge/automerge-repo-network-websocket": "2.6.0-subduction.46",
+    "@automerge/automerge-repo-storage-indexeddb": "2.6.0-subduction.46",
     "@automerge/automerge-subduction": "0.16.0",
-    "@automerge/vanillajs": "2.6.0-subduction.45",
+    "@automerge/vanillajs": "2.6.0-subduction.46",
+    "@codemirror/commands": "^6.10.4",
+    "@codemirror/language": "^6.12.4",
+    "@codemirror/state": "^6.7.1",
+    "@codemirror/view": "^6.43.6",
     "@keyhive/keyhive": "0.1.0-alpha.5",
     "@types/debug": "^4.1.13",
     "debug": "^4.4.3",
     "resolve.exports": "^2.0.3",
     "service-worker-types": "npm:@types/serviceworker@^0.0.153",
+    "solid-js": "^1.9.13",
     "tinyargs": "^0.1.4",
-    "@inkandswitch/patchwork-elements": "^4.0.0",
-    "@inkandswitch/patchwork-filesystem": "^0.2.0",
-    "@inkandswitch/patchwork-plugins": "^1.0.0",
-    "@inkandswitch/patchwork-providers": "^0.4.0"
+    "@inkandswitch/patchwork-elements": "^4.0.1",
+    "@inkandswitch/patchwork-filesystem": "^0.2.2",
+    "@inkandswitch/patchwork-plugins": "^1.0.1",
+    "@inkandswitch/patchwork-providers": "^0.4.2"
   },
   "peerDependencies": {
     "@automerge/automerge": "3.3.2",
     "@automerge/automerge-repo": "2.6.0-subduction.46",
     "@automerge/automerge-repo-keyhive": "0.3.0-alpha.sub.8b",
-    "@automerge/vanillajs": "2.6.0-subduction.45"
+    "@automerge/vanillajs": "2.6.0-subduction.46"
+  },
+  "peerDependenciesMeta": {
+    "@automerge/automerge": {
+      "optional": true
+    },
+    "@automerge/automerge-repo": {
+      "optional": true
+    },
+    "@automerge/automerge-repo-keyhive": {
+      "optional": true
+    },
+    "@automerge/vanillajs": {
+      "optional": true
+    }
   },
   "scripts": {
     "build": "tsc",