Skip to content

Commit 21b4a4b

Browse files
davesnxdavesnx
authored
Update opam to 2.2 and server-reason-react 0.3.1 (#496)
1 parent 6a187f9 commit 21b4a4b

File tree

64 files changed

+229
-64
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+229
-64
lines changed

‎.github/workflows/ci.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ on:
88
branches:
99
- main
1010

11+
env:
12+
OPAM_VERSION: 2.2.0
13+
DUNE_PROFILE: release
14+
1115
permissions:
1216
contents: write
1317
pull-requests: write
@@ -34,9 +38,11 @@ jobs:
3438
uses: actions/setup-node@v3
3539

3640
- name: Use OCaml ${{ matrix.ocaml-compiler }}
37-
uses: ocaml/setup-ocaml@v2
41+
uses: ocaml/setup-ocaml@v3
3842
with:
3943
ocaml-compiler: ${{ matrix.ocaml-compiler }}
44+
dune-cache: true
45+
opam-disable-sandboxing: true
4046

4147
- name: Load opam cache when not Windows
4248
if: runner.os != 'Windows'

‎dune-project

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
(ppxlib (>= 0.27.0))
3535
(sedlex (>= 3.2))
3636
(melange (>= 3.0.0))
37-
(server-reason-react (>= 0.3.0))
37+
(server-reason-react (>= 0.3.1))
3838
(reason-react (>= 0.14.0))
3939
(alcotest :with-test)
4040
(conf-npm :with-test)

‎packages/ppx/test/css-support/animations.t/run.t

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ If this test fail means that the module is not in sync with the ppx
1414

1515
$ dune build
1616

17-
$ dune describe pp ./input.re.ml | refmt --parse ml --print re
17+
$ dune describe pp ./input.re
1818
[@ocaml.ppx.context
1919
{
2020
tool_name: "ppx_driver",
@@ -43,6 +43,7 @@ If this test fail means that the module is not in sync with the ppx
4343
(0, [|CSS.opacity(0.)|]),
4444
(100, [|CSS.opacity(1.)|]),
4545
|]);
46+
4647
CSS.animationName(CSS.Types.AnimationName.make({js|random|js}));
4748
CSS.animationName(foo);
4849
CSS.animationNames([|foo, bar|]);

‎packages/ppx/test/css-support/backgrounds-and-borders-module.t/run.t

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ If this test fail means that the module is not in sync with the ppx
1414

1515
$ dune build
1616

17-
$ dune describe pp ./input.re.ml | refmt --parse ml --print re
17+
$ dune describe pp ./input.re
1818
[@ocaml.ppx.context
1919
{
2020
tool_name: "ppx_driver",
@@ -41,6 +41,7 @@ If this test fail means that the module is not in sync with the ppx
4141
let elevation1 = `rgba((0, 0, 0, `num(0.03)));
4242
};
4343
};
44+
4445
CSS.backgroundRepeat(`space);
4546
CSS.backgroundRepeat(`round);
4647
CSS.backgroundRepeat(`hv((`repeat, `repeat)));
@@ -60,6 +61,7 @@ If this test fail means that the module is not in sync with the ppx
6061
CSS.backgroundRepeat(`hv((`round, `noRepeat)));
6162
CSS.backgroundRepeat(`hv((`noRepeat, `noRepeat)));
6263
CSS.backgroundAttachment(`local);
64+
6365
CSS.backgroundClip(`borderBox);
6466
CSS.backgroundClip(`paddingBox);
6567
CSS.backgroundClip(`contentBox);
@@ -74,10 +76,12 @@ If this test fail means that the module is not in sync with the ppx
7476
CSS.unsafe({js|backgroundSize|js}, {js|10px auto|js});
7577
CSS.unsafe({js|backgroundSize|js}, {js|auto 10%|js});
7678
CSS.backgroundSize(`size((`em(50.), `percent(50.))));
79+
7780
CSS.unsafe({js|background|js}, {js|top left / 50% 60%|js});
7881
CSS.backgroundOrigin(`borderBox);
7982
CSS.backgroundColor(CSS.blue);
8083
CSS.backgroundColor(CSS.red);
84+
8185
CSS.backgroundClip(`paddingBox);
8286
CSS.unsafe(
8387
{js|background|js},
@@ -97,6 +101,7 @@ If this test fail means that the module is not in sync with the ppx
97101
CSS.unsafe({js|borderBottomLeftRadius|js}, {js|250px 100px|js});
98102
CSS.borderRadius(`pxFloat(10.));
99103
CSS.borderRadius(`percent(50.));
104+
100105
CSS.borderImageSource(`none);
101106
CSS.borderImageSource(`url({js|foo.png|js}));
102107
CSS.unsafe({js|borderImageSlice|js}, {js|10|js});
@@ -196,6 +201,7 @@ If this test fail means that the module is not in sync with the ppx
196201
{js|borderImage|js},
197202
{js|url(foo.png) fill 10 / 10% / 10px space|js},
198203
);
204+
199205
CSS.boxShadows([|
200206
CSS.Shadow.box(
201207
~x=`pxFloat(1.),
@@ -255,6 +261,7 @@ If this test fail means that the module is not in sync with the ppx
255261
Color.Shadow.elevation1,
256262
),
257263
|]);
264+
258265
CSS.unsafe({js|backgroundPositionX|js}, {js|right|js});
259266
CSS.unsafe({js|backgroundPositionX|js}, {js|center|js});
260267
CSS.unsafe({js|backgroundPositionX|js}, {js|50%|js});
@@ -305,6 +312,7 @@ If this test fail means that the module is not in sync with the ppx
305312
CSS.unsafe({js|backgroundPositionY|js}, {js|bottom -50px|js});
306313
CSS.unsafe({js|backgroundPositionY|js}, {js|top -50px|js});
307314
CSS.unsafe({js|backgroundPositionY|js}, {js|bottom 20px|js});
315+
308316
CSS.backgroundImage(
309317
`linearGradient((
310318
Some(`deg(45.)),
@@ -430,6 +438,7 @@ If this test fail means that the module is not in sync with the ppx
430438
|]: CSS.Types.Gradient.color_stop_list,
431439
)),
432440
);
441+
433442
CSS.backgroundImages([|
434443
`linearGradient((
435444
Some(`deg(45.)),
@@ -454,6 +463,7 @@ If this test fail means that the module is not in sync with the ppx
454463
[|(Some(CSS.blue), None), (Some(CSS.red), None)|]: CSS.Types.Gradient.color_stop_list,
455464
)),
456465
|]);
466+
457467
CSS.backgroundImage(
458468
`radialGradient((
459469
Some(`ellipse),
@@ -518,6 +528,7 @@ If this test fail means that the module is not in sync with the ppx
518528
{js|backgroundImage|js},
519529
{js|radial-gradient(60% 60%, white, black)|js},
520530
);
531+
521532
CSS.listStyleImage(
522533
`linearGradient((
523534
None,
@@ -649,34 +660,42 @@ If this test fail means that the module is not in sync with the ppx
649660
{js|listStyleImage|js},
650661
{js|radial-gradient(60% 60%, white, black)|js},
651662
);
663+
652664
CSS.imageRendering(`auto);
653665
CSS.imageRendering(`smooth);
654666
CSS.imageRendering(`highQuality);
655667
CSS.imageRendering(`pixelated);
656668
CSS.imageRendering(`crispEdges);
669+
657670
CSS.backgroundPosition(`bottom);
658671
CSS.unsafe({js|backgroundPositionX|js}, {js|50%|js});
659672
CSS.unsafe({js|backgroundPositionY|js}, {js|0|js});
660673
CSS.backgroundPosition2(`zero, `zero);
661674
CSS.backgroundPosition2(`rem(1.), `zero);
675+
662676
CSS.objectPosition2(`center, `top);
663677
CSS.objectPosition2(`center, `bottom);
664678
CSS.objectPosition2(`left, `center);
665679
CSS.objectPosition2(`right, `center);
666680
CSS.objectPosition2(`center, `center);
681+
667682
CSS.unsafe({js|objectPosition|js}, {js|25% 75%|js});
668683
CSS.objectPosition2(`percent(25.), `center);
684+
669685
CSS.objectPosition2(`zero, `zero);
670686
CSS.objectPosition2(`cm(1.), `cm(2.));
671687
CSS.objectPosition2(`ch(10.), `em(8.));
688+
672689
CSS.unsafe({js|objectPosition|js}, {js|bottom 10px right 20px|js});
673690
CSS.unsafe({js|objectPosition|js}, {js|right 3em bottom 10px|js});
674691
CSS.unsafe({js|objectPosition|js}, {js|top 0 right 10px|js});
692+
675693
CSS.unsafe({js|objectPosition|js}, {js|inherit|js});
676694
CSS.unsafe({js|objectPosition|js}, {js|initial|js});
677695
CSS.unsafe({js|objectPosition|js}, {js|revert|js});
678696
CSS.unsafe({js|objectPosition|js}, {js|revert-layer|js});
679697
CSS.unsafe({js|objectPosition|js}, {js|unset|js});
698+
680699
let _loadingKeyframes =
681700
CSS.keyframes([|
682701
(0, [|CSS.backgroundPosition2(`zero, `zero)|]),

‎packages/ppx/test/css-support/basic-user-interface-module.t/run.t

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ If this test fail means that the module is not in sync with the ppx
1414

1515
$ dune build
1616

17-
$ dune describe pp ./input.re.ml | refmt --parse ml --print re
17+
$ dune describe pp ./input.re
1818
[@ocaml.ppx.context
1919
{
2020
tool_name: "ppx_driver",
@@ -33,6 +33,7 @@ If this test fail means that the module is not in sync with the ppx
3333
cookies: [],
3434
}
3535
];
36+
3637
CSS.boxSizing(`borderBox);
3738
CSS.boxSizing(`contentBox);
3839
CSS.outlineStyle(`auto);
@@ -54,6 +55,7 @@ If this test fail means that the module is not in sync with the ppx
5455
CSS.unsafe({js|resize|js}, {js|vertical|js});
5556
CSS.textOverflow(`clip);
5657
CSS.textOverflow(`ellipsis);
58+
5759
CSS.cursor(`default);
5860
CSS.cursor(`none);
5961
CSS.cursor(`contextMenu);
@@ -76,19 +78,26 @@ If this test fail means that the module is not in sync with the ppx
7678
CSS.cursor(`zoomOut);
7779
CSS.unsafe({js|caretColor|js}, {js|auto|js});
7880
CSS.unsafe({js|caretColor|js}, {js|green|js});
81+
7982
CSS.unsafe({js|appearance|js}, {js|auto|js});
8083
CSS.unsafe({js|appearance|js}, {js|none|js});
84+
8185
CSS.textOverflow(`clip);
8286
CSS.textOverflow(`ellipsis);
87+
8388
CSS.textOverflow(`string({js|foo|js}));
8489
CSS.unsafe({js|textOverflow|js}, {js|clip clip|js});
8590
CSS.unsafe({js|textOverflow|js}, {js|ellipsis clip|js});
91+
8692
CSS.unsafe({js|textOverflow|js}, {js|'foo' clip|js});
8793
CSS.unsafe({js|textOverflow|js}, {js|clip ellipsis|js});
8894
CSS.unsafe({js|textOverflow|js}, {js|ellipsis ellipsis|js});
95+
8996
CSS.unsafe({js|textOverflow|js}, {js|'foo' ellipsis|js});
97+
9098
CSS.unsafe({js|textOverflow|js}, {js|clip 'foo'|js});
9199
CSS.unsafe({js|textOverflow|js}, {js|ellipsis 'foo'|js});
100+
92101
CSS.unsafe({js|textOverflow|js}, {js|'foo' 'foo'|js});
93102
CSS.userSelect(`auto);
94103
CSS.userSelect(`text);

‎packages/ppx/test/css-support/box-alignment-module.t/run.t

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ If this test fail means that the module is not in sync with the ppx
1313

1414
$ dune build
1515

16-
$ dune describe pp ./input.re.ml | refmt --parse ml --print re
16+
$ dune describe pp ./input.re
1717
[@ocaml.ppx.context
1818
{
1919
tool_name: "ppx_driver",
@@ -32,6 +32,7 @@ If this test fail means that the module is not in sync with the ppx
3232
cookies: [],
3333
}
3434
];
35+
3536
CSS.alignSelf(`auto);
3637
CSS.alignSelf(`normal);
3738
CSS.alignSelf(`stretch);
@@ -190,6 +191,7 @@ If this test fail means that the module is not in sync with the ppx
190191
CSS.unsafe({js|placeItems|js}, {js|first baseline legacy left|js});
191192
CSS.unsafe({js|placeItems|js}, {js|self-start legacy left|js});
192193
CSS.unsafe({js|placeItems|js}, {js|unsafe start legacy left|js});
194+
193195
CSS.gap2(~rowGap=`zero, ~columnGap=`zero);
194196
CSS.gap2(~rowGap=`zero, ~columnGap=`em(1.));
195197
CSS.gap(`em(1.));
@@ -199,6 +201,7 @@ If this test fail means that the module is not in sync with the ppx
199201
CSS.columnGap(`normal);
200202
CSS.rowGap(`zero);
201203
CSS.rowGap(`em(1.));
204+
202205
CSS.unsafe({js|marginTrim|js}, {js|none|js});
203206
CSS.unsafe({js|marginTrim|js}, {js|in-flow|js});
204207
CSS.unsafe({js|marginTrim|js}, {js|all|js});

‎packages/ppx/test/css-support/box-sizing-module.t/run.t

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ If this test fail means that the module is not in sync with the ppx
1414

1515
$ dune build
1616

17-
$ dune describe pp ./input.re.ml | refmt --parse ml --print re
17+
$ dune describe pp ./input.re
1818
[@ocaml.ppx.context
1919
{
2020
tool_name: "ppx_driver",
@@ -33,6 +33,7 @@ If this test fail means that the module is not in sync with the ppx
3333
cookies: [],
3434
}
3535
];
36+
3637
CSS.width(`maxContent);
3738
CSS.width(`minContent);
3839
CSS.unsafe({js|width|js}, {js|fit-content(10%)|js});
@@ -51,12 +52,19 @@ If this test fail means that the module is not in sync with the ppx
5152
CSS.maxHeight(`maxContent);
5253
CSS.maxHeight(`minContent);
5354
CSS.unsafe({js|maxHeight|js}, {js|fit-content(10%)|js});
55+
5456
CSS.aspectRatio(`auto);
5557
CSS.aspectRatio(`num(2.));
5658
CSS.aspectRatio(`ratio((16, 9)));
59+
5760
CSS.unsafe({js|width|js}, {js|fit-content|js});
61+
5862
CSS.unsafe({js|minWidth|js}, {js|fit-content|js});
63+
5964
CSS.unsafe({js|maxWidth|js}, {js|fit-content|js});
65+
6066
CSS.unsafe({js|height|js}, {js|fit-content|js});
67+
6168
CSS.unsafe({js|minHeight|js}, {js|fit-content|js});
69+
6270
CSS.unsafe({js|maxHeight|js}, {js|fit-content|js});

‎packages/ppx/test/css-support/calc.t/run.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ If this test fail means that the module is not in sync with the ppx
1212
> (preprocess (pps styled-ppx)))
1313
> EOF
1414

15-
$ dune describe pp ./input.re.ml | refmt --parse ml --print re
15+
$ dune describe pp ./input.re
1616
[@ocaml.ppx.context
1717
{
1818
tool_name: "ppx_driver",

‎packages/ppx/test/css-support/cascading-and-inheritance.t/run.t

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ If this test fail means that the module is not in sync with the ppx
1414

1515
$ dune build
1616

17-
$ dune describe pp ./input.re.ml | refmt --parse ml --print re
17+
$ dune describe pp ./input.re
1818
[@ocaml.ppx.context
1919
{
2020
tool_name: "ppx_driver",
@@ -33,6 +33,7 @@ If this test fail means that the module is not in sync with the ppx
3333
cookies: [],
3434
}
3535
];
36+
3637
CSS.unsafe({js|color|js}, {js|unset|js});
3738
CSS.unsafe({js|fontWeight|js}, {js|unset|js});
3839
CSS.unsafe({js|backgroundImage|js}, {js|unset|js});

‎packages/ppx/test/css-support/color-adjustments-module.t/run.t

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ If this test fail means that the module is not in sync with the ppx
1414

1515
$ dune build
1616

17-
$ dune describe pp ./input.re.ml | refmt --parse ml --print re
17+
$ dune describe pp ./input.re
1818
[@ocaml.ppx.context
1919
{
2020
tool_name: "ppx_driver",
@@ -33,6 +33,7 @@ If this test fail means that the module is not in sync with the ppx
3333
cookies: [],
3434
}
3535
];
36+
3637
CSS.unsafe({js|colorAdjust|js}, {js|economy|js});
3738
CSS.unsafe({js|colorAdjust|js}, {js|exact|js});
3839
CSS.unsafe({js|forcedColorAdjust|js}, {js|auto|js});

0 commit comments

Comments
 (0)