@solidjs/universal 2.0.0-experimental.4 → 2.0.0-experimental.5

package/dist/dev.cjs

@@ -2,6 +2,8 @@
 
 var solidJs = require('solid-js');
 
+const memo = fn => solidJs.createMemo(() => fn());
+
 function createRenderer({
   createElement,
   createTextNode,
@@ -164,7 +166,7 @@ function createRenderer({
         prevProps.children = value;
       });
     }
-    solidJs.createRenderEffect(() => props.ref && props.ref(node), () => ({}));
+    solidJs.createRenderEffect(() => props.ref && props.ref(node), () => {});
     solidJs.createRenderEffect(() => {
       const newProps = {};
       for (const prop in props) {
@@ -203,7 +205,7 @@ function createRenderer({
     },
     mergeProps: solidJs.merge,
     effect: solidJs.createRenderEffect,
-    memo: solidJs.createMemo,
+    memo,
     createComponent: solidJs.createComponent,
     use(fn, element, arg) {
       return solidJs.untrack(() => fn(element, arg));

package/dist/dev.js

@@ -1,12 +1,6 @@
-import {
-  createRoot,
-  merge,
-  createRenderEffect,
-  createMemo,
-  createComponent,
-  untrack,
-  flatten
-} from "solid-js";
+import { createMemo, createRoot, merge, createRenderEffect, createComponent, untrack, flatten } from 'solid-js';
+
+const memo = fn => createMemo(() => fn());
 
 function createRenderer({
   createElement,
@@ -25,14 +19,9 @@ function createRenderer({
     if (multi && !initial) initial = [];
     if (typeof accessor !== "function") {
       accessor = normalize(accessor, multi, true);
-      if (typeof accessor !== "function")
-        return insertExpression(parent, accessor, initial, marker);
+      if (typeof accessor !== "function") return insertExpression(parent, accessor, initial, marker);
     }
-    createRenderEffect(
-      () => normalize(accessor, multi),
-      (value, current) => insertExpression(parent, value, current, marker),
-      initial
-    );
+    createRenderEffect(() => normalize(accessor, multi), (value, current) => insertExpression(parent, value, current, marker), initial);
   }
   function insertExpression(parent, value, current, marker) {
     if (value === current) return;
@@ -58,7 +47,7 @@ function createRenderer({
         } else if (current == null) {
           appendNodes(parent, value);
         } else {
-          reconcileArrays(parent, (multi && current) || [getFirstChild(parent)], value);
+          reconcileArrays(parent, multi && current || [getFirstChild(parent)], value);
         }
       }
     } else {
@@ -104,8 +93,7 @@ function createRenderer({
         bEnd--;
       }
       if (aEnd === aStart) {
-        const node =
-          bEnd < bLength ? (bStart ? getNextSibling(b[bStart - 1]) : b[bEnd - bStart]) : after;
+        const node = bEnd < bLength ? bStart ? getNextSibling(b[bStart - 1]) : b[bEnd - bStart] : after;
         while (bStart < bEnd) insertNode(parentNode, b[bStart++], node);
       } else if (bEnd === bStart) {
         while (aStart < aEnd) {
@@ -145,7 +133,7 @@ function createRenderer({
   function cleanChildren(parent, current, marker, replacement) {
     if (marker === undefined) {
       let removed;
-      while ((removed = getFirstChild(parent))) removeNode(parent, removed);
+      while (removed = getFirstChild(parent)) removeNode(parent, removed);
       replacement && insertNode(parent, replacement);
       return "";
     }
@@ -155,11 +143,7 @@ function createRenderer({
         const el = current[i];
         if (replacement !== el) {
           const isParent = getParentNode(el) === parent;
-          if (replacement && !inserted && !i)
-            isParent
-              ? replaceNode(parent, replacement, el)
-              : insertNode(parent, replacement, marker);
-          else isParent && removeNode(parent, el);
+          if (replacement && !inserted && !i) isParent ? replaceNode(parent, replacement, el) : insertNode(parent, replacement, marker);else isParent && removeNode(parent, el);
         } else inserted = true;
       }
     } else if (replacement) insertNode(parent, replacement, marker);
@@ -175,37 +159,28 @@ function createRenderer({
     const prevProps = {};
     props || (props = {});
     if (!skipChildren) {
-      createRenderEffect(
-        () => normalize(props.children),
-        value => {
-          insertExpression(node, value, prevProps.children);
-          prevProps.children = value;
-        }
-      );
+      createRenderEffect(() => normalize(props.children), value => {
+        insertExpression(node, value, prevProps.children);
+        prevProps.children = value;
+      });
     }
-    createRenderEffect(
-      () => props.ref && props.ref(node),
-      () => ({})
-    );
-    createRenderEffect(
-      () => {
-        const newProps = {};
-        for (const prop in props) {
-          if (prop === "children" || prop === "ref") continue;
-          const value = props[prop];
-          if (value === prevProps[prop]) continue;
-          newProps[prop] = value;
-        }
-        return newProps;
-      },
-      props => {
-        for (const prop in props) {
-          const value = props[prop];
-          setProperty(node, prop, value, prevProps[prop]);
-          prevProps[prop] = value;
-        }
+    createRenderEffect(() => props.ref && props.ref(node), () => {});
+    createRenderEffect(() => {
+      const newProps = {};
+      for (const prop in props) {
+        if (prop === "children" || prop === "ref") continue;
+        const value = props[prop];
+        if (value === prevProps[prop]) continue;
+        newProps[prop] = value;
+      }
+      return newProps;
+    }, props => {
+      for (const prop in props) {
+        const value = props[prop];
+        setProperty(node, prop, value, prevProps[prop]);
+        prevProps[prop] = value;
       }
-    );
+    });
     return prevProps;
   }
   return {
@@ -228,7 +203,7 @@ function createRenderer({
     },
     mergeProps: merge,
     effect: createRenderEffect,
-    memo: createMemo,
+    memo,
     createComponent,
     use(fn, element, arg) {
       return untrack(() => fn(element, arg));

package/dist/universal.cjs

@@ -2,6 +2,8 @@
 
 var solidJs = require('solid-js');
 
+const memo = fn => solidJs.createMemo(() => fn());
+
 function createRenderer({
   createElement,
   createTextNode,
@@ -164,7 +166,7 @@ function createRenderer({
         prevProps.children = value;
       });
     }
-    solidJs.createRenderEffect(() => props.ref && props.ref(node), () => ({}));
+    solidJs.createRenderEffect(() => props.ref && props.ref(node), () => {});
     solidJs.createRenderEffect(() => {
       const newProps = {};
       for (const prop in props) {
@@ -203,7 +205,7 @@ function createRenderer({
     },
     mergeProps: solidJs.merge,
     effect: solidJs.createRenderEffect,
-    memo: solidJs.createMemo,
+    memo,
     createComponent: solidJs.createComponent,
     use(fn, element, arg) {
       return solidJs.untrack(() => fn(element, arg));

package/dist/universal.js

@@ -1,12 +1,6 @@
-import {
-  createRoot,
-  merge,
-  createRenderEffect,
-  createMemo,
-  createComponent,
-  untrack,
-  flatten
-} from "solid-js";
+import { createMemo, createRoot, merge, createRenderEffect, createComponent, untrack, flatten } from 'solid-js';
+
+const memo = fn => createMemo(() => fn());
 
 function createRenderer({
   createElement,
@@ -25,14 +19,9 @@ function createRenderer({
     if (multi && !initial) initial = [];
     if (typeof accessor !== "function") {
       accessor = normalize(accessor, multi, true);
-      if (typeof accessor !== "function")
-        return insertExpression(parent, accessor, initial, marker);
+      if (typeof accessor !== "function") return insertExpression(parent, accessor, initial, marker);
     }
-    createRenderEffect(
-      () => normalize(accessor, multi),
-      (value, current) => insertExpression(parent, value, current, marker),
-      initial
-    );
+    createRenderEffect(() => normalize(accessor, multi), (value, current) => insertExpression(parent, value, current, marker), initial);
   }
   function insertExpression(parent, value, current, marker) {
     if (value === current) return;
@@ -58,7 +47,7 @@ function createRenderer({
         } else if (current == null) {
           appendNodes(parent, value);
         } else {
-          reconcileArrays(parent, (multi && current) || [getFirstChild(parent)], value);
+          reconcileArrays(parent, multi && current || [getFirstChild(parent)], value);
         }
       }
     } else {
@@ -104,8 +93,7 @@ function createRenderer({
         bEnd--;
       }
       if (aEnd === aStart) {
-        const node =
-          bEnd < bLength ? (bStart ? getNextSibling(b[bStart - 1]) : b[bEnd - bStart]) : after;
+        const node = bEnd < bLength ? bStart ? getNextSibling(b[bStart - 1]) : b[bEnd - bStart] : after;
         while (bStart < bEnd) insertNode(parentNode, b[bStart++], node);
       } else if (bEnd === bStart) {
         while (aStart < aEnd) {
@@ -145,7 +133,7 @@ function createRenderer({
   function cleanChildren(parent, current, marker, replacement) {
     if (marker === undefined) {
       let removed;
-      while ((removed = getFirstChild(parent))) removeNode(parent, removed);
+      while (removed = getFirstChild(parent)) removeNode(parent, removed);
       replacement && insertNode(parent, replacement);
       return "";
     }
@@ -155,11 +143,7 @@ function createRenderer({
         const el = current[i];
         if (replacement !== el) {
           const isParent = getParentNode(el) === parent;
-          if (replacement && !inserted && !i)
-            isParent
-              ? replaceNode(parent, replacement, el)
-              : insertNode(parent, replacement, marker);
-          else isParent && removeNode(parent, el);
+          if (replacement && !inserted && !i) isParent ? replaceNode(parent, replacement, el) : insertNode(parent, replacement, marker);else isParent && removeNode(parent, el);
         } else inserted = true;
       }
     } else if (replacement) insertNode(parent, replacement, marker);
@@ -175,37 +159,28 @@ function createRenderer({
     const prevProps = {};
     props || (props = {});
     if (!skipChildren) {
-      createRenderEffect(
-        () => normalize(props.children),
-        value => {
-          insertExpression(node, value, prevProps.children);
-          prevProps.children = value;
-        }
-      );
+      createRenderEffect(() => normalize(props.children), value => {
+        insertExpression(node, value, prevProps.children);
+        prevProps.children = value;
+      });
     }
-    createRenderEffect(
-      () => props.ref && props.ref(node),
-      () => ({})
-    );
-    createRenderEffect(
-      () => {
-        const newProps = {};
-        for (const prop in props) {
-          if (prop === "children" || prop === "ref") continue;
-          const value = props[prop];
-          if (value === prevProps[prop]) continue;
-          newProps[prop] = value;
-        }
-        return newProps;
-      },
-      props => {
-        for (const prop in props) {
-          const value = props[prop];
-          setProperty(node, prop, value, prevProps[prop]);
-          prevProps[prop] = value;
-        }
+    createRenderEffect(() => props.ref && props.ref(node), () => {});
+    createRenderEffect(() => {
+      const newProps = {};
+      for (const prop in props) {
+        if (prop === "children" || prop === "ref") continue;
+        const value = props[prop];
+        if (value === prevProps[prop]) continue;
+        newProps[prop] = value;
+      }
+      return newProps;
+    }, props => {
+      for (const prop in props) {
+        const value = props[prop];
+        setProperty(node, prop, value, prevProps[prop]);
+        prevProps[prop] = value;
       }
-    );
+    });
     return prevProps;
   }
   return {
@@ -228,7 +203,7 @@ function createRenderer({
     },
     mergeProps: merge,
     effect: createRenderEffect,
-    memo: createMemo,
+    memo,
     createComponent,
     use(fn, element, arg) {
       return untrack(() => fn(element, arg));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@solidjs/universal",
   "description": "Solid's universal runtime for creating custom renderers",
-  "version": "2.0.0-experimental.4",
+  "version": "2.0.0-experimental.5",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -37,10 +37,10 @@
     "./types/*": "./types/*"
   },
   "peerDependencies": {
-    "solid-js": "^2.0.0-experimental.4"
+    "solid-js": "^2.0.0-experimental.5"
   },
   "devDependencies": {
-    "solid-js": "2.0.0-experimental.4"
+    "solid-js": "2.0.0-experimental.5"
   },
   "scripts": {
     "build": "npm-run-all -nl build:*",