From 73b0ccadfab2f8987d52337d730c3684a5262d69 Mon Sep 17 00:00:00 2001 From: David Grudl Date: Fri, 1 Aug 2025 04:01:37 +0200 Subject: [PATCH 1/3] support for PHP 8.5 --- .github/workflows/tests.yml | 2 +- composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 966a05a..60067d2 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php: ['8.1', '8.2', '8.3', '8.4'] + php: ['8.1', '8.2', '8.3', '8.4', '8.5'] fail-fast: false diff --git a/composer.json b/composer.json index ef08974..410a4a8 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ } ], "require": { - "php": "8.1 - 8.4", + "php": "8.1 - 8.5", "nette/utils": "^4.0.6" }, "suggest": { From 61e347acbdf1fe9243a63e1696a8d8f45a581546 Mon Sep 17 00:00:00 2001 From: hanisko Date: Tue, 26 Aug 2025 11:20:32 +0200 Subject: [PATCH 2/3] Composer: added nette/boostrap dependency (#4) Co-authored-by: Martin Hanisko --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 410a4a8..e0442b5 100644 --- a/composer.json +++ b/composer.json @@ -32,6 +32,7 @@ "phpstan/phpstan-nette": "^2.0@stable" }, "conflict": { + "nette/bootstrap": "<3.2.5", "nette/http": "<3.3.2" }, "autoload": { From 51cde30759d13272e0c0a3f04b54c2c9208799e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Bla=C5=BEek?= Date: Wed, 27 Aug 2025 11:27:52 +0200 Subject: [PATCH 3/3] fix: entry assets and css entry assets --- src/Assets/ViteMapper.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Assets/ViteMapper.php b/src/Assets/ViteMapper.php index e2c6e92..e4a6271 100644 --- a/src/Assets/ViteMapper.php +++ b/src/Assets/ViteMapper.php @@ -62,6 +62,8 @@ private function createProductionAsset(string $reference): Asset { $chunk = $this->chunks[$reference]; $entry = isset($chunk['isEntry']) || isset($chunk['isDynamicEntry']); + $entryCss = $entry && preg_match('~\.(css|sass|scss)$~i', $chunk['src']); + if (str_starts_with($reference, '_') && !$entry) { throw new AssetNotFoundException("Cannot directly access internal chunk '$reference'"); } @@ -69,7 +71,7 @@ private function createProductionAsset(string $reference): Asset $dependencies = $this->collectDependencies($reference); unset($dependencies[$chunk['file']]); - return $dependencies + return $dependencies || ($entry && !$entryCss) ? new EntryAsset( url: $this->baseUrl . '/' . $chunk['file'], file: $this->basePath . '/' . $chunk['file'],