Upgrade to Rescript 12 Beta 2

cknitt · cknitt · commit a53639ce37a6 · 2025-07-21T08:25:43.000+02:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -27,7 +27,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 24
 
       - name: NPM install
         run: npm ci
@@ -74,7 +74,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20 # minimum supported version
 
       - name: Download artifacts
         uses: actions/download-artifact@v4
@@ -103,7 +103,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 24
           registry-url: https://registry.npmjs.org # Needed to make auth work for publishing
 
       - name: Download artifacts
diff --git a/.node-version b/.node-version
@@ -1 +1 @@
-18
+24
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -12,7 +12,7 @@
   "author": "",
   "license": "ISC",
   "engines": {
-    "node": ">=18"
+    "node": ">=20"
   },
   "repository": {
     "type": "git",
@@ -37,12 +37,11 @@
   },
   "devDependencies": {
     "@clack/prompts": "^0.11.0",
-    "@rescript/core": "^1.3.0",
     "@rollup/plugin-commonjs": "^28.0.1",
     "@rollup/plugin-node-resolve": "^16.0.1",
     "@rollup/plugin-terser": "^0.4.4",
     "compare-versions": "^6.1.0",
-    "rescript": "^11.1.0",
+    "rescript": "^12.0.0-beta.2",
     "rollup": "^4.14.3"
   }
 }
diff --git a/rescript.json b/rescript.json
@@ -8,7 +8,5 @@
     "module": "esmodule",
     "in-source": true
   },
-  "suffix": ".res.mjs",
-  "bs-dependencies": ["@rescript/core"],
-  "bsc-flags": ["-open RescriptCore"]
+  "suffix": ".res.mjs"
 }
diff --git a/src/ErrorUtils.res b/src/ErrorUtils.res
@@ -1,5 +1,5 @@
 let getErrorMessage = exn =>
-  switch exn->Exn.message {
+  switch exn->JsExn.message {
   | Some(message) => message
   | None => exn->String.make
   }
diff --git a/src/JsonUtils.res b/src/JsonUtils.res
@@ -2,7 +2,7 @@ open Node
 
 let readJsonFile = async filename => {
   let contents = await Fs.Promises.readFile(filename)
-  JSON.parseExn(contents)
+  JSON.parseOrThrow(contents)
 }
 
 let updateFile = async (filename, updateFn) => {
@@ -13,7 +13,7 @@ let updateFile = async (filename, updateFn) => {
 
 let updateJsonFile = (filename, updateFn) =>
   updateFile(filename, contents => {
-    let json = JSON.parseExn(contents)
+    let json = JSON.parseOrThrow(contents)
     updateFn(json)
     JSON.stringify(json, ~space=2)
   })
diff --git a/src/Main.res b/src/Main.res
@@ -10,11 +10,8 @@ let getVersion = async () => {
 
 let handleError = async (~outro, perform) =>
   try await perform() catch {
-  | Exn.Error(error) =>
-    switch error->Exn.message {
-    | Some(message) => P.Log.error("Error: " ++ message)
-    | None => ()
-    }
+  | JsExn(error) =>
+    P.Log.error("Error: " ++ error->ErrorUtils.getErrorMessage)
 
     P.outro(outro)
 
diff --git a/src/NpmRegistry.res b/src/NpmRegistry.res
@@ -56,6 +56,6 @@ let getPackageVersions = async (packageName, range) => {
     }
 
   | responseNotOk => Error(HttpError({status: responseNotOk.status}))
-  | exception Exn.Error(exn) => Error(FetchError({message: exn->ErrorUtils.getErrorMessage}))
+  | exception JsExn(exn) => Error(FetchError({message: exn->ErrorUtils.getErrorMessage}))
   }
 }
diff --git a/src/RescriptVersions.res b/src/RescriptVersions.res
@@ -44,12 +44,12 @@ let promptVersions = async () => {
     let selectOptions = {ClackPrompts.message: "ReScript version?", options, ?initialValue}
 
     await P.select(selectOptions)->P.resultOrRaise
-  | Error(error) => error->NpmRegistry.getFetchErrorMessage->Error.make->Error.raise
+  | Error(error) => error->NpmRegistry.getFetchErrorMessage->JsError.throwWithMessage
   }
 
   let rescriptCoreVersions = switch rescriptCoreVersionsResult {
   | Ok(versions) => versions
-  | Error(error) => error->NpmRegistry.getFetchErrorMessage->Error.make->Error.raise
+  | Error(error) => error->NpmRegistry.getFetchErrorMessage->JsError.throwWithMessage
   }
 
   let rescriptCoreVersions = getCompatibleRescriptCoreVersions(
diff --git a/src/bindings/ClackPrompts.res b/src/bindings/ClackPrompts.res
@@ -63,7 +63,7 @@ let resultOrRaise = async promise => {
   let result = await promise
 
   if result->isCancel {
-    raise(Canceled)
+    throw(Canceled)
   } else {
     result->unsafeGetResultValue
   }

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,5 @@`
`8`	`8`	`"module": "esmodule",`
`9`	`9`	`"in-source": true`
`10`	`10`	`},`
`11`		`- "suffix": ".res.mjs",`
`12`		`- "bs-dependencies": ["@rescript/core"],`
`13`		`- "bsc-flags": ["-open RescriptCore"]`
	`11`	`+ "suffix": ".res.mjs"`
`14`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`let getErrorMessage = exn =>`
`2`		`- switch exn->Exn.message {`
	`2`	`+ switch exn->JsExn.message {`
`3`	`3`	`\| Some(message) => message`
`4`	`4`	`\| None => exn->String.make`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,6 @@ let getPackageVersions = async (packageName, range) => {`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`\| responseNotOk => Error(HttpError({status: responseNotOk.status}))`
`59`		`- \| exception Exn.Error(exn) => Error(FetchError({message: exn->ErrorUtils.getErrorMessage}))`
	`59`	`+ \| exception JsExn(exn) => Error(FetchError({message: exn->ErrorUtils.getErrorMessage}))`
`60`	`60`	`}`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,12 +44,12 @@ let promptVersions = async () => {`
`44`	`44`	`let selectOptions = {ClackPrompts.message: "ReScript version?", options, ?initialValue}`
`45`	`45`
`46`	`46`	`await P.select(selectOptions)->P.resultOrRaise`
`47`		`- \| Error(error) => error->NpmRegistry.getFetchErrorMessage->Error.make->Error.raise`
	`47`	`+ \| Error(error) => error->NpmRegistry.getFetchErrorMessage->JsError.throwWithMessage`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`let rescriptCoreVersions = switch rescriptCoreVersionsResult {`
`51`	`51`	`\| Ok(versions) => versions`
`52`		`- \| Error(error) => error->NpmRegistry.getFetchErrorMessage->Error.make->Error.raise`
	`52`	`+ \| Error(error) => error->NpmRegistry.getFetchErrorMessage->JsError.throwWithMessage`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`let rescriptCoreVersions = getCompatibleRescriptCoreVersions(`