From 389504f26fe8155e139de808eb3fc020f8f036d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dalibor=20Karlovi=C4=87?= <dalibor.karlovic@sigwin.hr>
Date: Tue, 13 Jun 2023 13:45:10 +0200
Subject: [PATCH] fix: YASSG common.mk doesn't pass YASSG_SKIP_BUNDLES (#135)

* fix: YASSG common.mk doesn't pass YASSG_SKIP_BUNDLES

* fix: tests with YASSG_SKIP_BUNDLES

* fix: tests with YASSG_SKIP_BUNDLES
---
 resources/YASSG/common.mk             | 4 ++--
 tests/functional/YASSG/CompatTest.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/YASSG/common.mk b/resources/YASSG/common.mk
index 8d242c0..161ba77 100644
--- a/resources/YASSG/common.mk
+++ b/resources/YASSG/common.mk
@@ -12,14 +12,14 @@ start/dev: dev ## Start app in "dev" mode
 dev: clean
 	@make dev/assets dev/server -j2
 dev/server: vendor index.php
-	symfony server:start --no-tls --document-root=. --port=${APP_PORT}
+	YASSG_SKIP_BUNDLES=${YASSG_SKIP_BUNDLES} symfony server:start --no-tls --document-root=. --port=${APP_PORT}
 dev/assets: node_modules
 	node_modules/.bin/encore dev-server
 index.php:
 	ln -s vendor/sigwin/yassg/web/index.php
 
 build: ${BUILD_DIR}/assets/entrypoints.json vendor ## Build app for "APP_ENV" target (defaults to "prod")
-	php vendor/sigwin/yassg/bin/yassg yassg:generate --env prod "$(BASE_URL)" ${BUILD_OPTS}
+	YASSG_SKIP_BUNDLES=${YASSG_SKIP_BUNDLES} php vendor/sigwin/yassg/bin/yassg yassg:generate --env prod "$(BASE_URL)" ${BUILD_OPTS}
 .PHONY: build
 
 ${BUILD_DIR}:
diff --git a/tests/functional/YASSG/CompatTest.php b/tests/functional/YASSG/CompatTest.php
index 5ed9401..e0df309 100644
--- a/tests/functional/YASSG/CompatTest.php
+++ b/tests/functional/YASSG/CompatTest.php
@@ -64,7 +64,7 @@ protected function getExpectedHelpCommandsExecutionPath(?array $env = null): arr
             'mkdir -p public',
             'npm install',
             'BASE_URL=file://localhost$ROOT/public node_modules/.bin/encore production',
-            'php vendor/sigwin/yassg/bin/yassg yassg:generate --env prod "file://localhost$ROOT/public" ',
+            'YASSG_SKIP_BUNDLES= php vendor/sigwin/yassg/bin/yassg yassg:generate --env prod "file://localhost$ROOT/public" ',
         ];
 
         $start = [
@@ -104,7 +104,7 @@ public function testDevServerWorks(): void
     {
         $this->testMakefileCommandsWork('dev/server', [
             'ln -s vendor/sigwin/yassg/web/index.php',
-            'symfony server:start --no-tls --document-root=. --port=9988',
+            'YASSG_SKIP_BUNDLES= symfony server:start --no-tls --document-root=. --port=9988',
         ], []);
     }