Issue #3432183 by catch, andypost, longwave: Move system/base component CSS to...

Issue #3432183 by catch, andypost, longwave: Move system/base component CSS to respective libraries where they exist

(cherry picked from commit 86b89313)

core/core.libraries.yml

@@ -382,6 +382,18 @@ drupal.ajax:
   version: VERSION
   js:
     misc/ajax.js: {}
+  css:
+    component:
+      misc/components/ajax-progress.module.css: { weight: -10 }
+  moved_files:
+    system/base:
+      deprecation_version: 10.3.0
+      removed_version: 11.0.0
+      deprecation_link: https://www.drupal.org/node/3432346
+      css:
+        component:
+          css/components/ajax-progress.module.css: misc/components/ajax-progress.module.css
+
   drupalSettings:
     # These placeholder values will be set by system_js_settings_alter().
     ajaxPageState:
@@ -462,6 +474,15 @@ drupal.autocomplete:
     component:
       assets/vendor/jquery.ui/themes/base/autocomplete.css: { weight: -11.7 }
       assets/vendor/jquery.ui/themes/base/menu.css: { weight: -11.7 }
+      misc/components/autocomplete-loading.module.css: { weight: -10 }
+  moved_files:
+    system/base:
+      deprecation_version: 10.3.0
+      removed_version: 11.0.0
+      deprecation_link: https://www.drupal.org/node/3432346
+      css:
+        component:
+          css/components/autocomplete-loading.module.css: misc/components/autocomplete-loading.module.css
   dependencies:
     - core/jquery
     - core/internal.jquery_ui
@@ -658,6 +679,17 @@ drupal.progress:
   version: VERSION
   js:
     misc/progress.js: {}
+  css:
+    component:
+      misc/components/progress.module.css: { weight: -10 }
+  moved_files:
+    system/base:
+      deprecation_version: 10.3.0
+      removed_version: 11.0.0
+      deprecation_link: https://www.drupal.org/node/3432346
+      css:
+        component:
+          css/components/progress.module.css: misc/components/progress.module.css
   dependencies:
     - core/drupal
     - core/jquery
@@ -691,6 +723,19 @@ drupal.tabledrag:
   version: VERSION
   js:
     misc/tabledrag.js: { weight: -1 }
+  css:
+    component:
+      misc/components/tabledrag.module.css: { weight: -10 }
+      misc/components/tree-child.module.css: { weight: -10 }
+  moved_files:
+    system/base:
+      deprecation_version: 10.3.0
+      removed_version: 11.0.0
+      deprecation_link: https://www.drupal.org/node/3432346
+      css:
+        component:
+          css/components/tabledrag.module.css: misc/components/tabledrag.module.css
+          css/components/tree-child.module.css: misc/components/tree-child.module.css
   dependencies:
     - core/jquery
     - core/drupal

core/modules/system/system.libraries.yml

@@ -3,9 +3,7 @@ base:
   css:
     # Adjust the weights to load these early.
     component:
-      css/components/ajax-progress.module.css: { weight: -10 }
       css/components/align.module.css: { weight: -10 }
-      css/components/autocomplete-loading.module.css: { weight: -10 }
       css/components/fieldgroup.module.css: { weight: -10 }
       css/components/container-inline.module.css: { weight: -10 }
       css/components/clearfix.module.css: { weight: -10 }
@@ -15,16 +13,13 @@ base:
       css/components/js.module.css: { weight: -10 }
       css/components/nowrap.module.css: { weight: -10 }
       css/components/position-container.module.css: { weight: -10 }
-      css/components/progress.module.css: { weight: -10 }
       css/components/reset-appearance.module.css: { weight: -10 }
       css/components/resize.module.css: { weight: -10 }
       css/components/sticky-header.module.css: { weight: -10 }
       css/components/system-status-counter.css: { weight: -10 }
       css/components/system-status-report-counters.css: { weight: -10 }
       css/components/system-status-report-general-info.css: { weight: -10 }
-      css/components/tabledrag.module.css: { weight: -10 }
       css/components/tablesort.module.css: { weight: -10 }
-      css/components/tree-child.module.css: { weight: -10 }
 
 admin:
   version: VERSION

core/profiles/demo_umami/tests/src/FunctionalJavascript/AssetAggregationAcrossPagesTest.php

