NTR: Fix make run (#666)

* NTR: Fix make run * NTR: Fix build * NTR: update --------- Co-authored-by: Vitalij Mik <[email protected]>
mollie · Dec 14, 2023 · 22a6e8a · 22a6e8a
1 parent ab42644
commit 22a6e8a
Show file tree

Hide file tree

Showing 4 changed files with 1,657 additions and 1,279 deletions.
diff --git a/makefile b/makefile
@@ -52,13 +52,15 @@ clean: ## Cleans all dependencies and files
 	rm -rf ./src/Resources/public/molllie-payments.js
 
 build: ## Installs the plugin, and builds the artifacts using the Shopware build commands.
-	php switch-composer.php prod
-	cd ../../.. && export NODE_OPTIONS=--openssl-legacy-provider && shopware-cli extension build custom/plugins/MolliePayments
-	php switch-composer.php dev
 	# -----------------------------------------------------
 	# CUSTOM WEBPACK
+	php switch-composer.php dev
 	cd ./src/Resources/app/storefront && make build -B
 	# -----------------------------------------------------
+	php switch-composer.php prod
+	cd ../../.. && export NODE_OPTIONS=--openssl-legacy-provider && shopware-cli extension build custom/plugins/MolliePayments
+	php switch-composer.php dev
+	# -----------------------------------------------------
 	cd ../../.. && php bin/console --no-debug theme:refresh
 	cd ../../.. && php bin/console --no-debug theme:compile
 	cd ../../.. && php bin/console --no-debug theme:refresh

diff --git a/src/Resources/app/storefront/makefile b/src/Resources/app/storefront/makefile
@@ -6,7 +6,7 @@
 .DEFAULT_GOAL := help
 
 help:
-    @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
+	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
 
 # ------------------------------------------------------------------------------------------------------------