Merge branch 'main' of github.com:/davesnx/styled-ppx into Turn-css-i…

…nto-native-compatible * 'main' of github.com:/davesnx/styled-ppx: Update README.md Remove omp
davesnx · Aug 29, 2023 · 405aeb4 · 405aeb4
2 parents b8f9228 + 6419465
commit 405aeb4
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -49,7 +49,7 @@ Install the **[vim plugin](https://github.com/ahrefs/vim-styled-ppx/blob/main/RE
 
 ## Contributing
 
-We would love your help improving **styled-ppx**!. Please see our contributing and community guidelines, they'll help you get set up locally and explain the whole process: [CONTRIBUTING.md](./CONTRIBUTING.md).
+We would love your help improving **styled-ppx**! Please see our contributing and community guidelines, they'll help you get set up locally and explain the whole process: [CONTRIBUTING.md](./CONTRIBUTING.md).
 
 ## License
 

diff --git a/dune-project b/dune-project
@@ -29,7 +29,6 @@
  (depends
  (ocaml (and (>= 4.14.0) (< 5.0.0)))
  (menhir (= 20220210))
- (ocaml-migrate-parsetree (= 2.4.0))
  (ppx_deriving (>= 5.0))
  (ppx_deriving_yojson (>= 3.7.0))
  (ppxlib (>= 0.27.0))

diff --git a/packages/ppx/test/snapshot/reason/label.t/input.re b/packages/ppx/test/snapshot/reason/label.t/input.re
@@ -50,3 +50,19 @@ let fn2 = (x, y) =>
  | B when y => [prop("by")]
  | B => [prop("b")]
  };
+
+/* let className = [%cx {|
+ font-size: 28px;
+ |}];
+
+ let fn = () => {
+ let className = [%cx
+ {|
+ margin-bottom: 4px;
+ font-size: 28px;
+ |}
+ ];
+
+ className;
+ };
+ */
diff --git a/packages/reason-css-parser/ppx/dune b/packages/reason-css-parser/ppx/dune
@@ -10,11 +10,21 @@
  (name reason_css_parser_ppx)
  (kind ppx_rewriter)
  (wrapped false)
+<<<<<<< HEAD
  (libraries
  styled-ppx.css-spec-parser
  ppxlib
  ppxlib.astlib
  reason_css_parser_ppx_lib)
+||||||| 7db3ba6
+ (libraries
+ ocaml-migrate-parsetree
+ styled-ppx.css-spec-parser
+ ppxlib
+ reason_css_parser_ppx_lib)
+=======
+ (libraries styled-ppx.css-spec-parser ppxlib reason_css_parser_ppx_lib)
+>>>>>>> 641946568320cde0b6bdaf621df14ce1940e1468
  (modules Reason_css_parser_ppx)
  (preprocess
  (pps ppxlib.metaquot)))
diff --git a/styled-ppx.opam b/styled-ppx.opam
@@ -13,7 +13,6 @@ depends: [
  "dune" {>= "3.8"}
  "ocaml" {>= "4.14.0" & < "5.0.0"}
  "menhir" {= "20220210"}
- "ocaml-migrate-parsetree" {= "2.4.0"}
  "ppx_deriving" {>= "5.0"}
  "ppx_deriving_yojson" {>= "3.7.0"}
  "ppxlib" {>= "0.27.0"}