solid-js 1.3.2 → 1.3.3

package/dist/dev.cjs

@@ -1332,6 +1332,9 @@ function lazy(fn) {
     }
     let Comp;
     return createMemo(() => (Comp = comp()) && untrack(() => {
+      Object.assign(Comp, {
+        [$DEVCOMP]: true
+      });
       if (!ctx) return Comp(props);
       const c = sharedConfig.context;
       setHydrateContext(ctx);
@@ -1519,7 +1522,6 @@ function Suspense(props) {
         setHydrateContext(ctx);
         set();
         setHydrateContext();
-        p = undefined;
       });
     }
   }
@@ -1546,6 +1548,7 @@ function Suspense(props) {
           dispose && dispose();
           if ((!inFallback || p !== undefined) && visibleContent) {
             store.resolved = true;
+            ctx = p = undefined;
             resumeEffects(store.effects);
             return rendered;
           }

package/dist/dev.js

@@ -1328,6 +1328,9 @@ function lazy(fn) {
     }
     let Comp;
     return createMemo(() => (Comp = comp()) && untrack(() => {
+      Object.assign(Comp, {
+        [$DEVCOMP]: true
+      });
       if (!ctx) return Comp(props);
       const c = sharedConfig.context;
       setHydrateContext(ctx);
@@ -1515,7 +1518,6 @@ function Suspense(props) {
         setHydrateContext(ctx);
         set();
         setHydrateContext();
-        p = undefined;
       });
     }
   }
@@ -1542,6 +1544,7 @@ function Suspense(props) {
           dispose && dispose();
           if ((!inFallback || p !== undefined) && visibleContent) {
             store.resolved = true;
+            ctx = p = undefined;
             resumeEffects(store.effects);
             return rendered;
           }

package/dist/solid.cjs

@@ -1438,7 +1438,6 @@ function Suspense(props) {
         setHydrateContext(ctx);
         set();
         setHydrateContext();
-        p = undefined;
       });
     }
   }
@@ -1465,6 +1464,7 @@ function Suspense(props) {
           dispose && dispose();
           if ((!inFallback || p !== undefined) && visibleContent) {
             store.resolved = true;
+            ctx = p = undefined;
             resumeEffects(store.effects);
             return rendered;
           }

package/dist/solid.js

@@ -1434,7 +1434,6 @@ function Suspense(props) {
         setHydrateContext(ctx);
         set();
         setHydrateContext();
-        p = undefined;
       });
     }
   }
@@ -1461,6 +1460,7 @@ function Suspense(props) {
           dispose && dispose();
           if ((!inFallback || p !== undefined) && visibleContent) {
             store.resolved = true;
+            ctx = p = undefined;
             resumeEffects(store.effects);
             return rendered;
           }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -144,5 +144,5 @@
     "compiler",
     "performance"
   ],
-  "gitHead": "b0aa7b227de8a3b4dc686690207d54a8af244efc"
+  "gitHead": "58f98c55a3573b23f683978c8828bbda563ae666"
 }

package/store/package.json

@@ -9,5 +9,27 @@
   "unpkg": "./dist/store.cjs",
   "types": "./types/index.d.ts",
   "type": "module",
-  "sideEffects": false
+  "sideEffects": false,
+  "exports": {
+    ".": {
+      "browser": {
+        "development": {
+          "import": "./dist/dev.js",
+          "require": "./dist/dev.cjs"
+        },
+        "import": "./dist/store.js",
+        "require": "./dist/store.cjs"
+      },
+      "node": {
+        "import": "./dist/server.js",
+        "require": "./dist/server.cjs"
+      },
+      "development": {
+        "import": "./dist/dev.js",
+        "require": "./dist/dev.cjs"
+      },
+      "import": "./dist/store.js",
+      "require": "./dist/store.cjs"
+    }
+  }
 }

package/universal/package.json