@@ -25,7 +25,7 @@ class AssetAggregationAcrossPagesTest extends PerformanceTestBase {
   public function testFrontAndRecipesPages() {
     $performance_data = $this->doRequests();
     $this->assertSame(4, $performance_data->getStylesheetCount());
-    $this->assertSame(90241, $performance_data->getStylesheetBytes());
+    $this->assertSame(82363, $performance_data->getStylesheetBytes());
     $this->assertSame(2, $performance_data->getScriptCount());
     $this->assertSame(14150, $performance_data->getScriptBytes());
   }
@@ -39,7 +39,7 @@ public function testFrontAndRecipesPagesAuthenticated() {
     $this->rebuildAll();
     $performance_data = $this->doRequests();
     $this->assertSame(4, $performance_data->getStylesheetCount());
-    $this->assertSame(94355, $performance_data->getStylesheetBytes());
+    $this->assertSame(89183, $performance_data->getStylesheetBytes());
     $this->assertSame(2, $performance_data->getScriptCount());
     $this->assertSame(264702, $performance_data->getScriptBytes());
   }

core/profiles/demo_umami/tests/src/FunctionalJavascript/OpenTelemetryAuthenticatedPerformanceTest.php

@@ -36,7 +36,7 @@ public function testFrontPageAuthenticatedWarmCache(): void {
       $this->drupalGet('<front>');
     }, 'authenticatedFrontPage');
     $this->assertSame(2, $performance_data->getStylesheetCount());
-    $this->assertSame(47552, $performance_data->getStylesheetBytes());
+    $this->assertSame(44966, $performance_data->getStylesheetBytes());
     $this->assertSame(1, $performance_data->getScriptCount());
     $this->assertSame(132351, $performance_data->getScriptBytes());
 

core/profiles/demo_umami/tests/src/FunctionalJavascript/OpenTelemetryFrontPagePerformanceTest.php

