Skip to content

Commit 4c80bae

Browse files
committed
sync with master
1 parent 44c2102 commit 4c80bae

File tree

2 files changed

+7
-19
lines changed

2 files changed

+7
-19
lines changed

runtime/Jsx.res

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,7 @@
2222
* along with this program; if not, write to the Free Software
2323
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
2424

25-
// Define this as a private empty record so that the compiler does not
26-
// unnecessarily add `Primitive_option.some` calls for optional props.
27-
type element = private {}
28-
29-
@val external null: element = "null"
30-
31-
external float: float => element = "%identity"
32-
external int: int => element = "%identity"
33-
external string: string => element = "%identity"
34-
35-
external array: array<element> => element = "%identity"
36-
37-
type componentLike<'props, 'return> = 'props => 'return
38-
type component<'props> = componentLike<'props, element>
39-
40-
/* this function exists to prepare for making `component` abstract */
41-
external component: componentLike<'props, element> => component<'props> = "%identity"
25+
include Jsx_common
26+
module DOMStyle = JsxDOMStyle
27+
module Event = JsxEvent
28+
module DOM = JsxDOM

runtime/Jsx_common.res

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@
2222
* along with this program; if not, write to the Free Software
2323
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
2424

25-
type element
26-
type ref
25+
// Define this as a private empty record so that the compiler does not
26+
// unnecessarily add `Primitive_option.some` calls for optional props.
27+
type element = private {}
2728

2829
@val external null: element = "null"
2930

0 commit comments

Comments
 (0)