Adjust to bs-* deprecations

analysis/src/FindFiles.ml

@@ -213,16 +213,21 @@ let findProjectFiles ~public ~namespace ~path ~sourceDirectories ~libBs =
 
 let findDependencyFiles base config =
   let deps =
-    config |> Json.get "bs-dependencies" |> bind Json.array
-    |> Option.value ~default:[]
-    |> List.filter_map Json.string
+    match
+      ( config |> Json.get "dependencies" |> bind Json.array,
+        config |> Json.get "bs-dependencies" |> bind Json.array )
+    with
+    | None, None -> []
+    | Some deps, None | _, Some deps -> deps |> List.filter_map Json.string
   in
   let devDeps =
-    config
-    |> Json.get "bs-dev-dependencies"
-    |> bind Json.array
-    |> Option.map (List.filter_map Json.string)
-    |> Option.value ~default:[]
+    match
+      ( config |> Json.get "dev-dependencies" |> bind Json.array,
+        config |> Json.get "bs-dev-dependencies" |> bind Json.array )
+    with
+    | None, None -> []
+    | Some devDeps, None | _, Some devDeps ->
+      devDeps |> List.filter_map Json.string
   in
   let deps = deps @ devDeps in
   Log.log ("Dependencies: " ^ String.concat " " deps);

analysis/src/Packages.ml

@@ -138,15 +138,20 @@ let newBsPackage ~rootPath =
                [path]
            in
            let bind f x = Option.bind x f in
-           let bsc_flags =
-             Json.get "bsc-flags" config
-             |> bind Json.array |> Option.value ~default:[]
+           let compiler_flags =
+             match
+               ( Json.get "compiler-flags" config |> bind Json.array,
+                 Json.get "bsc-flags" config |> bind Json.array )
+             with
+             | Some compiler_flags, None | _, Some compiler_flags ->
+               compiler_flags
+             | None, None -> []
            in
            let no_pervasives =
-             bsc_flags
+             compiler_flags
              |> List.exists (fun s -> Json.string s = Some "-nopervasives")
            in
-           let opens_from_bsc_flags =
+           let opens_from_compiler_flags =
              List.fold_left
                (fun opens item ->
                  match item |> Json.string with
@@ -158,15 +163,15 @@ let newBsPackage ~rootPath =
                      let path = name |> String.split_on_char '.' in
                      path :: opens
                    | _ -> opens))
-               [] bsc_flags
+               [] compiler_flags
            in
            let opens_from_pervasives =
              if no_pervasives then []
              else [["Stdlib"]; ["Pervasives"; "JsxModules"]]
            in
            let opens =
              opens_from_pervasives @ opens_from_namespace
-             |> List.rev_append opens_from_bsc_flags
+             |> List.rev_append opens_from_compiler_flags
              |> List.map (fun path -> path @ ["place holder"])
            in
            {

compiler/gentype/GenTypeConfig.ml

@@ -203,8 +203,10 @@ let read_config ~get_config_file ~namespace =
       | _ -> default.suffix
     in
     let bs_dependencies =
-      match bsconf |> get_opt "bs-dependencies" with
-      | Some (Arr {content}) ->
+      match
+        (bsconf |> get_opt "dependencies", bsconf |> get_opt "bs-dependencies")
+      with
+      | Some (Arr {content}), None | None, Some (Arr {content}) ->
         let strings = ref [] in
         content
         |> Array.iter (fun x ->

compiler/ml/typetexp.ml

@@ -888,8 +888,8 @@ let report_error env ppf = function
       Format.fprintf ppf
         "@[<v>@{<info>The module or file %a can't be found.@}@,\
          @[<v 2>- If it's a third-party dependency:@,\
-         - Did you add it to the \"bs-dependencies\" or \
-         \"bs-dev-dependencies\" in rescript.json?@]@,\
+         - Did you add it to the \"dependencies\" or \"dev-dependencies\" in \
+         rescript.json?@]@,\
          - Did you include the file's directory to the \"sources\" in \
          rescript.json?@,"
         Printtyp.longident lid);

rewatch/tests/snapshots/bs-dev-dependency-used-by-non-dev-source.txt

@@ -20,7 +20,7 @@ Use 'compiler-flags' instead.
 
   The module or file WebAPI can't be found.
   - If it's a third-party dependency:
-    - Did you add it to the "bs-dependencies" or "bs-dev-dependencies" in rescript.json?
+    - Did you add it to the "dependencies" or "dev-dependencies" in rescript.json?
   - Did you include the file's directory to the "sources" in rescript.json?
 
 

rewatch/tests/snapshots/remove-file.txt

@@ -22,7 +22,7 @@ Use 'compiler-flags' instead.
 
   The module or file Dep02 can't be found.
   - If it's a third-party dependency:
-    - Did you add it to the "bs-dependencies" or "bs-dev-dependencies" in rescript.json?
+    - Did you add it to the "dependencies" or "dev-dependencies" in rescript.json?
   - Did you include the file's directory to the "sources" in rescript.json?
 
 

rewatch/tests/snapshots/rename-file-internal-dep-namespace.txt

@@ -20,7 +20,7 @@ Use 'compiler-flags' instead.
 
   The module or file Other_module can't be found.
   - If it's a third-party dependency:
-    - Did you add it to the "bs-dependencies" or "bs-dev-dependencies" in rescript.json?
+    - Did you add it to the "dependencies" or "dev-dependencies" in rescript.json?
   - Did you include the file's directory to the "sources" in rescript.json?
 
 

rewatch/tests/snapshots/rename-file-internal-dep.txt

@@ -22,7 +22,7 @@ Use 'compiler-flags' instead.
 
   The module or file InternalDep can't be found.
   - If it's a third-party dependency:
-    - Did you add it to the "bs-dependencies" or "bs-dev-dependencies" in rescript.json?
+    - Did you add it to the "dependencies" or "dev-dependencies" in rescript.json?
   - Did you include the file's directory to the "sources" in rescript.json?
 
 

tests/build_tests/super_errors/expected/modules1.res.expected

@@ -7,5 +7,5 @@
 
   The module or file Foo can't be found.
   - If it's a third-party dependency:
-    - Did you add it to the "bs-dependencies" or "bs-dev-dependencies" in rescript.json?
+    - Did you add it to the "dependencies" or "dev-dependencies" in rescript.json?
   - Did you include the file's directory to the "sources" in rescript.json?