adapt bsb

Author: cknitt

compiler/bsb/bsb_build_schemas.ml

@@ -27,12 +27,15 @@ let name = "name"
 let ppx_flags = "ppx-flags"
 let pp_flags = "pp-flags"
 let bs_external_includes = "bs-external-includes"
+let dependencies = "dependencies"
 let bs_dependencies = "bs-dependencies"
+let dev_dependencies = "dev-dependencies"
 let bs_dev_dependencies = "bs-dev-dependencies"
 let sources = "sources"
 let dir = "dir"
 let files = "files"
 let subdirs = "subdirs"
+let compiler_flags = "compiler-flags"
 let bsc_flags = "bsc-flags"
 let excludes = "excludes"
 let slow_re = "slow-re"

compiler/bsb/bsb_build_util.ml

@@ -193,9 +193,12 @@ let rec walk_all_deps_aux (visited : string Hash_string.t) (paths : string list)
            )
         |> ignore
       in
+      explore_deps Bsb_build_schemas.dependencies;
       explore_deps Bsb_build_schemas.bs_dependencies;
       (match top with
-      | Expect_none -> explore_deps Bsb_build_schemas.bs_dev_dependencies
+      | Expect_none ->
+        explore_deps Bsb_build_schemas.dev_dependencies;
+        explore_deps Bsb_build_schemas.bs_dev_dependencies
       | Expect_name _ -> ());
       Queue.add {top; proj_dir = dir} queue;
       Hash_string.add visited cur_package_name dir

compiler/bsb/bsb_config_parse.ml

@@ -238,13 +238,24 @@ let interpret_json ~(filename : string) ~(json : Ext_json_types.t)
                 .path)
     in
     let bs_dependencies =
-      extract_dependencies map per_proj_dir Bsb_build_schemas.bs_dependencies
+      let dependencies =
+        extract_dependencies map per_proj_dir Bsb_build_schemas.dependencies
+      in
+      if dependencies == [] then
+        extract_dependencies map per_proj_dir Bsb_build_schemas.bs_dependencies
+      else dependencies
     in
     let bs_dev_dependencies =
       match package_kind with
       | Toplevel ->
-        extract_dependencies map per_proj_dir
-          Bsb_build_schemas.bs_dev_dependencies
+        let dev_dependencies =
+          extract_dependencies map per_proj_dir
+            Bsb_build_schemas.dev_dependencies
+        in
+        if dev_dependencies == [] then
+          extract_dependencies map per_proj_dir
+            Bsb_build_schemas.bs_dev_dependencies
+        else dev_dependencies
       | Dependency _ -> []
     in
     match map.?(Bsb_build_schemas.sources) with
@@ -258,7 +269,14 @@ let interpret_json ~(filename : string) ~(json : Ext_json_types.t)
           (* ~namespace *)
           sources
       in
-      let bsc_flags = extract_string_list map Bsb_build_schemas.bsc_flags in
+      let bsc_flags =
+        let compiler_flags =
+          extract_string_list map Bsb_build_schemas.compiler_flags
+        in
+        if compiler_flags == [] then
+          extract_string_list map Bsb_build_schemas.bsc_flags
+        else compiler_flags
+      in
       let jsx = Bsb_jsx.from_map map in
       let jsx, bsc_flags =
         match package_kind with