From 89baf1206a1df27ab5a666b6c31729fd1505e341 Mon Sep 17 00:00:00 2001
From: Ryan Carniato <ryansolid@gmail.com>
Date: Wed, 4 Jan 2023 01:10:34 -0800
Subject: [PATCH] fix ssr booleans, improve ssr performance

---
 .changeset/witty-fans-smell.md            |   6 +
 package.json                              |   8 +-
 packages/babel-preset-solid/package.json  |   2 +-
 packages/solid/h/jsx-runtime/src/jsx.d.ts | 286 ++++++++++++----------
 pnpm-lock.yaml                            |  40 +--
 5 files changed, 189 insertions(+), 153 deletions(-)
 create mode 100644 .changeset/witty-fans-smell.md

diff --git a/.changeset/witty-fans-smell.md b/.changeset/witty-fans-smell.md
new file mode 100644
index 000000000..ac14c35c1
--- /dev/null
+++ b/.changeset/witty-fans-smell.md
@@ -0,0 +1,6 @@
+---
+"babel-preset-solid": patch
+"solid-js": patch
+---
+
+fix boolean escaping, improve ssr performance
diff --git a/package.json b/package.json
index ef5b12b8d..d1eb3071a 100644
--- a/package.json
+++ b/package.json
@@ -33,16 +33,16 @@
     "@types/jest": "^28.1.6",
     "@types/node": "^18.0.6",
     "babel-jest": "^28.1.3",
-    "babel-plugin-jsx-dom-expressions": "^0.35.8",
+    "babel-plugin-jsx-dom-expressions": "^0.35.10",
     "coveralls": "^3.1.1",
     "csstype": "^3.1.0",
-    "dom-expressions": "0.35.8",
+    "dom-expressions": "0.35.10",
     "fast-glob": "^3.2.11",
-    "hyper-dom-expressions": "0.35.8",
+    "hyper-dom-expressions": "0.35.10",
     "jest": "^28.1.3",
     "jest-environment-jsdom": "^28.1.3",
     "jest-ts-webcompat-resolver": "^1.0.0",
-    "lit-dom-expressions": "0.35.8",
+    "lit-dom-expressions": "0.35.10",
     "ncp": "^2.0.0",
     "npm-run-all": "^4.1.5",
     "rimraf": "^3.0.2",
