Merge pull request #137 from netgen/NGGW-105-fix-assets-makefile

NGGW-105 fix assets build so it does not use sub-make
netgen · Mar 6, 2023 · c519630 · c519630
2 parents a0672bb + ea22810
commit c519630
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -28,25 +28,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
+.ONESHELL:
 assets: ## Build frontend assets for DEV environment
-	@$(MAKE) -s assets-node
+	. ${NVM_DIR}/nvm.sh && nvm use || nvm install $(cat .nvmrc)
 	yarn install
 	yarn build:dev
 
 .PHONY: assets-prod
+.ONESHELL:
 assets-prod: ## Build frontend assets for PROD environment
-	@$(MAKE) -s assets-node
+	. ${NVM_DIR}/nvm.sh && nvm use || nvm install $(cat .nvmrc)
 	yarn install
 	yarn build:prod
 
 .PHONY: assets-watch
+.ONESHELL:
 assets-watch: ## Watch frontend assets (during development)
-	@$(MAKE) -s assets-node
+	. ${NVM_DIR}/nvm.sh && nvm use || nvm install $(cat .nvmrc)
 	yarn install
 	yarn watch