Remove usage of deprecated rescript.json flags

cknitt · cknitt · commit 9344c4b2513c · 2025-07-23T08:47:59.000+02:00
diff --git a/analysis/examples/example-project/rescript.json b/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"]
diff --git a/analysis/examples/larger-project/rescript.json b/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",
diff --git a/analysis/examples/workspace-project/app/rescript.json b/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",
diff --git a/analysis/examples/workspace-project/rescript.json b/analysis/examples/workspace-project/rescript.json
@@ -7,5 +7,5 @@
     "in-source": true
   },
   "suffix": ".mjs",
-  "bs-dependencies": ["common", "myplugin", "app"]
+  "dependencies": ["common", "myplugin", "app"]
 }
diff --git a/docs/JSXV4.md b/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:
diff --git a/packages/playground/rescript.json b/packages/playground/rescript.json
@@ -10,7 +10,7 @@
     "in-source": false,
     "suffix": ".res.js"
   },
-  "bs-dependencies": [
+  "dependencies": [
     "@rescript/react"
   ]
 }
diff --git a/packages/playground/scripts/generate_cmijs.mjs b/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),
diff --git a/rescript.json b/rescript.json
@@ -1,4 +1,4 @@
 {
   "name": "rescript",
-  "bs-dependencies": ["@tests/gentype-react-example"]
+  "dependencies": ["@tests/gentype-react-example"]
 }
diff --git a/rewatch/CompilerConfigurationSpec.md b/rewatch/CompilerConfigurationSpec.md
@@ -13,13 +13,13 @@ This document contains a list of all bsconfig parameters with remarks, and wheth
 | sources              | Source                  |        |     [x]      |
 | sources              | array of Source         |        |     [x]      |
 | ignored-dirs         | array of string         |        |     [_]      |
-| bs-dependencies      | array of string         |        |     [x]      |
-| bs-dev-dependencies  | array of string         |        |     [x]      |
+| dependencies         | array of string         |        |     [x]      |
+| dev-dependencies     | array of string         |        |     [x]      |
 | generators           | array of Rule-Generator |        |     [_]      |
 | cut-generators       | boolean                 |        |     [_]      |
 | jsx                  | JSX                     |        |     [x]      |
 | gentypeconfig        | Gentype                 |        |     [_]      |
-| bsc-flags            | array of string         |        |     [x]      |
+| compiler-flags       | array of string         |        |     [x]      |
 | warnings             | Warnings                |        |     [x]      |
 | ppx-flags            | array of string         |        |     [x]      |
 | pp-flags             | array of string         |        |     [_]      |
diff --git a/rewatch/src/config.rs b/rewatch/src/config.rs
@@ -655,7 +655,7 @@ pub mod tests {
             "sources": [ { "dir": "src/", "subdirs": true } ],
             "package-specs": [ { "module": "es6", "in-source": true } ],
             "suffix": ".mjs",
-            "bs-dependencies": [ "@teamwalnut/app" ]
+            "dependencies": [ "@teamwalnut/app" ]
         }
         "#;
 
@@ -683,7 +683,7 @@ pub mod tests {
             "module": "esmodule",
             "in-source": true
           },
-          "bs-dev-dependencies": ["@rescript/tools"],
+          "dev-dependencies": ["@rescript/tools"],
           "warnings": {
             "error": "+101"
           }
@@ -714,7 +714,7 @@ pub mod tests {
               "module": "esmodule",
               "in-source": true
             },
