diff --git a/core/lib/Drupal/Core/Asset/CssCollectionOptimizerLazy.php b/core/lib/Drupal/Core/Asset/CssCollectionOptimizerLazy.php index 28a2857..d020e54 100644 --- a/core/lib/Drupal/Core/Asset/CssCollectionOptimizerLazy.php +++ b/core/lib/Drupal/Core/Asset/CssCollectionOptimizerLazy.php @@ -125,8 +125,10 @@ public function optimize(array $css_assets) { $query_args = [ 'theme' => $this->themeManager->getActiveTheme()->getName(), 'include' => implode(',', $this->dependencyResolver->getMinimalRepresentativeSubset($libraries)), - 'exclude' => implode(',', $this->dependencyResolver->getMinimalRepresentativeSubset($already_loaded)), - ]; + ]; + if ($already_loaded) { + $query_args['exclude'] = implode(',', $this->dependencyResolver->getMinimalRepresentativeSubset($already_loaded)); + } $query = UrlHelper::buildQuery($query_args); foreach ($css_assets as $order => $css_asset) { if (!empty($css_asset['preprocessed'])) { diff --git a/core/lib/Drupal/Core/Asset/JsCollectionOptimizerLazy.php b/core/lib/Drupal/Core/Asset/JsCollectionOptimizerLazy.php index 016661b..cc450fc 100644 --- a/core/lib/Drupal/Core/Asset/JsCollectionOptimizerLazy.php +++ b/core/lib/Drupal/Core/Asset/JsCollectionOptimizerLazy.php @@ -131,8 +131,10 @@ public function optimize(array $js_assets) { $query_args = [ 'include' => implode(',', $this->dependencyResolver->getMinimalRepresentativeSubset($libraries)), 'theme' => $this->themeManager->getActiveTheme()->getName(), - 'exclude' => implode(',', $this->dependencyResolver->getMinimalRepresentativeSubset($already_loaded)), ]; + if ($already_loaded) { + $query_args['exclude'] = implode(',', $this->dependencyResolver->getMinimalRepresentativeSubset($already_loaded)); + } $header_query = UrlHelper::buildQuery($query_args + ['scope' => 'header']); $footer_query = UrlHelper::buildQuery($query_args + ['scope' => 'footer']); foreach ($js_assets as $order => $js_asset) { diff --git a/core/tests/Drupal/FunctionalTests/Asset/AssetOptimizationTest.php b/core/tests/Drupal/FunctionalTests/Asset/AssetOptimizationTest.php index ea26b9b..b43a6fd 100644 --- a/core/tests/Drupal/FunctionalTests/Asset/AssetOptimizationTest.php +++ b/core/tests/Drupal/FunctionalTests/Asset/AssetOptimizationTest.php @@ -84,12 +84,13 @@ protected function assertInvalidAggregates($url) { $session->visit($this->replaceGroupDelta($url)); $this->assertResponse(400); - $session->visit($this->setInvalidLibrary($url)); - $this->assertResponse(400); $session->visit($this->omitTheme($url)); $this->assertResponse(400); + $session->visit($this->setInvalidLibrary($url)); + $this->assertResponse(200); + $session->visit($this->replaceGroupHash($url)); $this->assertResponse(200); $headers = $session->getResponseHeaders();