@@ -4,5 +4,15 @@
   "module": "./dist/universal.js",
   "types": "./types/index.d.ts",
   "type": "module",
-  "sideEffects": false
+  "sideEffects": false,
+  "exports": {
+    ".": {
+      "development": {
+        "import": "./dist/dev.js",
+        "require": "./dist/dev.cjs"
+      },
+      "import": "./dist/universal.js",
+      "require": "./dist/universal.cjs"
+    }
+  }
 }

package/web/dist/dev.cjs

@@ -404,13 +404,13 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
     }
     current = array;
   } else if (value instanceof Node) {
-    if (solidJs.sharedConfig.context) return current = value.parentNode ? value : current;
+    if (solidJs.sharedConfig.context) return current = value.parentNode ? multi ? [value] : value : current;
     if (Array.isArray(current)) {
       if (multi) return current = cleanChildren(parent, current, marker, value);
       cleanChildren(parent, current, null, value);
     } else if (current == null || current === "" || !parent.firstChild) {
       parent.appendChild(value);
-    } else parent.replaceChild(value, multi ? current : parent.firstChild);
+    } else parent.replaceChild(value, parent.firstChild);
     current = value;
   } else console.warn(`Unrecognized value. Skipped inserting`, value);
   return current;
@@ -453,7 +453,7 @@ function cleanChildren(parent, current, marker, replacement) {
         if (!inserted && !i) isParent ? parent.replaceChild(node, el) : parent.insertBefore(node, marker);else isParent && el.remove();
       } else inserted = true;
     }
-  } else if (current instanceof Node) parent.replaceChild(node, current);else parent.insertBefore(node, marker);
+  } else parent.insertBefore(node, marker);
   return [node];
 }
 function gatherHydratable(element, root) {
@@ -540,6 +540,9 @@ function Dynamic(props) {
     const component = p.component;
     switch (typeof component) {
       case "function":
+        Object.assign(component, {
+          [solidJs.$DEVCOMP]: true
+        });
         return solidJs.untrack(() => component(others));
       case "string":
         const isSvg = SVGElements.has(component);

package/web/dist/dev.js

@@ -1,4 +1,4 @@
-import { createMemo, createRoot, createRenderEffect, sharedConfig, enableHydration, createSignal, onCleanup, splitProps, untrack } from 'solid-js';
+import { createMemo, createRoot, createRenderEffect, sharedConfig, enableHydration, createSignal, onCleanup, splitProps, $DEVCOMP, untrack } from 'solid-js';
 export { ErrorBoundary, For, Index, Match, Show, Suspense, SuspenseList, Switch, createComponent, createRenderEffect as effect, getOwner, mergeProps } from 'solid-js';
 
 const booleans = ["allowfullscreen", "async", "autofocus", "autoplay", "checked", "controls", "default", "disabled", "formnovalidate", "hidden", "indeterminate", "ismap", "loop", "multiple", "muted", "nomodule", "novalidate", "open", "playsinline", "readonly", "required", "reversed", "seamless", "selected"];
@@ -401,13 +401,13 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
     }
     current = array;
   } else if (value instanceof Node) {
-    if (sharedConfig.context) return current = value.parentNode ? value : current;
+    if (sharedConfig.context) return current = value.parentNode ? multi ? [value] : value : current;
     if (Array.isArray(current)) {
       if (multi) return current = cleanChildren(parent, current, marker, value);
       cleanChildren(parent, current, null, value);
     } else if (current == null || current === "" || !parent.firstChild) {
       parent.appendChild(value);
-    } else parent.replaceChild(value, multi ? current : parent.firstChild);
+    } else parent.replaceChild(value, parent.firstChild);
     current = value;
   } else console.warn(`Unrecognized value. Skipped inserting`, value);
   return current;
@@ -450,7 +450,7 @@ function cleanChildren(parent, current, marker, replacement) {
         if (!inserted && !i) isParent ? parent.replaceChild(node, el) : parent.insertBefore(node, marker);else isParent && el.remove();
       } else inserted = true;
     }
