Skip to content

Commit cb1909f

Browse files
authored
Merge pull request #1018 from bloomberg/valid_module_name
address #1007, filter out valid modules
2 parents c818010 + 35eede7 commit cb1909f

18 files changed

+1447
-945
lines changed

bsconfig.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -466,11 +466,11 @@
466466
"a_filename_test.ml",
467467
"a.ml"
468468
]
469-
},
470-
469+
}
470+
// , "generate-merlin" : true
471471
// "ppx-flags": ["reason/bin/reactjs_jsx_ppx"]
472472
// ,
473473
// "bs-dependencies" : ["mocha"]
474474
// , "generate-merlin" : true
475475

476-
}
476+
}

docs/docson/build-schema.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -216,12 +216,13 @@
216216
"$ref": "#/definitions/sourceItem"
217217
}
218218
]
219+
},
220+
221+
"generate-merlin": {
222+
"type": "boolean",
223+
"description": "default false (generate .merlin)"
219224
}
220225
},
221-
"generate-merlin" : {
222-
"type" : "boolean",
223-
"description" : "default false"
224-
},
225226
"additionalProperties": false,
226227
"required": [
227228
"name",

jscomp/all.depend

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -581,9 +581,10 @@ ounit_tests/ounit_tests_main.cmx : ext/resize_array.cmx \
581581
ounit_tests/ounit_tests_main.cmi
582582
bsb/bsb_build_schemas.cmx :
583583
bsb/bsb_build_ui.cmx : ext/string_set.cmx ext/string_map.cmx \
584-
ext/resize_array.cmx ext/ext_filename.cmx ext/ext_file_pp.cmx \
585-
bsb/bsb_json.cmx bsb/bsb_dir.cmx bsb/bsb_build_util.cmx \
586-
bsb/bsb_build_schemas.cmx common/binary_cache.cmx bsb/bsb_build_ui.cmi
584+
ext/resize_array.cmx ext/ext_string.cmx ext/ext_filename.cmx \
585+
ext/ext_file_pp.cmx bsb/bsb_json.cmx bsb/bsb_dir.cmx \
586+
bsb/bsb_build_util.cmx bsb/bsb_build_schemas.cmx common/binary_cache.cmx \
587+
bsb/bsb_build_ui.cmi
587588
bsb/bsb_build_util.cmx : ext/ext_list.cmx ext/ext_filename.cmx \
588589
ext/ext_array.cmx bsb/bsb_json.cmx bsb/bsb_config.cmx \
589590
bsb/bsb_build_util.cmi

0 commit comments

Comments
 (0)