From 901f5ba25ea7ec95c575101159663a64f62655d0 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Mon, 21 Feb 2022 19:37:15 +0100
Subject: [PATCH] update makefile rules: using npm binary instead of webpack
 binary

---
 Makefile | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 3ad92f2..015e70b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,25 +1,20 @@
 COMPOSER_BIN ?= composer
 PHP_BIN ?= php8.1
 SSH_BIN ?= ssh
-WEBPACK_BIN ?= webpack
 YARN_BIN ?= yarn
+NPM_BIN ?= npm
 
-all: dep asset clean
-
-.ONESHELL:
-dep:
-	$(COMPOSER_BIN) update --ignore-platform-reqs
-	$(COMPOSER_BIN) install --ignore-platform-reqs
-	$(YARN_BIN)
+all: build
 
 asset-watch:
-	$(WEBPACK_BIN) -w
+	$(YARN_BIN)
+	$(NPM_BIN) run watch
 
 asset: js-routing
 	$(YARN_BIN)
-	$(WEBPACK_BIN)
+	$(NPM_BIN) run build
 
-js-routing:
+js-routing: doctrine-migration
 	$(PHP_BIN) bin/console fos:js-routing:dump --format=json --target=public/js/fos_js_routes.json
 
 clean:
@@ -28,3 +23,5 @@ clean:
 
 doctrine-migration:
 	PHP=$(PHP_BIN) ./bin/doctrine-migrate
+
+build: js-routing asset