Polish makefile and dune watch

Author: davesnx

.gitignore

@@ -9,3 +9,5 @@ _esy/
 static/
 
 .merlin
+
+.processes/last_built_at.txt

.processes/.gitkeep

@@ -12,52 +12,46 @@ install: ## Install dependencies from esy.json and package.json
 	@$(ESY) install
 	@npm install
 
-.PHONY: client-bundle
-client-bundle: ## Bundle the JS code
+.PHONY: webpack
+webpack: ## Bundle the JS code
 	@$(WEBPACK) --env development
 
-.PHONY: client-bundle-watch
-client-bundle-watch: ## Watch and bundle the JS code
-	@$(WEBPACK) --watch --env development
-
-.PHONY: client-bundle
-client-bundle-prod: ## Bundle the JS code for production
+.PHONY: webpack-prod
+webpack-prod: ## Bundle the JS code for production
 	@$(WEBPACK) --env production
 
-.PHONY: client-build
-client-build: ## Build Reason code
+.PHONY: webpack-watch
+webpack-watch: ## Watch and bundle the JS code
+	@$(WEBPACK) --watch --env development
+
+.PHONY: build-client
+build-client: ## Build Reason code
 	@$(DUNE) build @client
 
-.PHONY: client-build-watch
-client-build-watch: ## Watch reason code
+.PHONY: build-client-watch
+build-client-watch: ## Watch reason code
 	@$(DUNE) build -w @client
 
-.PHONY: server-build
-server-build: ## Build the project, including non installable libraries and executables
-	@$(DUNE) build @@default
-
-.PHONY: server-build-prod
-server-build-prod: ## Build for production (--profile=prod)
-	@$(DUNE) build --profile=prod @@default
+.PHONY: build-server-prod
+build-server-prod: ## Build for production (--profile=prod)
+	@$(DUNE) build --profile=prod @server
 
-.PHONY: server-start
-server-start: ## Start the server
-	@$(DUNE) exec --root . --no-buffer server/server.exe
+.PHONY: build-server
+build-server: ## Build the project, including non installable libraries and executables
+	@$(DUNE) build @server
 
-.PHONY: server-dev
-server-dev: ## Build in watch mode
-	@$(DUNE) build -w @@default
+.PHONY: start-server
+start-server: ## Start the server
+	@$(DUNE) exec server/server.exe
 
-.PHONY: server-dev
-watch: ## Build in watch
-	@$(DUNE) build -w @@default
+.PHONY: run
+run: ## Start the server in dev mode
+	@watchexec --no-ignore -w .processes/last_built_at.txt -r -c \
+	"clear; _build/default/server/server.exe"
 
-.PHONY: dev
-dev: ## Start the server in dev mode
-	@watchexec \
-		-w client -w server -w shared -w vendor \
-		--exts re,rei,res,resi,ml,mli -r -c \
-		"$(MAKE) client-build; $(MAKE) server-build; $(MAKE) client-bundle; $(MAKE) server-start"
+.PHONY: watch
+watch: ## Build in watch mode
+	@$(DUNE) build -w @client @server
 
 .PHONY: clean
 clean: ## Clean artifacts

Makefile

@@ -23,12 +23,12 @@ Command to run `wrk -t8 -c400 -d30s http://localhost:xxxx`
 
 ```sh
   Thread Stats   Avg      Stdev     Max   +/- Stdev
-    Latency   109.35us   42.15us   1.68ms   75.40%
-    Req/Sec     9.10k     2.11k   12.52k    51.08%
-  2179657 requests in 30.10s, 5.96GB read
-
-Requests/sec:  72414.39
-Transfer/sec:    202.62MB
+    Latency    40.82ms   10.45ms 188.76ms   85.29%
+    Req/Sec     1.22k   267.70     1.51k    70.58%
+  291638 requests in 30.08s, 270.62MB read
+  Socket errors: connect 0, read 964, write 0, timeout 0
+Requests/sec:   9695.68
+Transfer/sec:      9.00MB
 ```
 
 ### node-express-js

benchmark/README.md

@@ -1,3 +1 @@
-(subdir static)
-
-(subdir vendor)
+(dirs static vendor shared server client)

dune

@@ -8,3 +8,13 @@
   server-reason-react.css)
  (preprocess
   (pps server-reason-react.ppx)))
+
+(rule
+ (alias server)
+ (deps ./server.exe)
+ (action
+  ; we want dune to write the file but not attach any fsevents listeners to it,
+  ; so that watchexec can read from it without issues.
+  ; this means no (target), no (with-stdout-to), just a bash command with stdout
+  ; redirect inside a string
+  (bash "date > %{project_root}/../../.processes/last_built_at.txt")))

server/dune

@@ -3,6 +3,6 @@
  (modes melange)
  (libraries melange reason_react bs_css bs_css_emotion bs_webapi)
  (preprocess
-  (pps reactjs-jsx-ppx)))
+  (pps melange.ppx reactjs-jsx-ppx)))
 
 (copy_files# "../*.re")