Skip to content

Commit 98bac0d

Browse files
authored
[6.1] Add "nocache" as version option to webasset manager (#46379)
1 parent a8a892a commit 98bac0d

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

libraries/src/Document/Renderer/Html/ScriptsRenderer.php

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,11 @@ private function renderElement($item): string
186186

187187
// Check if script uses media version.
188188
if ($version && !str_contains($src, '?') && ($mediaVersion || $version !== 'auto')) {
189-
$src .= '?' . ($version === 'auto' ? $mediaVersion : $version);
189+
$src .= '?' . match ($version) {
190+
'auto' => $mediaVersion,
191+
'nocache' => 'nocache-' . rand(0, 1_000_000),
192+
default => $version,
193+
};
190194
}
191195

192196
$buffer .= $tab;
@@ -358,7 +362,11 @@ private function renderImportmap(array &$assets)
358362

359363
// Check if script uses media version.
360364
if ($version && !str_contains($src, '?') && !str_ends_with($src, '/') && ($mediaVersion || $version !== 'auto')) {
361-
$src .= '?' . ($version === 'auto' ? $mediaVersion : $version);
365+
$src .= '?' . match ($version) {
366+
'auto' => $mediaVersion,
367+
'nocache' => 'nocache-' . rand(0, 1_000_000),
368+
default => $version,
369+
};
362370
}
363371

364372
if (!$esmScope) {

libraries/src/Document/Renderer/Html/StylesRenderer.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,11 @@ private function renderElement($item): string
175175

176176
// Check if script uses media version.
177177
if ($version && !str_contains($src, '?') && ($mediaVersion || $version !== 'auto')) {
178-
$src .= '?' . ($version === 'auto' ? $mediaVersion : $version);
178+
$src .= '?' . match ($version) {
179+
'auto' => $mediaVersion,
180+
'nocache' => 'nocache-' . rand(0, 1_000_000),
181+
default => $version,
182+
};
179183
}
180184

181185
$buffer .= $tab;

0 commit comments

Comments
 (0)