fixed makefile in project-base (#4183)

Author: grossmannmartin

.gitlab-ci.yml

@@ -109,7 +109,6 @@ tests:functional-and-acceptance-with-licenses-check:
     script:
         - cp -f ./gitlab/docker-compose-ci.yml ./docker-compose.yml
         - docker compose up -d
-        - docker compose cp ./scripts php-fpm:/var/www/html/scripts
         - docker compose exec -T php-fpm /bin/bash -c "mv PRODUCTION DEVELOPMENT; php phing composer-dev npm-install-dependencies test-db-create frontend-api-generate-new-keys tests tests-acceptance-build tests-acceptance"
         - docker compose exec -T php-fpm bash -c "scripts/check-licenses.sh"
     after_script:

Makefile

@@ -16,11 +16,11 @@ help: ## Displays list of available commands
 # ------------------------------------------------------------------------------
 
 .PHONY: help generate-schema generate-schema-native check-fix php-checks php-lock-icons php-translations \
-	storefront-checks storefront-translations run-acceptance-tests-base \
+	storefront-checks storefront-translations check-schema run-acceptance-tests-base \
 	run-acceptance-tests-regression selected-acceptance-tests-base selected-acceptance-tests-regression \
 	run-specific-test-regression run-specific-test-base \
 	open-acceptance-tests-base open-acceptance-tests-regression run-smoke-tests \
-	generate-snapshots-info-table _prepare-data-for-acceptance-tests _cypress-prepare _cypress-cleanup \
+	generate-snapshots-info-table prepare-data-for-acceptance-tests cypress-prepare cypress-cleanup \
 	check-licenses
 
 # ------------------------------------------------------------------------------
@@ -33,20 +33,20 @@ generate-schema: ## Generates GraphQL schema and frontend types (in Docker)
 	docker compose cp php-fpm:/var/www/html/schema.graphql /tmp/schema.graphql
 	docker compose cp /tmp/schema.graphql storefront:/home/node/app/schema.graphql
 	docker compose exec -u root storefront chown node:node schema.graphql
-	find project-base/storefront/graphql/requests -type f -name "*.generated.tsx" -exec rm {} \;
-	docker compose exec storefront npm run gql
+	find storefront/graphql/requests -type f -name "*.generated.tsx" -exec rm {} \;
+	docker compose exec storefront pnpm run gql
 	docker compose exec storefront rm -rf /home/node/app/schema.graphql
 
 generate-schema-native: ## Generates GraphQL schema and frontend types (natively)
 	cd app; php ./bin/console graphql:validate
 	cd app; php phing frontend-api-generate-graphql-schema
 	cp app/schema.graphql storefront/schema.graphql
-	find project-base/storefront/graphql/requests -type f -name "*.generated.tsx" -exec rm {} \;
-	cd storefront; npm run gql
+	find storefront/graphql/requests -type f -name "*.generated.tsx" -exec rm {} \;
+	cd storefront; pnpm run gql
 	rm -rf storefront/schema.graphql
 
 # ------------------------------------------------------------------------------
-# ✅ Code Checks and Fixes (PHP & JS/TS)
+# ✅ Code Checks and Fixes (PHP and JS/TS)
 # ------------------------------------------------------------------------------
 
 check-fix: generate-schema php-checks php-translations storefront-checks storefront-translations check-licenses ## Runs all code checks (backend & storefront) and attempts to fix issues
@@ -66,20 +66,17 @@ storefront-checks: ## Runs Storefront (JS/TS) checks and attempts to fix issues
 storefront-translations: ## Updates translation files of the storefront
 	docker compose exec storefront pnpm run translate
 
+check-schema: ## Checks if generated GraphQL schema is correct
+	docker compose exec php-fpm php phing frontend-api-generate-graphql-schema
+	docker compose cp php-fpm:/var/www/html/schema.graphql /tmp/schema.graphql
+	docker compose cp /tmp/schema.graphql storefront:/home/node/app/schema.graphql
+	docker compose exec -u root storefront chown node:node schema.graphql
+	docker compose exec storefront sh check-code-gen.sh
+
 # ------------------------------------------------------------------------------
 # 🧪 Testing & Quality Assurance
 # ------------------------------------------------------------------------------
 
-# Internal helper functions (not shown in help)
-_prepare-data-for-acceptance-tests:
-	$(call prepare-data-for-acceptance-tests)
-
-_cypress-prepare:
-	$(call cypress-prepare)
-
-_cypress-cleanup:
-	$(call cypress-cleanup)
-
 define prepare-data-for-acceptance-tests
 	docker compose exec php-fpm php phing -D production.confirm.action=y -D change.environment=test environment-change
 	docker compose exec php-fpm php phing test-db-create test-db-demo test-elasticsearch-index-recreate test-elasticsearch-export
@@ -98,27 +95,28 @@ define cypress-cleanup
 endef
 
 define run_acceptance_tests
-	$(call _prepare-data-for-acceptance-tests)
-	$(call _cypress-prepare)
+	$(call prepare-data-for-acceptance-tests)
+	$(call cypress-prepare)
 	@echo "▶️ Running acceptance tests of type $(1)..."
 	-docker compose run --rm -e TYPE=$(1) -e COMMAND=run cypress || true
 	@echo "✅ Acceptance tests of type $(1) finished."
-	$(call _cypress-cleanup)
+	$(call cypress-cleanup)
 endef
 
 define selected_acceptance_tests
-	$(call _prepare-data-for-acceptance-tests)
-	$(call _cypress-prepare)
+	$(call prepare-data-for-acceptance-tests)
+	$(call cypress-prepare)
 	@echo "▶️ Running selected acceptance tests of type $(1)..."
 	-docker compose run --rm -e TYPE=$(1) -e COMMAND=selected cypress || true
 	@echo "✅ Selected acceptance tests of type $(1) finished."
-	$(call _cypress-cleanup)
+	$(call cypress-cleanup)
 endef
 
 define run_specific_acceptance_test
 	$(call prepare-data-for-acceptance-tests)
 	$(call cypress-prepare)
 	@echo "▶️ Running specific acceptance test: $(2) of type $(1)..."
+	docker compose build cypress
 	-docker compose run --rm -e TYPE=$(1) -e SPEC=$(2) cypress || true
 	@echo "✅ Specific acceptance test $(2) of type $(1) finished."
 	$(call cypress-cleanup)
@@ -134,15 +132,15 @@ else
 endif
 
 define open_acceptance_tests
-	$(call _prepare-data-for-acceptance-tests)
-	$(call _cypress-prepare)
+	$(call prepare-data-for-acceptance-tests)
+	$(call cypress-prepare)
 	@if [ "$(IS_WSL)" = "" ]; then \
 		xhost + $(get_ip); \
 	fi
 	@echo "▶️ Opening acceptance tests of type $(1)..."
 	-docker compose run --rm -e TYPE=$(1) -e DISPLAY=$(get_ip):0 -e COMMAND=open cypress || true
 	@echo "✅ Acceptance tests of type $(1) finished."
-	$(call _cypress-cleanup)
+	$(call cypress-cleanup)
 endef
 
 # Cypress Acceptance Tests
@@ -159,13 +157,6 @@ selected-acceptance-tests-base: ## Runs selected base acceptance tests (interact
 selected-acceptance-tests-regression: ## Runs selected regression acceptance tests (interactive selection, headless)
 	$(call selected_acceptance_tests,regression)
 
-run-specific-test-base: ## Runs a specific base acceptance test (interactive selection, headless)
-	@if [ -z "$(SPEC)" ]; then \
-		echo "❌ Error: SPEC parameter is required. Usage: make run-specific-test-base SPEC=e2e/filterAndSort/categoryDetailFilterAndSort.cy.ts"; \
-		exit 1; \
-	fi
-	$(call run_specific_acceptance_test,base,$(SPEC))
-
 run-specific-test-regression: ## Runs a specific regression acceptance test (interactive selection, headless)
 	@if [ -z "$(SPEC)" ]; then \
 		echo "❌ Error: SPEC parameter is required. Usage: make run-specific-test-regression SPEC=e2e/filterAndSort/categoryDetailFilterAndSort.cy.ts"; \
@@ -180,41 +171,52 @@ run-specific-test-base: ## Runs a specific base acceptance test (interactive sel
 	fi
 	$(call run_specific_acceptance_test,base,$(SPEC))
 
-run-specific-test-actual: ## Runs a specific actual acceptance test (interactive selection, headless)
-	@if [ -z "$(SPEC)" ]; then \
-		echo "❌ Error: SPEC parameter is required. Usage: make run-specific-test-actual SPEC=e2e/filterAndSort/categoryDetailFilterAndSort.cy.ts"; \
-		exit 1; \
-	fi
-	$(call run_specific_acceptance_test,actual,$(SPEC))
-
 open-acceptance-tests-base: ## Opens the Cypress GUI for debugging base acceptance tests
 	$(call open_acceptance_tests,base)
 
 open-acceptance-tests-regression: ## Opens the Cypress GUI for debugging regression acceptance tests
 	$(call open_acceptance_tests,regression)
 
 run-smoke-tests: ## Runs smoke tests (Cypress)
-	$(call _prepare-data-for-acceptance-tests)
-	$(call _cypress-prepare)
+	$(call prepare-data-for-acceptance-tests)
+	$(call cypress-prepare)
 	@echo "▶️ Running smoke tests..."
 	-docker compose run --rm -e TYPE=null -e COMMAND=smoke cypress || true
 	@echo "✅ Smoke tests finished."
-	$(call _cypress-cleanup)
+	$(call cypress-cleanup)
 
 # ------------------------------------------------------------------------------
 # 📸 Snapshots & Utilities
 # ------------------------------------------------------------------------------
 
 generate-snapshots-info-table: ## Generates overview table of Cypress snapshots
-	$(call _prepare-data-for-acceptance-tests)
-	$(call _cypress-prepare)
+	$(call prepare-data-for-acceptance-tests)
+	$(call cypress-prepare)
 	@echo "▶️ Generating snapshots info table..."
 	-docker compose exec storefront-cypress npm run generate-snapshots-table --prefix cypress || true
 	@echo "✅ Snapshots info table generation finished."
-	$(call _cypress-cleanup)
+	$(call cypress-cleanup)
+
+# ------------------------------------------------------------------------------
+# 📦 Checking dependencies licenses
+# ------------------------------------------------------------------------------
 
 check-licenses: ## Checks dependency licenses in Composer and NPM (php-fpm & storefront)
 	@echo "🔍 Checking dependency licenses..."
-	@docker compose exec php-fpm bash -lc "scripts/check-licenses.sh" && \
-	 docker compose exec storefront sh -lc "sh scripts/check-licenses.sh" && \
+	@docker compose exec -T php-fpm bash -lc "scripts/check-licenses.sh" && \
+	 docker compose exec -T storefront sh -lc "sh scripts/check-licenses.sh" && \
 	 echo "✅ All license checks passed"
+
+# ------------------------------------------------------------------------------
+# 💅 Compiling Tailwind CSS for admin
+# ------------------------------------------------------------------------------
+
+generate-tailwind-for-admin:
+	@echo "🚀 Compiling Tailwind CSS for admin..."
+	rm -rf storefront/public/tailwind-for-admin/style.css
+	mkdir -p storefront/public/tailwind-for-admin
+	docker compose exec storefront pnpm compile-tailwind-for-admin
+	@echo "✅ Tailwind CSS compiled to: storefront/public/tailwind-for-admin/style.css"
+	@echo "🔧 Rebuilding backend admin assets..."
+	docker compose exec php-fpm php phing npm-dev
+	@echo "🎉 Admin assets rebuilt! Tailwind classes are now available in GrapesJS."

scripts/check-licenses.sh app/scripts/check-licenses.shscripts/check-licenses.sh renamed to app/scripts/check-licenses.sh

@@ -652,16 +652,16 @@
         ]
     },
     "shopsys/administration": {
-        "version": "17.0.x-dev"
+        "version": "17.0.0"
     },
     "shopsys/article-feed-luigis-box": {
-        "version": "17.0.x-dev"
+        "version": "17.0.0"
     },
     "shopsys/brand-feed-luigis-box": {
-        "version": "17.0.x-dev"
+        "version": "17.0.0"
     },
     "shopsys/category-feed-luigis-box": {
-        "version": "17.0.x-dev"
+        "version": "17.0.0"
     },
     "shopsys/coding-standards": {
         "version": "v9.1.1"
@@ -685,7 +685,10 @@
         "version": "1.7.0"
     },
     "shopsys/luigis-box": {
-        "version": "17.0.x-dev"
+        "version": "17.0.0"
+    },
+    "shopsys/maker": {
+        "version": "17.0.0"
     },
     "shopsys/migrations": {
         "version": "v9.1.1"
@@ -706,7 +709,10 @@
         "version": "v9.1.1"
     },
     "shopsys/product-feed-luigis-box": {
-        "version": "17.0.x-dev"
+        "version": "17.0.0"
+    },
+    "shopsys/product-feed-mergado": {
+        "version": "17.0.0"
     },
     "shopsys/product-feed-zbozi": {
         "version": "v9.1.1"
@@ -917,6 +923,15 @@
             "config/packages/mailer.yaml"
         ]
     },
+    "symfony/maker-bundle": {
+        "version": "1.64",
+        "recipe": {
+            "repo": "github.com/symfony/recipes",
+            "branch": "main",
+            "version": "1.0",
+            "ref": "fadbfe33303a76e25cb63401050439aa9b1a9c7f"
+        }
+    },
     "symfony/messenger": {
         "version": "5.4",
         "recipe": {

app/symfony.lock

@@ -5,9 +5,9 @@ echo "SPEC variable is set to: $SPEC"
 
 if [ -n "$SPEC" ]; then
     echo "🎯 Running specific test: $SPEC"
-    if [ "$TYPE" = "actual" ]; then
-        echo "🔍 Running npm run specific-actual $SPEC"
-        npm run specific-actual "$SPEC"
+    if [ "$TYPE" = "regression" ]; then
+        echo "🔍 Running npm run specific-regression $SPEC"
+        npm run specific-regression "$SPEC"
     else
         echo "🔍 Running npm run specific-base $SPEC"
         npm run specific-base "$SPEC"