Skip to content

Commit 727d1dc

Browse files
committed
Update deps
1 parent 3d691eb commit 727d1dc

File tree

10 files changed

+106
-100
lines changed

10 files changed

+106
-100
lines changed

bsconfig.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
"subdirs": true
1212
}
1313
],
14-
"bs-dependencies": ["reason-react", "bs-webapi", "bs-log"],
14+
"bs-dependencies": ["reason-react", "bs-webapi", "res-logger"],
1515
"bs-dev-dependencies": ["re-classnames"],
1616
"reason": {
1717
"react-jsx": 3
1818
},
1919
"refmt": 3,
2020
"bsc-flags": ["-open Belt"],
2121
"ppx-flags": [
22-
["bs-log/ppx", "--lib=re-dnd"],
22+
["res-logger/ppx", "--lib=re-dnd"],
2323
],
2424
"package-specs": {
2525
"module": "es6",

examples/components/Control.re

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ let make =
1010
) => {
1111
<button
1212
type_="button"
13-
className={Cn.make(["control", className])}
13+
className=Cn.("control" + className)
1414
?style
1515
?onClick
1616
?onMouseDown

examples/components/Example.re

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,16 @@ module Container = {
1212
~children: React.element,
1313
) => {
1414
<div
15-
className={Cn.make([
16-
"example",
17-
switch (layout) {
18-
| Vertical => "vertical"
19-
| Horizontal => "horizontal"
20-
| CardBoard => "card-board"
21-
},
22-
])}>
15+
className=Cn.(
16+
"example"
17+
+ (
18+
switch (layout) {
19+
| Vertical => "vertical"
20+
| Horizontal => "horizontal"
21+
| CardBoard => "card-board"
22+
}
23+
)
24+
)>
2325
<div className="example-navbar-mobile">
2426
<Control onClick={_ => showMobileNav()}> <MenuIcon /> </Control>
2527
<h1> "re-dnd"->React.string </h1>

examples/components/Link.re

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
let make = (~path, ~active, ~children) => {
33
<button
44
type_="button"
5-
className={Cn.make(["link", "active"->Cn.ifTrue(active)])}
5+
className=Cn.("link" + "active"->on(active))
66
onClick={_ => ReasonReactRouter.push("#" ++ path)}>
77
children
88
</button>;

examples/components/Nav.re

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[@react.component]
22
let make = (~route, ~mobileNavShown, ~hideMobileNav) => {
3-
<nav className={Cn.make(["shown-mobile"->Cn.ifTrue(mobileNavShown)])}>
3+
<nav className=Cn.("shown-mobile"->on(mobileNavShown))>
44
<header>
55
<h1 onClick={_ => ReasonReactRouter.push("/")}>
66
"re-dnd"->React.string

examples/examples/CardBoard.re

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ let make = () => {
262262
containerId={TodoLists.Container.id()}
263263
index=todoListIndex
264264
className={(~dragging) =>
265-
Cn.make(["todo-list", "dragging"->Cn.ifTrue(dragging)])
265+
Cn.("todo-list" + "dragging"->on(dragging))
266266
}>
267267
{`ChildrenWithDragHandle(
268268
(~style, ~onMouseDown, ~onTouchStart) =>
@@ -271,7 +271,7 @@ let make = () => {
271271
key={todoListId->TodoListId.toString}
272272
axis=Y
273273
className={(~draggingOver) =>
274-
Cn.make(["todos", "active"->Cn.ifTrue(draggingOver)])
274+
Cn.("todos" + "active"->on(draggingOver))
275275
}>
276276
<div className="todos-header">
277277
<Control
@@ -295,10 +295,7 @@ let make = () => {
295295
containerId=todoListId
296296
index=todoIndex
297297
className={(~dragging) =>
298-
Cn.make([
299-
"todo",
300-
"dragging"->Cn.ifTrue(dragging),
301-
])
298+
Cn.("todo" + "dragging"->on(dragging))
302299
}>
303300
{`Children(todo.title->React.string)}
304301
</Todos.DraggableItem>;

examples/examples/NestedVerticalLists.re

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ let make = () => {
212212
containerId={TodoLists.Container.id()}
213213
index=todoListIndex
214214
className={(~dragging) =>
215-
Cn.make(["todo-list", "dragging"->Cn.ifTrue(dragging)])
215+
Cn.("todo-list" + "dragging"->on(dragging))
216216
}>
217217
{`ChildrenWithDragHandle(
218218
(~style, ~onMouseDown, ~onTouchStart) =>
@@ -221,7 +221,7 @@ let make = () => {
221221
key={todoListId->TodoListId.toString}
222222
axis=Y
223223
className={(~draggingOver) =>
224-
Cn.make(["todos", "active"->Cn.ifTrue(draggingOver)])
224+
Cn.("todos" + "active"->on(draggingOver))
225225
}>
226226
<div className="todos-header">
227227
<Control
@@ -245,10 +245,7 @@ let make = () => {
245245
containerId=todoListId
246246
index=todoIndex
247247
className={(~dragging) =>
248-
Cn.make([
249-
"todo",
250-
"dragging"->Cn.ifTrue(dragging),
251-
])
248+
Cn.("todo" + "dragging"->on(dragging))
252249
}>
253250
{`Children(todo.title->React.string)}
254251
</Todos.DraggableItem>;

examples/examples/SimpleList.re

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ let make = (~n: int, ~axis: Dnd.Axis.t) => {
8686
id={Todos.Container.id()}
8787
axis
8888
className={(~draggingOver) =>
89-
Cn.make(["todos", "active"->Cn.ifTrue(draggingOver)])
89+
Cn.("todos" + "active"->on(draggingOver))
9090
}>
9191
{state.todosIndex
9292
->Array.mapWithIndex((index, id) => {
@@ -98,7 +98,7 @@ let make = (~n: int, ~axis: Dnd.Axis.t) => {
9898
containerId={Todos.Container.id()}
9999
index
100100
className={(~dragging) =>
101-
Cn.make(["todo", "dragging"->Cn.ifTrue(dragging)])
101+
Cn.("todo" + "dragging"->on(dragging))
102102
}>
103103
{`Children(todo.title->React.string)}
104104
</Todos.DraggableItem>;

package.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
"prestart": "yarn run bs:build:dev",
1111
"build": "parcel build examples/index.html",
1212
"prebuild": "yarn run bs:build",
13-
"bs:build": "BS_LOG=off bsb -clean-world -make-world",
14-
"bs:build:dev": "BS_LOG=*,re-dnd=* bsb -clean-world -make-world",
15-
"bs:watch": "BS_LOG=*,re-dnd=* bsb -clean-world -make-world -w",
13+
"bs:build": "RES_LOG=off bsb -clean-world -make-world",
14+
"bs:build:dev": "RES_LOG=*,re-dnd=* bsb -clean-world -make-world",
15+
"bs:watch": "RES_LOG=*,re-dnd=* bsb -clean-world -make-world -w",
1616
"bs:clean": "bsb -clean-world",
1717
"clean": "rm -rf dist && yarn run bs:clean",
1818
"test": "exit 0",
@@ -40,22 +40,22 @@
4040
"url": "https://github.com/MinimaHQ/re-dnd"
4141
},
4242
"dependencies": {
43-
"bs-log": "1.1.0"
43+
"res-logger": "2.0.0-beta.2"
4444
},
4545
"peerDependencies": {
4646
"bs-platform": ">=7.1.1",
4747
"bs-webapi": ">=0.15.9",
4848
"reason-react": ">=0.8.0"
4949
},
5050
"devDependencies": {
51-
"autoprefixer": "9.7.6",
52-
"bs-platform": "7.2.2",
53-
"bs-webapi": "0.15.9",
51+
"autoprefixer": "9.8.6",
52+
"bs-platform": "8.4.2",
53+
"bs-webapi": "0.19.1",
5454
"bsb-js": "1.1.7",
5555
"parcel-bundler": "1.12.4",
56-
"re-classnames": "4.1.0",
57-
"react": "16.13.1",
58-
"react-dom": "16.13.1",
59-
"reason-react": "0.8.0"
56+
"re-classnames": "5.0.1",
57+
"react": "17.0.1",
58+
"react-dom": "17.0.1",
59+
"reason-react": "0.9.1"
6060
}
6161
}

0 commit comments

Comments
 (0)