-            "bs-dev-dependencies": ["@rescript/tools"],
+            "dev-dependencies": ["@rescript/tools"],
             "suffix": ".mjs",
             "warnings": {
               "error": "+101"
@@ -742,7 +742,7 @@ pub mod tests {
             "sources": [ { "dir": "src/", "subdirs": true } ],
             "package-specs": [ { "module": "es6", "in-source": true } ],
             "suffix": ".mjs",
-            "bs-dependencies": [ "@teamwalnut/app" ],
+            "dependencies": [ "@teamwalnut/app" ],
             "gentypeconfig": {
                 "module": "esmodule",
                 "generatedFileExtension": ".gen.tsx"
@@ -763,7 +763,7 @@ pub mod tests {
             "sources": [ { "dir": "src/", "subdirs": true } ],
             "package-specs": [ { "module": "es6", "in-source": true } ],
             "suffix": ".mjs",
-            "bs-dependencies": [ "@teamwalnut/app" ],
+            "dependencies": [ "@teamwalnut/app" ],
             "jsx": {
                 "module": "Voby.JSX"
             }
@@ -792,7 +792,7 @@ pub mod tests {
             "sources": [ { "dir": "src/", "subdirs": true } ],
             "package-specs": [ { "module": "es6", "in-source": true } ],
             "suffix": ".mjs",
-            "bs-dependencies": [ "@teamwalnut/app" ],
+            "dependencies": [ "@teamwalnut/app" ],
             "jsx": { "version": 4, "preserve": true }
         }
         "#;
diff --git a/rewatch/testrepo/packages/file-casing/rescript.json b/rewatch/testrepo/packages/file-casing/rescript.json
@@ -14,7 +14,7 @@
   ],
   "suffix": ".mjs",
   "dependencies": [],
-  "bsc-flags": [],
+  "compiler-flags": [],
   "jsx": {
     "version": 4
   }
diff --git a/rewatch/tests/compile.sh b/rewatch/tests/compile.sh
@@ -78,7 +78,7 @@ rewatch build --snapshot-output &> ../tests/snapshots/dependency-cycle.txt
 normalize_paths ../tests/snapshots/dependency-cycle.txt
 git checkout -- packages/new-namespace/src/NS_alias.res
 
-# this should not compile because  "@rescript/webapi" is part of bs-dev-dependencies
+# this should not compile because  "@rescript/webapi" is part of dev-dependencies
 # and FileToTest.res is not listed as "type":"dev"
 echo 'open WebAPI' >> packages/with-dev-deps/src/FileToTest.res
 rewatch build --snapshot-output &> ../tests/snapshots/bs-dev-dependency-used-by-non-dev-source.txt
diff --git a/runtime/Belt.res b/runtime/Belt.res
@@ -52,7 +52,7 @@ If you want to open Belt globally for all files in your project instead, you can
 
 ```json
 {
-  "bsc-flags": ["-open Belt"]
+  "compiler-flags": ["-open Belt"]
 }
 ```
 
diff --git a/runtime/rescript.json b/runtime/rescript.json
@@ -15,7 +15,7 @@
       "in-source": false
     }
   ],
-  "bsc-flags": [
+  "compiler-flags": [
     "-make-runtime",
     "-nostdlib",
     "-nopervasives",
diff --git a/scripts/res/rescript.json b/scripts/res/rescript.json
@@ -6,7 +6,7 @@
       "dir": "./"
     }
   ],
-  "bs-dependencies": ["@tests/docstring-tests"],
+  "dependencies": ["@tests/docstring-tests"],
   "package-specs": {
     "module": "esmodule",
     "in-source": true
diff --git a/tests/analysis_tests/tests-generic-jsx-transform/rescript.json b/tests/analysis_tests/tests-generic-jsx-transform/rescript.json
@@ -6,6 +6,6 @@
       "subdirs": true
     }
   ],
-  "bsc-flags": ["-w -33-44-8"],
+  "compiler-flags": ["-w -33-44-8"],
   "jsx": { "module": "GenericJsx" }
 }
diff --git a/tests/analysis_tests/tests-incremental-typechecking/rescript.json b/tests/analysis_tests/tests-incremental-typechecking/rescript.json
@@ -6,6 +6,6 @@
       "subdirs": true
     }
   ],
-  "bsc-flags": ["-w -33-44-8"],
+  "compiler-flags": ["-w -33-44-8"],
   "jsx": { "module": "GenericJsx" }
 }
diff --git a/tests/analysis_tests/tests-reanalyze/deadcode/rescript.json b/tests/analysis_tests/tests-reanalyze/deadcode/rescript.json
@@ -7,7 +7,7 @@
   },
   "name": "sample-typescript-app",
   "jsx": { "version": 4 },
