Merge branch 'main' into update-jsx-types-messaging

Author: break-stuff

demo/lit-app/custom-elements-svelte.d.ts

@@ -147,7 +147,7 @@ export type CustomElements = {
    * ### **CSS Parts:**
    *  - **radio-label** - Applies custom styles the radio group label
    */
-  "radio-group": Partial<RadioGroupProps | BaseProps | BaseEvents>;
+  "radio-group": Partial<RadioGroupProps & BaseProps & BaseEvents>;
 
   /**
    * Radio buttons allow users to select a single option from a group. Here is its [documentation](https://my-site.com/documentation).
@@ -162,7 +162,7 @@ export type CustomElements = {
    * ### **Slots:**
    *  - _default_ - add text here to label your radio button
    */
-  "radio-button": Partial<RadioButtonProps | BaseProps | BaseEvents>;
+  "radio-button": Partial<RadioButtonProps & BaseProps & BaseEvents>;
 
   /**
    * @deprecated An example of a deprecated element
@@ -172,7 +172,7 @@ export type CustomElements = {
    *
    */
   "deprecated-element": Partial<
-    DeprecatedElementProps | BaseProps | BaseEvents
+    DeprecatedElementProps & BaseProps & BaseEvents
   >;
 
   /**
@@ -181,7 +181,7 @@ export type CustomElements = {
    * ---
    *
    */
-  "my-button": Partial<MyButtonProps | BaseProps | BaseEvents>;
+  "my-button": Partial<MyButtonProps & BaseProps & BaseEvents>;
 };
 
 declare namespace svelteHTML {

packages/jsx-integration/CHANGELOG.md

@@ -1,9 +1,13 @@
 # CHANGELOG
 
-## 1.5.3
+## 1.5.4
 
 - Updated messaging in `README.md` for react wrappers
 
+## 1.5.3
+
+- Updated to use intersection types rather than union types
+
 ## 1.5.2
 
 - Fixed async file output

packages/jsx-integration/package.json

@@ -1,6 +1,6 @@
 {
   "name": "custom-element-jsx-integration",
-  "version": "1.5.3",
+  "version": "1.5.4",
   "description": "Tools for integrating custom elements into JSX projects",
   "main": "index.js",
   "module": "index.js",

packages/react-wrappers/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 1.6.8
+
+- Updated to import `React` in types
+
 ## 1.6.7
 
 - Fixed binding for custom event listener

packages/react-wrappers/package.json

@@ -1,6 +1,6 @@
 {
   "name": "custom-element-react-wrappers",
-  "version": "1.6.7",
+  "version": "1.6.8",
   "description": "A tool for generating react-compatible wrappers for custom elements",
   "main": "index.js",
   "module": "index.js",

packages/react-wrappers/src/wrapper-generator.ts

@@ -423,6 +423,7 @@ function getTypeDefinitionTemplate(
   const eventTypes = getCustomEventTypes(component);
 
   return `
+    import React from "react";
     import { 
       ${config.defaultExport ? "default" : component.name} as ${
         component.name

packages/solidjs-integration/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 1.8.2
+
+- Updated to use intersection types rather than union types
+
 ## 1.8.1
 
 - Fixed async file output

packages/solidjs-integration/package.json

@@ -1,6 +1,6 @@
 {
   "name": "custom-element-solidjs-integration",
-  "version": "1.8.1",
+  "version": "1.8.2",
   "description": "Tools for integrating custom elements into SolidJS",
   "main": "index.js",
   "module": "index.js",

packages/solidjs-integration/src/type-generator.ts

@@ -216,7 +216,7 @@ ${components
     */
     "${options.prefix}${component.tagName}${options.suffix}": Partial<${
       component.name
-    }Props | BaseProps | BaseEvents>;`;
+    }Props & BaseProps & BaseEvents>;`;
   })
   .join("\n")}
   }

packages/svelte-integration/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 1.1.2
+
+- Updated to use intersection types rather than union types
+
 ## 1.1.1
 
 - Fixed async file output