From 54475032f3ae39554d896d166d9115e2ffa60b0f Mon Sep 17 00:00:00 2001
From: Ivan Herak <herak.ivan@gmail.com>
Date: Fri, 3 Mar 2023 11:23:31 +0100
Subject: [PATCH 1/3] NGGW-105 fix assets build so it does not use sub-make

---
 Makefile | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index cb0d8efc2..a28455e3c 100644
--- a/Makefile
+++ b/Makefile
@@ -32,20 +32,17 @@ assets-node:
 	. ${NVM_DIR}/nvm.sh && nvm use || nvm install $(cat .nvmrc)
 
 .PHONY: assets
-assets: ## Build frontend assets for DEV environment
-	@$(MAKE) -s assets-node
+assets: assets-node ## Build frontend assets for DEV environment
 	yarn install
 	yarn build:dev
 
 .PHONY: assets-prod
-assets-prod: ## Build frontend assets for PROD environment
-	@$(MAKE) -s assets-node
+assets-prod: assets-node ## Build frontend assets for PROD environment
 	yarn install
 	yarn build:prod
 
 .PHONY: assets-watch
-assets-watch: ## Watch frontend assets (during development)
-	@$(MAKE) -s assets-node
+assets-watch: assets-node ## Watch frontend assets (during development)
 	yarn install
 	yarn watch
 

From 0b53b82b995f18e60c03070f87cf4093ce9f71ab Mon Sep 17 00:00:00 2001
From: Ivan Herak <herak.ivan@gmail.com>
Date: Fri, 3 Mar 2023 11:37:14 +0100
Subject: [PATCH 2/3] NGGW-105 proper fix for assets build

---
 Makefile | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index a28455e3c..766143692 100644
--- a/Makefile
+++ b/Makefile
@@ -27,22 +27,24 @@ endif
 vendor: ## Run composer install
 	$(COMPOSER_RUN) install $(COMPOSER_INSTALL_PARAMETERS)
 
-.PHONY: assets-node
-assets-node:
-	. ${NVM_DIR}/nvm.sh && nvm use || nvm install $(cat .nvmrc)
-
 .PHONY: assets
-assets: assets-node ## Build frontend assets for DEV environment
+.ONESHELL:
+assets: ## Build frontend assets for DEV environment
+	. ${NVM_DIR}/nvm.sh && nvm use || nvm install $(cat .nvmrc)
 	yarn install
 	yarn build:dev
 
 .PHONY: assets-prod
+.ONESHELL:
 assets-prod: assets-node ## Build frontend assets for PROD environment
+	. ${NVM_DIR}/nvm.sh && nvm use || nvm install $(cat .nvmrc)
 	yarn install
 	yarn build:prod
 
 .PHONY: assets-watch
+.ONESHELL:
 assets-watch: assets-node ## Watch frontend assets (during development)
+	. ${NVM_DIR}/nvm.sh && nvm use || nvm install $(cat .nvmrc)
 	yarn install
 	yarn watch
 

From ea22810a11420a294f8871030249c61768fd4756 Mon Sep 17 00:00:00 2001
From: Ivan Herak <herak.ivan@gmail.com>
Date: Fri, 3 Mar 2023 11:47:03 +0100
Subject: [PATCH 3/3] NGGW-105 remove old reference

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 766143692..a43270eb4 100644
--- a/Makefile
+++ b/Makefile
@@ -36,14 +36,14 @@ assets: ## Build frontend assets for DEV environment
 
 .PHONY: assets-prod
 .ONESHELL:
-assets-prod: assets-node ## Build frontend assets for PROD environment
+assets-prod: ## Build frontend assets for PROD environment
 	. ${NVM_DIR}/nvm.sh && nvm use || nvm install $(cat .nvmrc)
 	yarn install
 	yarn build:prod
 
 .PHONY: assets-watch
 .ONESHELL:
-assets-watch: assets-node ## Watch frontend assets (during development)
+assets-watch: ## Watch frontend assets (during development)
 	. ${NVM_DIR}/nvm.sh && nvm use || nvm install $(cat .nvmrc)
 	yarn install
 	yarn watch