diff --git a/packages/babel-preset-solid/package.json b/packages/babel-preset-solid/package.json
index be7fcba36..9a8c4e431 100644
--- a/packages/babel-preset-solid/package.json
+++ b/packages/babel-preset-solid/package.json
@@ -14,7 +14,7 @@
     "test": "node test.js"
   },
   "dependencies": {
-    "babel-plugin-jsx-dom-expressions": "^0.35.8"
+    "babel-plugin-jsx-dom-expressions": "^0.35.10"
   },
   "peerDependencies": {
     "@babel/core": "^7.0.0"
diff --git a/packages/solid/h/jsx-runtime/src/jsx.d.ts b/packages/solid/h/jsx-runtime/src/jsx.d.ts
index b13d192e3..834d4cc24 100644
--- a/packages/solid/h/jsx-runtime/src/jsx.d.ts
+++ b/packages/solid/h/jsx-runtime/src/jsx.d.ts
@@ -99,81 +99,73 @@ export namespace JSX {
   type OnCaptureAttributes<T> = {
     [Key in keyof CustomCaptureEvents as `oncapture:${Key}`]?: EventHandler<T, CustomCaptureEvents[Key]>;
   }
-  interface DOMAttributes<T> extends CustomAttributes<T>, DirectiveAttributes, DirectiveFunctionAttributes<T>, PropAttributes, AttrAttributes, OnAttributes<T>, OnCaptureAttributes<T> {
+  interface DOMAttributes<T> extends CustomAttributes<T>, DirectiveAttributes, DirectiveFunctionAttributes<T>,
+                                     PropAttributes, AttrAttributes, OnAttributes<T>, OnCaptureAttributes<T>,
+                                     CustomEventHandlersCamelCase<T>, CustomEventHandlersLowerCase<T> {
     children?: Element;
     innerHTML?: string;
     innerText?: string | number;
     textContent?: string | number;
+    // camel case events
     onCopy?: EventHandlerUnion<T, ClipboardEvent>;
     onCut?: EventHandlerUnion<T, ClipboardEvent>;
     onPaste?: EventHandlerUnion<T, ClipboardEvent>;
     onCompositionEnd?: EventHandlerUnion<T, CompositionEvent>;
     onCompositionStart?: EventHandlerUnion<T, CompositionEvent>;
     onCompositionUpdate?: EventHandlerUnion<T, CompositionEvent>;
-    onFocus?: EventHandlerUnion<T, FocusEvent>;
     onFocusOut?: EventHandlerUnion<T, FocusEvent>;
     onFocusIn?: EventHandlerUnion<T, FocusEvent>;
-    onBlur?: EventHandlerUnion<T, FocusEvent>;
-    onChange?: EventHandlerUnion<T, Event>;
-    onInvalid?: EventHandlerUnion<T, Event>;
-    onInput?: EventHandlerUnion<T, InputEvent>;
-    onBeforeInput?: EventHandlerUnion<T, InputEvent>;
-    onReset?: EventHandlerUnion<T, Event>;
-    onSubmit?: EventHandlerUnion<
-      T,
-      Event & {
-        submitter: HTMLElement;
-      }
-    >;
-    onLoad?: EventHandlerUnion<T, Event>;
-    onError?: EventHandlerUnion<T, Event>;
-    onKeyDown?: EventHandlerUnion<T, KeyboardEvent>;
-    onKeyPress?: EventHandlerUnion<T, KeyboardEvent>;
-    onKeyUp?: EventHandlerUnion<T, KeyboardEvent>;
-    onGotPointerCapture?: EventHandlerUnion<T, PointerEvent>;
-    onLostPointerCapture?: EventHandlerUnion<T, PointerEvent>;
-    onPointerCancel?: EventHandlerUnion<T, PointerEvent>;
-    onPointerDown?: EventHandlerUnion<T, PointerEvent>;
-    onPointerEnter?: EventHandlerUnion<T, PointerEvent>;
-    onPointerLeave?: EventHandlerUnion<T, PointerEvent>;
-    onPointerMove?: EventHandlerUnion<T, PointerEvent>;
-    onPointerOver?: EventHandlerUnion<T, PointerEvent>;
-    onPointerOut?: EventHandlerUnion<T, PointerEvent>;
-    onPointerUp?: EventHandlerUnion<T, PointerEvent>;
+    onEncrypted?: EventHandlerUnion<T, Event>;
+    onDragExit?: EventHandlerUnion<T, DragEvent>;
+    // lower case events
+    oncopy?: EventHandlerUnion<T, ClipboardEvent>;
+    oncut?: EventHandlerUnion<T, ClipboardEvent>;
+    onpaste?: EventHandlerUnion<T, ClipboardEvent>;
+    oncompositionend?: EventHandlerUnion<T, CompositionEvent>;
+    oncompositionstart?: EventHandlerUnion<T, CompositionEvent>;
+    oncompositionupdate?: EventHandlerUnion<T, CompositionEvent>;
+    onfocusout?: EventHandlerUnion<T, FocusEvent>;
+    onfocusin?: EventHandlerUnion<T, FocusEvent>;
+    onencrypted?: EventHandlerUnion<T, Event>;
+    ondragexit?: EventHandlerUnion<T, DragEvent>;
+  }
+  interface CustomEventHandlersCamelCase<T> {
     onAbort?: EventHandlerUnion<T, Event>;
+    onAnimationEnd?: EventHandlerUnion<T, AnimationEvent>;
+    onAnimationIteration?: EventHandlerUnion<T, AnimationEvent>;
+    onAnimationStart?: EventHandlerUnion<T, AnimationEvent>;
+    onAuxClick?: EventHandlerUnion<T, MouseEvent>;
+    onBeforeInput?: EventHandlerUnion<T, InputEvent>;
+    onBlur?: EventHandlerUnion<T, FocusEvent>;
     onCanPlay?: EventHandlerUnion<T, Event>;
     onCanPlayThrough?: EventHandlerUnion<T, Event>;
-    onDurationChange?: EventHandlerUnion<T, Event>;
-    onEmptied?: EventHandlerUnion<T, Event>;
-    onEncrypted?: EventHandlerUnion<T, Event>;
-    onEnded?: EventHandlerUnion<T, Event>;
-    onLoadedData?: EventHandlerUnion<T, Event>;
-    onLoadedMetadata?: EventHandlerUnion<T, Event>;
-    onLoadStart?: EventHandlerUnion<T, Event>;
-    onPause?: EventHandlerUnion<T, Event>;
-    onPlay?: EventHandlerUnion<T, Event>;
-    onPlaying?: EventHandlerUnion<T, Event>;
-    onProgress?: EventHandlerUnion<T, Event>;
-    onRateChange?: EventHandlerUnion<T, Event>;
-    onSeeked?: EventHandlerUnion<T, Event>;
-    onSeeking?: EventHandlerUnion<T, Event>;
-    onStalled?: EventHandlerUnion<T, Event>;
-    onSuspend?: EventHandlerUnion<T, Event>;
-    onTimeUpdate?: EventHandlerUnion<T, Event>;
-    onVolumeChange?: EventHandlerUnion<T, Event>;
-    onWaiting?: EventHandlerUnion<T, Event>;
+    onChange?: EventHandlerUnion<T, Event>;
     onClick?: EventHandlerUnion<T, MouseEvent>;
-    onAuxClick?: EventHandlerUnion<T, MouseEvent>;
     onContextMenu?: EventHandlerUnion<T, MouseEvent>;
     onDblClick?: EventHandlerUnion<T, MouseEvent>;
     onDrag?: EventHandlerUnion<T, DragEvent>;
     onDragEnd?: EventHandlerUnion<T, DragEvent>;
     onDragEnter?: EventHandlerUnion<T, DragEvent>;
-    onDragExit?: EventHandlerUnion<T, DragEvent>;
     onDragLeave?: EventHandlerUnion<T, DragEvent>;
     onDragOver?: EventHandlerUnion<T, DragEvent>;
     onDragStart?: EventHandlerUnion<T, DragEvent>;
     onDrop?: EventHandlerUnion<T, DragEvent>;
+    onDurationChange?: EventHandlerUnion<T, Event>;
+    onEmptied?: EventHandlerUnion<T, Event>;
+    onEnded?: EventHandlerUnion<T, Event>;
+    onError?: EventHandlerUnion<T, Event>;
+    onFocus?: EventHandlerUnion<T, FocusEvent>;
+    onGotPointerCapture?: EventHandlerUnion<T, PointerEvent>;
+    onInput?: EventHandlerUnion<T, InputEvent>;
+    onInvalid?: EventHandlerUnion<T, Event>;
+    onKeyDown?: EventHandlerUnion<T, KeyboardEvent>;
+    onKeyPress?: EventHandlerUnion<T, KeyboardEvent>;
+    onKeyUp?: EventHandlerUnion<T, KeyboardEvent>;
+    onLoad?: EventHandlerUnion<T, Event>;
+    onLoadedData?: EventHandlerUnion<T, Event>;
+    onLoadedMetadata?: EventHandlerUnion<T, Event>;
+    onLoadStart?: EventHandlerUnion<T, Event>;
+    onLostPointerCapture?: EventHandlerUnion<T, PointerEvent>;
     onMouseDown?: EventHandlerUnion<T, MouseEvent>;
     onMouseEnter?: EventHandlerUnion<T, MouseEvent>;
     onMouseLeave?: EventHandlerUnion<T, MouseEvent>;
@@ -181,89 +173,82 @@ export namespace JSX {
     onMouseOut?: EventHandlerUnion<T, MouseEvent>;
     onMouseOver?: EventHandlerUnion<T, MouseEvent>;
     onMouseUp?: EventHandlerUnion<T, MouseEvent>;
-    onSelect?: EventHandlerUnion<T, UIEvent>;
-    onTouchCancel?: EventHandlerUnion<T, TouchEvent>;
-    onTouchEnd?: EventHandlerUnion<T, TouchEvent>;
-    onTouchMove?: EventHandlerUnion<T, TouchEvent>;
-    onTouchStart?: EventHandlerUnion<T, TouchEvent>;
+    onPause?: EventHandlerUnion<T, Event>;
+    onPlay?: EventHandlerUnion<T, Event>;
+    onPlaying?: EventHandlerUnion<T, Event>;
+    onPointerCancel?: EventHandlerUnion<T, PointerEvent>;
+    onPointerDown?: EventHandlerUnion<T, PointerEvent>;
+    onPointerEnter?: EventHandlerUnion<T, PointerEvent>;
+    onPointerLeave?: EventHandlerUnion<T, PointerEvent>;
+    onPointerMove?: EventHandlerUnion<T, PointerEvent>;
+    onPointerOut?: EventHandlerUnion<T, PointerEvent>;
+    onPointerOver?: EventHandlerUnion<T, PointerEvent>;
+    onPointerUp?: EventHandlerUnion<T, PointerEvent>;
+    onProgress?: EventHandlerUnion<T, Event>;
+    onRateChange?: EventHandlerUnion<T, Event>;
+    onReset?: EventHandlerUnion<T, Event>;
     onScroll?: EventHandlerUnion<T, UIEvent>;
-    onWheel?: EventHandlerUnion<T, WheelEvent>;
-    onAnimationStart?: EventHandlerUnion<T, AnimationEvent>;
-    onAnimationEnd?: EventHandlerUnion<T, AnimationEvent>;
-    onAnimationIteration?: EventHandlerUnion<T, AnimationEvent>;
-    onTransitionEnd?: EventHandlerUnion<T, TransitionEvent>;
-
-    // lower case events
-    oncopy?: EventHandlerUnion<T, ClipboardEvent>;
-    oncut?: EventHandlerUnion<T, ClipboardEvent>;
-    onpaste?: EventHandlerUnion<T, ClipboardEvent>;
-    oncompositionend?: EventHandlerUnion<T, CompositionEvent>;
-    oncompositionstart?: EventHandlerUnion<T, CompositionEvent>;
-    oncompositionupdate?: EventHandlerUnion<T, CompositionEvent>;
-    onfocus?: EventHandlerUnion<T, FocusEvent>;
-    onfocusout?: EventHandlerUnion<T, FocusEvent>;
-    onfocusin?: EventHandlerUnion<T, FocusEvent>;
-    onblur?: EventHandlerUnion<T, FocusEvent>;
-    onchange?: EventHandlerUnion<T, Event>;
-    oninvalid?: EventHandlerUnion<T, Event>;
-    oninput?: EventHandlerUnion<T, InputEvent>;
-    onbeforeinput?: EventHandlerUnion<T, InputEvent>;
-    onreset?: EventHandlerUnion<T, Event>;
-    onsubmit?: EventHandlerUnion<
+    onSeeked?: EventHandlerUnion<T, Event>;
+    onSeeking?: EventHandlerUnion<T, Event>;
+    onSelect?: EventHandlerUnion<T, UIEvent>;
+    onStalled?: EventHandlerUnion<T, Event>;
+    onSubmit?: EventHandlerUnion<
       T,
       Event & {
         submitter: HTMLElement;
       }
     >;
-    onload?: EventHandlerUnion<T, Event>;
-    onerror?: EventHandlerUnion<T, Event>;
-    onkeydown?: EventHandlerUnion<T, KeyboardEvent>;
-    onkeypress?: EventHandlerUnion<T, KeyboardEvent>;
-    onkeyup?: EventHandlerUnion<T, KeyboardEvent>;
-    ongotpointercapture?: EventHandlerUnion<T, PointerEvent>;
-    onlostpointercapture?: EventHandlerUnion<T, PointerEvent>;
-    onpointercancel?: EventHandlerUnion<T, PointerEvent>;
-    onpointerdown?: EventHandlerUnion<T, PointerEvent>;
-    onpointerenter?: EventHandlerUnion<T, PointerEvent>;
-    onpointerleave?: EventHandlerUnion<T, PointerEvent>;
-    onpointermove?: EventHandlerUnion<T, PointerEvent>;
-    onpointerover?: EventHandlerUnion<T, PointerEvent>;
-    onpointerout?: EventHandlerUnion<T, PointerEvent>;
-    onpointerup?: EventHandlerUnion<T, PointerEvent>;
+    onSuspend?: EventHandlerUnion<T, Event>;
+    onTimeUpdate?: EventHandlerUnion<T, Event>;
+    onTouchCancel?: EventHandlerUnion<T, TouchEvent>;
+    onTouchEnd?: EventHandlerUnion<T, TouchEvent>;
+    onTouchMove?: EventHandlerUnion<T, TouchEvent>;
+    onTouchStart?: EventHandlerUnion<T, TouchEvent>;
+    onTransitionEnd?: EventHandlerUnion<T, TransitionEvent>;
+    onVolumeChange?: EventHandlerUnion<T, Event>;
+    onWaiting?: EventHandlerUnion<T, Event>;
+    onWheel?: EventHandlerUnion<T, WheelEvent>;
+  }
+  /**
+   * @type {GlobalEventHandlers}
+   */
+  interface CustomEventHandlersLowerCase<T> {
     onabort?: EventHandlerUnion<T, Event>;
+    onanimationend?: EventHandlerUnion<T, AnimationEvent>;
+    onanimationiteration?: EventHandlerUnion<T, AnimationEvent>;
+    onanimationstart?: EventHandlerUnion<T, AnimationEvent>;
+    onauxclick?: EventHandlerUnion<T, MouseEvent>;
+    onbeforeinput?: EventHandlerUnion<T, InputEvent>;
+    onblur?: EventHandlerUnion<T, FocusEvent>;
     oncanplay?: EventHandlerUnion<T, Event>;
     oncanplaythrough?: EventHandlerUnion<T, Event>;
-    ondurationchange?: EventHandlerUnion<T, Event>;
-    onemptied?: EventHandlerUnion<T, Event>;
-    onencrypted?: EventHandlerUnion<T, Event>;
-    onended?: EventHandlerUnion<T, Event>;
-    onloadeddata?: EventHandlerUnion<T, Event>;
-    onloadedmetadata?: EventHandlerUnion<T, Event>;
-    onloadstart?: EventHandlerUnion<T, Event>;
-    onpause?: EventHandlerUnion<T, Event>;
-    onplay?: EventHandlerUnion<T, Event>;
-    onplaying?: EventHandlerUnion<T, Event>;
-    onprogress?: EventHandlerUnion<T, Event>;
-    onratechange?: EventHandlerUnion<T, Event>;
-    onseeked?: EventHandlerUnion<T, Event>;
-    onseeking?: EventHandlerUnion<T, Event>;
-    onstalled?: EventHandlerUnion<T, Event>;
-    onsuspend?: EventHandlerUnion<T, Event>;
-    ontimeupdate?: EventHandlerUnion<T, Event>;
-    onvolumechange?: EventHandlerUnion<T, Event>;
-    onwaiting?: EventHandlerUnion<T, Event>;
+    onchange?: EventHandlerUnion<T, Event>;
     onclick?: EventHandlerUnion<T, MouseEvent>;
-    onauxclick?: EventHandlerUnion<T, MouseEvent>;
     oncontextmenu?: EventHandlerUnion<T, MouseEvent>;
     ondblclick?: EventHandlerUnion<T, MouseEvent>;
     ondrag?: EventHandlerUnion<T, DragEvent>;
     ondragend?: EventHandlerUnion<T, DragEvent>;
     ondragenter?: EventHandlerUnion<T, DragEvent>;
-    ondragexit?: EventHandlerUnion<T, DragEvent>;
     ondragleave?: EventHandlerUnion<T, DragEvent>;
     ondragover?: EventHandlerUnion<T, DragEvent>;
     ondragstart?: EventHandlerUnion<T, DragEvent>;
     ondrop?: EventHandlerUnion<T, DragEvent>;
+    ondurationchange?: EventHandlerUnion<T, Event>;
+    onemptied?: EventHandlerUnion<T, Event>;
+    onended?: EventHandlerUnion<T, Event>;
+    onerror?: EventHandlerUnion<T, Event>;
+    onfocus?: EventHandlerUnion<T, FocusEvent>;
+    ongotpointercapture?: EventHandlerUnion<T, PointerEvent>;
+    oninput?: EventHandlerUnion<T, InputEvent>;
+    oninvalid?: EventHandlerUnion<T, Event>;
+    onkeydown?: EventHandlerUnion<T, KeyboardEvent>;
+    onkeypress?: EventHandlerUnion<T, KeyboardEvent>;
+    onkeyup?: EventHandlerUnion<T, KeyboardEvent>;
+    onload?: EventHandlerUnion<T, Event>;
+    onloadeddata?: EventHandlerUnion<T, Event>;
+    onloadedmetadata?: EventHandlerUnion<T, Event>;
+    onloadstart?: EventHandlerUnion<T, Event>;
+    onlostpointercapture?: EventHandlerUnion<T, PointerEvent>;
     onmousedown?: EventHandlerUnion<T, MouseEvent>;
     onmouseenter?: EventHandlerUnion<T, MouseEvent>;
     onmouseleave?: EventHandlerUnion<T, MouseEvent>;
@@ -271,17 +256,41 @@ export namespace JSX {
     onmouseout?: EventHandlerUnion<T, MouseEvent>;
     onmouseover?: EventHandlerUnion<T, MouseEvent>;
     onmouseup?: EventHandlerUnion<T, MouseEvent>;
+    onpause?: EventHandlerUnion<T, Event>;
+    onplay?: EventHandlerUnion<T, Event>;
+    onplaying?: EventHandlerUnion<T, Event>;
+    onpointercancel?: EventHandlerUnion<T, PointerEvent>;
+    onpointerdown?: EventHandlerUnion<T, PointerEvent>;
+    onpointerenter?: EventHandlerUnion<T, PointerEvent>;
+    onpointerleave?: EventHandlerUnion<T, PointerEvent>;
+    onpointermove?: EventHandlerUnion<T, PointerEvent>;
+    onpointerout?: EventHandlerUnion<T, PointerEvent>;
+    onpointerover?: EventHandlerUnion<T, PointerEvent>;
+    onpointerup?: EventHandlerUnion<T, PointerEvent>;
+    onprogress?: EventHandlerUnion<T, Event>;
+    onratechange?: EventHandlerUnion<T, Event>;
+    onreset?: EventHandlerUnion<T, Event>;
+    onscroll?: EventHandlerUnion<T, UIEvent>;
+    onseeked?: EventHandlerUnion<T, Event>;
+    onseeking?: EventHandlerUnion<T, Event>;
     onselect?: EventHandlerUnion<T, UIEvent>;
+    onstalled?: EventHandlerUnion<T, Event>;
+    onsubmit?: EventHandlerUnion<
+      T,
+      Event & {
+        submitter: HTMLElement;
+      }
+    >;
+    onsuspend?: EventHandlerUnion<T, Event>;
+    ontimeupdate?: EventHandlerUnion<T, Event>;
     ontouchcancel?: EventHandlerUnion<T, TouchEvent>;
     ontouchend?: EventHandlerUnion<T, TouchEvent>;
     ontouchmove?: EventHandlerUnion<T, TouchEvent>;
     ontouchstart?: EventHandlerUnion<T, TouchEvent>;
-    onscroll?: EventHandlerUnion<T, UIEvent>;
-    onwheel?: EventHandlerUnion<T, WheelEvent>;
-    onanimationstart?: EventHandlerUnion<T, AnimationEvent>;
-    onanimationend?: EventHandlerUnion<T, AnimationEvent>;
-    onanimationiteration?: EventHandlerUnion<T, AnimationEvent>;
     ontransitionend?: EventHandlerUnion<T, TransitionEvent>;
+    onvolumechange?: EventHandlerUnion<T, Event>;
+    onwaiting?: EventHandlerUnion<T, Event>;
+    onwheel?: EventHandlerUnion<T, WheelEvent>;
   }
 
   interface CSSProperties extends csstype.PropertiesHyphen {
@@ -978,6 +987,9 @@ export namespace JSX {
     colSpan?: FunctionMaybe<number | string>;
     rowSpan?: FunctionMaybe<number | string>;
   }
+  interface TemplateHTMLAttributes<T extends HTMLTemplateElement> extends HTMLAttributes<T> {
+    content?: FunctionMaybe<DocumentFragment>;
+  }
   interface TextareaHTMLAttributes<T> extends HTMLAttributes<T> {
     autocomplete?: FunctionMaybe<string>;
     autofocus?: FunctionMaybe<boolean>;
@@ -1826,7 +1838,10 @@ export namespace JSX {
       ZoomAndPanSVGAttributes {
     viewTarget?: FunctionMaybe<string>;
   }
-  interface IntrinsicElements {
+  /**
+   * @type {HTMLElementTagNameMap}
+   */
+  interface HTMLElementTags {
     a: AnchorHTMLAttributes<HTMLAnchorElement>;
     abbr: HTMLAttributes<HTMLElement>;
     address: HTMLAttributes<HTMLElement>;
@@ -1838,7 +1853,6 @@ export namespace JSX {
     base: BaseHTMLAttributes<HTMLBaseElement>;
     bdi: HTMLAttributes<HTMLElement>;
     bdo: HTMLAttributes<HTMLElement>;
-    big: HTMLAttributes<HTMLElement>;
     blockquote: BlockquoteHTMLAttributes<HTMLElement>;
     body: HTMLAttributes<HTMLBodyElement>;
     br: HTMLAttributes<HTMLBRElement>;
@@ -1883,7 +1897,6 @@ export namespace JSX {
     input: InputHTMLAttributes<HTMLInputElement>;
     ins: InsHTMLAttributes<HTMLModElement>;
     kbd: HTMLAttributes<HTMLElement>;
-    keygen: KeygenHTMLAttributes<HTMLElement>;
     label: LabelHTMLAttributes<HTMLLabelElement>;
     legend: HTMLAttributes<HTMLLegendElement>;
     li: LiHTMLAttributes<HTMLLIElement>;
@@ -1892,11 +1905,9 @@ export namespace JSX {
     map: MapHTMLAttributes<HTMLMapElement>;
     mark: HTMLAttributes<HTMLElement>;
     menu: MenuHTMLAttributes<HTMLElement>;
-    menuitem: HTMLAttributes<HTMLElement>;
     meta: MetaHTMLAttributes<HTMLMetaElement>;
     meter: MeterHTMLAttributes<HTMLElement>;
     nav: HTMLAttributes<HTMLElement>;
-    noindex: HTMLAttributes<HTMLElement>;
     noscript: HTMLAttributes<HTMLElement>;
     object: ObjectHTMLAttributes<HTMLObjectElement>;
     ol: OlHTMLAttributes<HTMLOListElement>;
@@ -1904,7 +1915,6 @@ export namespace JSX {
     option: OptionHTMLAttributes<HTMLOptionElement>;
     output: OutputHTMLAttributes<HTMLElement>;
     p: HTMLAttributes<HTMLParagraphElement>;
-    param: ParamHTMLAttributes<HTMLParamElement>;
     picture: HTMLAttributes<HTMLElement>;
     pre: HTMLAttributes<HTMLPreElement>;
     progress: ProgressHTMLAttributes<HTMLProgressElement>;
@@ -1928,10 +1938,11 @@ export namespace JSX {
     sup: HTMLAttributes<HTMLElement>;
     table: HTMLAttributes<HTMLTableElement>;
     tbody: HTMLAttributes<HTMLTableSectionElement>;
-    td: TdHTMLAttributes<HTMLTableDataCellElement>;
+    td: TdHTMLAttributes<HTMLTableCellElement>;
+    template: TemplateHTMLAttributes<HTMLTemplateElement>;
     textarea: TextareaHTMLAttributes<HTMLTextAreaElement>;
     tfoot: HTMLAttributes<HTMLTableSectionElement>;
-    th: ThHTMLAttributes<HTMLTableHeaderCellElement>;
+    th: ThHTMLAttributes<HTMLTableCellElement>;
     thead: HTMLAttributes<HTMLTableSectionElement>;
     time: TimeHTMLAttributes<HTMLElement>;
     title: HTMLAttributes<HTMLTitleElement>;
@@ -1942,7 +1953,21 @@ export namespace JSX {
     var: HTMLAttributes<HTMLElement>;
     video: VideoHTMLAttributes<HTMLVideoElement>;
     wbr: HTMLAttributes<HTMLElement>;
-    svg: SvgSVGAttributes<SVGSVGElement>;
+  }
+  /**
+   * @type {HTMLElementDeprecatedTagNameMap}
+   */
+  interface HTMLElementDeprecatedTags {
+    big: HTMLAttributes<HTMLElement>;
+    keygen: KeygenHTMLAttributes<HTMLElement>;
+    menuitem: HTMLAttributes<HTMLElement>;
+    noindex: HTMLAttributes<HTMLElement>;
+    param: ParamHTMLAttributes<HTMLParamElement>;
+  }
+  /**
+   * @type {SVGElementTagNameMap}
+   */
+  interface SVGElementTags {
     animate: AnimateSVGAttributes<SVGAnimateElement>;
     animateMotion: AnimateMotionSVGAttributes<SVGAnimateMotionElement>;
     animateTransform: AnimateTransformSVGAttributes<SVGAnimateTransformElement>;
@@ -1959,6 +1984,7 @@ export namespace JSX {
     feDiffuseLighting: FeDiffuseLightingSVGAttributes<SVGFEDiffuseLightingElement>;
     feDisplacementMap: FeDisplacementMapSVGAttributes<SVGFEDisplacementMapElement>;
     feDistantLight: FeDistantLightSVGAttributes<SVGFEDistantLightElement>;
+    feDropShadow: Partial<SVGFEDropShadowElement>;
     feFlood: FeFloodSVGAttributes<SVGFEFloodElement>;
     feFuncA: FeFuncSVGAttributes<SVGFEFuncAElement>;
     feFuncB: FeFuncSVGAttributes<SVGFEFuncBElement>;
@@ -1984,13 +2010,16 @@ export namespace JSX {
     marker: MarkerSVGAttributes<SVGMarkerElement>;
     mask: MaskSVGAttributes<SVGMaskElement>;
     metadata: MetadataSVGAttributes<SVGMetadataElement>;
+    mpath: Partial<SVGMPathElement>;
     path: PathSVGAttributes<SVGPathElement>;
     pattern: PatternSVGAttributes<SVGPatternElement>;
     polygon: PolygonSVGAttributes<SVGPolygonElement>;
     polyline: PolylineSVGAttributes<SVGPolylineElement>;
     radialGradient: RadialGradientSVGAttributes<SVGRadialGradientElement>;
     rect: RectSVGAttributes<SVGRectElement>;
+    set: Partial<SVGSetElement>;
     stop: StopSVGAttributes<SVGStopElement>;
+    svg: SvgSVGAttributes<SVGSVGElement>;
     switch: SwitchSVGAttributes<SVGSwitchElement>;
     symbol: SymbolSVGAttributes<SVGSymbolElement>;
     text: TextSVGAttributes<SVGTextElement>;
@@ -1999,4 +2028,5 @@ export namespace JSX {
     use: UseSVGAttributes<SVGUseElement>;
     view: ViewSVGAttributes<SVGViewElement>;
   }
+  interface IntrinsicElements extends HTMLElementTags, HTMLElementDeprecatedTags, SVGElementTags {}
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ff54d9ea7..c319cbd2b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -17,16 +17,16 @@ importers:
       '@types/jest': ^28.1.6
       '@types/node': ^18.0.6
       babel-jest: ^28.1.3
-      babel-plugin-jsx-dom-expressions: ^0.35.8
+      babel-plugin-jsx-dom-expressions: ^0.35.10
       coveralls: ^3.1.1
       csstype: ^3.1.0
-      dom-expressions: 0.35.8
+      dom-expressions: 0.35.10
       fast-glob: ^3.2.11
-      hyper-dom-expressions: 0.35.8
+      hyper-dom-expressions: 0.35.10
       jest: ^28.1.3
       jest-environment-jsdom: ^28.1.3
       jest-ts-webcompat-resolver: ^1.0.0
-      lit-dom-expressions: 0.35.8
+      lit-dom-expressions: 0.35.10
       ncp: ^2.0.0
       npm-run-all: ^4.1.5
       rimraf: ^3.0.2
@@ -52,16 +52,16 @@ importers:
       '@types/jest': 28.1.6
       '@types/node': 18.0.6
       babel-jest: 28.1.3_@babel+core@7.18.9
-      babel-plugin-jsx-dom-expressions: 0.35.8_@babel+core@7.18.9
+      babel-plugin-jsx-dom-expressions: 0.35.10_@babel+core@7.18.9
       coveralls: 3.1.1
       csstype: 3.1.0
-      dom-expressions: 0.35.8_csstype@3.1.0
+      dom-expressions: 0.35.10_csstype@3.1.0
       fast-glob: 3.2.11
-      hyper-dom-expressions: 0.35.8
+      hyper-dom-expressions: 0.35.10
       jest: 28.1.3_@types+node@18.0.6
       jest-environment-jsdom: 28.1.3
       jest-ts-webcompat-resolver: 1.0.0
-      lit-dom-expressions: 0.35.8
+      lit-dom-expressions: 0.35.10
       ncp: 2.0.0
       npm-run-all: 4.1.5
       rimraf: 3.0.2
@@ -76,9 +76,9 @@ importers:
 
   packages/babel-preset-solid:
     specifiers:
-      babel-plugin-jsx-dom-expressions: ^0.35.8
+      babel-plugin-jsx-dom-expressions: ^0.35.10
     dependencies:
-      babel-plugin-jsx-dom-expressions: 0.35.8
+      babel-plugin-jsx-dom-expressions: 0.35.10
 
   packages/solid:
     specifiers:
@@ -2489,8 +2489,8 @@ packages:
       '@types/babel__traverse': 7.17.1
     dev: true
 
-  /babel-plugin-jsx-dom-expressions/0.35.8:
-    resolution: {integrity: sha512-IzObXlDFA80wyEW/IUtCxaUAoJnq4CTpvcvC1xBZBlMpJDwmK6mIYnTZ9xgFyGCrAjC0LxVcqeDQx31gJJ4UJQ==}
+  /babel-plugin-jsx-dom-expressions/0.35.10:
+    resolution: {integrity: sha512-2xELzEm6CR152zeNu3Cr02zch52eVRXV4iAtSSpukcmRltsSMyIrPv1Hm1xSp76IO3OOhhySOii24xvIvV1xfQ==}
     peerDependencies:
       '@babel/core': ^7.0.0
     dependencies:
@@ -2500,8 +2500,8 @@ packages:
       html-entities: 2.3.2
     dev: false
 
-  /babel-plugin-jsx-dom-expressions/0.35.8_@babel+core@7.18.9:
-    resolution: {integrity: sha512-IzObXlDFA80wyEW/IUtCxaUAoJnq4CTpvcvC1xBZBlMpJDwmK6mIYnTZ9xgFyGCrAjC0LxVcqeDQx31gJJ4UJQ==}
+  /babel-plugin-jsx-dom-expressions/0.35.10_@babel+core@7.18.9:
+    resolution: {integrity: sha512-2xELzEm6CR152zeNu3Cr02zch52eVRXV4iAtSSpukcmRltsSMyIrPv1Hm1xSp76IO3OOhhySOii24xvIvV1xfQ==}
     peerDependencies:
       '@babel/core': ^7.0.0
     dependencies:
@@ -3122,8 +3122,8 @@ packages:
       path-type: 4.0.0
     dev: true
 
-  /dom-expressions/0.35.8_csstype@3.1.0:
-    resolution: {integrity: sha512-EIMgN/QNmAFk7UGqWXM1Uql2HCS9dEJDQ7R2IAmMNrQA4AyuPJ3JFJ1VoImP8fqp96Wrh+o/3W0zdlOvbnbVYA==}
+  /dom-expressions/0.35.10_csstype@3.1.0:
+    resolution: {integrity: sha512-Vu8nVNJUcbufjgir38tKKF0A+nrWRtjJc429xfjV9bDHjSg9KBkcJxXZQQvQnESmWuVpxXSuJdm38+FRUW3mAg==}
     peerDependencies:
       csstype: ^3.0
     dependencies:
@@ -3883,8 +3883,8 @@ packages:
     engines: {node: '>=10.17.0'}
     dev: true
 
-  /hyper-dom-expressions/0.35.8:
-    resolution: {integrity: sha512-N4L/Glxx6mb/0zrXnBuQ+kD6vSp7XhQHf2astN+YR5j0uZ4DDxSgGc0s14h5tcUgHb0yAuytiFyA/33TI8QChQ==}
+  /hyper-dom-expressions/0.35.10:
+    resolution: {integrity: sha512-l+i4YlT5y8Xj89b+oULcfpZv22RXnQjmZEwk2AWkwvQeCMtmJM1SH4tBpp+SRPpQ6c16T4VSPtUBPJa2UxUiqw==}
     dev: true
 
   /iconv-lite/0.4.24:
@@ -4836,8 +4836,8 @@ packages:
     resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==}
     dev: true
 
-  /lit-dom-expressions/0.35.8:
-    resolution: {integrity: sha512-0xSRlrcmbDTIhImiBo3hU02GpkF9P+nT0oVqnmoBqAKnaCetEu5ACN0R0De5kuZ5qPl5NmcnfXvI8Q3zsohkqA==}
+  /lit-dom-expressions/0.35.10:
+    resolution: {integrity: sha512-kop3Ex/tWZIzThjc1lZwS6w1UKh6Ab/GoB5ktR7ijPKuwVvbfU03VPff7gx0We9pVIe8mXYR10vGhSnXMokrhA==}
     dev: true
 
   /load-json-file/4.0.0: