Skip to content

Commit 1afa599

Browse files
committed
Upgrade to Rescript 12 Beta 2
1 parent 0845536 commit 1afa599

File tree

11 files changed

+112
-40
lines changed

11 files changed

+112
-40
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ jobs:
2727
- name: Use Node.js
2828
uses: actions/setup-node@v4
2929
with:
30-
node-version: 18
30+
node-version: 24
3131

3232
- name: NPM install
3333
run: npm ci
3434

3535
- name: Build
36-
run: npx rescript
36+
run: npx rescript -q
3737

3838
- name: Pack
3939
run: npm pack
@@ -74,7 +74,7 @@ jobs:
7474
- name: Use Node.js
7575
uses: actions/setup-node@v4
7676
with:
77-
node-version: 18
77+
node-version: 20 # minimum supported version
7878

7979
- name: Download artifacts
8080
uses: actions/download-artifact@v4
@@ -103,7 +103,7 @@ jobs:
103103
- name: Use Node.js
104104
uses: actions/setup-node@v4
105105
with:
106-
node-version: 18
106+
node-version: 24
107107
registry-url: https://registry.npmjs.org # Needed to make auth work for publishing
108108

109109
- name: Download artifacts

.node-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
18
1+
24

package-lock.json

Lines changed: 95 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"author": "",
1313
"license": "ISC",
1414
"engines": {
15-
"node": ">=18"
15+
"node": ">=20"
1616
},
1717
"repository": {
1818
"type": "git",
@@ -37,12 +37,11 @@
3737
},
3838
"devDependencies": {
3939
"@clack/prompts": "^0.11.0",
40-
"@rescript/core": "^1.3.0",
4140
"@rollup/plugin-commonjs": "^28.0.1",
4241
"@rollup/plugin-node-resolve": "^16.0.1",
4342
"@rollup/plugin-terser": "^0.4.4",
4443
"compare-versions": "^6.1.0",
45-
"rescript": "^11.1.0",
44+
"rescript": "^12.0.0-beta.2",
4645
"rollup": "^4.14.3"
4746
}
4847
}

rescript.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,5 @@
88
"module": "esmodule",
99
"in-source": true
1010
},
11-
"suffix": ".res.mjs",
12-
"bs-dependencies": ["@rescript/core"],
13-
"bsc-flags": ["-open RescriptCore"]
11+
"suffix": ".res.mjs"
1412
}

src/ErrorUtils.res

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
let getErrorMessage = exn =>
2-
switch exn->Exn.message {
2+
switch exn->JsExn.message {
33
| Some(message) => message
44
| None => exn->String.make
55
}

src/JsonUtils.res

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ open Node
22

33
let readJsonFile = async filename => {
44
let contents = await Fs.Promises.readFile(filename)
5-
JSON.parseExn(contents)
5+
JSON.parseOrThrow(contents)
66
}
77

88
let updateFile = async (filename, updateFn) => {
@@ -13,7 +13,7 @@ let updateFile = async (filename, updateFn) => {
1313

1414
let updateJsonFile = (filename, updateFn) =>
1515
updateFile(filename, contents => {
16-
let json = JSON.parseExn(contents)
16+
let json = JSON.parseOrThrow(contents)
1717
updateFn(json)
1818
JSON.stringify(json, ~space=2)
1919
})

src/Main.res

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,8 @@ let getVersion = async () => {
1010

1111
let handleError = async (~outro, perform) =>
1212
try await perform() catch {
13-
| Exn.Error(error) =>
14-
switch error->Exn.message {
15-
| Some(message) => P.Log.error("Error: " ++ message)
16-
| None => ()
17-
}
13+
| JsExn(error) =>
14+
P.Log.error("Error: " ++ error->ErrorUtils.getErrorMessage)
1815

1916
P.outro(outro)
2017

src/NpmRegistry.res

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,6 @@ let getPackageVersions = async (packageName, range) => {
5656
}
5757

5858
| 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}))
6060
}
6161
}

src/RescriptVersions.res

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@ let promptVersions = async () => {
4444
let selectOptions = {ClackPrompts.message: "ReScript version?", options, ?initialValue}
4545

4646
await P.select(selectOptions)->P.resultOrRaise
47-
| Error(error) => error->NpmRegistry.getFetchErrorMessage->Error.make->Error.raise
47+
| Error(error) => error->NpmRegistry.getFetchErrorMessage->JsError.throwWithMessage
4848
}
4949

5050
let rescriptCoreVersions = switch rescriptCoreVersionsResult {
5151
| Ok(versions) => versions
52-
| Error(error) => error->NpmRegistry.getFetchErrorMessage->Error.make->Error.raise
52+
| Error(error) => error->NpmRegistry.getFetchErrorMessage->JsError.throwWithMessage
5353
}
5454

5555
let rescriptCoreVersions = getCompatibleRescriptCoreVersions(

0 commit comments

Comments
 (0)