-  "bs-dependencies": ["@rescript/react"],
+  "dependencies": ["@rescript/react"],
   "sources": [
     {
       "dir": "src",
diff --git a/tests/analysis_tests/tests-reanalyze/termination/rescript.json b/tests/analysis_tests/tests-reanalyze/termination/rescript.json
@@ -5,7 +5,7 @@
     "unsuppress": []
   },
   "name": "arnold",
-  "bs-dependencies": [],
+  "dependencies": [],
   "sources": [
     {
       "dir": "src",
diff --git a/tests/analysis_tests/tests/rescript.json b/tests/analysis_tests/tests/rescript.json
@@ -9,8 +9,8 @@
       "subdirs": true
     }
   ],
-  "bsc-flags": ["-w -33-44-8"],
-  "bs-dependencies": ["@rescript/react"],
+  "compiler-flags": ["-w -33-44-8"],
+  "dependencies": ["@rescript/react"],
   "jsx": { "version": 4 },
   "suffix": ".res.js",
   "editor": {
diff --git a/tests/build_tests/case/rescript.json b/tests/build_tests/case/rescript.json
@@ -2,5 +2,5 @@
   "name": "case",
   "version": "0.1.0",
   "sources": ["src"],
-  "bs-dependencies": []
+  "dependencies": []
 }
diff --git a/tests/build_tests/case2/rescript.json b/tests/build_tests/case2/rescript.json
@@ -2,5 +2,5 @@
   "name": "case2",
   "version": "0.1.0",
   "sources": ["src"],
-  "bs-dependencies": []
+  "dependencies": []
 }
diff --git a/tests/build_tests/case3/rescript.json b/tests/build_tests/case3/rescript.json
@@ -10,6 +10,6 @@
     "in-source": true
   },
   "suffix": ".res.js",
-  "bs-dependencies": [],
+  "dependencies": [],
   "warnings": { "error": "+101" }
 }
diff --git a/tests/build_tests/custom_namespace/rescript.json b/tests/build_tests/custom_namespace/rescript.json
@@ -11,7 +11,7 @@
     "in-source": true,
     "suffix": ".res.js"
   },
-  "bsc-flags": ["-bs-no-version-header"],
+  "compiler-flags": ["-bs-no-version-header"],
   "warnings": {
     "number": "-40+6+7",
     "error": true
diff --git a/tests/build_tests/cycle/rescript.json b/tests/build_tests/cycle/rescript.json
@@ -10,6 +10,6 @@
     "in-source": true,
     "suffix": ".res.js"
   },
-  "bs-dependencies": [],
+  "dependencies": [],
   "warnings": { "error": "+101" }
 }
diff --git a/tests/build_tests/duplicated_symlinked_packages/a/rescript.json b/tests/build_tests/duplicated_symlinked_packages/a/rescript.json
@@ -10,7 +10,7 @@
     "in-source": true,
     "suffix": ".res.js"
   },
-  "bs-dependencies": ["c", "z"],
+  "dependencies": ["c", "z"],
   "warnings": { "error": "+101" },
   "namespace": true
 }
diff --git a/tests/build_tests/duplicated_symlinked_packages/b/rescript.json b/tests/build_tests/duplicated_symlinked_packages/b/rescript.json
@@ -10,7 +10,7 @@
     "in-source": true,
     "suffix": ".res.js"
   },
-  "bs-dependencies": ["c"],
+  "dependencies": ["c"],
   "warnings": { "error": "+101" },
   "namespace": true
 }
diff --git a/tests/build_tests/duplicated_symlinked_packages/rescript.json b/tests/build_tests/duplicated_symlinked_packages/rescript.json
@@ -2,5 +2,5 @@
   "name": "duplicated-symlinked-packages",
   "version": "0.1.0",
   "sources": ["src"],
-  "bs-dependencies": ["a", "b", "z"]
+  "dependencies": ["a", "b", "z"]
 }
diff --git a/tests/build_tests/install/rescript.json b/tests/build_tests/install/rescript.json
@@ -10,6 +10,6 @@
     "in-source": true,
     "suffix": ".res.js"
   },
-  "bs-dependencies": [],
+  "dependencies": [],
   "warnings": { "error": "+101" }
 }
diff --git a/tests/build_tests/jsx_settings_inheritance/rescript.json b/tests/build_tests/jsx_settings_inheritance/rescript.json
@@ -14,5 +14,5 @@
     "suffix": ".res.js"
   },
   "namespace": true,
-  "bs-dependencies": ["@rescript/react", "a", "b"]
+  "dependencies": ["@rescript/react", "a", "b"]
 }
diff --git a/tests/build_tests/rerror/rescript.json b/tests/build_tests/rerror/rescript.json
@@ -2,5 +2,5 @@
   "name": "rerror",
   "version": "0.1.0",
   "sources": ["src"],
-  "bs-dependencies": []
+  "dependencies": []
 }
