Skip to content

Commit 6008633

Browse files
committed
Also build .res files in others/
1 parent a7ae475 commit 6008633

File tree

10 files changed

+107
-88
lines changed

10 files changed

+107
-88
lines changed

jscomp/main/builtin_cmi_datasets.ml

Lines changed: 3 additions & 1 deletion
Large diffs are not rendered by default.

jscomp/main/builtin_cmj_datasets.ml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
(* 02cc6267be3c48ac539d17899b1037f1 *)
1+
(* a32a8631aa0bfcd37a4d742e9ad8aada *)
22
let module_names : string array = Obj.magic (
33
"Js" (* 23 *),
44
"Arg" (* 217 *),
@@ -31,6 +31,7 @@ let module_names : string array = Obj.magic (
3131
"Js_map" (* 23 *),
3232
"Js_obj" (* 23 *),
3333
"Js_set" (* 23 *),
34+
"JsxDOM" (* 23 *),
3435
"Lexing" (* 812 *),
3536
"Random" (* 251 *),
3637
"Stream" (* 307 *),
@@ -165,6 +166,7 @@ let module_data : string array = Obj.magic (
165166
(* Js_map *)"\132\149\166\190\000\000\000\003\000\000\000\001\000\000\000\003\000\000\000\003\160\128A",
166167
(* Js_obj *)"\132\149\166\190\000\000\000\003\000\000\000\001\000\000\000\003\000\000\000\003\160\128A",
167168
(* Js_set *)"\132\149\166\190\000\000\000\003\000\000\000\001\000\000\000\003\000\000\000\003\160\128A",
169+
(* JsxDOM *)"\132\149\166\190\000\000\000\003\000\000\000\001\000\000\000\003\000\000\000\003\160\128A",
168170
(* Lexing *)"\132\149\166\190\000\000\003\024\000\000\000\192\000\000\002\158\000\000\002{\160\b\000\000@\000\176&engine\144\160\160C@@@\176&lexeme\144\160\160A@@@\176(new_line\144\160\160A@@@\176*lexeme_end\144\160\160A@@\144\148\192A\160\176\001\004@&lexbuf@@\151\176\161C\160(pos_cnum@\160\151\176\161K\160*lex_curr_pA\160\144\004\015@\176\1924stdlib-406/lexing.ml\001\000\210\001\026\178\001\026\202\192\004\002\001\000\210\001\026\178\001\026\219@@\176\004\004\192\004\004\001\000\210\001\026\178\001\026\228@\208B@@@@\176*new_engine\144\160\160C@@@\176*sub_lexeme\144\160\160C@@@\176+flush_input\144\160\160A@@@\176+from_string\144\160\160A@@@\176+lexeme_char\144\160\160B@@@\176,lexeme_end_p\144\160\160A@@\144\148\192A\160\176\001\004D&lexbuf@@\151\176\161K\160\0042A\160\144\004\b@\176\192\0041\001\000\213\001\027\021\001\027/\192\0042\001\000\213\001\027\021\001\027@@\208B@@@@\176,lexeme_start\144\160\160A@@\144\148\192A\160\176\001\004>&lexbuf@@\151\176\161C\160\004M@\160\151\176\161J\160+lex_start_pA\160\144\004\014@\176\192\004L\001\000\209\001\026|\001\026\150\192\004M\001\000\209\001\026|\001\026\168@@\176\004\003\192\004O\001\000\209\001\026|\001\026\177@\208B@@@@\176-from_function\144\160\160A@@@\176.lexeme_start_p\144\160\160A@@\144\148\192A\160\176\001\004B&lexbuf@@\151\176\161J\160\004\029A\160\144\004\b@\176\192\004h\001\000\212\001\026\230\001\027\002\192\004i\001\000\212\001\026\230\001\027\020@\208B@@@@\176.sub_lexeme_opt\144\160\160C@@@\176/sub_lexeme_char\144\160\160B@@\144\148\192B\160\176\001\0045&lexbuf@\160\176\001\0046!i@@\151\176c\160\151\176\161A\160*lex_bufferA\160\144\004\015@\176\192\004\137\001\000\197\001\025z\001\025\163\192\004\138\001\000\197\001\025z\001\025\180@\160\144\004\017@\176\192\004\142\001\000\197\001\025z\001\025\153\192\004\143\001\000\197\001\025z\001\025\182@\208B@@@@\1763sub_lexeme_char_opt\144\160\160B@@@A",
169171
(* Random *)"\132\149\166\190\000\000\000\231\000\000\000O\000\000\001\001\000\000\000\246\160\b\000\0000\000\176#int\144\160\160A@@@\176$bits\144\160\160A@@@\176$bool\144\160\160A@@@\176$init\144\160\160A@@@\176%State\145\b\000\000$\000\160\160A@@\160\160A@@\160\160A@@\160\160A@@\160\160B@@\160\160B@@\160\160B@@\160\160B@@\160\160A@@@\176%float\144\160\160A@@@\176%int32\144\160\160A@@@\176%int64\144\160\160A@@@\176)full_init\144\160\160A@@@\176)get_state\144\160\160A@@@\176)self_init\144\160\160A@@@\176)set_state\144\160\160A@@@A",
170172
(* Stream *)"\132\149\166\190\000\000\001\031\000\000\000f\000\000\001D\000\000\0010\160\b\000\000P\000\176$dump\144\160\160B@@@\176$from\144\160\160A@@@\176$iapp\144\160\160B@@@\176$iter\144\160\160B@@@\176$junk\144\160\160A@@@\176$lapp\144\160\160B@@@\176$next\144\160\160A@@@\176$peek\144\160\160A@@@\176%count\144\160\160A@@@\176%empty\144\160\160A@@@\176%icons\144\160\160B@@@\176%ising\144\160\160A@@@\176%lcons\144\160\160B@@@\176%lsing\144\160\160A@@@\176%npeek\144\160\160B@@@\176%slazy\144\160\160A@@@\176&sempty\144@\144\146A\176'of_list\144\160\160A@@@\176(of_bytes\144\160\160A@@@\176)of_string\144\160\160A@@@A",

jscomp/others/jsxDOM.res

Lines changed: 78 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -265,98 +265,98 @@ type domProps = {
265265
width?: string /* in html5 this can only be a number, but in html4 it can ba a percentage as well */,
266266
wrap?: string /* "hard" or "soft" */,
267267
/* Clipboard events */
268-
onCopy?: ReactEvent.Clipboard.t => unit,
269-
onCut?: ReactEvent.Clipboard.t => unit,
270-
onPaste?: ReactEvent.Clipboard.t => unit,
268+
onCopy?: JsxEvent.Clipboard.t => unit,
269+
onCut?: JsxEvent.Clipboard.t => unit,
270+
onPaste?: JsxEvent.Clipboard.t => unit,
271271
/* Composition events */
272-
onCompositionEnd?: ReactEvent.Composition.t => unit,
273-
onCompositionStart?: ReactEvent.Composition.t => unit,
274-
onCompositionUpdate?: ReactEvent.Composition.t => unit,
272+
onCompositionEnd?: JsxEvent.Composition.t => unit,
273+
onCompositionStart?: JsxEvent.Composition.t => unit,
274+
onCompositionUpdate?: JsxEvent.Composition.t => unit,
275275
/* Keyboard events */
276-
onKeyDown?: ReactEvent.Keyboard.t => unit,
277-
onKeyPress?: ReactEvent.Keyboard.t => unit,
278-
onKeyUp?: ReactEvent.Keyboard.t => unit,
276+
onKeyDown?: JsxEvent.Keyboard.t => unit,
277+
onKeyPress?: JsxEvent.Keyboard.t => unit,
278+
onKeyUp?: JsxEvent.Keyboard.t => unit,
279279
/* Focus events */
280-
onFocus?: ReactEvent.Focus.t => unit,
281-
onBlur?: ReactEvent.Focus.t => unit,
280+
onFocus?: JsxEvent.Focus.t => unit,
281+
onBlur?: JsxEvent.Focus.t => unit,
282282
/* Form events */
283-
onChange?: ReactEvent.Form.t => unit,
284-
onInput?: ReactEvent.Form.t => unit,
285-
onSubmit?: ReactEvent.Form.t => unit,
286-
onInvalid?: ReactEvent.Form.t => unit,
283+
onChange?: JsxEvent.Form.t => unit,
284+
onInput?: JsxEvent.Form.t => unit,
285+
onSubmit?: JsxEvent.Form.t => unit,
286+
onInvalid?: JsxEvent.Form.t => unit,
287287
/* Mouse events */
288-
onClick?: ReactEvent.Mouse.t => unit,
289-
onContextMenu?: ReactEvent.Mouse.t => unit,
290-
onDoubleClick?: ReactEvent.Mouse.t => unit,
291-
onDrag?: ReactEvent.Mouse.t => unit,
292-
onDragEnd?: ReactEvent.Mouse.t => unit,
293-
onDragEnter?: ReactEvent.Mouse.t => unit,
294-
onDragExit?: ReactEvent.Mouse.t => unit,
295-
onDragLeave?: ReactEvent.Mouse.t => unit,
296-
onDragOver?: ReactEvent.Mouse.t => unit,
297-
onDragStart?: ReactEvent.Mouse.t => unit,
298-
onDrop?: ReactEvent.Mouse.t => unit,
299-
onMouseDown?: ReactEvent.Mouse.t => unit,
300-
onMouseEnter?: ReactEvent.Mouse.t => unit,
301-
onMouseLeave?: ReactEvent.Mouse.t => unit,
302-
onMouseMove?: ReactEvent.Mouse.t => unit,
303-
onMouseOut?: ReactEvent.Mouse.t => unit,
304-
onMouseOver?: ReactEvent.Mouse.t => unit,
305-
onMouseUp?: ReactEvent.Mouse.t => unit,
288+
onClick?: JsxEvent.Mouse.t => unit,
289+
onContextMenu?: JsxEvent.Mouse.t => unit,
290+
onDoubleClick?: JsxEvent.Mouse.t => unit,
291+
onDrag?: JsxEvent.Mouse.t => unit,
292+
onDragEnd?: JsxEvent.Mouse.t => unit,
293+
onDragEnter?: JsxEvent.Mouse.t => unit,
294+
onDragExit?: JsxEvent.Mouse.t => unit,
295+
onDragLeave?: JsxEvent.Mouse.t => unit,
296+
onDragOver?: JsxEvent.Mouse.t => unit,
297+
onDragStart?: JsxEvent.Mouse.t => unit,
298+
onDrop?: JsxEvent.Mouse.t => unit,
299+
onMouseDown?: JsxEvent.Mouse.t => unit,
300+
onMouseEnter?: JsxEvent.Mouse.t => unit,
301+
onMouseLeave?: JsxEvent.Mouse.t => unit,
302+
onMouseMove?: JsxEvent.Mouse.t => unit,
303+
onMouseOut?: JsxEvent.Mouse.t => unit,
304+
onMouseOver?: JsxEvent.Mouse.t => unit,
305+
onMouseUp?: JsxEvent.Mouse.t => unit,
306306
/* Selection events */
307-
onSelect?: ReactEvent.Selection.t => unit,
307+
onSelect?: JsxEvent.Selection.t => unit,
308308
/* Touch events */
309-
onTouchCancel?: ReactEvent.Touch.t => unit,
310-
onTouchEnd?: ReactEvent.Touch.t => unit,
311-
onTouchMove?: ReactEvent.Touch.t => unit,
312-
onTouchStart?: ReactEvent.Touch.t => unit,
309+
onTouchCancel?: JsxEvent.Touch.t => unit,
310+
onTouchEnd?: JsxEvent.Touch.t => unit,
311+
onTouchMove?: JsxEvent.Touch.t => unit,
312+
onTouchStart?: JsxEvent.Touch.t => unit,
313313
// Pointer events
314-
onPointerOver?: ReactEvent.Pointer.t => unit,
315-
onPointerEnter?: ReactEvent.Pointer.t => unit,
316-
onPointerDown?: ReactEvent.Pointer.t => unit,
317-
onPointerMove?: ReactEvent.Pointer.t => unit,
318-
onPointerUp?: ReactEvent.Pointer.t => unit,
319-
onPointerCancel?: ReactEvent.Pointer.t => unit,
320-
onPointerOut?: ReactEvent.Pointer.t => unit,
321-
onPointerLeave?: ReactEvent.Pointer.t => unit,
322-
onGotPointerCapture?: ReactEvent.Pointer.t => unit,
323-
onLostPointerCapture?: ReactEvent.Pointer.t => unit,
314+
onPointerOver?: JsxEvent.Pointer.t => unit,
315+
onPointerEnter?: JsxEvent.Pointer.t => unit,
316+
onPointerDown?: JsxEvent.Pointer.t => unit,
317+
onPointerMove?: JsxEvent.Pointer.t => unit,
318+
onPointerUp?: JsxEvent.Pointer.t => unit,
319+
onPointerCancel?: JsxEvent.Pointer.t => unit,
320+
onPointerOut?: JsxEvent.Pointer.t => unit,
321+
onPointerLeave?: JsxEvent.Pointer.t => unit,
322+
onGotPointerCapture?: JsxEvent.Pointer.t => unit,
323+
onLostPointerCapture?: JsxEvent.Pointer.t => unit,
324324
/* UI events */
325-
onScroll?: ReactEvent.UI.t => unit,
325+
onScroll?: JsxEvent.UI.t => unit,
326326
/* Wheel events */
327-
onWheel?: ReactEvent.Wheel.t => unit,
327+
onWheel?: JsxEvent.Wheel.t => unit,
328328
/* Media events */
329-
onAbort?: ReactEvent.Media.t => unit,
330-
onCanPlay?: ReactEvent.Media.t => unit,
331-
onCanPlayThrough?: ReactEvent.Media.t => unit,
332-
onDurationChange?: ReactEvent.Media.t => unit,
333-
onEmptied?: ReactEvent.Media.t => unit,
334-
onEncrypted?: ReactEvent.Media.t => unit,
335-
onEnded?: ReactEvent.Media.t => unit,
336-
onError?: ReactEvent.Media.t => unit,
337-
onLoadedData?: ReactEvent.Media.t => unit,
338-
onLoadedMetadata?: ReactEvent.Media.t => unit,
339-
onLoadStart?: ReactEvent.Media.t => unit,
340-
onPause?: ReactEvent.Media.t => unit,
341-
onPlay?: ReactEvent.Media.t => unit,
342-
onPlaying?: ReactEvent.Media.t => unit,
343-
onProgress?: ReactEvent.Media.t => unit,
344-
onRateChange?: ReactEvent.Media.t => unit,
345-
onSeeked?: ReactEvent.Media.t => unit,
346-
onSeeking?: ReactEvent.Media.t => unit,
347-
onStalled?: ReactEvent.Media.t => unit,
348-
onSuspend?: ReactEvent.Media.t => unit,
349-
onTimeUpdate?: ReactEvent.Media.t => unit,
350-
onVolumeChange?: ReactEvent.Media.t => unit,
351-
onWaiting?: ReactEvent.Media.t => unit,
329+
onAbort?: JsxEvent.Media.t => unit,
330+
onCanPlay?: JsxEvent.Media.t => unit,
331+
onCanPlayThrough?: JsxEvent.Media.t => unit,
332+
onDurationChange?: JsxEvent.Media.t => unit,
333+
onEmptied?: JsxEvent.Media.t => unit,
334+
onEncrypted?: JsxEvent.Media.t => unit,
335+
onEnded?: JsxEvent.Media.t => unit,
336+
onError?: JsxEvent.Media.t => unit,
337+
onLoadedData?: JsxEvent.Media.t => unit,
338+
onLoadedMetadata?: JsxEvent.Media.t => unit,
339+
onLoadStart?: JsxEvent.Media.t => unit,
340+
onPause?: JsxEvent.Media.t => unit,
341+
onPlay?: JsxEvent.Media.t => unit,
342+
onPlaying?: JsxEvent.Media.t => unit,
343+
onProgress?: JsxEvent.Media.t => unit,
344+
onRateChange?: JsxEvent.Media.t => unit,
345+
onSeeked?: JsxEvent.Media.t => unit,
346+
onSeeking?: JsxEvent.Media.t => unit,
347+
onStalled?: JsxEvent.Media.t => unit,
348+
onSuspend?: JsxEvent.Media.t => unit,
349+
onTimeUpdate?: JsxEvent.Media.t => unit,
350+
onVolumeChange?: JsxEvent.Media.t => unit,
351+
onWaiting?: JsxEvent.Media.t => unit,
352352
/* Image events */
353-
onLoad?: ReactEvent.Image.t => unit /* duplicate */ /* ~onError: ReactEvent.Image.t => unit=?, */,
353+
onLoad?: JsxEvent.Image.t => unit /* duplicate */ /* ~onError: JsxEvent.Image.t => unit=?, */,
354354
/* Animation events */
355-
onAnimationStart?: ReactEvent.Animation.t => unit,
356-
onAnimationEnd?: ReactEvent.Animation.t => unit,
357-
onAnimationIteration?: ReactEvent.Animation.t => unit,
355+
onAnimationStart?: JsxEvent.Animation.t => unit,
356+
onAnimationEnd?: JsxEvent.Animation.t => unit,
357+
onAnimationIteration?: JsxEvent.Animation.t => unit,
358358
/* Transition events */
359-
onTransitionEnd?: ReactEvent.Transition.t => unit,
359+
onTransitionEnd?: JsxEvent.Transition.t => unit,
360360
/* svg */
361361
accentHeight?: string,
362362
accumulate?: string,

jscomp/others/release.ninja

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,10 @@ o others/js_vector.cmi : cc others/js_vector.mli | others/belt_internals.cmi oth
6464
o others/js_weakmap.cmi others/js_weakmap.cmj : cc others/js_weakmap.ml | others/belt_internals.cmi others/js.cmi $bsc
6565
o others/js_weakset.cmi others/js_weakset.cmj : cc others/js_weakset.ml | others/belt_internals.cmi others/js.cmi $bsc
6666
o others/jsx.cmi others/jsx.cmj : cc others/jsx.ml | others/belt_internals.cmi others/js.cmi $bsc
67+
o others/jsxDOM.cmi others/jsxDOM.cmj : cc others/jsxDOM.res | others/belt_internals.cmi others/js.cmi $bsc
6768
o others/jsxDOMStyle.cmi others/jsxDOMStyle.cmj : cc others/jsxDOMStyle.ml | others/belt_internals.cmi others/js.cmi $bsc
6869
o others/jsxEvent.cmi others/jsxEvent.cmj : cc others/jsxEvent.ml | others/belt_internals.cmi others/js.cmi $bsc
69-
o js_pkg : phony others/js_OO.cmi others/js_OO.cmj others/js_array.cmi others/js_array.cmj others/js_array2.cmi others/js_array2.cmj others/js_bigint.cmi others/js_bigint.cmj others/js_cast.cmi others/js_cast.cmj others/js_console.cmi others/js_console.cmj others/js_date.cmi others/js_date.cmj others/js_dict.cmi others/js_dict.cmj others/js_exn.cmi others/js_exn.cmj others/js_float.cmi others/js_float.cmj others/js_global.cmi others/js_global.cmj others/js_int.cmi others/js_int.cmj others/js_json.cmi others/js_json.cmj others/js_list.cmi others/js_list.cmj others/js_map.cmi others/js_map.cmj others/js_mapperRt.cmi others/js_mapperRt.cmj others/js_math.cmi others/js_math.cmj others/js_null.cmi others/js_null.cmj others/js_null_undefined.cmi others/js_null_undefined.cmj others/js_obj.cmi others/js_obj.cmj others/js_option.cmi others/js_option.cmj others/js_promise.cmi others/js_promise.cmj others/js_re.cmi others/js_re.cmj others/js_result.cmi others/js_result.cmj others/js_set.cmi others/js_set.cmj others/js_string.cmi others/js_string.cmj others/js_string2.cmi others/js_string2.cmj others/js_typed_array.cmi others/js_typed_array.cmj others/js_typed_array2.cmi others/js_typed_array2.cmj others/js_types.cmi others/js_types.cmj others/js_undefined.cmi others/js_undefined.cmj others/js_vector.cmi others/js_vector.cmj others/js_weakmap.cmi others/js_weakmap.cmj others/js_weakset.cmi others/js_weakset.cmj others/jsx.cmi others/jsx.cmj others/jsxDOMStyle.cmi others/jsxDOMStyle.cmj others/jsxEvent.cmi others/jsxEvent.cmj
70+
o js_pkg : phony others/js_OO.cmi others/js_OO.cmj others/js_array.cmi others/js_array.cmj others/js_array2.cmi others/js_array2.cmj others/js_bigint.cmi others/js_bigint.cmj others/js_cast.cmi others/js_cast.cmj others/js_console.cmi others/js_console.cmj others/js_date.cmi others/js_date.cmj others/js_dict.cmi others/js_dict.cmj others/js_exn.cmi others/js_exn.cmj others/js_float.cmi others/js_float.cmj others/js_global.cmi others/js_global.cmj others/js_int.cmi others/js_int.cmj others/js_json.cmi others/js_json.cmj others/js_list.cmi others/js_list.cmj others/js_map.cmi others/js_map.cmj others/js_mapperRt.cmi others/js_mapperRt.cmj others/js_math.cmi others/js_math.cmj others/js_null.cmi others/js_null.cmj others/js_null_undefined.cmi others/js_null_undefined.cmj others/js_obj.cmi others/js_obj.cmj others/js_option.cmi others/js_option.cmj others/js_promise.cmi others/js_promise.cmj others/js_re.cmi others/js_re.cmj others/js_result.cmi others/js_result.cmj others/js_set.cmi others/js_set.cmj others/js_string.cmi others/js_string.cmj others/js_string2.cmi others/js_string2.cmj others/js_typed_array.cmi others/js_typed_array.cmj others/js_typed_array2.cmi others/js_typed_array2.cmj others/js_types.cmi others/js_types.cmj others/js_undefined.cmi others/js_undefined.cmj others/js_vector.cmi others/js_vector.cmj others/js_weakmap.cmi others/js_weakmap.cmj others/js_weakset.cmi others/js_weakset.cmj others/jsx.cmi others/jsx.cmj others/jsxDOM.cmi others/jsxDOM.cmj others/jsxDOMStyle.cmi others/jsxDOMStyle.cmj others/jsxEvent.cmi others/jsxEvent.cmj
7071
o others/belt_Array.cmj : cc_cmi others/belt_Array.ml | others/belt.cmi others/belt_Array.cmi others/belt_internals.cmi others/js.cmi others/js.cmj others/js_math.cmj $bsc js_pkg
7172
o others/belt_Array.cmi : cc others/belt_Array.mli | others/belt.cmi others/belt_internals.cmi others/js.cmi others/js.cmj $bsc js_pkg
7273
o others/belt_Float.cmj : cc_cmi others/belt_Float.ml | others/belt.cmi others/belt_Float.cmi others/belt_internals.cmi others/js.cmi $bsc js_pkg

lib/4.06.1/unstable/js_compiler.ml

Lines changed: 6 additions & 2 deletions
Large diffs are not rendered by default.

lib/4.06.1/unstable/js_playground_compiler.ml

Lines changed: 6 additions & 2 deletions
Large diffs are not rendered by default.

lib/4.06.1/whole_compiler.ml

Lines changed: 6 additions & 2 deletions
Large diffs are not rendered by default.

lib/es6/jsxDOM.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */

lib/js/jsxDOM.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */

scripts/ninja.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1014,7 +1014,7 @@ ${ninjaQuickBuidList([
10141014
var jsPrefixSourceFiles = othersDirFiles.filter(
10151015
x =>
10161016
x.startsWith("js") &&
1017-
(x.endsWith(".ml") || x.endsWith(".mli")) &&
1017+
(x.endsWith(".ml") || x.endsWith(".mli") || x.endsWith(".res") || x.endsWith(".resi")) &&
10181018
!x.includes(".cppo") &&
10191019
!x.includes(".pp") &&
10201020
!x.includes("#") &&

0 commit comments

Comments
 (0)