@jundle/cloudflare 0.0.1-14 → 0.0.1-15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jundle/cloudflare",
-  "version": "0.0.1-14",
+  "version": "0.0.1-15",
   "description": "Cloudflare Workers runtime for the jundle dev server (workerd via Miniflare).",
   "license": "ISC",
   "type": "module",

package/src/harness.js

@@ -220,16 +220,50 @@ async function syncVersion() {
 // document in a worker), and surfacing it would trip the
 // hot client's first-update overlay rule and force a full
 // reload on the next update instead of HMR.
+//
+// The re-import can install a second (browser) shim over
+// the dev shim's globals — client.browser.js imports
+// ./shim.js first, so any module importing the client
+// runtime installs it as a side effect — and the
+// client's chunkCache skips re-loading chunks, so a
+// poisoned global makes the next render require through
+// an empty shim ("has not been loaded yet"). Snapshot the
+// four shim globals before the re-import and restore
+// them before the push lands (finally, so a failed
+// import cannot leave them poisoned). A snapshot of
+// undefined restores by deleting the global, not by
+// assigning undefined (the shim was not installed yet).
+const SHIM_GLOBALS = [
+  "__webpack_require__",
+  "__webpack_chunk_load__",
+  "__webpack_get_script_filename__",
+  "__jundleFlight",
+];
+function snapshotShimGlobals() {
+  return SHIM_GLOBALS.map((name) => [name, globalThis[name]]);
+}
+function restoreShimGlobals(saved) {
+  for (const [name, value] of saved) {
+    if (value === undefined) delete globalThis[name];
+    else globalThis[name] = value;
+  }
+}
 async function pushSsrUpdates(clientKeys) {
   for (const key of clientKeys) {
     const [env, file] = key.split("\0");
     const url = `/@jundle/module?env=${encodeURIComponent(env)}&file=${encodeURIComponent(file)}`;
+    const saved = snapshotShimGlobals();
+    let rec;
+    let ok = false;
     try {
-      const rec = await ensureModuleByUrl(url);
-      globalThis.__jundleFlight?.updateModule?.(url, rec.exports);
+      rec = await ensureModuleByUrl(url);
+      ok = true;
     } catch (e) {
       console.error(`[jundle runner] SSR push ${url}: ${e && e.message ? e.message : String(e)}`);
+    } finally {
+      restoreShimGlobals(saved);
     }
+    if (ok) globalThis.__jundleFlight?.updateModule?.(url, rec.exports);
   }
 }