Skip to content

Commit 89270a7

Browse files
authored
bump version (#693)
* bump version * install more files
1 parent 9f99fbc commit 89270a7

File tree

6 files changed

+58
-46
lines changed

6 files changed

+58
-46
lines changed

jscomp/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,8 @@ travis-world-test:./bin/bspack
120120
install:
121121
cp ./bin/bsc ./bin/bsppx ./bin/bspack ../bin/
122122
cp ./runtime/*.cmt* ./runtime/*.cmj* ./stdlib/*.cm* ./others/*.ml ./others/*.mli ./others/*.cm* ../lib/ocaml/
123-
cp ./runtime/js.ml ./runtime/js.cmi ./runtime/js_unsafe.cmi ../lib/ocaml/
123+
cp ./runtime/js.ml ./runtime/js.cmi ./runtime/js_unsafe.cmi ./runtime/js_null.ml ./runtime/js_null.cmi \
124+
./runtime/js_undefined.ml ./runtime/js_undefined.cmi ./runtime/js_null_undefined.ml ./runtime/js_null_undefined.cmi ../lib/ocaml/
124125

125126

126127

jscomp/bin/bs_ppx.ml

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
(** Bundled by bspack 08/25-14:43 *)
1+
(** Bundled by bspack 08/30-11:56 *)
22
module String_map : sig
33
#1 "string_map.mli"
44
(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -4037,7 +4037,7 @@ let int32 = "Caml_int32"
40374037
let block = "Block"
40384038
let js_primitive = "Js_primitive"
40394039
let module_ = "Caml_module"
4040-
let version = "0.9.6"
4040+
let version = "0.9.7"
40414041

40424042

40434043
let runtime_set =
@@ -4832,14 +4832,11 @@ let handle_attributes
48324832
get_name = `Nm_na ;
48334833
external_module_name = None ;
48344834
} ->
4835-
begin match arg_types with
4836-
| _self :: _args ->
4837-
Js_send {splice ;
4838-
name = string_of_bundle_source prim_name_or_pval_prim;
4839-
pipe = true}
4840-
| _ ->
4841-
Location.raise_errorf ~loc "Ill defined attribute [@@bs.send] (at least one argument)"
4842-
end
4835+
(** can be one argument *)
4836+
Js_send {splice ;
4837+
name = string_of_bundle_source prim_name_or_pval_prim;
4838+
pipe = true}
4839+
48434840
| {val_send_pipe = Some _ }
48444841
-> Location.raise_errorf ~loc "conflict attributes found"
48454842

@@ -6200,11 +6197,11 @@ let rec unsafe_mapper : Ast_mapper.mapper =
62006197
Ast_comb.to_undefined_type loc @@
62016198
if name = "module_" then
62026199
Typ.constr ~loc
6203-
{ txt = Ldot (Lident "Bs_node", "node_module") ;
6200+
{ txt = Ldot (Lident "Node", "node_module") ;
62046201
loc} []
62056202
else if name = "require" then
62066203
(Typ.constr ~loc
6207-
{ txt = Ldot (Lident "Bs_node", "node_require") ;
6204+
{ txt = Ldot (Lident "Node", "node_require") ;
62086205
loc} [] )
62096206
else
62106207
Ast_literal.type_string ~loc () in

0 commit comments

Comments
 (0)