Merge pull request #1 from pierreboissinot/feat/asset-mapper-integrity

smnandre · web-flow · commit 9bd9761d12e5 · 2024-11-07T02:37:46.000+01:00
[AssetMapper] Add integrity hash to modulepreload
diff --git a/src/Symfony/Component/AssetMapper/ImportMap/ImportMapRenderer.php b/src/Symfony/Component/AssetMapper/ImportMap/ImportMapRenderer.php
@@ -78,7 +78,7 @@ public function render(string|array $entryPoint, array $attributes = []): string
                     $integrityMap[$path] = $integrity;
                 }
                 if ($preload) {
-                    $modulePreloads[] = $path;
+                    $modulePreloads[] = ['path' => $path, 'integrity' => $integrity];
                 }
             } elseif ($preload) {
                 $cssLinks[] = $path;
@@ -142,10 +142,13 @@ public function render(string|array $entryPoint, array $attributes = []): string
                 HTML;
         }
 
-        foreach ($modulePreloads as $url) {
-            $url = $this->escapeAttributeValue($url);
+        foreach ($modulePreloads as $modulePreload) {
+            $url = $this->escapeAttributeValue($modulePreload['path']);
+            if ($integrity = $modulePreload['integrity']) {
+                $integrity = " integrity=\"$integrity\"";
+            }
 
-            $output .= "\n<link rel=\"modulepreload\" href=\"$url\">";
+            $output .= "\n<link rel=\"modulepreload\" href=\"$url\"$integrity>";
         }
 
         if (\count($entryPoint) > 0) {

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public function render(string\|array $entryPoint, array $attributes = []): string`
`78`	`78`	`$integrityMap[$path] = $integrity;`
`79`	`79`	`}`
`80`	`80`	`if ($preload) {`
`81`		`- $modulePreloads[] = $path;`
	`81`	`+ $modulePreloads[] = ['path' => $path, 'integrity' => $integrity];`
`82`	`82`	`}`
`83`	`83`	`} elseif ($preload) {`
`84`	`84`	`$cssLinks[] = $path;`
`@@ -142,10 +142,13 @@ public function render(string\|array $entryPoint, array $attributes = []): string`
`142`	`142`	`HTML;`
`143`	`143`	`}`
`144`	`144`
`145`		`- foreach ($modulePreloads as $url) {`
`146`		`- $url = $this->escapeAttributeValue($url);`
	`145`	`+ foreach ($modulePreloads as $modulePreload) {`
	`146`	`+ $url = $this->escapeAttributeValue($modulePreload['path']);`
	`147`	`+ if ($integrity = $modulePreload['integrity']) {`
	`148`	`+ $integrity = " integrity=\"$integrity\"";`
	`149`	`+ }`
`147`	`150`
`148`		`- $output .= "\n<link rel=\"modulepreload\" href=\"$url\">";`
	`151`	`+ $output .= "\n<link rel=\"modulepreload\" href=\"$url\"$integrity>";`
`149`	`152`	`}`
`150`	`153`
`151`	`154`	`if (\count($entryPoint) > 0) {`