Skip to content

Commit 3c566a4

Browse files
authored
Update to rescript 12 (#154)
* update to rescript 12 * update node 24 * router: get ride of safeMakeEvent for IE * @rescript/runtime as peer dependency
1 parent ed63111 commit 3c566a4

26 files changed

+750
-654
lines changed

.github/workflows/nodejs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ jobs:
1616

1717
strategy:
1818
matrix:
19-
node-version: [16.x]
19+
node-version: [24.x]
2020

2121
steps:
2222
- uses: actions/checkout@v3
2323
- name: Use Node.js ${{ matrix.node-version }}
24-
uses: actions/setup-node@v3
24+
uses: actions/setup-node@v6
2525
with:
2626
node-version: ${{ matrix.node-version }}
2727
- run: npm install

.gitignore

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
finalOutput/*.js
44
.merlin
55
.install
6-
/lib/bs/
7-
/lib/js/
8-
/lib/ocaml/
96
/docs/
107
*.log
118
.bsb.lock
@@ -19,3 +16,6 @@ src/legacy/*.bs.js
1916

2017
# React
2118
!/src/react/*.js
19+
20+
# ReScript
21+
lib/

package-lock.json

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

package.json

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@
1212
],
1313
"scripts": {
1414
"build": "rescript build",
15-
"start": "rescript build -w",
16-
"clean": "rescript clean -with-deps",
15+
"start": "rescript watch",
16+
"clean": "rescript clean",
17+
"format": "rescript format",
1718
"test": "echo 'tests disabled for now'"
1819
},
1920
"keywords": [
@@ -28,12 +29,13 @@
2829
},
2930
"homepage": "https://rescript-lang.org/docs/react/latest/introduction",
3031
"devDependencies": {
31-
"react": "^19.1.0",
32-
"react-dom": "^19.1.0",
33-
"rescript": "^11.0.0"
32+
"react": "^19.2.0",
33+
"react-dom": "^19.2.0",
34+
"rescript": "^12.0.0"
3435
},
3536
"peerDependencies": {
36-
"react": ">=19.1.0",
37-
"react-dom": ">=19.1.0"
37+
"@rescript/runtime": ">=12.0.0",
38+
"react": ">=19.2.0",
39+
"react-dom": ">=19.2.0"
3840
}
3941
}

rescript.json

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
11
{
22
"name": "@rescript/react",
33
"jsx": {
4-
"version": 4,
5-
"mode": "classic"
4+
"version": 4
65
},
7-
"sources": [{ "dir": "src", "subdirs": true }],
8-
"package-specs": [{ "module": "commonjs", "in-source": true }],
9-
"suffix": ".bs.js",
10-
"bs-dev-dependencies": [],
11-
"bsc-flags": []
12-
}
6+
"sources": [
7+
{
8+
"dir": "src"
9+
}
10+
],
11+
"package-specs": [
12+
{
13+
"module": "esmodule",
14+
"in-source": true
15+
}
16+
],
17+
"suffix": ".res.js"
18+
}

0 commit comments

Comments
 (0)