[AssetMapper] Only download a CSS file if it is explicitly advertised

weaverryan · weaverryan · commit 1f41d673f779 · 2023-11-09T21:35:45.000-05:00
diff --git a/src/Symfony/Component/AssetMapper/ImportMap/Resolver/JsDelivrEsmResolver.php b/src/Symfony/Component/AssetMapper/ImportMap/Resolver/JsDelivrEsmResolver.php
@@ -129,8 +129,9 @@ public function resolvePackages(array $packagesToRequire): array
 
             $entrypoints = $cssEntrypointResponse->toArray()['entrypoints'] ?? [];
             $cssFile = $entrypoints['css']['file'] ?? null;
+            $guessed = $entrypoints['css']['guessed'] ?? true;
 
-            if (!$cssFile) {
+            if (!$cssFile || $guessed) {
                 continue;
             }
 
diff --git a/src/Symfony/Component/AssetMapper/Tests/ImportMap/Resolver/JsDelivrEsmResolverTest.php b/src/Symfony/Component/AssetMapper/Tests/ImportMap/Resolver/JsDelivrEsmResolverTest.php
@@ -224,7 +224,7 @@ public static function provideResolvePackagesTests(): iterable
                 [
                     'url' => '/v1/packages/npm/bootstrap@5.2.0/entrypoints',
                     'response' => ['body' => ['entrypoints' => [
-                        'css' => ['file' => '/dist/css/bootstrap.min.css'],
+                        'css' => ['file' => '/dist/css/bootstrap.min.css', 'guessed' => false],
                     ]]],
                 ],
                 [

Original file line number	Diff line number	Diff line change
`@@ -129,8 +129,9 @@ public function resolvePackages(array $packagesToRequire): array`
`129`	`129`
`130`	`130`	`$entrypoints = $cssEntrypointResponse->toArray()['entrypoints'] ?? [];`
`131`	`131`	`$cssFile = $entrypoints['css']['file'] ?? null;`
	`132`	`+ $guessed = $entrypoints['css']['guessed'] ?? true;`
`132`	`133`
`133`		`- if (!$cssFile) {`
	`134`	`+ if (!$cssFile \|\| $guessed) {`
`134`	`135`	`continue;`
`135`	`136`	`}`
`136`	`137`
Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ public static function provideResolvePackagesTests(): iterable`
`224`	`224`	`[`
`225`	`225`	`'url' => '/v1/packages/npm/bootstrap@5.2.0/entrypoints',`
`226`	`226`	`'response' => ['body' => ['entrypoints' => [`
`227`		`- 'css' => ['file' => '/dist/css/bootstrap.min.css'],`
	`227`	`+ 'css' => ['file' => '/dist/css/bootstrap.min.css', 'guessed' => false],`
`228`	`228`	`]]],`
`229`	`229`	`],`
`230`	`230`	`[`