update to latest melange

.vscode/settings.json

@@ -0,0 +1,6 @@
+{
+    "ocaml.sandbox": {
+        "kind": "opam",
+        "switch": "${workspaceFolder:hello-native-bucklescript}"
+    }
+}

Makefile

@@ -13,37 +13,28 @@ help: ## Print this help message
 
 .PHONY: create-switch
 create-switch:
-	opam switch create . --deps-only
+	opam switch create . 5.1.0 -y --deps-only
 
 .PHONY: init
-init: create-switch install pins ## Configure everything to develop this repository in local
-
-.PHONY: pins
-pins: ## Pin development dependencies
-	opam pin add $(project_name).dev .
+init: create-switch install ## Configure everything to develop this repository in local
 
 .PHONY: install
 install: ## Install dependencies
-	yarn install
 	opam install . --deps-only --with-test
-	rm -rf node_modules/melange && ln -sfn $$(opam var melange:lib)/runtime node_modules/melange
-
-.PHONY: deps
-deps: $(opam_file) ## Alias to update the opam file and install the needed deps
 
-.PHONY: build_js
-build_js: ## Build the Melange project
-	$(DUNE) build @exe_js
+.PHONY: build_melange
+build_melange: ## Build the Melange project
+	$(DUNE) build @melange
 
 .PHONY: build_native
 build_native: ## Build the native project
 	$(DUNE) build exes/native.exe
 
 .PHONY: build
-build: build_js build_native ## Build both Melange and native projects
+build: build_melange build_native ## Build both Melange and native projects
 
-.PHONY: run_js
-run_js: ## Run the js project
+.PHONY: run_melange
+run_js: ## Run the melange project
 	node _build/default/exes/date/exes/js
 
 .PHONY: run_native
@@ -64,7 +55,4 @@ format-check: ## Checks if format is correct
 
 .PHONY: watch
 watch: ## Watch for the filesystem and rebuild on every change
-	$(DUNE) build @@default --watch
-
-$(opam_file): $(project_name).opam.template dune-project ## Update the package dependencies when new deps are added to dune-project
-	opam exec -- dune build @install        # Update the $(project_name).opam file
+	$(DUNE) build --watch

README.md

@@ -1,6 +1,6 @@
 This repository contains an example of a library written in
-ocaml/reason for both javascript (through bucklescript) and native
-(through the ocaml compiler).
+OCaml/Reason for both JavaScript (through [Melange](melange.re/)) and native
+(through the OCaml compiler).
 
 The `shared` directory contains the core of the library, available in
 both modes. `js` and `native` contain the part specific to one
@@ -21,33 +21,26 @@ step.
 
 ## Installation
 
-For bucklescript:
+Installing requires [opam](opam.ocaml.org/), OCaml's package manager. Once it is
+installed, just needs to run:
 
 ```bash
-yarn
+make init
 ```
 
