Build more projects using Rewatch

lib_dev/process.js

@@ -160,7 +160,7 @@ export function setup(cwd = process.cwd()) {
     rescript(command, args = [], options = {}) {
       const cliPath = path.join(
         import.meta.dirname,
-        "../cli/rescript-legacy.js",
+        "../cli/rescript.js",
       );
       return exec("node", [cliPath, command, ...args].filter(Boolean), options);
     },

packages/playground/rescript.json

@@ -5,11 +5,6 @@
     "dir": "src",
     "subdirs": true
   },
-  "package-specs": {
-    "module": "esmodule",
-    "in-source": false,
-    "suffix": ".res.js"
-  },
   "dependencies": [
     "@rescript/react"
   ]

rescript.json

@@ -1,4 +1,24 @@
 {
   "name": "rescript",
-  "dependencies": ["@tests/gentype-react-example", "playground"]
+  "package-specs": [
+    {
+      "module": "esmodule",
+      "in-source": true,
+      "suffix": ".res.js"
+    },
+    {
+      "module": "esmodule",
+      "in-source": false,
+      "suffix": ".res.js"
+    }
+  ],
+  "jsx": {
+    "version": 4
+  },
+  "dependencies": [
+    "@tests/gentype-react-example",
+    "@tests/docstring-tests",
+    "playground",
+    "@utils/scripts"
+  ]
 }

scripts/format.sh

@@ -6,7 +6,7 @@ echo Formatting OCaml code...
 dune build @fmt --auto-promote
 
 echo Formatting ReScript code...
-files=$(find runtime tests -type f \( -name "*.res" -o -name "*.resi" \) ! -name "syntaxErrors*" ! -name "generated_mocha_test.res" ! -path "tests/syntax_tests*" ! -path "tests/analysis_tests/tests*" ! -path "*/node_modules/*")
+files=$(find runtime tests scripts/res -type f \( -name "*.res" -o -name "*.resi" \) ! -name "syntaxErrors*" ! -name "generated_mocha_test.res" ! -path "tests/syntax_tests*" ! -path "tests/analysis_tests/tests*" ! -path "*/node_modules/*")
 ./cli/rescript.js format $files
 
 echo Formatting JS code...

scripts/format_check.sh

@@ -17,7 +17,7 @@ case "$(uname -s)" in
     fi
 
     echo "Checking ReScript code formatting..."
-    files=$(find runtime tests -type f \( -name "*.res" -o -name "*.resi" \) ! -name "syntaxErrors*" ! -name "generated_mocha_test.res" ! -path "tests/syntax_tests*" ! -path "tests/analysis_tests/tests*" ! -path "*/node_modules/*")
+    files=$(find runtime tests scripts/res -type f \( -name "*.res" -o -name "*.resi" \) ! -name "syntaxErrors*" ! -name "generated_mocha_test.res" ! -path "tests/syntax_tests*" ! -path "tests/analysis_tests/tests*" ! -path "*/node_modules/*")
     if ./cli/rescript.js format --check $files; then
       printf "${successGreen}✅ ReScript code formatting ok.${reset}\n"
     else

scripts/res/GenApiDocs.res

@@ -12,17 +12,16 @@ module Docgen = RescriptTools.Docgen
 
 let packagePath = Path.join([Node.dirname, "..", "..", "package.json"])
 let version = switch Fs.readFileSync(packagePath, ~encoding="utf8")->JSON.parseOrThrow {
-  | Object(dict{"version": JSON.String(version)}) => version
-  | _ => JsError.panic("Invalid package.json format")
+| Object(dict{"version": JSON.String(version)}) => version
+| _ => JsError.panic("Invalid package.json format")
 }
-let version = Semver.parse(version)->Option.getExn 
+let version = Semver.parse(version)->Option.getOrThrow
 let version = Semver.toString({...version, preRelease: None}) // Remove pre-release identifiers for API docs
 let dirVersion = Path.join([Node.dirname, "apiDocs", version])
 if !Fs.existsSync(dirVersion) {
   Fs.mkdirSync(dirVersion)
 }
 
-
 let entryPointFiles = ["Belt.res", "Dom.res", "Js.res", "Stdlib.res"]
 
 let hiddenModules = ["Js.Internal", "Js.MapperRt"]
@@ -56,9 +55,10 @@ let docsDecoded = entryPointFiles->Array.map(libFile =>
       },
     )->Buffer.toString
 
-    let docs = output
-    ->JSON.parseOrThrow
-    ->Docgen.decodeFromJson
+    let docs =
+      output
+      ->JSON.parseOrThrow
+      ->Docgen.decodeFromJson
     Console.log(`Generated docs from ${libFile}`)
     docs
   } catch {
@@ -257,7 +257,7 @@ let () = {
     tocTree
     ->Dict.fromArray
     ->JSON.stringifyAny
-    ->Option.getExn,
+    ->Option.getOrThrow,
   )
   Console.log("Generated toc_tree.json")
   Console.log(`API docs generated successfully in ${dirVersion}`)

scripts/res/package.json

@@ -3,9 +3,9 @@
   "type": "module",
   "private": true,
   "scripts": {
-    "build": "rescript legacy build",
+    "build": "rescript build",
     "clean": "rescript clean",
-    "dev": "rescript legacy -w",
+    "dev": "rescript build -w",
     "apidocs:generate": "yarn build && node GenApiDocs.res.js"
   },
   "dependencies": {

scripts/res/rescript.json

@@ -6,10 +6,5 @@
       "dir": "./"
     }
   ],
-  "dependencies": ["@tests/docstring-tests"],
-  "package-specs": {
-    "module": "esmodule",
-    "in-source": true
-  },
-  "suffix": ".res.js"
+  "dependencies": ["@tests/docstring-tests"]
 }

tests/docstring_tests/package.json

@@ -3,7 +3,7 @@
   "type": "module",
   "private": true,
   "scripts": {
-    "build": "rescript legacy build",
+    "build": "rescript build",
     "clean": "rescript clean",
     "dev": "rescript -w"
   },

tests/docstring_tests/rescript.json

@@ -2,10 +2,5 @@
   "name": "@tests/docstring-tests",
   "sources": {
     "dir": "."
-  },
-  "package-specs": {
-    "module": "esmodule",
-    "in-source": true
-  },
-  "suffix": ".res.js"
+  }
 }

tests/gentype_tests/typescript-react-example/rescript.json

@@ -25,10 +25,5 @@
       "subdirs": true
     }
   ],
-  "uncurried": true,
-  "package-specs": {
-    "module": "esmodule",
-    "in-source": true
-  },
-  "suffix": ".res.js"
+  "uncurried": true
 }