From 86b89313740d3edbcf49ff49b2ffba055e06a2d3 Mon Sep 17 00:00:00 2001
From: nod_ <nod_@598310.no-reply.drupal.org>
Date: Tue, 9 Apr 2024 00:47:25 +0200
Subject: [PATCH] Issue #3432183 by catch, andypost, longwave: Move system/base
component CSS to respective libraries where they exist
---
core/core.libraries.yml | 45 +++++++++++++++++++
.../components/ajax-progress.module.css | 0
.../autocomplete-loading.module.css | 0
.../components/progress.module.css | 0
.../components/tabledrag.module.css | 0
.../components/tree-child.module.css | 0
core/modules/system/system.libraries.yml | 5 ---
.../AssetAggregationAcrossPagesTest.php | 4 +-
...nTelemetryAuthenticatedPerformanceTest.php | 2 +-
.../OpenTelemetryFrontPagePerformanceTest.php | 2 +-
.../StandardPerformanceTest.php | 6 +--
core/themes/claro/claro.info.yml | 18 ++++++--
core/themes/olivero/olivero.info.yml | 15 ++++---
core/themes/olivero/olivero.libraries.yml | 7 ++-
.../components/ajax-progress.module.css | 0
.../autocomplete-loading.module.css | 0
.../components/progress.module.css | 0
.../components/tabledrag.module.css | 0
.../components/tree-child.module.css | 0
core/themes/stable9/stable9.info.yml | 27 ++++++++---
20 files changed, 105 insertions(+), 26 deletions(-)
rename core/{modules/system/css => misc}/components/ajax-progress.module.css (100%)
rename core/{modules/system/css => misc}/components/autocomplete-loading.module.css (100%)
rename core/{modules/system/css => misc}/components/progress.module.css (100%)
rename core/{modules/system/css => misc}/components/tabledrag.module.css (100%)
rename core/{modules/system/css => misc}/components/tree-child.module.css (100%)
rename core/themes/stable9/css/{system => core}/components/ajax-progress.module.css (100%)
rename core/themes/stable9/css/{system => core}/components/autocomplete-loading.module.css (100%)
rename core/themes/stable9/css/{system => core}/components/progress.module.css (100%)
rename core/themes/stable9/css/{system => core}/components/tabledrag.module.css (100%)
rename core/themes/stable9/css/{system => core}/components/tree-child.module.css (100%)
diff --git a/core/core.libraries.yml b/core/core.libraries.yml
index 4f535ef7cc82..b0c78fce2331 100644
--- a/core/core.libraries.yml
+++ b/core/core.libraries.yml
@@ -377,6 +377,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:
@@ -457,6 +469,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
@@ -618,6 +639,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
@@ -646,6 +678,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
diff --git a/core/modules/system/css/components/ajax-progress.module.css b/core/misc/components/ajax-progress.module.css
similarity index 100%
rename from core/modules/system/css/components/ajax-progress.module.css
rename to core/misc/components/ajax-progress.module.css
diff --git a/core/modules/system/css/components/autocomplete-loading.module.css b/core/misc/components/autocomplete-loading.module.css
similarity index 100%
rename from core/modules/system/css/components/autocomplete-loading.module.css
rename to core/misc/components/autocomplete-loading.module.css
diff --git a/core/modules/system/css/components/progress.module.css b/core/misc/components/progress.module.css
similarity index 100%
rename from core/modules/system/css/components/progress.module.css
rename to core/misc/components/progress.module.css
diff --git a/core/modules/system/css/components/tabledrag.module.css b/core/misc/components/tabledrag.module.css
similarity index 100%
rename from core/modules/system/css/components/tabledrag.module.css
rename to core/misc/components/tabledrag.module.css
diff --git a/core/modules/system/css/components/tree-child.module.css b/core/misc/components/tree-child.module.css
similarity index 100%
rename from core/modules/system/css/components/tree-child.module.css
rename to core/misc/components/tree-child.module.css
diff --git a/core/modules/system/system.libraries.yml b/core/modules/system/system.libraries.yml
index 2f510872d512..d708796dd519 100644
--- a/core/modules/system/system.libraries.yml
+++ b/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
diff --git a/core/profiles/demo_umami/tests/src/FunctionalJavascript/AssetAggregationAcrossPagesTest.php b/core/profiles/demo_umami/tests/src/FunctionalJavascript/AssetAggregationAcrossPagesTest.php
index 1e56dcdd3c15..5204151bd104 100644
--- a/core/profiles/demo_umami/tests/src/FunctionalJavascript/AssetAggregationAcrossPagesTest.php
+++ b/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(264166, $performance_data->getScriptBytes());
}
diff --git a/core/profiles/demo_umami/tests/src/FunctionalJavascript/OpenTelemetryAuthenticatedPerformanceTest.php b/core/profiles/demo_umami/tests/src/FunctionalJavascript/OpenTelemetryAuthenticatedPerformanceTest.php
index 9b4686ebefa0..7ac127792ba3 100644
--- a/core/profiles/demo_umami/tests/src/FunctionalJavascript/OpenTelemetryAuthenticatedPerformanceTest.php
+++ b/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(132083, $performance_data->getScriptBytes());
diff --git a/core/profiles/demo_umami/tests/src/FunctionalJavascript/OpenTelemetryFrontPagePerformanceTest.php b/core/profiles/demo_umami/tests/src/FunctionalJavascript/OpenTelemetryFrontPagePerformanceTest.php
index 36590df28c96..5f3fbff2c45d 100644
--- a/core/profiles/demo_umami/tests/src/FunctionalJavascript/OpenTelemetryFrontPagePerformanceTest.php
+++ b/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());
}
/**
diff --git a/core/profiles/standard/tests/src/FunctionalJavascript/StandardPerformanceTest.php b/core/profiles/standard/tests/src/FunctionalJavascript/StandardPerformanceTest.php
index 27b30ed21abb..55884855a24c 100644
--- a/core/profiles/standard/tests/src/FunctionalJavascript/StandardPerformanceTest.php
+++ b/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',
diff --git a/core/themes/claro/claro.info.yml b/core/themes/claro/claro.info.yml
index 5b8fd2393527..a6e78d5e9fbc 100644
--- a/core/themes/claro/claro.info.yml
+++ b/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:
diff --git a/core/themes/olivero/olivero.info.yml b/core/themes/olivero/olivero.info.yml
index 0df1401d178d..1f330d094c03 100644
--- a/core/themes/olivero/olivero.info.yml
+++ b/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:
diff --git a/core/themes/olivero/olivero.libraries.yml b/core/themes/olivero/olivero.libraries.yml
index 306cb5a115a9..7fce73c7e52f 100644
--- a/core/themes/olivero/olivero.libraries.yml
+++ b/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:
diff --git a/core/themes/stable9/css/system/components/ajax-progress.module.css b/core/themes/stable9/css/core/components/ajax-progress.module.css
similarity index 100%
rename from core/themes/stable9/css/system/components/ajax-progress.module.css
rename to core/themes/stable9/css/core/components/ajax-progress.module.css
diff --git a/core/themes/stable9/css/system/components/autocomplete-loading.module.css b/core/themes/stable9/css/core/components/autocomplete-loading.module.css
similarity index 100%
rename from core/themes/stable9/css/system/components/autocomplete-loading.module.css
rename to core/themes/stable9/css/core/components/autocomplete-loading.module.css
diff --git a/core/themes/stable9/css/system/components/progress.module.css b/core/themes/stable9/css/core/components/progress.module.css
similarity index 100%
rename from core/themes/stable9/css/system/components/progress.module.css
rename to core/themes/stable9/css/core/components/progress.module.css
diff --git a/core/themes/stable9/css/system/components/tabledrag.module.css b/core/themes/stable9/css/core/components/tabledrag.module.css
similarity index 100%
rename from core/themes/stable9/css/system/components/tabledrag.module.css
rename to core/themes/stable9/css/core/components/tabledrag.module.css
diff --git a/core/themes/stable9/css/system/components/tree-child.module.css b/core/themes/stable9/css/core/components/tree-child.module.css
similarity index 100%
rename from core/themes/stable9/css/system/components/tree-child.module.css
rename to core/themes/stable9/css/core/components/tree-child.module.css
diff --git a/core/themes/stable9/stable9.info.yml b/core/themes/stable9/stable9.info.yml
index fd2dd2e022fb..dd81e741775d 100644
--- a/core/themes/stable9/stable9.info.yml
+++ b/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:
--
GitLab