Skip to content

Commit 470feb2

Browse files
authored
Remove unused generate-merlin option (#5839)
1 parent 3d554d0 commit 470feb2

File tree

8 files changed

+3
-18
lines changed

8 files changed

+3
-18
lines changed

bsconfig.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@
33
"version": "7.0.0",
44
"sources": {
55
"dir": "jscomp/test/"
6-
},
7-
"generate-merlin": true
6+
}
87
}

docs/docson/build-schema.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -494,10 +494,6 @@
494494
"$ref": "#/definitions/entries",
495495
"description": "(internal) Used by bsb to build to different targets: native (ocamlopt), bytecode (ocamlc) or JS (bsc)"
496496
},
497-
"generate-merlin": {
498-
"type": "boolean",
499-
"description": "Whether to generate the `.merlin` file for [Merlin](https://github.com/ocaml/merlin). Default: true"
500-
},
501497
"use-stdlib": {
502498
"type": "boolean",
503499
"description": "(Experimental) whether to use the OCaml standard library. Default: true"

jscomp/bsb/bsb_build_schemas.ml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ let js_post_build = "js-post-build"
4949
let cmd = "cmd"
5050
let ninja = "ninja"
5151
let package_specs = "package-specs"
52-
let generate_merlin = "generate-merlin"
5352
let type_ = "type"
5453
let dev = "dev"
5554
let export_all = "all"

jscomp/bsb/bsb_config_parse.ml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -333,8 +333,6 @@ let interpret_json ~(package_kind : Bsb_package_kind.t) ~(per_proj_dir : string)
333333
file_groups = groups;
334334
files_to_install = Queue.create ();
335335
built_in_dependency = built_in_package;
336-
generate_merlin =
337-
extract_boolean map Bsb_build_schemas.generate_merlin false;
338336
reason_react_jsx;
339337
jsx;
340338
generators = extract_generators map;

jscomp/bsb/bsb_config_types.ml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ type t = {
5757
package_specs : Bsb_package_specs.t;
5858
file_groups : Bsb_file_groups.t;
5959
files_to_install : Bsb_db.module_info Queue.t;
60-
generate_merlin : bool;
6160
reason_react_jsx : reason_react_jsx option;
6261
jsx: Bsb_jsx.t;
6362
(* whether apply PPX transform or not*)

jscomp/build_tests/custom_namespace/bsconfig.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,5 @@
1616
"number" : "-40+6+7",
1717
"error" : true
1818
},
19-
"suffix": ".bs.js",
20-
"generate-merlin": true
19+
"suffix": ".bs.js"
2120
}

jscomp/build_tests/namespace/bsconfig.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,5 @@
1919
"number" : "-40+6+7",
2020
"error" : true
2121
},
22-
"suffix": ".bs.js",
23-
"generate-merlin": true
22+
"suffix": ".bs.js"
2423
}

lib/4.06.1/rescript.ml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1735,7 +1735,6 @@ let js_post_build = "js-post-build"
17351735
let cmd = "cmd"
17361736
let ninja = "ninja"
17371737
let package_specs = "package-specs"
1738-
let generate_merlin = "generate-merlin"
17391738
let type_ = "type"
17401739
let dev = "dev"
17411740
let export_all = "all"
@@ -8425,7 +8424,6 @@ type t = {
84258424
package_specs : Bsb_package_specs.t;
84268425
file_groups : Bsb_file_groups.t;
84278426
files_to_install : Bsb_db.module_info Queue.t;
8428-
generate_merlin : bool;
84298427
reason_react_jsx : reason_react_jsx option;
84308428
jsx: Bsb_jsx.t;
84318429
(* whether apply PPX transform or not*)
@@ -10856,8 +10854,6 @@ let interpret_json ~(package_kind : Bsb_package_kind.t) ~(per_proj_dir : string)
1085610854
file_groups = groups;
1085710855
files_to_install = Queue.create ();
1085810856
built_in_dependency = built_in_package;
10859-
generate_merlin =
10860-
extract_boolean map Bsb_build_schemas.generate_merlin false;
1086110857
reason_react_jsx;
1086210858
jsx;
1086310859
generators = extract_generators map;

0 commit comments

Comments
 (0)