Adapt bsb to new rescript.json flags and remove usage of deprecated ones (#7699)

Author: cknitt

analysis/examples/example-project/rescript.json

@@ -1,11 +1,11 @@
 {
   "name": "tryit",
   "sources": "src",
-  "bsc-flags": ["-bs-super-errors", "-open Belt"],
+  "compiler-flags": ["-open Belt"],
   "warnings": {
     "number": "-32-26-27-33"
   },
-  "bs-dependencies": ["reason-react"],
+  "dependencies": ["reason-react"],
   "namespace": "my-namespace",
   "reanalyze": {
     "analysis": ["dce", "exception"]

analysis/examples/larger-project/rescript.json

@@ -5,8 +5,8 @@
     "unsuppress": []
   },
   "name": "sample-typescript-app",
-  "bsc-flags": ["-bs-super-errors -w a"],
-  "bs-dependencies": ["@rescript/react", "@glennsl/bs-json"],
+  "compiler-flags": ["-w a"],
+  "dependencies": ["@rescript/react", "@glennsl/bs-json"],
   "sources": [
     {
       "dir": "src",

analysis/examples/workspace-project/app/rescript.json

@@ -1,7 +1,7 @@
 {
   "name": "app",
-  "bsc-flags": ["-open Common"],
-  "bs-dependencies": ["common", "myplugin"],
+  "compiler-flags": ["-open Common"],
+  "dependencies": ["common", "myplugin"],
   "sources": [
     {
       "dir": "src",

analysis/examples/workspace-project/rescript.json

@@ -7,5 +7,5 @@
     "in-source": true
   },
   "suffix": ".mjs",
-  "bs-dependencies": ["common", "myplugin", "app"]
+  "dependencies": ["common", "myplugin", "app"]
 }

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

docs/JSXV4.md

@@ -27,7 +27,7 @@ For example, suppose a V3 project uses rescript-react 0.11, which requires compa
   "version": 3,
   "v3-dependencies": ["rescript-react-native", "rescript-react-navigation"]
 },
-"bsc-flags": ["-open ReactV3"]
+"compiler-flags": ["-open ReactV3"]
 ```
 
 Another example is a V4 project that also uses `"rescript-react-native", "rescript-react-navigation"`. Then the setting will be:

packages/playground/rescript.json

@@ -10,7 +10,7 @@
     "in-source": false,
     "suffix": ".res.js"
   },
-  "bs-dependencies": [
+  "dependencies": [
     "@rescript/react"
   ]
 }

packages/playground/scripts/generate_cmijs.mjs

@@ -30,7 +30,7 @@ exec("yarn rescript legacy");
 // Otherwise we can't use them for compilation within the playground.
 buildCmij(compilerRootDir, "compiler-builtins");
 
-const packages = resConfig["bs-dependencies"];
+const packages = resConfig["dependencies"];
 for (const pkgName of packages) {
   buildCmij(
     path.join(compilerRootDir, "node_modules", pkgName),