From 136803d5aaa7f26447abaa269bf96bb57cb8b5b1 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Mon, 21 Feb 2022 19:51:22 +0100
Subject: [PATCH] backports murph-skeleton

---
 Makefile | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index 8a4c664..8506d09 100644
--- a/Makefile
+++ b/Makefile
@@ -1,37 +1,31 @@
 COMPOSER ?= composer
 PHP ?= php8.1
 SSH ?= ssh
-WEBPACK ?= webpack
 YARN ?= yarn
+NPM_BIN ?= npm
 
-all: dep asset clean
-
-.ONESHELL:
-dep:
-	$(COMPOSER) update --ignore-platform-reqs
-	$(COMPOSER) install --ignore-platform-reqs
-	$(YARN)
+all: build
 
 asset-watch:
-	$(WEBPACK) -w
+	$(YARN_BIN)
+	$(NPM_BIN) run watch
 
 asset: js-routing
-	$(YARN)
-	$(WEBPACK)
+	$(YARN_BIN)
+	$(NPM_BIN) run build
 
-js-routing:
+js-routing: doctrine-migration
 	$(PHP) bin/console fos:js-routing:dump --format=json --target=public/js/fos_js_routes.json
 
 clean:
 	rm -fr var/cache/dev/*
 	rm -fr var/cache/prod/*
 
-build: clean doctrine-migration js-routing
-	npm run build
-
 doctrine-migration:
 	PHP=$(PHP) ./bin/doctrine-migrate
 
+build: clean js-routing asset
+
 deploy-prod:
 	mage deploy prod
 	ssh webdeblanio@asuka "cd blog && make build"