@solidjs/web 2.0.0-rc.1 → 2.0.0-rc.3

package/dist/server.cjs

@@ -57,14 +57,18 @@ const transparentOptions = {
 const syncOptions = {
   sync: true
 };
-const effect = (fn, effectFn, options) => solidJs.createRenderEffect(fn, effectFn, options ? {
-  sync: true,
-  ...options,
-  transparent: !options.scope
-} : transparentOptions);
-const memo = fn => solidJs.createMemo(() => fn(), syncOptions);
+function effect(fn, effectFn, options) {
+  solidJs.createRenderEffect(fn, effectFn, options ? {
+    sync: true,
+    ...options,
+    transparent: !options.scope
+  } : transparentOptions);
+}
+function memo(fn) {
+  return solidJs.createMemo(() => fn(), syncOptions);
+}
 
-const STATE = Symbol.for("dom-expressions.container-trace-state");
+const STATE = Symbol.for("solid.container-trace-state");
 const state = globalThis[STATE] || (globalThis[STATE] = {
   materialized: new WeakMap(),
   materializedValues: new WeakSet()
@@ -72,7 +76,10 @@ const state = globalThis[STATE] || (globalThis[STATE] = {
 function setContainerTraceResolver(fn) {
   state.resolveTrace = fn;
 }
-const TRACE = Symbol.for("dom-expressions.container-trace");
+function setContainerTraceStreamMint(fn) {
+  state.streamOf = fn;
+}
+const TRACE = Symbol.for("solid.container-trace");
 function materialize(marker) {
   let value = state.materialized.get(marker.$tr);
   if (value === undefined) {
@@ -84,13 +91,14 @@ function materialize(marker) {
 }
 function parseTrace(value, ctx) {
   const trace = value[TRACE];
+  const sub = trace.subscribe();
   return {
     a: trace.array ? 1 : 0,
-    i: ctx.parse(trace.subscribe())
+    i: ctx.parse(state.streamOf ? state.streamOf(sub) : sub)
   };
 }
 const ContainerTracePlugin = {
-  tag: "dom-expressions/container-trace",
+  tag: "solid/container-trace",
   test(value) {
     return value != null && typeof value === "object" && TRACE in value;
   },
@@ -100,9 +108,10 @@ const ContainerTracePlugin = {
     },
     async async(value, ctx) {
       const trace = value[TRACE];
+      const sub = trace.subscribe();
       return {
         a: trace.array ? 1 : 0,
-        i: await ctx.parse(trace.subscribe())
+        i: await ctx.parse(state.streamOf ? state.streamOf(sub) : sub)
       };
     },
     stream: parseTrace
@@ -120,6 +129,18 @@ const ContainerTracePlugin = {
   }
 };
 
+setContainerTraceStreamMint(iterable => {
+  const stream = seroval.createStream();
+  (async () => {
+    try {
+      for await (const value of iterable) stream.next(value);
+      stream.return(undefined);
+    } catch (error) {
+      stream.throw(error);
+    }
+  })();
+  return stream;
+});
 const DEFAULT_WEB_PLUGINS = Object.freeze([web.AbortSignalPlugin,
 web.CustomEventPlugin, web.DOMExceptionPlugin, web.EventPlugin,
 web.FormDataPlugin, web.HeadersPlugin, web.ReadableStreamPlugin, web.RequestPlugin, web.ResponsePlugin, web.URLSearchParamsPlugin, web.URLPlugin,
@@ -193,11 +214,14 @@ function isSafeError(value) {
   return !!(value && (typeof value === "object" || typeof value === "function") && value[SAFE_ERROR]);
 }
 const REVALIDATE_HEADER = "X-Revalidate";
-function initWithRevalidate(init) {
+function initWithRevalidate(init = {}) {
+  const resolved = typeof init === "number" ? {
+    status: init
+  } : init;
   const {
     revalidate,
     ...responseInit
-  } = init;
+  } = resolved;
   let headers;
   if (responseInit.headers && responseInit.headers.getSetCookie) {
     headers = new Headers();
@@ -223,9 +247,7 @@ function redirect(url, init = 302) {
   const {
     responseInit,
     headers
-  } = initWithRevalidate(typeof init === "number" ? {
-    status: init
-  } : init);
+  } = initWithRevalidate(init);
   if (responseInit.status === undefined) {
     responseInit.status = 302;
   }
@@ -442,6 +464,7 @@ function registerEntryAssets(manifest) {
       const assets = resolveAssets(key, manifest);
       if (assets) {
         for (let i = 0; i < assets.css.length; i++) ctx.registerAsset("style", assets.css[i]);
+        for (let i = 1; i < assets.js.length; i++) ctx.registerAsset("module", assets.js[i]);
       }
       return;
     }
@@ -701,7 +724,7 @@ function emitHeadResource(registry, context, tracking, emitResource, nonce, desc
         if (!styles) tracking.boundaryStyles.set(tracking.currentBoundaryId, styles = new Set());
         styles.add(entry);
       }
-      const markup = `<link${attrHtml}>`;
+      const markup = `<link${attrHtml}${nonceAttr(nonce, "style")}>`;
       if (emitResource) emitResource(markup, entry);else {
         registry.eagerHtml += markup;
         entry.emitted = true;
@@ -799,7 +822,7 @@ function headGroupSignature(winner) {
   }
   return sig;
 }
-function renderShellHead(registry, nonce, isPendingFragment) {
+function renderShellHead(registry, nonce, isPendingFragment, noScripts) {
   commitHeadBoundary(registry, "", isPendingFragment);
   registry.shellFlushed = true;
   const winners = resolveHead(registry.committed);
@@ -809,8 +832,14 @@ function renderShellHead(registry, nonce, isPendingFragment) {
   let metas = "";
   let others = "";
   let scripts = "";
+  let title = null;
   for (const [identity, winner] of winners) {
     registry.flushed.set(identity, headGroupSignature(winner));
+    if (identity === "title") {
+      const children = winner.tags[0].props.children;
+      title = children == null ? "" : String(children);
+      continue;
+    }
     for (let i = 0; i < winner.tags.length; i++) {
       const t = winner.tags[i];
       const markup = renderHeadTagMarkup(t.tag, t.props, identity, nonce);
@@ -819,10 +848,12 @@ function renderShellHead(registry, nonce, isPendingFragment) {
   }
   return {
     prelude,
-    html: registry.eagerHtml + links + metas + others + scripts
+    html: registry.eagerHtml + links + metas + others + scripts,
+    title,
+    noScripts
   };
 }
-function flushHeadFragment(registry, boundary) {
+function flushHeadFragment(registry, boundary, nonce) {
   const groups = commitHeadBoundary(registry, boundary);
   if (!groups.length) return null;
   const winners = resolveHead(registry.committed);
@@ -853,12 +884,87 @@ function flushHeadFragment(registry, boundary) {
         if (v == null || v === false) continue;
         attrs[name] = v === true ? "" : String(v);
       }
+      if (nonce && !hasNonceProp(t.props)) {
+        const destination = nonceDestination(t.tag, t.props);
+        const value = destination && nonce[destination];
+        if (value) attrs.nonce = String(value);
+      }
       const children = t.props.children;
       ops.push(["a", identity, t.tag, attrs, children == null ? null : String(children)]);
     }
   }
   return ops.length ? ops : null;
 }
+function normalizeNonce(nonce) {
+  if (nonce == null) return undefined;
+  if (typeof nonce === "string") {
+    const attr = nonce ? ` nonce="${escape(nonce, true)}"` : "";
+    return {
+      script: nonce,
+      style: nonce,
+      scriptAttr: attr,
+      styleAttr: attr
+    };
+  }
+  const script = nonce.script;
+  const style = nonce.style;
+  if (!script && !style) return undefined;
+  return {
+    script,
+    style,
+    scriptAttr: typeof script === "string" && script ? ` nonce="${escape(script, true)}"` : "",
+    styleAttr: typeof style === "string" && style ? ` nonce="${escape(style, true)}"` : ""
+  };
+}
+function destinationNonce(nonce, destination) {
+  if (nonce == null) return undefined;
+  if (typeof nonce === "string") return nonce || undefined;
+  const value = nonce[destination];
+  return typeof value === "string" && value ? value : undefined;
+}
+function scriptNonce(nonce) {
+  return destinationNonce(nonce, "script");
+}
+function styleNonce(nonce) {
+  return destinationNonce(nonce, "style");
+}
+function asciiLowerCase(value) {
+  return value.replace(/[A-Z]/g, c => String.fromCharCode(c.charCodeAt(0) + 32));
+}
+function hasNonceProp(props) {
+  for (const name in props) if (name.length === 5 && asciiLowerCase(name) === "nonce" && props[name] != null) return true;
+  return false;
+}
+function nonceDestination(tag, props) {
+  if (tag === "script") return "script";
+  if (tag === "style") return "style";
+  if (tag !== "link") return null;
+  const rel = props.rel;
+  if (typeof rel !== "string") return null;
+  const rels = asciiLowerCase(rel).split(/[\t\n\f\r ]+/);
+  if (rels.includes("stylesheet")) return "style";
+  const isModulePreload = rels.includes("modulepreload");
+  if (!isModulePreload && !rels.includes("preload")) return null;
+  const as = typeof props.as === "string" ? asciiLowerCase(props.as) : "";
+  if (as === "style") return "style";
+  if (as === "script") return "script";
+  if (!isModulePreload) return null;
+  switch (as) {
+    case "fetch":
+    case "font":
+    case "image":
+    case "json":
+    case "text":
+    case "track":
+      return null;
+    default:
+      return "script";
+  }
+}
+function nonceAttr(nonce, destination) {
+  if (!nonce || !destination) return "";
+  return destination === "script" ? nonce.scriptAttr : nonce.styleAttr;
+}
 function renderHeadAttrHtml(props) {
   let attrs = "";
   for (const name in props) {
@@ -887,7 +993,7 @@ function headAttrRecord(props, skipRelHref) {
 function renderHeadTagMarkup(tag, props, identity, nonce) {
   let attrs = renderHeadAttrHtml(props);
   if (identity != null) attrs += ` data-dh="${escape(identity, true)}"`;
-  if (nonce && (tag === "script" || tag === "style")) attrs += ` nonce="${nonce}"`;
+  if (nonce && !hasNonceProp(props)) attrs += nonceAttr(nonce, nonceDestination(tag, props));
   if (tag === "meta" || tag === "link" || tag === "base") return `<${tag}${attrs}>`;
   let body = props.children == null ? "" : String(props.children);
   if (tag === "script") body = body.replace(/<\/(script)/gi, "<\\/$1");else if (tag === "style") body = escapeStyleContent(body);else body = escape(body);
@@ -902,15 +1008,15 @@ function useHead(tags) {
 }
 const VOID_ELEMENTS = /^(?:area|base|br|col|embed|hr|img|input|keygen|link|menuitem|meta|param|source|track|wbr)$/i;
 const REPLACE_SCRIPT = `function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById("pl-"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!=="pl-"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById("pl-"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue==="pl-"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}`;
-const HEAD_SCRIPT = `function $dha(o,i,e,n){for(i=0;i<o.length;i++)e=o[i],"t"==e[0]?((n=document.querySelector("title"))||(n=document.createElement("title"),document.head.appendChild(n)),n.textContent=e[1],n.setAttribute("data-dh","title")):"r"==e[0]?$dhr(e[1]):(n=document.createElement(e[2]),Object.keys(e[3]).forEach(function(a){n.setAttribute(a,e[3][a])}),null!=e[4]&&(n.textContent=e[4]),n.setAttribute("data-dh",e[1]),document.head.appendChild(n))}function $dhr(v,l,i){for(l=document.head.querySelectorAll("[data-dh]"),i=0;i<l.length;i++)l[i].getAttribute("data-dh")==v&&l[i].remove()}function $dh(o){_$HY.h?_$HY.h(o):$dha(o)}`;
+const HEAD_SCRIPT = `function $dha(o,i,e,n){for(i=0;i<o.length;i++)e=o[i],"t"==e[0]?((n=document.querySelector("title"))?n.hasAttribute("data-dh")||n.setAttribute("data-dhf",n.textContent):(n=document.createElement("title"),document.head.appendChild(n)),n.textContent=e[1],n.setAttribute("data-dh","title")):"r"==e[0]?$dhr(e[1]):(n=document.createElement(e[2]),Object.keys(e[3]).forEach(function(a){n.setAttribute(a,e[3][a])}),null!=e[4]&&(n.textContent=e[4]),n.setAttribute("data-dh",e[1]),document.head.appendChild(n))}function $dhr(v,l,i){for(l=document.head.querySelectorAll("[data-dh]"),i=0;i<l.length;i++)l[i].getAttribute("data-dh")==v&&l[i].remove()}function $dh(o){_$HY.h?_$HY.h(o):$dha(o)}`;
 function renderToString(code, options = {}) {
   const {
     renderId = "",
-    nonce,
     noScripts,
     manifest,
     onHead
   } = options;
+  const nonce = normalizeNonce(options.nonce);
   let scripts = "";
   const serializer = createHydrationSerializer({
     scopeId: renderId,
@@ -927,7 +1033,7 @@ function renderToString(code, options = {}) {
   const tracking = createAssetTracking();
   const headRegistry = createHeadRegistry();
   solidJs.sharedConfig.context = {
-    nonce,
+    nonce: options.nonce,
     escape: escape,
     resolve: resolveSSRNode,
     ssr: ssr,
@@ -968,12 +1074,11 @@ function renderToString(code, options = {}) {
   serializeFragmentAssets("", tracking.boundaryModules, solidJs.sharedConfig.context, renderId);
   solidJs.sharedConfig.context.noHydrate = true;
   serializer.close();
-  const head = renderShellHead(headRegistry, nonce, null);
+  const head = renderShellHead(headRegistry, nonce, null, noScripts);
   return assembleDocument(resolveSSRSelectValues(html), tracking.emittedAssets, tracking.inlineStyles, scripts.length ? scripts : "", nonce, head, onHead);
 }
 function renderToStream(code, options = {}) {
   let {
-    nonce,
     onCompleteShell,
     onCompleteAll,
     renderId = "",
@@ -981,6 +1086,7 @@ function renderToStream(code, options = {}) {
     manifest,
     onHead
   } = options;
+  const nonce = normalizeNonce(options.nonce);
   let dispose;
   let dead = false;
   const abandon = () => {
@@ -1005,6 +1111,32 @@ function renderToStream(code, options = {}) {
     } catch (_) {}
     abandon();
   };
+  const coalesceWrites = (writeRaw, endRaw) => {
+    let buf = "";
+    let scheduled = false;
+    const flush = () => {
+      scheduled = false;
+      if (!buf) return;
+      const out = buf;
+      buf = "";
+      writeRaw(out);
+    };
+    return {
+      write(payload) {
+        buf += payload;
+        if (buf.length >= 16384) return flush();
+        if (!scheduled) {
+          scheduled = true;
+          deferFlush(flush);
+        }
+      },
+      flush,
+      end() {
+        flush();
+        endRaw();
+      }
+    };
+  };
   const guardSink = w => ({
     write(payload) {
       if (dead) return;
@@ -1024,6 +1156,23 @@ function renderToStream(code, options = {}) {
     }
   });
   const blockingPromises = new Set();
+  const canBatchStubs = !options.serializer && !options.sink;
+  let stubBatch = null;
+  const STUB_BATCH_KEY = "$B";
+  const flushStubBatch = () => {
+    if (!stubBatch) return;
+    const batch = stubBatch;
+    stubBatch = null;
+    if (batch.size === 1) {
+      const [id, p] = batch.entries().next().value;
+      serializer.write(id, p);
+      return;
+    }
+    const obj = {};
+    for (const [id, p] of batch) obj[id] = p;
+    serializer.write(STUB_BATCH_KEY, obj);
+    pushTask(`(b=>{for(var k in b)_$HY.r[k]=b[k];delete _$HY.r["${STUB_BATCH_KEY}"]})(_$HY.r["${STUB_BATCH_KEY}"])`);
+  };
   let headerEmitted = false;
   const pushTask = task => {
     if (noScripts) return;
@@ -1060,10 +1209,11 @@ function renderToStream(code, options = {}) {
         buffer.write(renderInlineStyle(styles.inline[i], nonce));
       }
       if (styles.links.length) {
+        const styleAttr = nonceAttr(nonce, "style");
         emitTask(`$dfs("${key}",${styles.links.length},${deferActivation ? 1 : 0})`);
         writeTasks();
         for (const entry of styles.links) {
-          buffer.write(typeof entry === "string" ? `<link rel="stylesheet" href="${entry}" onload="$dfc('${key}')" onerror="$dfc('${key}')">` : `<link${entry.attrHtml} onload="$dfc('${key}')" onerror="$dfc('${key}')">`);
+          buffer.write(typeof entry === "string" ? `<link rel="stylesheet" href="${entry}"${styleAttr} onload="$dfc('${key}')" onerror="$dfc('${key}')">` : `<link${entry.attrHtml}${styleAttr} onload="$dfc('${key}')" onerror="$dfc('${key}')">`);
         }
         buffer.write(`<template id="${key}">${value}</template>`);
       } else {
@@ -1078,7 +1228,7 @@ function renderToStream(code, options = {}) {
     },
     asset(type, value) {
       if (type === "module") {
-        buffer.write(`<link rel="modulepreload" href="${value}">`);
+        buffer.write(`<link rel="modulepreload" href="${value}"${nonceAttr(nonce, "script")}>`);
       } else if (type === "inline-style") {
         buffer.write(renderInlineStyle(value, nonce));
       } else if (type === "head-tag") {
@@ -1113,6 +1263,7 @@ function renderToStream(code, options = {}) {
           context.live.end = null;
           end();
         }
+        flushStubBatch();
         serializer.flush();
       }));
     }
@@ -1120,7 +1271,7 @@ function renderToStream(code, options = {}) {
   const registry = new Map();
   const writeTasks = () => {
     if (tasks.length && !completed && firstFlushed) {
-      buffer.write(`<script${nonce ? ` nonce="${nonce}"` : ""}>${tasks}</script>`);
+      buffer.write(`<script${nonceAttr(nonce, "script")}>${tasks}</script>`);
       tasks = "";
     }
     timer = null;
@@ -1174,7 +1325,7 @@ function renderToStream(code, options = {}) {
   };
   solidJs.sharedConfig.context = context = {
     async: true,
-    nonce,
+    nonce: options.nonce,
     live: {},
     registerHeadTags(tags) {
       registerHeadTags(headRegistry, context, tracking,
@@ -1232,10 +1383,18 @@ function renderToStream(code, options = {}) {
     },
     serialize(id, p, deferStream) {
       if (solidJs.sharedConfig.context.noHydrate) return;
-      if (!firstFlushed && deferStream && typeof p === "object" && "then" in p) {
-        blockingPromises.add(p);
-        p.then(d => serializer.write(id, d)).catch(e => serializer.write(id, e));
-      } else serializer.write(id, p);
+      if (!firstFlushed && p && typeof p === "object" && "then" in p) {
+        if (deferStream) {
+          blockingPromises.add(p);
+          p.then(d => serializer.write(id, d)).catch(e => serializer.write(id, e));
+          return;
+        }
+        if (canBatchStubs && !shellCompleted) {
+          (stubBatch ||= new Map()).set(id, p);
+          return;
+        }
+      }
+      serializer.write(id, p);
     },
     escape: escape,
     resolve: resolveSSRNode,
@@ -1269,7 +1428,7 @@ function renderToStream(code, options = {}) {
             queue(flushEnd);
           }))
         });
-        serializer.write(key + "_fr", p);
+        if (canBatchStubs && !shellCompleted) (stubBatch ||= new Map()).set(key + "_fr", p);else serializer.write(key + "_fr", p);
       }
       return (value, error) => {
         if (registry.has(key)) {
@@ -1300,7 +1459,7 @@ function renderToStream(code, options = {}) {
             } else {
               serializeFragmentAssets(key, tracking.boundaryModules, context);
               const styles = collectStreamStyles(key, tracking, headStyles);
-              const headOps = error ? null : flushHeadFragment(headRegistry, key);
+              const headOps = error ? null : flushHeadFragment(headRegistry, key, nonce);
               if (headOps) emitHeadOps(key, headOps);
               sink.fragment(key, resolveSSRSelectValues(value !== undefined ? value : " "), {
                 styles,
@@ -1386,14 +1545,17 @@ function renderToStream(code, options = {}) {
   function doShell() {
     if (shellCompleted) return;
     solidJs.sharedConfig.context = context;
+    const blockersBefore = blockingPromises.size;
     if (!resolveRootHoles()) return;
+    if (blockingPromises.size !== blockersBefore) return;
     if (!headShellReady(headRegistry, p => blockingPromises.add(p))) return;
     headStyles = new Set();
     for (const url of tracking.emittedAssets) {
       if (isCssUrl(url)) headStyles.add(url);
     }
     serializeRootAssets();
-    const head = renderShellHead(headRegistry, nonce, k => registry.has(k));
+    flushStubBatch();
+    const head = renderShellHead(headRegistry, nonce, k => registry.has(k), noScripts);
     sink.shell(resolveSSRSelectValues(html), {
       preloads: tracking.emittedAssets,
       inlineStyles: tracking.inlineStyles,
@@ -1414,6 +1576,7 @@ function renderToStream(code, options = {}) {
   let drainTurn = 0;
   const scheduleFlush = fn => {
     const attempt = () => {
+      flushStubBatch();
       if (registry.size !== lastRegistrySize || drainTurn++ < MIN_DRAIN_TURNS) {
         if (registry.size !== lastRegistrySize) drainTurn = 0;
         lastRegistrySize = registry.size;
@@ -1461,22 +1624,18 @@ function renderToStream(code, options = {}) {
             }
           };
           writer.closed && writer.closed.catch(failed);
-          writable = {
-            end() {
-              pendingWrites.then(() => {
-                ended = true;
-                writer.releaseLock();
-                w.close().catch(() => {});
-                resolve();
-              });
-            }
-          };
-          buffer = {
-            write(payload) {
-              pendingWrites = pendingWrites.then(() => writer.write(encoder.encode(payload))).catch(failed);
-            }
-          };
+          buffer = writable = coalesceWrites(payload => {
+            pendingWrites = pendingWrites.then(() => writer.write(encoder.encode(payload))).catch(failed);
+          }, () => {
+            pendingWrites.then(() => {
+              ended = true;
+              writer.releaseLock();
+              w.close().catch(() => {});
+              resolve();
+            });
+          });
           buffer.write(tmp);
+          buffer.flush();
           firstFlushed = true;
           if (completed) {
             dispose();
@@ -1506,7 +1665,8 @@ function renderToStream(code, options = {}) {
           allSettled(blockingPromises).then(() => {
             scheduleFlush(() => {
               try {
-                if (!resolveRootHoles() || !headShellReady(headRegistry, p => blockingPromises.add(p))) return flush();
+                const blockersBefore = blockingPromises.size;
+                if (!resolveRootHoles() || blockingPromises.size !== blockersBefore || !headShellReady(headRegistry, p => blockingPromises.add(p))) return flush();
               } catch (err) {
                 failRender(err);
                 return resolve(tmp);
@@ -1535,8 +1695,10 @@ function renderToStream(code, options = {}) {
               return;
             }
             if (!shellCompleted) return flush();
-            buffer = writable = guardSink(w);
+            const sink = guardSink(w);
+            buffer = writable = coalesceWrites(sink.write, sink.end);
             buffer.write(tmp);
+            buffer.flush();
             firstFlushed = true;
             if (completed) {
               dispose();
@@ -1563,9 +1725,7 @@ function renderToStream(code, options = {}) {
   };
 }
 function HydrationScript(props) {
-  const {
-    nonce
-  } = solidJs.sharedConfig.context;
+  const nonce = scriptNonce(solidJs.sharedConfig.context && solidJs.sharedConfig.context.nonce);
   return ssr(generateHydrationScript({
     nonce,
     ...props
@@ -1722,6 +1882,15 @@ function createLiveHoles(sink, scoped) {
   const stamp = typeof solidJs.creationStamp === "function" ? solidJs.creationStamp : () => 0;
   const inScope = scoped && typeof solidJs.inServerComponentScope === "function" ? solidJs.inServerComponentScope : null;
   const stripMarkers = html => html.replace(/<!--lh:\/?\d+-->/g, "");
+  const swept = (owner, ctx, fn) => {
+    const prev = solidJs.sharedConfig.context;
+    solidJs.sharedConfig.context = ctx;
+    try {
+      return owner ? solidJs.runWithOwner(owner, fn) : fn();
+    } finally {
+      solidJs.sharedConfig.context = prev;
+    }
+  };
   function resolveHoleValue(hole) {
     const result = {
       t: [""],
@@ -1787,6 +1956,7 @@ function createLiveHoles(sink, scoped) {
       const recordsBefore = engine.recordStamp;
       const ownersBefore = stamp();
       const owner = solidJs.getOwner();
+      const holeCtx = solidJs.sharedConfig.context;
       const b = {
         key: null,
         children: [],
@@ -1800,7 +1970,7 @@ function createLiveHoles(sink, scoped) {
           const sweepOwnersBefore = stamp();
           let res;
           try {
-            res = owner ? solidJs.runWithOwner(owner, () => resolveHoleValue(hole)) : resolveHoleValue(hole);
+            res = swept(owner, holeCtx, () => resolveHoleValue(hole));
           } catch (err) {
             b.closed = true;
             sink.closeBinding(b.key);
@@ -1908,6 +2078,7 @@ function createLiveHoles(sink, scoped) {
     },
     attr(cap) {
       const owner = solidJs.getOwner();
+      const holeCtx = solidJs.sharedConfig.context;
       const b = {
         key: "lha:" + cap.id,
         children: [],
@@ -1943,7 +2114,7 @@ function createLiveHoles(sink, scoped) {
                 if (vt === "string" || vt === "number") html += v;
               }
             };
-            owner ? solidJs.runWithOwner(owner, run) : run();
+            swept(owner, holeCtx, run);
           } catch (err) {
             if (solidJs.ssrHandleError(err, true)) return;
             b.closed = true;
@@ -2279,6 +2450,32 @@ function ssrHydrationKey() {
   const hk = getHydrationKey();
   return hk ? ` _hk=${hk}` : "";
 }
+const CLAIM_PROP = /*#__PURE__*/Symbol.for("solid.claim-prop");
+const CLAIMS_STREAM = 1;
+const CLAIMS_DOCUMENT = 2;
+const CLAIM_UNSAFE = /[^A-Za-z0-9_.!~*'()-]/g;
+function encodeClaimKey(key) {
+  return String(key).replace(CLAIM_UNSAFE, c => encodeURIComponent(c));
+}
+function ssrClaim(map) {
+  const mode = solidJs.sharedConfig.context && solidJs.sharedConfig.context.claims;
+  if (!mode || mode === CLAIMS_DOCUMENT && !(typeof solidJs.inServerComponentScope === "function" && solidJs.inServerComponentScope())) {
+    return "";
+  }
+  let out = "";
+  for (const pos in map) {
+    const value = map[pos];
+    const list = Array.isArray(value) ? value : [value];
+    for (const fn of list) {
+      const prop = typeof fn === "function" && fn[CLAIM_PROP] || undefined;
+      if (prop === undefined) {
+        continue;
+      }
+      out += `${out ? "," : ""}${pos}=${encodeClaimKey(prop)}`;
+    }
+  }
+  return out ? ` _bnd="${out}"` : "";
+}
 function decodeSSREntities(s) {
   return s.indexOf("&") < 0 ? s : s.replace(/&quot;/g, '"').replace(/&lt;/g, "<").replace(/&amp;/g, "&");
 }
@@ -2311,22 +2508,49 @@ function tagIs(html, i, name) {
   const c = html.charCodeAt(i + 1 + name.length);
   return c === 32 || c === 62 || c === 9 || c === 10 || c === 13;
 }
+let selectValuesActive = false;
+function ssrSelectValues() {
+  selectValuesActive = true;
+}
 function resolveSSRSelectValues(html) {
-  if (html.indexOf("<select") < 0) return html;
+  if (!selectValuesActive) return html;
+  let cand = html.indexOf("<select");
+  if (cand < 0) return html;
   let out = "";
   let idx = 0;
-  let sel = null;
-  let i = html.indexOf("<");
-  while (i >= 0) {
-    let e;
-    if (html.charCodeAt(i + 1) === 33) {
-      e = html.charCodeAt(i + 2) === 45 ? html.indexOf("-->", i) : html.indexOf(">", i);
-      if (e < 0) break;
-      if (html.charCodeAt(i + 2) === 45) e += 2;
-    } else {
-      e = tagEnd(html, i);
-      if (e < 0) break;
-      if (sel) {
+  while (cand >= 0) {
+    if (!tagIs(html, cand, "select")) {
+      cand = html.indexOf("<select", cand + 7);
+      continue;
+    }
+    const e0 = tagEnd(html, cand);
+    if (e0 < 0) break;
+    const open = html.slice(cand, e0 + 1);
+    const m = SELECT_VALUE_ATTR.exec(open);
+    if (!m) {
+      cand = html.indexOf("<select", e0 + 1);
+      continue;
+    }
+    const bound = decodeSSREntities(m[1]);
+    const sel = {
+      values: /\smultiple(?=[\s>=])/.test(open) ? bound.split(",") : [bound],
+      strip: cand + m.index,
+      stripEnd: cand + m.index + m[0].length,
+      body: e0 + 1,
+      marks: [],
+      defaulted: false
+    };
+    let committed = false;
+    let i = html.indexOf("<", e0 + 1);
+    while (i >= 0) {
+      let e;
+      if (html.charCodeAt(i + 1) === 33) {
+        e = html.charCodeAt(i + 2) === 45 ? html.indexOf("-->", i) : html.indexOf(">", i);
+        if (e < 0) break;
+        if (html.charCodeAt(i + 2) === 45) e += 2;
+      } else {
+        e = tagEnd(html, i);
+        if (e < 0) break;
         if (html.startsWith("</select>", i)) {
           out += html.slice(idx, sel.strip) + html.slice(sel.stripEnd, sel.body);
           let seg = sel.body;
@@ -2338,7 +2562,8 @@ function resolveSSRSelectValues(html) {
           }
           out += html.slice(seg, i);
           idx = i;
-          sel = null;
+          committed = true;
+          break;
         } else if (tagIs(html, i, "option")) {
           const attrs = html.slice(i + 7, e);
           if (/\sselected(?=[\s=]|$)/.test(attrs)) sel.defaulted = true;else {
@@ -2347,23 +2572,13 @@ function resolveSSRSelectValues(html) {
             if (sel.values.includes(value)) sel.marks.push(e);
           }
         }
-      } else if (tagIs(html, i, "select")) {
-        const m = SELECT_VALUE_ATTR.exec(html.slice(i, e + 1));
-        if (m) {
-          const bound = decodeSSREntities(m[1]);
-          sel = {
-            values: /\smultiple(?=[\s>=])/.test(html.slice(i, e + 1)) ? bound.split(",") : [bound],
-            strip: i + m.index,
-            stripEnd: i + m.index + m[0].length,
-            body: e + 1,
-            marks: [],
-            defaulted: false
-          };
-        }
       }
+      i = html.indexOf("<", e + 1);
     }
-    i = html.indexOf("<", e + 1);
+    if (!committed) break;
+    cand = html.indexOf("<select", idx);
   }
+  if (idx === 0) return html;
   return out + html.slice(idx);
 }
 function escape(s, attr) {
@@ -2387,22 +2602,20 @@ function escape(s, attr) {
   return escapeSlow(s, attr, i);
 }
 const ESCAPE_CONTENT = /[&<]/;
-const ESCAPE_ATTR = /[&"]/;
+const ESCAPE_ATTR = /[&"<]/;
 function escapeSlow(s, attr, start) {
-  const delim = attr ? '"' : "<";
-  const delimCode = attr ? 34 : 60;
-  const escDelim = attr ? "&quot;" : "&lt;";
+  if (attr) return escapeAttrSlow(s, start);
   const c0 = s.charCodeAt(start);
-  let iDelim = c0 === delimCode ? start : s.indexOf(delim, start);
+  let iDelim = c0 === 60 ? start : s.indexOf("<", start);
   let iAmp = c0 === 38 ? start : s.indexOf("&", start);
   let left = 0,
     out = "";
   while (iDelim >= 0 && iAmp >= 0) {
     if (iDelim < iAmp) {
       if (left < iDelim) out += s.substring(left, iDelim);
-      out += escDelim;
+      out += "&lt;";
       left = iDelim + 1;
-      iDelim = s.indexOf(delim, left);
+      iDelim = s.indexOf("<", left);
     } else {
       if (left < iAmp) out += s.substring(left, iAmp);
       out += "&amp;";
@@ -2413,9 +2626,9 @@ function escapeSlow(s, attr, start) {
   if (iDelim >= 0) {
     do {
       if (left < iDelim) out += s.substring(left, iDelim);
-      out += escDelim;
+      out += "&lt;";
       left = iDelim + 1;
-      iDelim = s.indexOf(delim, left);
+      iDelim = s.indexOf("<", left);
     } while (iDelim >= 0);
   } else while (iAmp >= 0) {
     if (left < iAmp) out += s.substring(left, iAmp);
@@ -2425,6 +2638,36 @@ function escapeSlow(s, attr, start) {
   }
   return left < s.length ? out + s.substring(left) : out;
 }
+function escapeAttrSlow(s, start) {
+  const c0 = s.charCodeAt(start);
+  let iQuot = c0 === 34 ? start : s.indexOf('"', start);
+  let iAmp = c0 === 38 ? start : s.indexOf("&", start);
+  let iLt = c0 === 60 ? start : s.indexOf("<", start);
+  let left = 0,
+    out = "";
+  for (;;) {
+    let i = -1,
+      ent;
+    if (iQuot >= 0) {
+      i = iQuot;
+      ent = "&quot;";
+    }
+    if (iAmp >= 0 && (i < 0 || iAmp < i)) {
+      i = iAmp;
+      ent = "&amp;";
+    }
+    if (iLt >= 0 && (i < 0 || iLt < i)) {
+      i = iLt;
+      ent = "&lt;";
+    }
+    if (i < 0) break;
+    if (left < i) out += s.substring(left, i);
+    out += ent;
+    left = i + 1;
+    if (i === iQuot) iQuot = s.indexOf('"', left);else if (i === iAmp) iAmp = s.indexOf("&", left);else iLt = s.indexOf("<", left);
+  }
+  return left < s.length ? out + s.substring(left) : out;
+}
 function tryJoinPlainSSRArray(nodes) {
   if (nodes.length === 0) return undefined;
   let out = "";
@@ -2448,11 +2691,12 @@ function generateHydrationScript({
   eventNames = ["click", "input"],
   nonce
 } = {}) {
-  return `<script${nonce ? ` nonce="${nonce}"` : ""}>window._$HY||(e=>{let t=e=>e&&e.hasAttribute&&(e.hasAttribute("_hk")?e:t(e.host&&e.host.nodeType?e.host:e.parentNode));["${eventNames.join('","')}"].forEach((o=>document.addEventListener(o,(o=>{if(!e.events)return;let s=t(o.composedPath&&o.composedPath()[0]||o.target);s&&!e.completed.has(s)&&e.events.push([s,o])}))))})(_$HY={events:[],completed:new WeakSet,r:{},fe(){}});</script><!--xs-->`;
+  return `<script${nonce ? ` nonce="${escape(String(nonce), true)}"` : ""}>window._$HY||(e=>{let t=e=>e&&e.hasAttribute&&(e.hasAttribute("_hk")?e:t(e.host&&e.host.nodeType?e.host:e.parentNode));["${eventNames.join('","')}"].forEach((o=>document.addEventListener(o,(o=>{if(!e.events)return;let s=t(o.composedPath&&o.composedPath()[0]||o.target);s&&!e.completed.has(s)&&e.events.push([s,o])}))))})(_$HY={events:[],completed:new WeakSet,r:{},fe(){}});</script><!--xs-->`;
 }
 function queue(fn) {
   return Promise.resolve().then(fn);
 }
+const deferFlush = typeof setImmediate === "function" ? setImmediate : fn => setTimeout(fn, 0);
 function allSettled(promises) {
   let size = promises.size;
   return Promise.allSettled(promises).then(() => {
@@ -2461,10 +2705,11 @@ function allSettled(promises) {
   });
 }
 function assembleDocument(html, emittedAssets, inlineStyles, scripts, nonce, headTags, onHead) {
-  const scriptTag = scripts ? `<script${nonce ? ` nonce="${nonce}"` : ""}>${scripts}</script>` : "";
-  const headTagsHtml = headTags ? headTags.html : "";
+  const scriptTag = scripts ? `<script${nonceAttr(nonce, "script")}>${scripts}</script>` : "";
+  const title = headTags ? headTags.title : null;
+  let headTagsHtml = headTags ? headTags.html : "";
   const headPrelude = headTags ? headTags.prelude : "";
-  if (!onHead && !headTagsHtml && !headPrelude && !(emittedAssets && emittedAssets.size) && !(inlineStyles && inlineStyles.size)) {
+  if (!onHead && title == null && !headTagsHtml && !headPrelude && !(emittedAssets && emittedAssets.size) && !(inlineStyles && inlineStyles.size)) {
     if (!scriptTag) return html;
     const xs = html.indexOf("<!--xs-->");
     return xs === -1 ? html + scriptTag : html.slice(0, xs) + scriptTag + html.slice(xs);
@@ -2476,15 +2721,33 @@ function assembleDocument(html, emittedAssets, inlineStyles, scripts, nonce, hea
       html = html.slice(0, at) + headPrelude + html.slice(at);
     }
   }
-  const headIdx = html.indexOf("</head>");
+  let headIdx = html.indexOf("</head>");
   if (headIdx === -1) {
     if (onHead) {
-      onHead(headPrelude + headTagsHtml + renderHeadAssets(emittedAssets, inlineStyles, nonce));
+      let titleHtml = "";
+      if (title != null) {
+        titleHtml = headTags.noScripts ? `<title data-dh="title">${escape(title)}</title>` : `<script${nonceAttr(nonce, "script")}>(function(x,t){(t=document.querySelector("title"))?(t.hasAttribute("data-dh")||t.setAttribute("data-dhf",t.textContent),t.textContent=x):(document.title=x,t=document.querySelector("title"));t&&t.setAttribute("data-dh","title")})(${JSON.stringify(title).replace(/</g, "\\u003C")})</script>`;
+      }
+      onHead(headPrelude + headTagsHtml + titleHtml + renderHeadAssets(emittedAssets, inlineStyles, nonce));
     }
     if (!scriptTag) return html;
     const xs = html.indexOf("<!--xs-->");
     return xs === -1 ? html + scriptTag : html.slice(0, xs) + scriptTag + html.slice(xs);
   }
+  if (title != null) {
+    const winner = escape(title);
+    const open = html.match(/<head(?:\s[^>]*)?>/);
+    const from = open ? open.index + open[0].length : 0;
+    const m = /<title(\s[^>]*)?>([\s\S]*?)<\/title>/.exec(html.slice(from, headIdx));
+    if (m) {
+      const at = from + m.index;
+      const stash = m[2].replace(/"/g, "&quot;");
+      html = html.slice(0, at) + `<title${m[1] || ""} data-dh="title" data-dhf="${stash}">${winner}</title>` + html.slice(at + m[0].length);
+      headIdx = html.indexOf("</head>");
+    } else {
+      headTagsHtml = `<title data-dh="title">${winner}</title>` + headTagsHtml;
+    }
+  }
   const head = headTagsHtml + renderHeadAssets(emittedAssets, inlineStyles, nonce);
   if (!scriptTag) return html.slice(0, headIdx) + head + html.slice(headIdx);
   const xsIdx = html.indexOf("<!--xs-->");
@@ -2493,9 +2756,11 @@ function assembleDocument(html, emittedAssets, inlineStyles, scripts, nonce, hea
 }
 function renderHeadAssets(emittedAssets, inlineStyles, nonce) {
   let head = "";
+  const styleAttr = nonceAttr(nonce, "style");
+  const scriptAttr = nonceAttr(nonce, "script");
   if (emittedAssets && emittedAssets.size) {
     for (const url of emittedAssets) {
-      head += isCssUrl(url) ? `<link rel="stylesheet" href="${url}">` : `<link rel="modulepreload" href="${url}">`;
+      head += isCssUrl(url) ? `<link rel="stylesheet" href="${url}"${styleAttr}>` : `<link rel="modulepreload" href="${url}"${scriptAttr}>`;
     }
   }
   if (inlineStyles && inlineStyles.size) {
@@ -2557,12 +2822,15 @@ function escapeStyleContent(content) {
 }
 function renderInlineStyle(entry, nonce) {
   let attrs = "";
+  let hasNonce = false;
   if (entry.attrs) {
     for (const name in entry.attrs) {
+      if (name.length === 5 && asciiLowerCase(name) === "nonce") hasNonce = true;
       attrs += ` ${name}="${escape(String(entry.attrs[name]), true)}"`;
     }
   }
-  return `<style${nonce ? ` nonce="${nonce}"` : ""} data-asset="${escape(entry.id, true)}"${attrs}>${escapeStyleContent(entry.content)}</style>`;
+  const nonceHtml = hasNonce ? "" : nonceAttr(nonce, "style");
+  return `<style${nonceHtml} data-asset="${escape(entry.id, true)}"${attrs}>${escapeStyleContent(entry.content)}</style>`;
 }
 function waitForFragments(registry, key) {
   for (const k of [...registry.keys()].reverse()) {
@@ -2804,16 +3072,13 @@ function deriveHead(stub, responseInit = {}) {
     headers
   };
 }
-function escapeAttribute(value) {
-  return value.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;");
-}
 function createSSRResponse(result, event, options = {}) {
   const stub = event && event.response;
   const {
     responseInit,
-    nonce,
     transformChunk
   } = options;
+  const nonce = normalizeNonce(options.nonce);
   if (typeof result === "string") {
     if (stub) commitResponseStub(stub);
     const head = deriveHead(stub, responseInit);
@@ -2883,7 +3148,7 @@ function createSSRResponse(result, event, options = {}) {
         if (closed || !controller) return;
         const location = stub && stub.headers.get("Location");
         if (location) {
-          const attr = nonce ? ` nonce="${escapeAttribute(nonce)}"` : "";
+          const attr = nonceAttr(nonce, "script");
           enqueue(`<script${attr}>window.location=${JSON.stringify(location).replace(/</g, "\\u003c")}</script>`);
         }
         closed = true;
@@ -3120,10 +3385,17 @@ Object.defineProperty(exports, "scope", {
   enumerable: true,
   get: function () { return solidJs.ssrScope; }
 });
+Object.defineProperty(exports, "sharedConfig", {
+  enumerable: true,
+  get: function () { return solidJs.sharedConfig; }
+});
 Object.defineProperty(exports, "untrack", {
   enumerable: true,
   get: function () { return solidJs.untrack; }
 });
+exports.CLAIMS_DOCUMENT = CLAIMS_DOCUMENT;
+exports.CLAIMS_STREAM = CLAIMS_STREAM;
+exports.CLAIM_PROP = CLAIM_PROP;
 exports.ChildProperties = ChildProperties;
 exports.DOMElements = DOMElements;
 exports.DOMWithState = DOMWithState;
@@ -3195,9 +3467,11 @@ exports.reload = reload;
 exports.render = notSup;
 exports.renderToStream = renderToStream;
 exports.renderToString = renderToString;
+exports.resolveSSRNode = resolveSSRNode;
 exports.resolveSSRSelectValues = resolveSSRSelectValues;
 exports.respond = respond;
 exports.runHydrationEvents = notSup;
+exports.scriptNonce = scriptNonce;
 exports.serializeCookie = serializeCookie;
 exports.setAttribute = notSup;
 exports.setAttributeNS = notSup;
@@ -3206,13 +3480,16 @@ exports.setStyleProperty = notSup;
 exports.spread = notSup;
 exports.ssr = ssr;
 exports.ssrAttribute = ssrAttribute;
+exports.ssrClaim = ssrClaim;
 exports.ssrClassName = ssrClassName;
 exports.ssrElement = ssrElement;
 exports.ssrGroup = ssrGroup;
 exports.ssrHydrationKey = ssrHydrationKey;
+exports.ssrSelectValues = ssrSelectValues;
 exports.ssrStyle = ssrStyle;
 exports.ssrStyleProperty = ssrStyleProperty;
 exports.style = notSup;
+exports.styleNonce = styleNonce;
 exports.template = notSup;
 exports.unregisterDelegatedContainer = notSup;
 exports.unregisterDelegatedRoot = notSup;