Merge branch '4.8' of https://github.com/craftcms/cms into 5.0

# Conflicts:
#	CHANGELOG-WIP.md

CHANGELOG.md

@@ -11,6 +11,7 @@
 - Added support for element partial templates. ([#14284](https://github.com/craftcms/cms/pull/14284))
 - Added the `partialTemplatesPath` config setting. ([#14284](https://github.com/craftcms/cms/pull/14284))
 - Garbage collection now deletes orphaned nested entries.
+- The `{% js %}` and `{% css %}` tags now support `.js.gz` and `.css.gz` URLs. ([#14243](https://github.com/craftcms/cms/issues/14243))
 - Added `craft\base\Element::render()`. ([#14284](https://github.com/craftcms/cms/pull/14284))
 - Added `craft\elements\ElementCollection::render()`. ([#14284](https://github.com/craftcms/cms/pull/14284))
 - Added `craft\elements\NestedElementManager::$allowDeletion`.

src/helpers/Template.php

@@ -270,7 +270,7 @@ private static function _profileToken(string $type, string $name, int $count): s
     public static function css(string $css, array $options = [], ?string $key = null): void
     {
         // Is this a CSS file?
-        if (preg_match('/^[^\r\n]+\.css$/i', $css) || UrlHelper::isAbsoluteUrl($css)) {
+        if (preg_match('/^[^\r\n]+\.css(\.gz)?$/i', $css) || UrlHelper::isAbsoluteUrl($css)) {
             Craft::$app->getView()->registerCssFile($css, $options, $key);
         } else {
             Craft::$app->getView()->registerCss($css, $options, $key);
@@ -291,7 +291,7 @@ public static function css(string $css, array $options = [], ?string $key = null
     public static function js(string $js, array $options = [], ?string $key = null): void
     {
         // Is this a JS file?
-        if (preg_match('/^[^\r\n]+\.js$/i', $js) || UrlHelper::isAbsoluteUrl($js)) {
+        if (preg_match('/^[^\r\n]+\.js(\.gz)?$/i', $js) || UrlHelper::isAbsoluteUrl($js)) {
             Craft::$app->getView()->registerJsFile($js, $options, $key);
         } else {
             $position = $options['position'] ?? View::POS_READY;