solid-js 1.7.0-beta.2 → 1.7.0-beta.3

package/dist/server.cjs

@@ -420,7 +420,7 @@ function ErrorBoundary(props) {
   if (error) return displayFallback();
   sync = false;
   return {
-    t: `<!e${id}>${resolveSSRNode(res)}<!/e${id}>`
+    t: `<!!$e${id}>${resolveSSRNode(res)}<!!$/e${id}>`
   };
 }
 const SuspenseContext = createContext();

package/dist/server.js

@@ -418,7 +418,7 @@ function ErrorBoundary(props) {
   if (error) return displayFallback();
   sync = false;
   return {
-    t: `<!e${id}>${resolveSSRNode(res)}<!/e${id}>`
+    t: `<!!$e${id}>${resolveSSRNode(res)}<!!$/e${id}>`
   };
 }
 const SuspenseContext = createContext();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "1.7.0-beta.2",
+  "version": "1.7.0-beta.3",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",

package/web/dist/dev.cjs

@@ -119,7 +119,7 @@ function render(code, element, init, options = {}) {
     element.textContent = "";
   };
 }
-function template(html, isSVG, isCE) {
+function template(html, isCE, isSVG) {
   let node;
   const create = () => {
     const t = document.createElement("template");
@@ -397,7 +397,7 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
     let cleaned = [];
     for (let i = 0; i < current.length; i++) {
       const node = current[i];
-      if (node.nodeType === 8 && node.data === "!") node.remove();else cleaned.push(node);
+      if (node.nodeType === 8 && node.data.slice(0, 2) === "!$") node.remove();else cleaned.push(node);
     }
     current = cleaned;
   }

package/web/dist/dev.js

@@ -118,7 +118,7 @@ function render(code, element, init, options = {}) {
     element.textContent = "";
   };
 }
-function template(html, isSVG, isCE) {
+function template(html, isCE, isSVG) {
   let node;
   const create = () => {
     const t = document.createElement("template");
@@ -396,7 +396,7 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
     let cleaned = [];
     for (let i = 0; i < current.length; i++) {
       const node = current[i];
-      if (node.nodeType === 8 && node.data === "!") node.remove();else cleaned.push(node);
+      if (node.nodeType === 8 && node.data.slice(0, 2) === "!$") node.remove();else cleaned.push(node);
     }
     current = cleaned;
   }

package/web/dist/server.cjs

@@ -125,10 +125,10 @@ function renderToStream(code, options = {}) {
     },
     replace(id, payloadFn) {
       if (firstFlushed) return;
-      const placeholder = `<!${id}>`;
+      const placeholder = `<!!$${id}>`;
       const first = html.indexOf(placeholder);
       if (first === -1) return;
-      const last = html.indexOf(`<!/${id}>`, first + placeholder.length);
+      const last = html.indexOf(`<!!$/${id}>`, first + placeholder.length);
       html = html.replace(html.slice(first, last + placeholder.length + 1), resolveSSRNode(payloadFn()));
     },
     writeResource(id, p, error, wait) {
@@ -388,7 +388,7 @@ function resolveSSRNode(node) {
     let prev = {};
     let mapped = "";
     for (let i = 0, len = node.length; i < len; i++) {
-      if (typeof prev !== "object" && typeof node[i] !== "object") mapped += `<!--!-->`;
+      if (typeof prev !== "object" && typeof node[i] !== "object") mapped += `<!--!$-->`;
       mapped += resolveSSRNode(prev = node[i]);
     }
     return mapped;

package/web/dist/server.js

@@ -124,10 +124,10 @@ function renderToStream(code, options = {}) {
     },
     replace(id, payloadFn) {
       if (firstFlushed) return;
-      const placeholder = `<!${id}>`;
+      const placeholder = `<!!$${id}>`;
       const first = html.indexOf(placeholder);
       if (first === -1) return;
-      const last = html.indexOf(`<!/${id}>`, first + placeholder.length);
+      const last = html.indexOf(`<!!$/${id}>`, first + placeholder.length);
       html = html.replace(html.slice(first, last + placeholder.length + 1), resolveSSRNode(payloadFn()));
     },
     writeResource(id, p, error, wait) {
@@ -387,7 +387,7 @@ function resolveSSRNode(node) {
     let prev = {};
     let mapped = "";
     for (let i = 0, len = node.length; i < len; i++) {
-      if (typeof prev !== "object" && typeof node[i] !== "object") mapped += `<!--!-->`;
+      if (typeof prev !== "object" && typeof node[i] !== "object") mapped += `<!--!$-->`;
       mapped += resolveSSRNode(prev = node[i]);
     }
     return mapped;

package/web/dist/web.cjs

@@ -119,7 +119,7 @@ function render(code, element, init, options = {}) {
     element.textContent = "";
   };
 }
-function template(html, isSVG, isCE) {
+function template(html, isCE, isSVG) {
   let node;
   const create = () => {
     const t = document.createElement("template");
@@ -397,7 +397,7 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
     let cleaned = [];
     for (let i = 0; i < current.length; i++) {
       const node = current[i];
-      if (node.nodeType === 8 && node.data === "!") node.remove();else cleaned.push(node);
+      if (node.nodeType === 8 && node.data.slice(0, 2) === "!$") node.remove();else cleaned.push(node);
     }
     current = cleaned;
   }

package/web/dist/web.js

@@ -118,7 +118,7 @@ function render(code, element, init, options = {}) {
     element.textContent = "";
   };
 }
-function template(html, isSVG, isCE) {
+function template(html, isCE, isSVG) {
   let node;
   const create = () => {
     const t = document.createElement("template");
@@ -396,7 +396,7 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
     let cleaned = [];
     for (let i = 0; i < current.length; i++) {
       const node = current[i];
-      if (node.nodeType === 8 && node.data === "!") node.remove();else cleaned.push(node);
+      if (node.nodeType === 8 && node.data.slice(0, 2) === "!$") node.remove();else cleaned.push(node);
     }
     current = cleaned;
   }

package/web/types/client.d.ts

@@ -10,7 +10,7 @@ export function getPropAlias(prop: string, tagName: string): string | undefined;
 
 type MountableElement = Element | Document | ShadowRoot | DocumentFragment | Node;
 export function render(code: () => JSX.Element, element: MountableElement): () => void;
-export function template(html: string, isSVG?: boolean, isCE?: boolean): () => Element;
+export function template(html: string, isCE?: boolean, isSVG?: boolean): () => Element;
 export function effect<T>(fn: (prev?: T) => T, init?: T): void;
 export function memo<T>(fn: () => T, equal: boolean): () => T;
 export function untrack<T>(fn: () => T): T;