@@ -66,7 +66,7 @@ public function testFrontPageHotCache() {
     $this->assertSame(1, $performance_data->getScriptCount());
     $this->assertSame(7075, $performance_data->getScriptBytes());
     $this->assertSame(2, $performance_data->getStylesheetCount());
-    $this->assertSame(45495, $performance_data->getStylesheetBytes());
+    $this->assertSame(41556, $performance_data->getStylesheetBytes());
   }
 
   /**

core/profiles/standard/tests/src/FunctionalJavascript/StandardPerformanceTest.php

@@ -55,7 +55,7 @@ public function testAnonymous() {
     }, 'standardFrontPage');
     $this->assertNoJavaScript($performance_data);
     $this->assertSame(1, $performance_data->getStylesheetCount());
-    $this->assertSame(7434, $performance_data->getStylesheetBytes());
+    $this->assertSame(3495, $performance_data->getStylesheetBytes());
 
     $expected_queries = [
       'SELECT "base_table"."id" AS "id", "base_table"."path" AS "path", "base_table"."alias" AS "alias", "base_table"."langcode" AS "langcode" FROM "path_alias" "base_table" WHERE ("base_table"."status" = 1) AND ("base_table"."alias" LIKE "/node" ESCAPE ' . "'\\\\'" . ') AND ("base_table"."langcode" IN ("en", "und")) ORDER BY "base_table"."langcode" ASC, "base_table"."id" DESC',
@@ -100,7 +100,7 @@ public function testAnonymous() {
     }, 'standardNodePage');
     $this->assertNoJavaScript($performance_data);
     $this->assertSame(1, $performance_data->getStylesheetCount());
-    $this->assertSame(7159, $performance_data->getStylesheetBytes());
+    $this->assertSame(3220, $performance_data->getStylesheetBytes());
 
     $expected_queries = [
       'SELECT "base_table"."id" AS "id", "base_table"."path" AS "path", "base_table"."alias" AS "alias", "base_table"."langcode" AS "langcode" FROM "path_alias" "base_table" WHERE ("base_table"."status" = 1) AND ("base_table"."alias" LIKE "/node/1" ESCAPE ' . "'\\\\'" . ') AND ("base_table"."langcode" IN ("en", "und")) ORDER BY "base_table"."langcode" ASC, "base_table"."id" DESC',
@@ -129,7 +129,7 @@ public function testAnonymous() {
     }, 'standardUserPage');
     $this->assertNoJavaScript($performance_data);
     $this->assertSame(1, $performance_data->getStylesheetCount());
-    $this->assertSame(7159, $performance_data->getStylesheetBytes());
+    $this->assertSame(3220, $performance_data->getStylesheetBytes());
 
     $expected_queries = [
       'SELECT "base_table"."id" AS "id", "base_table"."path" AS "path", "base_table"."alias" AS "alias", "base_table"."langcode" AS "langcode" FROM "path_alias" "base_table" WHERE ("base_table"."status" = 1) AND ("base_table"."alias" LIKE "/user/2" ESCAPE ' . "'\\\\'" . ') AND ("base_table"."langcode" IN ("en", "und")) ORDER BY "base_table"."langcode" ASC, "base_table"."id" DESC',

core/themes/claro/claro.info.yml

@@ -22,15 +22,27 @@ libraries:
   - core/normalize
   - claro/global-styling
 libraries-override:
+  core/drupal.tabledrag:
+    css:
+      component:
+        misc/components/tabledrag.module.css: css/components/tabledrag.css
+
+  core/drupal.ajax:
+    css:
+      component:
+        misc/components/ajax-progress.module.css: css/components/ajax-progress.module.css
+
+  core/drupal.autocomplete:
+    css:
+      component:
+        misc/components/autocomplete-loading.module.css: css/components/autocomplete-loading.module.css
+
   system/base:
     css:
       component:
-        css/components/ajax-progress.module.css: css/components/ajax-progress.module.css
-        css/components/autocomplete-loading.module.css: css/components/autocomplete-loading.module.css
         css/components/system-status-counter.css: css/components/system-status-counter.css
         css/components/system-status-report-counters.css: css/components/system-status-report-counters.css
         css/components/system-status-report-general-info.css: css/components/system-status-report-general-info.css
-        css/components/tabledrag.module.css: css/components/tabledrag.css
 
   system/admin:
     css:

core/themes/olivero/olivero.info.yml

@@ -34,15 +34,18 @@ regions:
   footer_top: Footer Top
   footer_bottom: Footer Bottom
 libraries-override:
+  core/drupal.ajax:
+    css:
+      component:
+        core/components/ajax-progress.module.css: css/components/ajax-progress.module.css
+  core/drupal.autocomplete:
+    css:
+      component:
+        core/components/autocomplete-loading.module.css: css/components/autocomplete-loading.module.css
   system/admin:
     css:
       theme:
         css/system.admin.css: false
-  system/base:
-    css:
-      component:
-        css/components/ajax-progress.module.css: css/components/ajax-progress.module.css
-        css/components/autocomplete-loading.module.css: css/components/autocomplete-loading.module.css
   core/drupal.checkbox: false
   core/drupal.dropbutton:
     css:
@@ -65,6 +68,8 @@ libraries-extend:
     - olivero/drupal.dialog
   core/drupal.progress:
     - olivero/progress
+  core/drupal.tabledrag:
+    - olivero/tabledrag
   layout_discovery/onecol:
     - olivero/layout_discovery_section
   layout_discovery/twocol_bricks:

core/themes/olivero/olivero.libraries.yml

@@ -47,7 +47,6 @@ global-styling:
       css/components/pager.css: {}
       css/components/table.css: {}
       css/components/text-content.css: {}
-      css/components/tabledrag.css: {}
       css/components/wide-content.css: {}
 
   js:
@@ -290,6 +289,12 @@ tabs:
   js:
     js/tabs.js: {}
 
+tabledrag:
+  version: VERSION
+  css:
+    component:
+      css/components/tabledrag.css: {}
+
 tags:
   version: VERSION
   css:

core/themes/stable9/stable9.info.yml

@@ -53,6 +53,16 @@ libraries-override:
       component:
         css/contextual.toolbar.css: css/contextual/contextual.toolbar.css
 
+  core/drupal.ajax:
+    css:
+      component:
+        misc/components/ajax-progress.module.css: css/core/components/ajax-progress.module.css
+
+  core/drupal.autocomplete:
+    css:
+      component:
+        misc/components/autocomplete-loading.module.css: css/core/components/autocomplete-loading.module.css
+
   core/drupal.dialog.off_canvas:
     css:
       base:
@@ -74,6 +84,18 @@ libraries-override:
     css:
       component:
         misc/dropbutton/dropbutton.css: css/core/dropbutton/dropbutton.css
+
+  core/drupal.progress:
+    css:
+      component:
+        misc/components/progress.module.css: css/core/components/progress.module.css
+
+  core/drupal.tabledrag:
+    css:
+      component:
+        misc/components/tabledrag.module.css: css/core/components/tabledrag.module.css
+        misc/components/tree-child.module.css: css/core/components/tree-child.module.css
+
   core/drupal.vertical-tabs:
     css:
       component:
@@ -209,9 +231,7 @@ libraries-override:
   system/base:
     css:
       component:
-        css/components/ajax-progress.module.css: css/system/components/ajax-progress.module.css
         css/components/align.module.css: css/system/components/align.module.css
-        css/components/autocomplete-loading.module.css: css/system/components/autocomplete-loading.module.css
         css/components/fieldgroup.module.css: css/system/components/fieldgroup.module.css
         css/components/container-inline.module.css: css/system/components/container-inline.module.css
         css/components/clearfix.module.css: css/system/components/clearfix.module.css
@@ -221,16 +241,13 @@ libraries-override:
         css/components/js.module.css: css/system/components/js.module.css
         css/components/nowrap.module.css: css/system/components/nowrap.module.css
         css/components/position-container.module.css: css/system/components/position-container.module.css
-        css/components/progress.module.css: css/system/components/progress.module.css
         css/components/reset-appearance.module.css: css/system/components/reset-appearance.module.css
         css/components/resize.module.css: css/system/components/resize.module.css
         css/components/sticky-header.module.css: css/system/components/sticky-header.module.css
         css/components/system-status-counter.css: css/system/components/system-status-counter.css
         css/components/system-status-report-counters.css: css/system/components/system-status-report-counters.css
         css/components/system-status-report-general-info.css: css/system/components/system-status-report-general-info.css
-        css/components/tabledrag.module.css: css/system/components/tabledrag.module.css
         css/components/tablesort.module.css: css/system/components/tablesort.module.css
-        css/components/tree-child.module.css: css/system/components/tree-child.module.css
   system/admin:
     css:
       theme: