Skip to content

Upgrade to Rescript 12 Beta 2 #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 21, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,12 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: 18
node-version: 24

- name: NPM install
run: npm ci

- name: Build
run: npx rescript

- name: Pack
- name: Pack (includes rescript build)
run: npm pack

- name: Prepare package upload
Expand Down Expand Up @@ -74,7 +71,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
Expand Down Expand Up @@ -103,7 +100,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
Expand Down
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18
24
430 changes: 261 additions & 169 deletions package-lock.json

Large diffs are not rendered by default.

9 changes: 4 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"author": "",
"license": "ISC",
"engines": {
"node": ">=18"
"node": ">=20"
},
"repository": {
"type": "git",
Expand All @@ -36,13 +36,12 @@
"create-rescript-app": "out/create-rescript-app.mjs"
},
"devDependencies": {
"@clack/prompts": "^0.9.1",
"@rescript/core": "^1.3.0",
"@clack/prompts": "^0.11.0",
"@rollup/plugin-commonjs": "^28.0.1",
"@rollup/plugin-node-resolve": "^15.2.3",
"@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"
}
}
4 changes: 1 addition & 3 deletions rescript.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,5 @@
"module": "esmodule",
"in-source": true
},
"suffix": ".res.mjs",
"bs-dependencies": ["@rescript/core"],
"bsc-flags": ["-open RescriptCore"]
"suffix": ".res.mjs"
}
2 changes: 1 addition & 1 deletion src/ErrorUtils.res
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
let getErrorMessage = exn =>
switch exn->Exn.message {
switch exn->JsExn.message {
| Some(message) => message
| None => exn->String.make
}
4 changes: 2 additions & 2 deletions src/JsonUtils.res
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand All @@ -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)
})
Expand Down
7 changes: 2 additions & 5 deletions src/Main.res
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion src/NpmRegistry.res
Original file line number Diff line number Diff line change
Expand Up @@ -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}))
}
}
4 changes: 2 additions & 2 deletions src/RescriptVersions.res
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion src/bindings/ClackPrompts.res
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ let resultOrRaise = async promise => {
let result = await promise

if result->isCancel {
raise(Canceled)
throw(Canceled)
} else {
result->unsafeGetResultValue
}
Expand Down