solid-js 1.5.1 → 1.5.4

package/web/dist/server.js

@@ -263,8 +263,7 @@ function toRefParam(index) {
 const REPLACE_SCRIPT = `function $df(e,t,d,l){d=document.getElementById(e),(l=document.getElementById("pl-"+e))&&l.replaceWith(...d.childNodes),d.remove(),_$HY.set(e,t)}`;
 function renderToString(code, options = {}) {
   let scripts = "";
-  let context;
-  sharedConfig.context = context = {
+  sharedConfig.context = {
     id: options.renderId || "",
     count: 0,
     suspense: {},
@@ -276,8 +275,8 @@ function renderToString(code, options = {}) {
     }
   };
   let html = resolveSSRNode(escape(code()));
-  sharedConfig.context = undefined;
-  html = injectAssets(context.assets, html);
+  sharedConfig.context.noHydrate = true;
+  html = injectAssets(sharedConfig.context.assets, html);
   if (scripts.length) html = injectScripts(html, scripts, options.nonce);
   return html;
 }
@@ -351,6 +350,9 @@ function renderToStream(code, options = {}) {
     suspense: {},
     assets: [],
     nonce,
+    block(p) {
+      if (!firstFlushed) blockingResources.push(p);
+    },
     replace(id, payloadFn) {
       if (firstFlushed) return;
       const placeholder = `<!${id}>`;
@@ -390,14 +392,15 @@ function renderToStream(code, options = {}) {
             }
           }
         }
-        Promise.resolve().then(checkEnd);
+        if (!registry.size) Promise.resolve().then(checkEnd);
         return firstFlushed;
       };
     }
   };
   let html = resolveSSRNode(escape(code()));
   function doShell() {
-    sharedConfig.context = undefined;
+    sharedConfig.context = context;
+    context.noHydrate = true;
     html = injectAssets(context.assets, html);
     for (const key in context.resources) {
       if (!("data" in context.resources[key] || context.resources[key].ref[0].error)) pushTask(`_$HY.init("${key}")`);
@@ -426,7 +429,7 @@ function renderToStream(code, options = {}) {
           complete();
         };
       } else onCompleteAll = complete;
-      checkEnd();
+      if (!registry.size) Promise.resolve().then(checkEnd);
     },
     pipe(w) {
       Promise.allSettled(blockingResources).then(() => {
@@ -525,8 +528,8 @@ function ssrElement(tag, props, children, needsId) {
   let classResolved;
   for (let i = 0; i < keys.length; i++) {
     const prop = keys[i];
-    if (ChildProperties.has(prop) && children === undefined) {
-      children = prop === "innerHTML" ? props[prop] : escape(props[prop]);
+    if (ChildProperties.has(prop)) {
+      if (children === undefined) children = prop === "innerHTML" ? props[prop] : escape(props[prop]);
       continue;
     }
     const value = props[prop];
@@ -757,7 +760,9 @@ function ssrSpread(props, isSVG, skipChildren) {
 }
 
 const isServer = true;
+function insert() {}
 function spread() {}
+function delegateEvents() {}
 function Dynamic(props) {
   const [p, others] = splitProps(props, ["component"]);
   const comp = p.component,
@@ -772,4 +777,4 @@ function Portal(props) {
   return "";
 }
 
-export { Assets, Dynamic, HydrationScript, NoHydration, Portal, escape, generateHydrationScript, getAssets, getHydrationKey, isServer, pipeToNodeWritable, pipeToWritable, renderToStream, renderToString, renderToStringAsync, resolveSSRNode, spread, ssr, ssrAttribute, ssrClassList, ssrElement, ssrHydrationKey, ssrSpread, ssrStyle, useAssets };
+export { Assets, Dynamic, HydrationScript, NoHydration, Portal, delegateEvents, escape, generateHydrationScript, getAssets, getHydrationKey, insert, isServer, pipeToNodeWritable, pipeToWritable, renderToStream, renderToString, renderToStringAsync, resolveSSRNode, spread, ssr, ssrAttribute, ssrClassList, ssrElement, ssrHydrationKey, ssrSpread, ssrStyle, useAssets };

package/web/dist/web.cjs

@@ -457,7 +457,7 @@ function normalizeIncomingArray(normalized, array, current, unwrap) {
     } else if ((typeof item) === "function") {
       if (unwrap) {
         while (typeof item === "function") item = item();
-        dynamic = normalizeIncomingArray(normalized, Array.isArray(item) ? item : [item], prev) || dynamic;
+        dynamic = normalizeIncomingArray(normalized, Array.isArray(item) ? item : [item], Array.isArray(prev) ? prev : [prev]) || dynamic;
       } else {
         normalized.push(item);
         dynamic = true;
@@ -640,6 +640,10 @@ Object.defineProperty(exports, 'mergeProps', {
   enumerable: true,
   get: function () { return solidJs.mergeProps; }
 });
+Object.defineProperty(exports, 'untrack', {
+  enumerable: true,
+  get: function () { return solidJs.untrack; }
+});
 exports.Aliases = Aliases;
 exports.Assets = voidFn;
 exports.ChildProperties = ChildProperties;

package/web/dist/web.js

@@ -1,5 +1,5 @@
 import { createMemo, createRoot, createRenderEffect, sharedConfig, untrack, enableHydration, createSignal, onCleanup, splitProps } from 'solid-js';
-export { ErrorBoundary, For, Index, Match, Show, Suspense, SuspenseList, Switch, createComponent, createRenderEffect as effect, getOwner, mergeProps } from 'solid-js';
+export { ErrorBoundary, For, Index, Match, Show, Suspense, SuspenseList, Switch, createComponent, createRenderEffect as effect, getOwner, mergeProps, untrack } 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"];
 const Properties = /*#__PURE__*/new Set(["className", "value", "readOnly", "formNoValidate", "isMap", "noModule", "playsInline", ...booleans]);
@@ -454,7 +454,7 @@ function normalizeIncomingArray(normalized, array, current, unwrap) {
     } else if ((typeof item) === "function") {
       if (unwrap) {
         while (typeof item === "function") item = item();
-        dynamic = normalizeIncomingArray(normalized, Array.isArray(item) ? item : [item], prev) || dynamic;
+        dynamic = normalizeIncomingArray(normalized, Array.isArray(item) ? item : [item], Array.isArray(prev) ? prev : [prev]) || dynamic;
       } else {
         normalized.push(item);
         dynamic = true;

package/web/package.json

@@ -0,0 +1,50 @@
+{
+  "name": "solid-js/web",
+  "main": "./dist/server.cjs",
+  "module": "./dist/server.js",
+  "browser": {
+    "./dist/server.cjs": "./dist/web.cjs",
+    "./dist/server.js": "./dist/web.js"
+  },
+  "unpkg": "./dist/web.cjs",
+  "types": "./types/index.d.ts",
+  "type": "module",
+  "sideEffects": false,
+  "exports": {
+    ".": {
+      "browser": {
+        "development": {
+          "import": {
+            "types": "./types/index.d.ts",
+            "default": "./dist/dev.js"
+          },
+          "require": "./dist/dev.cjs"
+        },
+        "import": {
+          "types": "./types/index.d.ts",
+          "default": "./dist/web.js"
+        },
+        "require": "./dist/web.cjs"
+      },
+      "node": {
+        "import": {
+          "types": "./types/index.d.ts",
+          "default": "./dist/server.js"
+        },
+        "require": "./dist/server.cjs"
+      },
+      "development": {
+        "import": {
+          "types": "./types/index.d.ts",
+          "default": "./dist/dev.js"
+        },
+        "require": "./dist/dev.cjs"
+      },
+      "import": {
+        "types": "./types/index.d.ts",
+        "default": "./dist/web.js"
+      },
+      "require": "./dist/web.cjs"
+    }
+  }
+}

package/web/types/client.d.ts

@@ -13,6 +13,7 @@ export function render(code: () => JSX.Element, element: MountableElement): () =
 export function template(html: string, count: number, 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;
 export function insert<T>(
   parent: MountableElement,
   accessor: (() => T) | T,
@@ -67,4 +68,4 @@ export function getAssets(): string;
 export function Assets(props: { children?: JSX.Element }): JSX.Element;
 export function HydrationScript(): JSX.Element;
 export function NoHydration(props: { children?: JSX.Element }): JSX.Element;
-export function getHydrationScript(): string;
+export function generateHydrationScript(): string;