-For native:
-
-- install [esy](https://esy.sh/)
-- then run `esy install`
-
-It can work with opam, but we use esy in this example as it is easier
-to understand for people from the javascript world.
-
 ## Compilation
 
-For bucklescript:
+For Melange:
 
 ```bash
-yarn bsb -make-world
+dune build @melange
 ```
 
 For native
 
 ```bash
-esy dune build @all
+dune build exes/native.exe
 ```
 
 The commands are wrapped in a Makefile and can be called with `make
-js` and `make native`.
+melange` and `make native`.

date/js/date.re

@@ -15,5 +15,4 @@ let tomorrow = () => {
 
 let wrap = x => Js.Date.fromString(x);
 
-let unwrap = x =>
-  (Js.Date.toISOString(x) |> Js.String.split("T"))->Array.get(0);
+let unwrap = x => Js.Date.toISOString(x);

date/js/dune

@@ -1,11 +1,20 @@
 (library
  (name date_js)
- (libraries bs_atdgen_codec_runtime)
- (modes melange))
+ (libraries melange-atdgen-codec-runtime tomorrow)
+ (modes melange)
+ (preprocess
+  (pps melange.ppx)))
 
-(copy_files# "../shared_ml/*.{ml,mli}")
+(copy_files# "../shared/yesterday.mli")
 
-(copy_files# "../shared_atd/*_bs.{ml,mli}")
-
-(copy_files# "../shared_atd/*_t.{ml,mli}")
+(rule
+ (targets user_t.mli user_t.ml)
+ (deps ../shared/user.atd)
+ (action
+  (run %{bin:atdgen} -t %{deps} -o ../js/user)))
 
+(rule
+ (target user_bs.ml)
+ (deps ../shared/user.atd)
+ (action
+  (run %{bin:atdgen} -bs %{deps} -o ../js/user)))

date/native/dune

@@ -1,9 +1,17 @@
 (library
  (name date_native)
- (libraries atdgen-runtime yojson unix ISO8601))
+ (libraries atdgen-runtime tomorrow yojson unix ISO8601))
 
-(copy_files# "../shared_ml/*.{ml,mli}")
+(copy_files# "../shared/yesterday.mli")
 
-(copy_files# "../shared_atd/*_j.{ml,mli}")
+(rule
+ (targets user_t.mli user_t.ml)
+ (deps ../shared/user.atd)
+ (action
+  (run %{bin:atdgen} -t %{deps} -o ../native/user)))
 
-(copy_files# "../shared_atd/*_t.{ml,mli}")
+(rule
+ (target user_j.ml)
+ (deps ../shared/user.atd)
+ (action
+  (run %{bin:atdgen} -j -j-std %{deps} -o ../native/user)))

date/shared/tomorrow/dune

@@ -0,0 +1,3 @@
+(library
+ (name tomorrow)
+ (modes :standard melange))

dune-project

@@ -1,4 +1,4 @@
-(lang dune 3.6)
+(lang dune 3.10)
 
 (using melange 0.1)
 

exes/dune

@@ -1,9 +1,9 @@
 (melange.emit
- (alias exe_js)
+ (alias melange)
  (target date)
- (entries js)
+ (modules js)
  (libraries date_js)
- (module_system commonjs))
+ (module_systems commonjs))
 
 (executable
  (name native)

exes/js.ml

@@ -1,4 +1,4 @@
-Js.log ("yesterday was " ^ Js_date.toISOString (Date_js.Yesterday.yesterday ()))
+Js.log ("yesterday was " ^ Js.Date.toISOString (Date_js.Yesterday.yesterday ()))
 
 let user : Date_js.User_t.t =
   { name = "Joe"; added = Date_js.Yesterday.yesterday () }

hello-native-melange.opam

@@ -9,10 +9,11 @@ license: "MIT"
 homepage: "https://github.com/ahrefs/hello-native-bucklescript"
 bug-reports: "https://github.com/ahrefs/hello-native-bucklescript/issues"
 depends: [
-  "ocaml" {= "4.14.0"}
-  "dune" {>= "3.0"}
-  "reason" {= "3.8.1"}
-  "melange" {= "0.3.1"}
+  "ocaml" {= "5.1.0"}
+  "dune" {>= "3.10"}
+  "reason" {= "3.10.0"}
+  "melange" {= "2.0.0"}
+  "melange-atdgen-codec-runtime" {= "dev"}
   "atdgen" {= "2.10.0"}
   "ISO8601" {= "0.2.6"}
   "ocaml-lsp-server" {dev}
@@ -37,5 +38,6 @@ build: [
 dev-repo: "git+https://github.com/ahrefs/hello-native-bucklescript.git"
 
 pin-depends: [
-  [ "dune.dev" "git+https://github.com/ocaml/dune.git#35418c2" ]
+  [ "melange-json.dev" "git+https://github.com/melange-community/melange-json.git#ac8a148" ]
+  [ "melange-atdgen-codec-runtime.dev" "git+https://github.com/ahrefs/melange-atdgen-codec-runtime.git#d5f22fc" ]
 ]