-  } else if (current instanceof Node) parent.replaceChild(node, current);else parent.insertBefore(node, marker);
+  } else parent.insertBefore(node, marker);
   return [node];
 }
 function gatherHydratable(element, root) {
@@ -537,6 +537,9 @@ function Dynamic(props) {
     const component = p.component;
     switch (typeof component) {
       case "function":
+        Object.assign(component, {
+          [$DEVCOMP]: true
+        });
         return untrack(() => component(others));
       case "string":
         const isSvg = SVGElements.has(component);

package/web/dist/web.cjs

@@ -403,13 +403,13 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
     }
     current = array;
   } else if (value instanceof Node) {
-    if (solidJs.sharedConfig.context) return current = value.parentNode ? value : current;
+    if (solidJs.sharedConfig.context) return current = value.parentNode ? multi ? [value] : value : current;
     if (Array.isArray(current)) {
       if (multi) return current = cleanChildren(parent, current, marker, value);
       cleanChildren(parent, current, null, value);
     } else if (current == null || current === "" || !parent.firstChild) {
       parent.appendChild(value);
-    } else parent.replaceChild(value, multi ? current : parent.firstChild);
+    } else parent.replaceChild(value, parent.firstChild);
     current = value;
   } else ;
   return current;
@@ -452,7 +452,7 @@ function cleanChildren(parent, current, marker, replacement) {
         if (!inserted && !i) isParent ? parent.replaceChild(node, el) : parent.insertBefore(node, marker);else isParent && el.remove();
       } else inserted = true;
     }
-  } else if (current instanceof Node) parent.replaceChild(node, current);else parent.insertBefore(node, marker);
+  } else parent.insertBefore(node, marker);
   return [node];
 }
 function gatherHydratable(element, root) {

package/web/dist/web.js

@@ -400,13 +400,13 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
     }
     current = array;
   } else if (value instanceof Node) {
-    if (sharedConfig.context) return current = value.parentNode ? value : current;
+    if (sharedConfig.context) return current = value.parentNode ? multi ? [value] : value : current;
     if (Array.isArray(current)) {
       if (multi) return current = cleanChildren(parent, current, marker, value);
       cleanChildren(parent, current, null, value);
     } else if (current == null || current === "" || !parent.firstChild) {
       parent.appendChild(value);
-    } else parent.replaceChild(value, multi ? current : parent.firstChild);
+    } else parent.replaceChild(value, parent.firstChild);
     current = value;
   } else ;
   return current;
@@ -449,7 +449,7 @@ function cleanChildren(parent, current, marker, replacement) {
         if (!inserted && !i) isParent ? parent.replaceChild(node, el) : parent.insertBefore(node, marker);else isParent && el.remove();
       } else inserted = true;
     }
-  } else if (current instanceof Node) parent.replaceChild(node, current);else parent.insertBefore(node, marker);
+  } else parent.insertBefore(node, marker);
   return [node];
 }
 function gatherHydratable(element, root) {

package/web/package.json

@@ -9,5 +9,27 @@
   "unpkg": "./dist/web.cjs",
   "types": "./types/index.d.ts",
   "type": "module",
-  "sideEffects": false
+  "sideEffects": false,
+  "exports": {
+    ".": {
+      "browser": {
+        "development": {
+          "import": "./dist/dev.js",
+          "require": "./dist/dev.cjs"
+        },
+        "import": "./dist/web.js",
+        "require": "./dist/web.cjs"
+      },
+      "node": {
+        "import": "./dist/server.js",
+        "require": "./dist/server.cjs"
+      },
+      "development": {
+        "import": "./dist/dev.js",
+        "require": "./dist/dev.cjs"
+      },
+      "import": "./dist/web.js",
+      "require": "./dist/web.cjs"
+    }
+  }
 }