Merge pull request #67 from mattjbray/dave/melange2

bump: updates for melange 2.0

Author: actionshrimp

.github/workflows/build.yml

@@ -49,38 +49,14 @@ jobs:
 
       - run: opam install "${{ matrix.package }}" --with-test
 
-  build-node:
-    strategy:
-      fail-fast: false
-      matrix:
-        os:
-          - ubuntu-latest
-        node-version:
-          - 16.x
-
-    runs-on: ${{ matrix.os }}
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
-        with:
-          node-version: ${{ matrix.node-version }}
-          cache: 'npm'
-
-      - run: npm ci
-      - run: npm run build
-      - run: npm test
-
   build-melange:
     strategy:
       fail-fast: false
       matrix:
         os:
           - ubuntu-latest
         ocaml-compiler:
-          - 4.14.x
+          - 5.1.x
         package:
           - melange-decoders
 

__tests__/decoders_js_json_test.ml

@@ -1,7 +1,7 @@
 open Jest
 open Js_json
 
-external parse_int : string -> int = "parseInt" [@@bs.scope "window"] [@@bs.val]
+external parse_int : string -> int = "parseInt" [@@mel.scope "window"] [@@mel.val]
 
 let () =
   describe

melange-decoders.opam

@@ -34,17 +34,3 @@ build: [
   ]
 ]
 dev-repo: "git+https://github.com/mattjbray/ocaml-decoders.git"
-pin-depends: [
-  [
-    "melange-fetch.dev"
-    "git+https://github.com/melange-community/melange-fetch.git#d2183ec245cbf5c7a8f99f8c41d2de0758c8cda7"
-  ]
-  [
-    "melange-jest.~dev"
-    "git+https://github.com/melange-community/melange-jest.git#9cd5449738ab6387880ad0ec7a31b78e08f4476d"
-  ]
-  [
-    "melange-webapi.~dev"
-    "git+https://github.com/melange-community/melange-webapi.git#6052d83efa2f29a295d83fb93a6121a232701033"
-  ]
-]

melange-decoders.opam.template

@@ -3,4 +3,4 @@
  (public_name melange-decoders)
  (preprocess (pps melange.ppx))
  (modes melange)
- (libraries decoders))
+ (libraries decoders melange.dom))

src-js/dune

@@ -1,21 +1,21 @@
 module DOMParser = struct
   type t
 
-  external create : unit -> t = "DOMParser" [@@bs.new]
+  external create : unit -> t = "DOMParser" [@@mel.new]
 
   external parseFromString : t -> string -> string -> Dom.element
     = "parseFromString"
-    [@@bs.send]
+    [@@mel.send]
 
   external firstElementChildUnsafe : Dom.element -> Dom.element
     = "firstElementChild"
-    [@@bs.get]
+    [@@mel.get]
 
   external querySelector :
     Dom.element -> string -> Dom.element Js.null_undefined = "querySelector"
-    [@@bs.send]
+    [@@mel.send]
 
-  external textContent : Dom.element -> string = "textContent" [@@bs.get]
+  external textContent : Dom.element -> string = "textContent" [@@mel.get]
 
   let parse_xml text =
     let parser = create () in
@@ -30,13 +30,13 @@ end
 
 module Node = struct
   (* See https://developer.mozilla.org/en-US/docs/Web/API/Node/nodeType *)
-  external element_node : int = "ELEMENT_NODE" [@@bs.val] [@@bs.scope "Node"]
+  external element_node : int = "ELEMENT_NODE" [@@mel.scope "Node"]
 
-  external text_node : int = "TEXT_NODE" [@@bs.val] [@@bs.scope "Node"]
+  external text_node : int = "TEXT_NODE" [@@mel.scope "Node"]
 
-  external comment_node : int = "COMMENT_NODE" [@@bs.val] [@@bs.scope "Node"]
+  external comment_node : int = "COMMENT_NODE" [@@mel.scope "Node"]
 
-  external nodeType : Dom.node -> int = "nodeType" [@@bs.get]
+  external nodeType : Dom.node -> int = "nodeType" [@@mel.get]
 
   external of_element : Dom.element -> Dom.node = "%identity"
 
@@ -72,52 +72,52 @@ module Node_list = struct
 end
 
 module Text = struct
-  external data : Dom.text -> string = "data" [@@bs.get]
+  external data : Dom.text -> string = "data" [@@mel.get]
 end
 
 module Element = struct
-  external childNodes : Dom.element -> Dom.nodeList = "childNodes" [@@bs.get]
+  external childNodes : Dom.element -> Dom.nodeList = "childNodes" [@@mel.get]
 
   let child_nodes elt = childNodes elt |> Node_list.to_array |> Array.to_list
 
-  external tagName : Dom.element -> string = "tagName" [@@bs.get]
+  external tagName : Dom.element -> string = "tagName" [@@mel.get]
 
   external getAttribute : Dom.element -> string -> string Js.Nullable.t
     = "getAttribute"
-    [@@bs.send]
+    [@@mel.send]
 
   external getAttributeNames : Dom.element -> string Js.Array.t
     = "getAttributeNames"
-    [@@bs.send]
+    [@@mel.send]
 
   let get_attribute elt attr =
     let v = getAttribute elt attr in
     Js.Nullable.toOption v
 
 
   external append : Dom.element -> Dom.node array -> unit = "append"
-    [@@bs.send] [@@variadic]
+    [@@mel.send] [@@variadic]
 
   external setAttribute : Dom.element -> string -> string -> unit
     = "setAttribute"
-    [@@bs.send]
+    [@@mel.send]
 end
 
 module XMLSerializer = struct
   type t
 
-  external create : unit -> t = "XMLSerializer" [@@bs.new]
+  external create : unit -> t = "XMLSerializer" [@@mel.new]
 
   external serializeToString : t -> Dom.node -> string = "serializeToString"
-    [@@bs.send]
+    [@@mel.send]
 end
 
 module Document = struct
   external createElementNS : string -> string -> Dom.element = "createElementNS"
-    [@@val] [@@scope "window", "document"]
+    [@@scope "window", "document"]
 
   external createTextNode : string -> Dom.text = "createTextNode"
-    [@@val] [@@scope "window", "document"]
+    [@@scope "window", "document"]
 end
 
 module Encode = struct