solid-js - npm Package Compare versions

Comparing version 1.7.7 to 1.7.8

dist/dev.js

@@ -881,3 +881,14 @@ let taskIdCounter = 1,
   }
-  if (sharedConfig.context) setHydrateContext();
+  if (sharedConfig.context) {
+    if (sharedConfig.count) {
+      sharedConfig.effects || (sharedConfig.effects = []);
+      sharedConfig.effects.push(...queue.slice(0, userLength));
+      return;
+    } else if (sharedConfig.effects) {
+      queue = [...sharedConfig.effects, ...queue];
+      userLength += sharedConfig.effects.length;
+      delete sharedConfig.effects;
+    }
+    setHydrateContext();
+  }
   for (i = 0; i < userLength; i++) runTop(queue[i]);
@@ -960,2 +971,9 @@ }
 }
+function runErrors(err, fns, owner) {
+  try {
+    for (const f of fns) f(err);
+  } catch (e) {
+    handleError(e, owner && owner.owner || null);
+  }
+}
 function handleError(err, owner = Owner) {
@@ -967,16 +985,6 @@ const fns = ERROR && lookup(owner, ERROR);
     fn() {
-      try {
-        for (const f of fns) f(error);
-      } catch (e) {
-        handleError(e, owner?.owner || null);
-      }
+      runErrors(error, fns, owner);
     },
     state: STALE
-  });else {
-    try {
-      for (const f of fns) f(error);
-    } catch (e) {
-      handleError(e, owner?.owner || null);
-    }
-  }
+  });else runErrors(error, fns, owner);
 }
@@ -1403,4 +1411,7 @@ function lookup(owner, key) {
       const [s, set] = createSignal();
+      sharedConfig.count || (sharedConfig.count = 0);
+      sharedConfig.count++;
       (p || (p = fn())).then(mod => {
         setHydrateContext(ctx);
+        sharedConfig.count--;
         set(() => mod.default);
@@ -1407,0 +1418,0 @@ setHydrateContext();

dist/server.js

@@ -20,3 +20,3 @@ const equalFn = (a, b) => a === b;
   } catch (e) {
-    handleError(e, owner?.owner || null);
+    handleError(e, owner && owner.owner || null);
   }
@@ -426,3 +426,3 @@ }
   return {
-    t: `<!!$e${id}>${resolveSSRNode(res)}<!!$/e${id}>`
+    t: `<!--!$e${id}-->${resolveSSRNode(res)}<!--!$/e${id}-->`
   };
@@ -638,3 +638,3 @@ }
       const res = {
-        t: `<template id="pl-${id}"></template>${resolveSSRNode(props.fallback)}<!pl-${id}>`
+        t: `<template id="pl-${id}"></template>${resolveSSRNode(props.fallback)}<!--pl-${id}-->`
       };
@@ -641,0 +641,0 @@ setHydrateContext(ctx);

dist/solid.js

@@ -841,3 +841,14 @@ let taskIdCounter = 1,
   }
-  if (sharedConfig.context) setHydrateContext();
+  if (sharedConfig.context) {
+    if (sharedConfig.count) {
+      sharedConfig.effects || (sharedConfig.effects = []);
+      sharedConfig.effects.push(...queue.slice(0, userLength));
+      return;
+    } else if (sharedConfig.effects) {
+      queue = [...sharedConfig.effects, ...queue];
+      userLength += sharedConfig.effects.length;
+      delete sharedConfig.effects;
+    }
+    setHydrateContext();
+  }
   for (i = 0; i < userLength; i++) runTop(queue[i]);
@@ -919,2 +930,9 @@ }
 }
+function runErrors(err, fns, owner) {
+  try {
+    for (const f of fns) f(err);
+  } catch (e) {
+    handleError(e, owner && owner.owner || null);
+  }
+}
 function handleError(err, owner = Owner) {
@@ -926,16 +944,6 @@ const fns = ERROR && lookup(owner, ERROR);
     fn() {
-      try {
-        for (const f of fns) f(error);
-      } catch (e) {
-        handleError(e, owner?.owner || null);
-      }
+      runErrors(error, fns, owner);
     },
     state: STALE
-  });else {
-    try {
-      for (const f of fns) f(error);
-    } catch (e) {
-      handleError(e, owner?.owner || null);
-    }
-  }
+  });else runErrors(error, fns, owner);
 }
@@ -1358,4 +1366,7 @@ function lookup(owner, key) {
       const [s, set] = createSignal();
+      sharedConfig.count || (sharedConfig.count = 0);
+      sharedConfig.count++;
       (p || (p = fn())).then(mod => {
         setHydrateContext(ctx);
+        sharedConfig.count--;
         set(() => mod.default);
@@ -1362,0 +1373,0 @@ setHydrateContext();

package.json

 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "1.7.7",
+  "version": "1.7.8",
   "author": "Ryan Carniato",
@@ -6,0 +6,0 @@ "license": "MIT",

types/render/hydration.d.ts

@@ -0,1 +1,2 @@
+import { Computation } from "../reactive/signal";
 export type HydrationContext = {
@@ -14,2 +15,4 @@ id: string;
     done?: boolean;
+    count?: number;
+    effects?: Computation<any, any>[];
 };
@@ -16,0 +19,0 @@ export declare const sharedConfig: SharedConfig;

web/dist/server.js

@@ -126,6 +126,6 @@ import { sharedConfig, createRoot, splitProps } from 'solid-js';
       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()));
@@ -200,3 +200,3 @@ },
       if (onCompleteAll) {
-        ogComplete = onCompleteAll;
+        let ogComplete = onCompleteAll;
         onCompleteAll = options => {
@@ -466,3 +466,3 @@ ogComplete(options);
   const marker = `<template id="pl-${key}">`;
-  const close = `<!pl-${key}>`;
+  const close = `<!--pl-${key}-->`;
   const first = html.indexOf(marker);
@@ -469,0 +469,0 @@ if (first === -1) return html;

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

818142

increased by0.33%

Lines of code

22938

increased by0.33%

No dependency changes