diff --git a/tests/build_tests/transitive_dependency/a/rescript.json b/tests/build_tests/transitive_dependency/a/rescript.json
@@ -18,5 +18,5 @@
   "warnings": {
     "error": true
   },
-  "bs-dependencies": ["b"]
+  "dependencies": ["b"]
 }
diff --git a/tests/build_tests/weird_deps/rescript.json b/tests/build_tests/weird_deps/rescript.json
@@ -16,6 +16,6 @@
     "in-source": true,
     "suffix": ".res.js"
   },
-  "bs-dependencies": ["weird"],
+  "dependencies": ["weird"],
   "warnings": { "error": "+101" }
 }
diff --git a/tests/build_tests/weird_devdeps/rescript.json b/tests/build_tests/weird_devdeps/rescript.json
@@ -16,7 +16,7 @@
     "in-source": true,
     "suffix": ".res.js"
   },
-  "bs-dependencies": [],
-  "bs-dev-dependencies": ["weird"],
+  "dependencies": [],
+  "dev-dependencies": ["weird"],
   "warnings": { "error": "+101" }
 }
diff --git a/tests/build_tests/zerocycle/rescript.json b/tests/build_tests/zerocycle/rescript.json
@@ -7,5 +7,5 @@
     "in-source": true
   },
   "suffix": ".res.js",
-  "bs-dependencies": []
+  "dependencies": []
 }
diff --git a/tests/gentype_tests/typescript-react-example/rescript.json b/tests/gentype_tests/typescript-react-example/rescript.json
@@ -16,9 +16,9 @@
     "exportInterfaces": false
   },
   "name": "@tests/gentype-react-example",
-  "bsc-flags": [],
+  "compiler-flags": [],
   "jsx": { "version": 4 },
-  "bs-dependencies": ["@rescript/react"],
+  "dependencies": ["@rescript/react"],
   "sources": [
     {
       "dir": "src",
diff --git a/tests/ounit_tests/ounit_bsb_regex_tests.ml b/tests/ounit_tests/ounit_bsb_regex_tests.ml
@@ -37,7 +37,7 @@ let suites =
   "sources": [
     "src"
   ],
-  "bs-dependencies" : [
+  "dependencies": [
   ]
 }
 |}
@@ -48,7 +48,7 @@ let suites =
   "sources": [
     "src"
   ],
-  "bs-dependencies" : [
+  "dependencies": [
   ]
 }
 |}
diff --git a/tests/syntax_tests/data/idempotency/genType/src/Config_.res b/tests/syntax_tests/data/idempotency/genType/src/Config_.res
@@ -299,7 +299,7 @@ let readConfig = (~bsVersion, ~getConfigFile, ~getBsConfigFile, ~namespace) => {
       | Some(True(_)) => {...config, namespace: namespace}
       | _ => config
       }
-      let config = switch map->String_map.find_opt("bs-dependencies") {
+      let config = switch map->String_map.find_opt("dependencies") {
       | Some(Arr({content})) =>
         let strings = ref(list{})
         content->Array.iter(x =>
diff --git a/tests/tests/rescript.json b/tests/tests/rescript.json
diff --git a/tests/tools_tests/rescript.json b/tests/tools_tests/rescript.json
diff --git a/tools/README.md b/tools/README.md

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "app",`
`3`		`- "bsc-flags": ["-open Common"],`
`4`		`- "bs-dependencies": ["common", "myplugin"],`
	`3`	`+ "compiler-flags": ["-open Common"],`
	`4`	`+ "dependencies": ["common", "myplugin"],`
`5`	`5`	`"sources": [`
`6`	`6`	`{`
`7`	`7`	`"dir": "src",`
Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,5 @@`
`7`	`7`	`"in-source": true`
`8`	`8`	`},`
`9`	`9`	`"suffix": ".mjs",`
`10`		`- "bs-dependencies": ["common", "myplugin", "app"]`
	`10`	`+ "dependencies": ["common", "myplugin", "app"]`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`"in-source": false,`
`11`	`11`	`"suffix": ".res.js"`
`12`	`12`	`},`
`13`		`- "bs-dependencies": [`
	`13`	`+ "dependencies": [`
`14`	`14`	`"@rescript/react"`
`15`	`15`	`]`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "rescript",`
`3`		`- "bs-dependencies": ["@tests/gentype-react-example"]`
	`3`	`+ "dependencies": ["@tests/gentype-react-example"]`
`4`	`4`	`}`