Skip to content

Commit 7ceb298

Browse files
authored
Merge pull request #35 from shakacode/rescript-11
ReScript 11
2 parents 3523e3d + 47ee04c commit 7ceb298

26 files changed

+1649
-5169
lines changed

.github/workflows/pr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ${{ matrix.os }}
1212
strategy:
1313
matrix:
14-
node-version: [16.x]
14+
node-version: [20.x]
1515
os: [ubuntu-latest, macOS-latest, windows-latest]
1616

1717
steps:
@@ -39,5 +39,5 @@ jobs:
3939
- name: Install deps
4040
run: yarn install
4141

42-
- name: Build lib
42+
- name: Build
4343
run: yarn rescript build -with-deps

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
node_modules/
22
lib/
33
dist/
4+
.parcel-cache/
45
yarn-error.log
5-
*.bs.js
6+
*.res.js
67
.vercel
78
.merlin
89
.bsb.lock

.postcssrc

Lines changed: 0 additions & 5 deletions
This file was deleted.

HISTORY.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# History
22

3+
## UNRELEASED
4+
5+
---
6+
7+
## 6.0.0
8+
* **[ BREAKING ]** Update to `rescript@11`.
9+
310
## 5.0.0
411
* **[ BREAKING ]** Update to `rescript@10`.
512
* **[ BREAKING ]** Replace `bs-webapi` with `rescript-webapi`.

bsconfig.json

Lines changed: 0 additions & 29 deletions
This file was deleted.

examples/App.res

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ let make = () => {
2222
None
2323
}, [route])
2424

25-
let showMobileNav = React.useCallback(() => ShowMobileNav->dispatch)
26-
let hideMobileNav = React.useCallback(() => HideMobileNav->dispatch)
25+
let showMobileNav = React.useCallback0(() => ShowMobileNav->dispatch)
26+
let hideMobileNav = React.useCallback0(() => HideMobileNav->dispatch)
2727

2828
<Container>
2929
<Nav route mobileNavShown=state.mobileNavShown hideMobileNav />

examples/components/Example.res

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,13 @@ module Container = {
1818
},
1919
])}>
2020
<div className="example-navbar-mobile">
21-
<Control onClick={_ => showMobileNav()}> <MenuIcon /> </Control>
21+
<Control onClick={_ => showMobileNav()}>
22+
<MenuIcon />
23+
</Control>
2224
<h1> {"rescript-dnd"->React.string} </h1>
23-
<a href="https://github.com/shakacode/rescript-dnd"> <GithubIcon /> </a>
25+
<a href="https://github.com/shakacode/rescript-dnd">
26+
<GithubIcon />
27+
</a>
2428
</div>
2529
children
2630
</div>

examples/components/Nav.res

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ let make = (~route, ~mobileNavShown, ~hideMobileNav) =>
66
<a href="https://github.com/shakacode/rescript-dnd" className="github-link">
77
<GithubIcon />
88
</a>
9-
<Control className="close-button" onClick={_ => hideMobileNav()}> <CloseIcon /> </Control>
9+
<Control className="close-button" onClick={_ => hideMobileNav()}>
10+
<CloseIcon />
11+
</Control>
1012
</header>
1113
<Link path="vertical-list" active={route == Route.VerticalList}>
1214
{"Vertical list"->React.string}

examples/examples/CardBoard.res

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ let reducer = (state, action) =>
8383
{
8484
...state,
8585
todosMap: state.todosMap->Map.update(todoId, x =>
86-
x->Option.map(todo => {...todo, todoListId: todoListId})
86+
x->Option.map(todo => {...todo, todoListId})
8787
),
8888
todoListsMap: state.todoListsMap
8989
->Map.update(todo.todoListId, x =>
@@ -212,7 +212,7 @@ let make = () => {
212212
{
213213
open Todo
214214
{
215-
id: id,
215+
id,
216216
title: "Todo " ++ id->TodoId.toString,
217217
todoListId: {
218218
let id = id->TodoId.toInt

examples/examples/NestedVerticalLists.res

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ let reducer = (state, action) =>
8383
{
8484
...state,
8585
todosMap: state.todosMap->Map.update(todoId, x =>
86-
x->Option.map(todo => {...todo, todoListId: todoListId})
86+
x->Option.map(todo => {...todo, todoListId})
8787
),
8888
todoListsMap: state.todoListsMap
8989
->Map.update(todo.todoListId, x =>
@@ -157,7 +157,7 @@ let make = () => {
157157
{
158158
open Todo
159159
{
160-
id: id,
160+
id,
161161
title: "Todo " ++ id->TodoId.toString,
162162
todoListId: {
163163
let id = id->TodoId.toInt

0 commit comments

Comments
 (0)