File tree 8 files changed +3
-18
lines changed
8 files changed +3
-18
lines changed Original file line number Diff line number Diff line change 3
3
"version" : " 7.0.0" ,
4
4
"sources" : {
5
5
"dir" : " jscomp/test/"
6
- },
7
- "generate-merlin" : true
6
+ }
8
7
}
Original file line number Diff line number Diff line change 494
494
"$ref" : " #/definitions/entries" ,
495
495
"description" : " (internal) Used by bsb to build to different targets: native (ocamlopt), bytecode (ocamlc) or JS (bsc)"
496
496
},
497
- "generate-merlin" : {
498
- "type" : " boolean" ,
499
- "description" : " Whether to generate the `.merlin` file for [Merlin](https://github.com/ocaml/merlin). Default: true"
500
- },
501
497
"use-stdlib" : {
502
498
"type" : " boolean" ,
503
499
"description" : " (Experimental) whether to use the OCaml standard library. Default: true"
Original file line number Diff line number Diff line change @@ -49,7 +49,6 @@ let js_post_build = "js-post-build"
49
49
let cmd = " cmd"
50
50
let ninja = " ninja"
51
51
let package_specs = " package-specs"
52
- let generate_merlin = " generate-merlin"
53
52
let type_ = " type"
54
53
let dev = " dev"
55
54
let export_all = " all"
Original file line number Diff line number Diff line change @@ -333,8 +333,6 @@ let interpret_json ~(package_kind : Bsb_package_kind.t) ~(per_proj_dir : string)
333
333
file_groups = groups;
334
334
files_to_install = Queue. create () ;
335
335
built_in_dependency = built_in_package;
336
- generate_merlin =
337
- extract_boolean map Bsb_build_schemas. generate_merlin false ;
338
336
reason_react_jsx;
339
337
jsx;
340
338
generators = extract_generators map;
Original file line number Diff line number Diff line change @@ -57,7 +57,6 @@ type t = {
57
57
package_specs : Bsb_package_specs .t ;
58
58
file_groups : Bsb_file_groups .t ;
59
59
files_to_install : Bsb_db .module_info Queue .t ;
60
- generate_merlin : bool ;
61
60
reason_react_jsx : reason_react_jsx option ;
62
61
jsx : Bsb_jsx .t ;
63
62
(* whether apply PPX transform or not*)
Original file line number Diff line number Diff line change 16
16
"number" : " -40+6+7" ,
17
17
"error" : true
18
18
},
19
- "suffix" : " .bs.js" ,
20
- "generate-merlin" : true
19
+ "suffix" : " .bs.js"
21
20
}
Original file line number Diff line number Diff line change 19
19
"number" : " -40+6+7" ,
20
20
"error" : true
21
21
},
22
- "suffix" : " .bs.js" ,
23
- "generate-merlin" : true
22
+ "suffix" : " .bs.js"
24
23
}
Original file line number Diff line number Diff line change @@ -1735,7 +1735,6 @@ let js_post_build = "js-post-build"
1735
1735
let cmd = " cmd"
1736
1736
let ninja = " ninja"
1737
1737
let package_specs = " package-specs"
1738
- let generate_merlin = " generate-merlin"
1739
1738
let type_ = " type"
1740
1739
let dev = " dev"
1741
1740
let export_all = " all"
@@ -8425,7 +8424,6 @@ type t = {
8425
8424
package_specs : Bsb_package_specs .t ;
8426
8425
file_groups : Bsb_file_groups .t ;
8427
8426
files_to_install : Bsb_db .module_info Queue .t ;
8428
- generate_merlin : bool ;
8429
8427
reason_react_jsx : reason_react_jsx option ;
8430
8428
jsx : Bsb_jsx .t ;
8431
8429
(* whether apply PPX transform or not*)
@@ -10856,8 +10854,6 @@ let interpret_json ~(package_kind : Bsb_package_kind.t) ~(per_proj_dir : string)
10856
10854
file_groups = groups;
10857
10855
files_to_install = Queue. create () ;
10858
10856
built_in_dependency = built_in_package;
10859
- generate_merlin =
10860
- extract_boolean map Bsb_build_schemas. generate_merlin false ;
10861
10857
reason_react_jsx;
10862
10858
jsx;
10863
10859
generators = extract_generators map;
You can’t perform that action at this time.
0 commit comments