solid-js 1.8.7 → 1.8.9

package/dist/dev.cjs

@@ -152,7 +152,7 @@ const NO_INIT = {};
 var Owner = null;
 let Transition = null;
 let Scheduler = null;
-let ExternalSourceFactory = null;
+let ExternalSourceConfig = null;
 let Listener = null;
 let Updates = null;
 let Effects = null;
@@ -438,10 +438,11 @@ function batch(fn) {
   return runUpdates(fn, false);
 }
 function untrack(fn) {
-  if (Listener === null) return fn();
+  if (!ExternalSourceConfig && Listener === null) return fn();
   const listener = Listener;
   Listener = null;
   try {
+    if (ExternalSourceConfig) return ExternalSourceConfig.untrack(fn);
     return fn();
   } finally {
     Listener = listener;
@@ -594,22 +595,31 @@ let SuspenseContext;
 function getSuspenseContext() {
   return SuspenseContext || (SuspenseContext = createContext());
 }
-function enableExternalSource(factory) {
-  if (ExternalSourceFactory) {
-    const oldFactory = ExternalSourceFactory;
-    ExternalSourceFactory = (fn, trigger) => {
-      const oldSource = oldFactory(fn, trigger);
-      const source = factory(x => oldSource.track(x), trigger);
-      return {
-        track: x => source.track(x),
-        dispose() {
-          source.dispose();
-          oldSource.dispose();
-        }
-      };
+function enableExternalSource(factory, untrack = fn => fn()) {
+  if (ExternalSourceConfig) {
+    const {
+      factory: oldFactory,
+      untrack: oldUntrack
+    } = ExternalSourceConfig;
+    ExternalSourceConfig = {
+      factory: (fn, trigger) => {
+        const oldSource = oldFactory(fn, trigger);
+        const source = factory(x => oldSource.track(x), trigger);
+        return {
+          track: x => source.track(x),
+          dispose() {
+            source.dispose();
+            oldSource.dispose();
+          }
+        };
+      },
+      untrack: fn => oldUntrack(() => untrack(fn))
     };
   } else {
-    ExternalSourceFactory = factory;
+    ExternalSourceConfig = {
+      factory,
+      untrack
+    };
   }
 }
 function readSignal() {
@@ -752,14 +762,14 @@ function createComputation(fn, init, pure, state = STALE, options) {
     }
   }
   if (options && options.name) c.name = options.name;
-  if (ExternalSourceFactory) {
+  if (ExternalSourceConfig && c.fn) {
     const [track, trigger] = createSignal(undefined, {
       equals: false
     });
-    const ordinary = ExternalSourceFactory(c.fn, trigger);
+    const ordinary = ExternalSourceConfig.factory(c.fn, trigger);
     onCleanup(() => ordinary.dispose());
     const triggerInTransition = () => startTransition(trigger).then(() => inTransition.dispose());
-    const inTransition = ExternalSourceFactory(c.fn, triggerInTransition);
+    const inTransition = ExternalSourceConfig.factory(c.fn, triggerInTransition);
     c.fn = x => {
       track();
       return Transition && Transition.running ? inTransition.track(x) : ordinary.track(x);
@@ -1340,41 +1350,37 @@ function mergeProps(...sources) {
       }
     }, propTraps);
   }
-  const target = {};
   const sourcesMap = {};
-  const defined = new Set();
+  const defined = Object.create(null);
   for (let i = sources.length - 1; i >= 0; i--) {
     const source = sources[i];
     if (!source) continue;
     const sourceKeys = Object.getOwnPropertyNames(source);
-    for (let i = 0, length = sourceKeys.length; i < length; i++) {
+    for (let i = sourceKeys.length - 1; i >= 0; i--) {
       const key = sourceKeys[i];
       if (key === "__proto__" || key === "constructor") continue;
       const desc = Object.getOwnPropertyDescriptor(source, key);
-      if (!defined.has(key)) {
-        if (desc.get) {
-          defined.add(key);
-          Object.defineProperty(target, key, {
-            enumerable: true,
-            configurable: true,
-            get: resolveSources.bind(sourcesMap[key] = [desc.get.bind(source)])
-          });
-        } else {
-          if (desc.value !== undefined) defined.add(key);
-          target[key] = desc.value;
-        }
+      if (!defined[key]) {
+        defined[key] = desc.get ? {
+          enumerable: true,
+          configurable: true,
+          get: resolveSources.bind(sourcesMap[key] = [desc.get.bind(source)])
+        } : desc.value !== undefined ? desc : undefined;
       } else {
         const sources = sourcesMap[key];
         if (sources) {
-          if (desc.get) {
-            sources.push(desc.get.bind(source));
-          } else if (desc.value !== undefined) {
-            sources.push(() => desc.value);
-          }
-        } else if (target[key] === undefined) target[key] = desc.value;
+          if (desc.get) sources.push(desc.get.bind(source));else if (desc.value !== undefined) sources.push(() => desc.value);
+        }
       }
     }
   }
+  const target = {};
+  const definedKeys = Object.keys(defined);
+  for (let i = definedKeys.length - 1; i >= 0; i--) {
+    const key = definedKeys[i],
+      desc = defined[key];
+    if (desc && desc.get) Object.defineProperty(target, key, desc);else target[key] = desc ? desc.value : undefined;
+  }
   return target;
 }
 function splitProps(props, ...keys) {
@@ -1508,7 +1514,7 @@ function Show(props) {
 }
 function Switch(props) {
   let keyed = false;
-  const equals = (a, b) => a[0] === b[0] && (keyed ? a[1] === b[1] : !a[1] === !b[1]) && a[2] === b[2];
+  const equals = (a, b) => (keyed ? a[1] === b[1] : !a[1] === !b[1]) && a[2] === b[2];
   const conditions = children(() => props.children),
     evalConditions = createMemo(() => {
       let conds = conditions();

package/dist/dev.js

@@ -152,7 +152,7 @@ const NO_INIT = {};
 var Owner = null;
 let Transition = null;
 let Scheduler = null;
-let ExternalSourceFactory = null;
+let ExternalSourceConfig = null;
 let Listener = null;
 let Updates = null;
 let Effects = null;
@@ -497,10 +497,11 @@ function batch(fn) {
   return runUpdates(fn, false);
 }
 function untrack(fn) {
-  if (Listener === null) return fn();
+  if (!ExternalSourceConfig && Listener === null) return fn();
   const listener = Listener;
   Listener = null;
   try {
+    if (ExternalSourceConfig) return ExternalSourceConfig.untrack(fn);
     return fn();
   } finally {
     Listener = listener;
@@ -667,22 +668,28 @@ let SuspenseContext;
 function getSuspenseContext() {
   return SuspenseContext || (SuspenseContext = createContext());
 }
-function enableExternalSource(factory) {
-  if (ExternalSourceFactory) {
-    const oldFactory = ExternalSourceFactory;
-    ExternalSourceFactory = (fn, trigger) => {
-      const oldSource = oldFactory(fn, trigger);
-      const source = factory(x => oldSource.track(x), trigger);
-      return {
-        track: x => source.track(x),
-        dispose() {
-          source.dispose();
-          oldSource.dispose();
-        }
-      };
+function enableExternalSource(factory, untrack = fn => fn()) {
+  if (ExternalSourceConfig) {
+    const { factory: oldFactory, untrack: oldUntrack } = ExternalSourceConfig;
+    ExternalSourceConfig = {
+      factory: (fn, trigger) => {
+        const oldSource = oldFactory(fn, trigger);
+        const source = factory(x => oldSource.track(x), trigger);
+        return {
+          track: x => source.track(x),
+          dispose() {
+            source.dispose();
+            oldSource.dispose();
+          }
+        };
+      },
+      untrack: fn => oldUntrack(() => untrack(fn))
     };
   } else {
-    ExternalSourceFactory = factory;
+    ExternalSourceConfig = {
+      factory,
+      untrack
+    };
   }
 }
 function readSignal() {
@@ -837,14 +844,14 @@ function createComputation(fn, init, pure, state = STALE, options) {
     }
   }
   if (options && options.name) c.name = options.name;
-  if (ExternalSourceFactory) {
+  if (ExternalSourceConfig && c.fn) {
     const [track, trigger] = createSignal(undefined, {
       equals: false
     });
-    const ordinary = ExternalSourceFactory(c.fn, trigger);
+    const ordinary = ExternalSourceConfig.factory(c.fn, trigger);
     onCleanup(() => ordinary.dispose());
     const triggerInTransition = () => startTransition(trigger).then(() => inTransition.dispose());
-    const inTransition = ExternalSourceFactory(c.fn, triggerInTransition);
+    const inTransition = ExternalSourceConfig.factory(c.fn, triggerInTransition);
     c.fn = x => {
       track();
       return Transition && Transition.running ? inTransition.track(x) : ordinary.track(x);
@@ -1455,41 +1462,43 @@ function mergeProps(...sources) {
       propTraps
     );
   }
-  const target = {};
   const sourcesMap = {};
-  const defined = new Set();
+  const defined = Object.create(null);
   for (let i = sources.length - 1; i >= 0; i--) {
     const source = sources[i];
     if (!source) continue;
     const sourceKeys = Object.getOwnPropertyNames(source);
-    for (let i = 0, length = sourceKeys.length; i < length; i++) {
+    for (let i = sourceKeys.length - 1; i >= 0; i--) {
       const key = sourceKeys[i];
       if (key === "__proto__" || key === "constructor") continue;
       const desc = Object.getOwnPropertyDescriptor(source, key);
-      if (!defined.has(key)) {
-        if (desc.get) {
-          defined.add(key);
-          Object.defineProperty(target, key, {
-            enumerable: true,
-            configurable: true,
-            get: resolveSources.bind((sourcesMap[key] = [desc.get.bind(source)]))
-          });
-        } else {
-          if (desc.value !== undefined) defined.add(key);
-          target[key] = desc.value;
-        }
+      if (!defined[key]) {
+        defined[key] = desc.get
+          ? {
+              enumerable: true,
+              configurable: true,
+              get: resolveSources.bind((sourcesMap[key] = [desc.get.bind(source)]))
+            }
+          : desc.value !== undefined
+          ? desc
+          : undefined;
       } else {
         const sources = sourcesMap[key];
         if (sources) {
-          if (desc.get) {
-            sources.push(desc.get.bind(source));
-          } else if (desc.value !== undefined) {
-            sources.push(() => desc.value);
-          }
-        } else if (target[key] === undefined) target[key] = desc.value;
+          if (desc.get) sources.push(desc.get.bind(source));
+          else if (desc.value !== undefined) sources.push(() => desc.value);
+        }
       }
     }
   }
+  const target = {};
+  const definedKeys = Object.keys(defined);
+  for (let i = definedKeys.length - 1; i >= 0; i--) {
+    const key = definedKeys[i],
+      desc = defined[key];
+    if (desc && desc.get) Object.defineProperty(target, key, desc);
+    else target[key] = desc ? desc.value : undefined;
+  }
   return target;
 }
 function splitProps(props, ...keys) {
@@ -1662,8 +1671,7 @@ function Show(props) {
 }
 function Switch(props) {
   let keyed = false;
-  const equals = (a, b) =>
-    a[0] === b[0] && (keyed ? a[1] === b[1] : !a[1] === !b[1]) && a[2] === b[2];
+  const equals = (a, b) => (keyed ? a[1] === b[1] : !a[1] === !b[1]) && a[2] === b[2];
   const conditions = children(() => props.children),
     evalConditions = createMemo(
       () => {

package/dist/solid.cjs

@@ -152,7 +152,7 @@ const NO_INIT = {};
 var Owner = null;
 let Transition = null;
 let Scheduler = null;
-let ExternalSourceFactory = null;
+let ExternalSourceConfig = null;
 let Listener = null;
 let Updates = null;
 let Effects = null;
@@ -420,10 +420,11 @@ function batch(fn) {
   return runUpdates(fn, false);
 }
 function untrack(fn) {
-  if (Listener === null) return fn();
+  if (!ExternalSourceConfig && Listener === null) return fn();
   const listener = Listener;
   Listener = null;
   try {
+    if (ExternalSourceConfig) return ExternalSourceConfig.untrack(fn);
     return fn();
   } finally {
     Listener = listener;
@@ -554,22 +555,31 @@ let SuspenseContext;
 function getSuspenseContext() {
   return SuspenseContext || (SuspenseContext = createContext());
 }
-function enableExternalSource(factory) {
-  if (ExternalSourceFactory) {
-    const oldFactory = ExternalSourceFactory;
-    ExternalSourceFactory = (fn, trigger) => {
-      const oldSource = oldFactory(fn, trigger);
-      const source = factory(x => oldSource.track(x), trigger);
-      return {
-        track: x => source.track(x),
-        dispose() {
-          source.dispose();
-          oldSource.dispose();
-        }
-      };
+function enableExternalSource(factory, untrack = fn => fn()) {
+  if (ExternalSourceConfig) {
+    const {
+      factory: oldFactory,
+      untrack: oldUntrack
+    } = ExternalSourceConfig;
+    ExternalSourceConfig = {
+      factory: (fn, trigger) => {
+        const oldSource = oldFactory(fn, trigger);
+        const source = factory(x => oldSource.track(x), trigger);
+        return {
+          track: x => source.track(x),
+          dispose() {
+            source.dispose();
+            oldSource.dispose();
+          }
+        };
+      },
+      untrack: fn => oldUntrack(() => untrack(fn))
     };
   } else {
-    ExternalSourceFactory = factory;
+    ExternalSourceConfig = {
+      factory,
+      untrack
+    };
   }
 }
 function readSignal() {
@@ -711,14 +721,14 @@ function createComputation(fn, init, pure, state = STALE, options) {
       if (!Owner.owned) Owner.owned = [c];else Owner.owned.push(c);
     }
   }
-  if (ExternalSourceFactory) {
+  if (ExternalSourceConfig && c.fn) {
     const [track, trigger] = createSignal(undefined, {
       equals: false
     });
-    const ordinary = ExternalSourceFactory(c.fn, trigger);
+    const ordinary = ExternalSourceConfig.factory(c.fn, trigger);
     onCleanup(() => ordinary.dispose());
     const triggerInTransition = () => startTransition(trigger).then(() => inTransition.dispose());
-    const inTransition = ExternalSourceFactory(c.fn, triggerInTransition);
+    const inTransition = ExternalSourceConfig.factory(c.fn, triggerInTransition);
     c.fn = x => {
       track();
       return Transition && Transition.running ? inTransition.track(x) : ordinary.track(x);
@@ -1293,41 +1303,37 @@ function mergeProps(...sources) {
       }
     }, propTraps);
   }
-  const target = {};
   const sourcesMap = {};
-  const defined = new Set();
+  const defined = Object.create(null);
   for (let i = sources.length - 1; i >= 0; i--) {
     const source = sources[i];
     if (!source) continue;
     const sourceKeys = Object.getOwnPropertyNames(source);
-    for (let i = 0, length = sourceKeys.length; i < length; i++) {
+    for (let i = sourceKeys.length - 1; i >= 0; i--) {
       const key = sourceKeys[i];
       if (key === "__proto__" || key === "constructor") continue;
       const desc = Object.getOwnPropertyDescriptor(source, key);
-      if (!defined.has(key)) {
-        if (desc.get) {
-          defined.add(key);
-          Object.defineProperty(target, key, {
-            enumerable: true,
-            configurable: true,
-            get: resolveSources.bind(sourcesMap[key] = [desc.get.bind(source)])
-          });
-        } else {
-          if (desc.value !== undefined) defined.add(key);
-          target[key] = desc.value;
-        }
+      if (!defined[key]) {
+        defined[key] = desc.get ? {
+          enumerable: true,
+          configurable: true,
+          get: resolveSources.bind(sourcesMap[key] = [desc.get.bind(source)])
+        } : desc.value !== undefined ? desc : undefined;
       } else {
         const sources = sourcesMap[key];
         if (sources) {
-          if (desc.get) {
-            sources.push(desc.get.bind(source));
-          } else if (desc.value !== undefined) {
-            sources.push(() => desc.value);
-          }
-        } else if (target[key] === undefined) target[key] = desc.value;
+          if (desc.get) sources.push(desc.get.bind(source));else if (desc.value !== undefined) sources.push(() => desc.value);
+        }
       }
     }
   }
+  const target = {};
+  const definedKeys = Object.keys(defined);
+  for (let i = definedKeys.length - 1; i >= 0; i--) {
+    const key = definedKeys[i],
+      desc = defined[key];
+    if (desc && desc.get) Object.defineProperty(target, key, desc);else target[key] = desc ? desc.value : undefined;
+  }
   return target;
 }
 function splitProps(props, ...keys) {
@@ -1452,7 +1458,7 @@ function Show(props) {
 }
 function Switch(props) {
   let keyed = false;
-  const equals = (a, b) => a[0] === b[0] && (keyed ? a[1] === b[1] : !a[1] === !b[1]) && a[2] === b[2];
+  const equals = (a, b) => (keyed ? a[1] === b[1] : !a[1] === !b[1]) && a[2] === b[2];
   const conditions = children(() => props.children),
     evalConditions = createMemo(() => {
       let conds = conditions();

package/dist/solid.js

@@ -152,7 +152,7 @@ const NO_INIT = {};
 var Owner = null;
 let Transition = null;
 let Scheduler = null;
-let ExternalSourceFactory = null;
+let ExternalSourceConfig = null;
 let Listener = null;
 let Updates = null;
 let Effects = null;
@@ -474,10 +474,11 @@ function batch(fn) {
   return runUpdates(fn, false);
 }
 function untrack(fn) {
-  if (Listener === null) return fn();
+  if (!ExternalSourceConfig && Listener === null) return fn();
   const listener = Listener;
   Listener = null;
   try {
+    if (ExternalSourceConfig) return ExternalSourceConfig.untrack(fn);
     return fn();
   } finally {
     Listener = listener;
@@ -614,22 +615,28 @@ let SuspenseContext;
 function getSuspenseContext() {
   return SuspenseContext || (SuspenseContext = createContext());
 }
-function enableExternalSource(factory) {
-  if (ExternalSourceFactory) {
-    const oldFactory = ExternalSourceFactory;
-    ExternalSourceFactory = (fn, trigger) => {
-      const oldSource = oldFactory(fn, trigger);
-      const source = factory(x => oldSource.track(x), trigger);
-      return {
-        track: x => source.track(x),
-        dispose() {
-          source.dispose();
-          oldSource.dispose();
-        }
-      };
+function enableExternalSource(factory, untrack = fn => fn()) {
+  if (ExternalSourceConfig) {
+    const { factory: oldFactory, untrack: oldUntrack } = ExternalSourceConfig;
+    ExternalSourceConfig = {
+      factory: (fn, trigger) => {
+        const oldSource = oldFactory(fn, trigger);
+        const source = factory(x => oldSource.track(x), trigger);
+        return {
+          track: x => source.track(x),
+          dispose() {
+            source.dispose();
+            oldSource.dispose();
+          }
+        };
+      },
+      untrack: fn => oldUntrack(() => untrack(fn))
     };
   } else {
-    ExternalSourceFactory = factory;
+    ExternalSourceConfig = {
+      factory,
+      untrack
+    };
   }
 }
 function readSignal() {
@@ -782,14 +789,14 @@ function createComputation(fn, init, pure, state = STALE, options) {
       else Owner.owned.push(c);
     }
   }
-  if (ExternalSourceFactory) {
+  if (ExternalSourceConfig && c.fn) {
     const [track, trigger] = createSignal(undefined, {
       equals: false
     });
-    const ordinary = ExternalSourceFactory(c.fn, trigger);
+    const ordinary = ExternalSourceConfig.factory(c.fn, trigger);
     onCleanup(() => ordinary.dispose());
     const triggerInTransition = () => startTransition(trigger).then(() => inTransition.dispose());
-    const inTransition = ExternalSourceFactory(c.fn, triggerInTransition);
+    const inTransition = ExternalSourceConfig.factory(c.fn, triggerInTransition);
     c.fn = x => {
       track();
       return Transition && Transition.running ? inTransition.track(x) : ordinary.track(x);
@@ -1391,41 +1398,43 @@ function mergeProps(...sources) {
       propTraps
     );
   }
-  const target = {};
   const sourcesMap = {};
-  const defined = new Set();
+  const defined = Object.create(null);
   for (let i = sources.length - 1; i >= 0; i--) {
     const source = sources[i];
     if (!source) continue;
     const sourceKeys = Object.getOwnPropertyNames(source);
-    for (let i = 0, length = sourceKeys.length; i < length; i++) {
+    for (let i = sourceKeys.length - 1; i >= 0; i--) {
       const key = sourceKeys[i];
       if (key === "__proto__" || key === "constructor") continue;
       const desc = Object.getOwnPropertyDescriptor(source, key);
-      if (!defined.has(key)) {
-        if (desc.get) {
-          defined.add(key);
-          Object.defineProperty(target, key, {
-            enumerable: true,
-            configurable: true,
-            get: resolveSources.bind((sourcesMap[key] = [desc.get.bind(source)]))
-          });
-        } else {
-          if (desc.value !== undefined) defined.add(key);
-          target[key] = desc.value;
-        }
+      if (!defined[key]) {
+        defined[key] = desc.get
+          ? {
+              enumerable: true,
+              configurable: true,
+              get: resolveSources.bind((sourcesMap[key] = [desc.get.bind(source)]))
+            }
+          : desc.value !== undefined
+          ? desc
+          : undefined;
       } else {
         const sources = sourcesMap[key];
         if (sources) {
-          if (desc.get) {
-            sources.push(desc.get.bind(source));
-          } else if (desc.value !== undefined) {
-            sources.push(() => desc.value);
-          }
-        } else if (target[key] === undefined) target[key] = desc.value;
+          if (desc.get) sources.push(desc.get.bind(source));
+          else if (desc.value !== undefined) sources.push(() => desc.value);
+        }
       }
     }
   }
+  const target = {};
+  const definedKeys = Object.keys(defined);
+  for (let i = definedKeys.length - 1; i >= 0; i--) {
+    const key = definedKeys[i],
+      desc = defined[key];
+    if (desc && desc.get) Object.defineProperty(target, key, desc);
+    else target[key] = desc ? desc.value : undefined;
+  }
   return target;
 }
 function splitProps(props, ...keys) {
@@ -1579,8 +1588,7 @@ function Show(props) {
 }
 function Switch(props) {
   let keyed = false;
-  const equals = (a, b) =>
-    a[0] === b[0] && (keyed ? a[1] === b[1] : !a[1] === !b[1]) && a[2] === b[2];
+  const equals = (a, b) => (keyed ? a[1] === b[1] : !a[1] === !b[1]) && a[2] === b[2];
   const conditions = children(() => props.children),
     evalConditions = createMemo(
       () => {

package/h/jsx-runtime/types/jsx.d.ts

@@ -656,6 +656,7 @@ export namespace JSX {
     about?: FunctionMaybe<string>;
     datatype?: FunctionMaybe<string>;
     inlist?: FunctionMaybe<any>;
+    popover?: FunctionMaybe<boolean | "manual" | "auto">;
     prefix?: FunctionMaybe<string>;
     property?: FunctionMaybe<string>;
     resource?: FunctionMaybe<string>;
@@ -730,6 +731,8 @@ export namespace JSX {
     formmethod?: FunctionMaybe<HTMLFormMethod>;
     formnovalidate?: FunctionMaybe<boolean>;
     formtarget?: FunctionMaybe<string>;
+    popovertarget?: FunctionMaybe<string>;
+    popovertargetaction?: FunctionMaybe<"hide" | "show" | "toggle">;
     name?: FunctionMaybe<string>;
     type?: FunctionMaybe<"submit" | "reset" | "button">;
     value?: FunctionMaybe<string>;
@@ -738,6 +741,8 @@ export namespace JSX {
     formMethod?: FunctionMaybe<HTMLFormMethod>;
     formNoValidate?: FunctionMaybe<boolean>;
     formTarget?: FunctionMaybe<string>;
+    popoverTarget?: FunctionMaybe<string>;
+    popoverTargetAction?: FunctionMaybe<"hide" | "show" | "toggle">;
   }
   interface CanvasHTMLAttributes<T> extends HTMLAttributes<T> {
     width?: FunctionMaybe<number | string>;
@@ -1828,7 +1833,16 @@ export namespace JSX {
       NewViewportSVGAttributes<T>,
       ExternalResourceSVGAttributes,
       StylableSVGAttributes,
-      FitToViewBoxSVGAttributes {}
+      FitToViewBoxSVGAttributes {
+    width?: FunctionMaybe<number | string>;
+    height?: FunctionMaybe<number | string>;
+    preserveAspectRatio?: FunctionMaybe<SVGPreserveAspectRatio>;
+    refX?: FunctionMaybe<number | string>;
+    refY?: FunctionMaybe<number | string>;
+    viewBox?: FunctionMaybe<string>;
+    x?: FunctionMaybe<number | string>;
+    y?: FunctionMaybe<number | string>;
+  }
   interface TextSVGAttributes<T>
     extends TextContentElementSVGAttributes<T>,
       GraphicsElementSVGAttributes<T>,
@@ -1981,7 +1995,8 @@ export namespace JSX {
     ruby: HTMLAttributes<HTMLElement>;
     s: HTMLAttributes<HTMLElement>;
     samp: HTMLAttributes<HTMLElement>;
-    script: ScriptHTMLAttributes<HTMLElement>;
+    script: ScriptHTMLAttributes<HTMLScriptElement>;
+    search: HTMLAttributes<HTMLElement>;
     section: HTMLAttributes<HTMLElement>;
     select: SelectHTMLAttributes<HTMLSelectElement>;
     slot: HTMLSlotElementAttributes;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "1.8.7",
+  "version": "1.8.9",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -215,7 +215,8 @@
   ],
   "dependencies": {
     "csstype": "^3.1.0",
-    "seroval": "^0.15.1"
+    "seroval": "^1.0.3",
+    "seroval-plugins": "^1.0.3"
   },
   "scripts": {
     "build": "npm-run-all -nl build:*",

package/store/dist/dev.cjs

@@ -318,11 +318,12 @@ const $ROOT = Symbol("store-root");
 function applyState(target, parent, property, merge, key) {
   const previous = parent[property];
   if (target === previous) return;
-  if (property !== $ROOT && (!isWrappable(target) || !isWrappable(previous) || key && target[key] !== previous[key])) {
+  const isArray = Array.isArray(target);
+  if (property !== $ROOT && (!isWrappable(target) || !isWrappable(previous) || isArray !== Array.isArray(previous) || key && target[key] !== previous[key])) {
     setProperty(parent, property, target);
     return;
   }
-  if (Array.isArray(target)) {
+  if (isArray) {
     if (target.length && previous.length && (!merge || key && target[0] && target[0][key] != null)) {
       let i, j, start, end, newEnd, item, newIndicesNext, keyVal;
       for (start = 0, end = Math.min(previous.length, target.length); start < end && (previous[start] === target[start] || key && previous[start] && target[start] && previous[start][key] === target[start][key]); start++) {

package/store/dist/dev.js

@@ -362,14 +362,18 @@ const $ROOT = Symbol("store-root");
 function applyState(target, parent, property, merge, key) {
   const previous = parent[property];
   if (target === previous) return;
+  const isArray = Array.isArray(target);
   if (
     property !== $ROOT &&
-    (!isWrappable(target) || !isWrappable(previous) || (key && target[key] !== previous[key]))
+    (!isWrappable(target) ||
+      !isWrappable(previous) ||
+      isArray !== Array.isArray(previous) ||
+      (key && target[key] !== previous[key]))
   ) {
     setProperty(parent, property, target);
     return;
   }
-  if (Array.isArray(target)) {
+  if (isArray) {
     if (
       target.length &&
       previous.length &&

package/store/dist/store.cjs

@@ -302,11 +302,12 @@ const $ROOT = Symbol("store-root");
 function applyState(target, parent, property, merge, key) {
   const previous = parent[property];
   if (target === previous) return;
-  if (property !== $ROOT && (!isWrappable(target) || !isWrappable(previous) || key && target[key] !== previous[key])) {
+  const isArray = Array.isArray(target);
+  if (property !== $ROOT && (!isWrappable(target) || !isWrappable(previous) || isArray !== Array.isArray(previous) || key && target[key] !== previous[key])) {
     setProperty(parent, property, target);
     return;
   }
-  if (Array.isArray(target)) {
+  if (isArray) {
     if (target.length && previous.length && (!merge || key && target[0] && target[0][key] != null)) {
       let i, j, start, end, newEnd, item, newIndicesNext, keyVal;
       for (start = 0, end = Math.min(previous.length, target.length); start < end && (previous[start] === target[start] || key && previous[start] && target[start] && previous[start][key] === target[start][key]); start++) {

package/store/dist/store.js

@@ -340,14 +340,18 @@ const $ROOT = Symbol("store-root");
 function applyState(target, parent, property, merge, key) {
   const previous = parent[property];
   if (target === previous) return;
+  const isArray = Array.isArray(target);
   if (
     property !== $ROOT &&
-    (!isWrappable(target) || !isWrappable(previous) || (key && target[key] !== previous[key]))
+    (!isWrappable(target) ||
+      !isWrappable(previous) ||
+      isArray !== Array.isArray(previous) ||
+      (key && target[key] !== previous[key]))
   ) {
     setProperty(parent, property, target);
     return;
   }
-  if (Array.isArray(target)) {
+  if (isArray) {
     if (
       target.length &&
       previous.length &&

package/types/jsx.d.ts

@@ -732,6 +732,7 @@ export namespace JSX {
     about?: string;
     datatype?: string;
     inlist?: any;
+    popover?: boolean | "manual" | "auto";
     prefix?: string;
     property?: string;
     resource?: string;
@@ -802,6 +803,8 @@ export namespace JSX {
     formmethod?: HTMLFormMethod;
     formnovalidate?: boolean;
     formtarget?: string;
+    popovertarget?: string;
+    popovertargetaction?: "hide" | "show" | "toggle";
     name?: string;
     type?: "submit" | "reset" | "button";
     value?: string;
@@ -810,6 +813,8 @@ export namespace JSX {
     formMethod?: HTMLFormMethod;
     formNoValidate?: boolean;
     formTarget?: string;
+    popoverTarget?: string;
+    popoverTargetAction?: "hide" | "show" | "toggle";
   }
   interface CanvasHTMLAttributes<T> extends HTMLAttributes<T> {
     width?: number | string;
@@ -1905,7 +1910,16 @@ export namespace JSX {
       NewViewportSVGAttributes<T>,
       ExternalResourceSVGAttributes,
       StylableSVGAttributes,
-      FitToViewBoxSVGAttributes {}
+      FitToViewBoxSVGAttributes {
+    width?: number | string;
+    height?: number | string;
+    preserveAspectRatio?: SVGPreserveAspectRatio;
+    refX?: number | string;
+    refY?: number | string;
+    viewBox?: string;
+    x?: number | string;
+    y?: number | string;
+  }
   interface TextSVGAttributes<T>
     extends TextContentElementSVGAttributes<T>,
       GraphicsElementSVGAttributes<T>,
@@ -2058,7 +2072,8 @@ export namespace JSX {
     ruby: HTMLAttributes<HTMLElement>;
     s: HTMLAttributes<HTMLElement>;
     samp: HTMLAttributes<HTMLElement>;
-    script: ScriptHTMLAttributes<HTMLElement>;
+    script: ScriptHTMLAttributes<HTMLScriptElement>;
+    search: HTMLAttributes<HTMLElement>;
     section: HTMLAttributes<HTMLElement>;
     select: SelectHTMLAttributes<HTMLSelectElement>;
     slot: HTMLSlotElementAttributes;

package/types/reactive/signal.d.ts

@@ -30,7 +30,6 @@ export declare const $TRACK: unique symbol;
 export declare const $DEVCOMP: unique symbol;
 export declare var Owner: Owner | null;
 export declare let Transition: TransitionState | null;
-declare let ExternalSourceFactory: ExternalSourceFactory | null;
 /** Object storing callbacks for debugging during development */
 export declare const DevHooks: {
   afterUpdate: (() => void) | null;
@@ -639,7 +638,10 @@ type SuspenseContext = Context<SuspenseContextType | undefined> & {
 };
 declare let SuspenseContext: SuspenseContext;
 export declare function getSuspenseContext(): SuspenseContext;
-export declare function enableExternalSource(factory: ExternalSourceFactory): void;
+export declare function enableExternalSource(
+  factory: ExternalSourceFactory,
+  untrack?: <V>(fn: () => V) => V
+): void;
 export declare function readSignal(this: SignalState<any> | Memo<any>): any;
 export declare function writeSignal(
   node: SignalState<any> | Memo<any>,

package/types/render/component.d.ts

@@ -121,7 +121,9 @@ export type SplitProps<T, K extends (readonly (keyof T)[])[]> = [
       ? Pick<T, Extract<K[P], readonly (keyof T)[]>[number]>
       : never;
   },
-  Omit<T, K[number][number]>
+  {
+    [P in keyof T as Exclude<P, K[number][number]>]: T[P];
+  }
 ];
 export declare function splitProps<
   T extends Record<any, any>,

package/web/dist/dev.cjs

@@ -335,7 +335,7 @@ function assignProp(node, prop, value, prev, isSVG, skipRef) {
   let isCE, isProp, isChildProp, propAlias, forceProp;
   if (prop === "style") return style(node, value, prev);
   if (prop === "classList") return classList(node, value, prev);
-  if (value === prev) return prev;
+  if (value === prev && (prop !== "value" || prop !== "checked")) return prev;
   if (prop === "ref") {
     if (!skipRef) value(node);
   } else if (prop.slice(0, 3) === "on:") {

package/web/dist/dev.js

@@ -791,7 +791,7 @@ function assignProp(node, prop, value, prev, isSVG, skipRef) {
   let isCE, isProp, isChildProp, propAlias, forceProp;
   if (prop === "style") return style(node, value, prev);
   if (prop === "classList") return classList(node, value, prev);
-  if (value === prev) return prev;
+  if (value === prev && (prop !== "value" || prop !== "checked")) return prev;
   if (prop === "ref") {
     if (!skipRef) value(node);
   } else if (prop.slice(0, 3) === "on:") {

package/web/dist/server.cjs

@@ -2,6 +2,7 @@
 
 var solidJs = require('solid-js');
 var seroval = require('seroval');
+var web = require('seroval-plugins/web');
 
 const booleans = ["allowfullscreen", "async", "autofocus", "autoplay", "checked", "controls", "default", "disabled", "formnovalidate", "hidden", "indeterminate", "inert", "ismap", "loop", "multiple", "muted", "nomodule", "novalidate", "open", "playsinline", "readonly", "required", "reversed", "seamless", "selected"];
 const BooleanAttributes = /*#__PURE__*/new Set(booleans);
@@ -23,6 +24,9 @@ function createSerializer({
 }) {
   return new seroval.Serializer({
     scopeId,
+    plugins: [
+    web.CustomEventPlugin, web.DOMExceptionPlugin, web.EventPlugin,
+    web.FormDataPlugin, web.HeadersPlugin, web.ReadableStreamPlugin, web.RequestPlugin, web.ResponsePlugin, web.URLSearchParamsPlugin, web.URLPlugin],
     globalIdentifier: GLOBAL_IDENTIFIER,
     disabledFeatures: ES2017FLAG,
     onData,
@@ -262,35 +266,39 @@ function renderToStream(code, options = {}) {
     },
     pipe(w) {
       allSettled(blockingPromises).then(() => {
-        doShell();
-        buffer = writable = w;
-        buffer.write(tmp);
-        firstFlushed = true;
-        if (completed) writable.end();else setTimeout(flushEnd);
+        setTimeout(() => {
+          doShell();
+          buffer = writable = w;
+          buffer.write(tmp);
+          firstFlushed = true;
+          if (completed) writable.end();else queue(flushEnd);
+        });
       });
     },
     pipeTo(w) {
       return allSettled(blockingPromises).then(() => {
-        doShell();
-        const encoder = new TextEncoder();
-        const writer = w.getWriter();
         let resolve;
         const p = new Promise(r => resolve = r);
-        writable = {
-          end() {
-            writer.releaseLock();
-            w.close();
-            resolve();
-          }
-        };
-        buffer = {
-          write(payload) {
-            writer.write(encoder.encode(payload));
-          }
-        };
-        buffer.write(tmp);
-        firstFlushed = true;
-        if (completed) writable.end();else setTimeout(flushEnd);
+        setTimeout(() => {
+          doShell();
+          const encoder = new TextEncoder();
+          const writer = w.getWriter();
+          writable = {
+            end() {
+              writer.releaseLock();
+              w.close();
+              resolve();
+            }
+          };
+          buffer = {
+            write(payload) {
+              writer.write(encoder.encode(payload));
+            }
+          };
+          buffer.write(tmp);
+          firstFlushed = true;
+          if (completed) writable.end();else queue(flushEnd);
+        });
         return p;
       });
     }
@@ -334,7 +342,7 @@ function ssrClassList(value) {
 }
 function ssrStyle(value) {
   if (!value) return "";
-  if (typeof value === "string") return value;
+  if (typeof value === "string") return escape(value, true);
   let result = "";
   const k = Object.keys(value);
   for (let i = 0; i < k.length; i++) {
@@ -530,7 +538,7 @@ function replacePlaceholder(html, key, value) {
 }
 const RequestContext = Symbol();
 function getRequestEvent() {
-  return globalThis[RequestContext] ? globalThis[RequestContext].getStore() : undefined;
+  return globalThis[RequestContext] ? globalThis[RequestContext].getStore() || solidJs.sharedConfig.context && solidJs.sharedConfig.context.event || console.log("RequestEvent is missing. This is most likely due to accessing `getRequestEvent` non-managed async scope in a partially polyfilled environment. Try moving it above all `await` calls.") : undefined;
 }
 function Assets(props) {
   useAssets(() => props.children);

package/web/dist/server.js

@@ -12,6 +12,18 @@ export {
   mergeProps
 } from "solid-js";
 import { Feature, Serializer, getCrossReferenceHeader } from "seroval";
+import {
+  CustomEventPlugin,
+  DOMExceptionPlugin,
+  EventPlugin,
+  FormDataPlugin,
+  HeadersPlugin,
+  ReadableStreamPlugin,
+  RequestPlugin,
+  ResponsePlugin,
+  URLSearchParamsPlugin,
+  URLPlugin
+} from "seroval-plugins/web";
 
 const booleans = [
   "allowfullscreen",
@@ -57,6 +69,18 @@ const GLOBAL_IDENTIFIER = "_$HY.r";
 function createSerializer({ onData, onDone, scopeId, onError }) {
   return new Serializer({
     scopeId,
+    plugins: [
+      CustomEventPlugin,
+      DOMExceptionPlugin,
+      EventPlugin,
+      FormDataPlugin,
+      HeadersPlugin,
+      ReadableStreamPlugin,
+      RequestPlugin,
+      ResponsePlugin,
+      URLSearchParamsPlugin,
+      URLPlugin
+    ],
     globalIdentifier: GLOBAL_IDENTIFIER,
     disabledFeatures: ES2017FLAG,
     onData,
@@ -292,37 +316,41 @@ function renderToStream(code, options = {}) {
     },
     pipe(w) {
       allSettled(blockingPromises).then(() => {
-        doShell();
-        buffer = writable = w;
-        buffer.write(tmp);
-        firstFlushed = true;
-        if (completed) writable.end();
-        else setTimeout(flushEnd);
+        setTimeout(() => {
+          doShell();
+          buffer = writable = w;
+          buffer.write(tmp);
+          firstFlushed = true;
+          if (completed) writable.end();
+          else queue(flushEnd);
+        });
       });
     },
     pipeTo(w) {
       return allSettled(blockingPromises).then(() => {
-        doShell();
-        const encoder = new TextEncoder();
-        const writer = w.getWriter();
         let resolve;
         const p = new Promise(r => (resolve = r));
-        writable = {
-          end() {
-            writer.releaseLock();
-            w.close();
-            resolve();
-          }
-        };
-        buffer = {
-          write(payload) {
-            writer.write(encoder.encode(payload));
-          }
-        };
-        buffer.write(tmp);
-        firstFlushed = true;
-        if (completed) writable.end();
-        else setTimeout(flushEnd);
+        setTimeout(() => {
+          doShell();
+          const encoder = new TextEncoder();
+          const writer = w.getWriter();
+          writable = {
+            end() {
+              writer.releaseLock();
+              w.close();
+              resolve();
+            }
+          };
+          buffer = {
+            write(payload) {
+              writer.write(encoder.encode(payload));
+            }
+          };
+          buffer.write(tmp);
+          firstFlushed = true;
+          if (completed) writable.end();
+          else queue(flushEnd);
+        });
         return p;
       });
     }
@@ -366,7 +394,7 @@ function ssrClassList(value) {
 }
 function ssrStyle(value) {
   if (!value) return "";
-  if (typeof value === "string") return value;
+  if (typeof value === "string") return escape(value, true);
   let result = "";
   const k = Object.keys(value);
   for (let i = 0; i < k.length; i++) {
@@ -571,7 +599,13 @@ function replacePlaceholder(html, key, value) {
 }
 const RequestContext = Symbol();
 function getRequestEvent() {
-  return globalThis[RequestContext] ? globalThis[RequestContext].getStore() : undefined;
+  return globalThis[RequestContext]
+    ? globalThis[RequestContext].getStore() ||
+        (sharedConfig.context && sharedConfig.context.event) ||
+        console.log(
+          "RequestEvent is missing. This is most likely due to accessing `getRequestEvent` non-managed async scope in a partially polyfilled environment. Try moving it above all `await` calls."
+        )
+    : undefined;
 }
 function Assets(props) {
   useAssets(() => props.children);

package/web/dist/web.cjs

@@ -333,7 +333,7 @@ function assignProp(node, prop, value, prev, isSVG, skipRef) {
   let isCE, isProp, isChildProp, propAlias, forceProp;
   if (prop === "style") return style(node, value, prev);
   if (prop === "classList") return classList(node, value, prev);
-  if (value === prev) return prev;
+  if (value === prev && (prop !== "value" || prop !== "checked")) return prev;
   if (prop === "ref") {
     if (!skipRef) value(node);
   } else if (prop.slice(0, 3) === "on:") {

package/web/dist/web.js

@@ -784,7 +784,7 @@ function assignProp(node, prop, value, prev, isSVG, skipRef) {
   let isCE, isProp, isChildProp, propAlias, forceProp;
   if (prop === "style") return style(node, value, prev);
   if (prop === "classList") return classList(node, value, prev);
-  if (value === prev) return prev;
+  if (value === prev && (prop !== "value" || prop !== "checked")) return prev;
   if (prop === "ref") {
     if (!skipRef) value(node);
   } else if (prop.slice(0, 3) === "on:") {