refactor: remove exact nested css duplicates
This commit is contained in:
leefer
@@ -1803,21 +1803,29 @@ test("heart breathing prepares once then contracts on each exhale", async ({ pag
|
||||
await expect(page.locator(".heart-breath-ripple span").first()).toHaveCSS("transition-duration", "4s");
|
||||
});
|
||||
|
||||
test("stylesheet layers do not repeat identical top-level rules", async ({ page }) => {
|
||||
test("stylesheet layers do not repeat identical rules in the same cascade context", async ({ page }) => {
|
||||
await mockApplication(page, session("admin", true));
|
||||
await page.goto("/index.html");
|
||||
|
||||
const duplicates = await page.evaluate(() => {
|
||||
const occurrences = new Map();
|
||||
const visitRules = (rules, href, context = []) => {
|
||||
for (const rule of Array.from(rules || [])) {
|
||||
if (typeof rule.selectorText === "string" && rule.style) {
|
||||
const key = `${context.join("\u0001")}\u0000${rule.selectorText}\u0000${rule.style.cssText}`;
|
||||
const rows = occurrences.get(key) || [];
|
||||
rows.push(href);
|
||||
occurrences.set(key, rows);
|
||||
continue;
|
||||
}
|
||||
if (!rule.cssRules) continue;
|
||||
const condition = rule.conditionText || rule.media?.mediaText || rule.name || "";
|
||||
visitRules(rule.cssRules, href, [...context, `${rule.type}:${condition}`]);
|
||||
}
|
||||
};
|
||||
for (const sheet of Array.from(document.styleSheets)) {
|
||||
const href = sheet.href ? new URL(sheet.href).pathname : "inline";
|
||||
for (const rule of Array.from(sheet.cssRules || [])) {
|
||||
if (typeof rule.selectorText !== "string" || !rule.style) continue;
|
||||
const key = `${rule.selectorText}\u0000${rule.style.cssText}`;
|
||||
const rows = occurrences.get(key) || [];
|
||||
rows.push(href);
|
||||
occurrences.set(key, rows);
|
||||
}
|
||||
visitRules(sheet.cssRules, href);
|
||||
}
|
||||
return Array.from(occurrences.entries())
|
||||
.filter(([, paths]) => new Set(paths).size > 1)
|
||||
|
||||
@@ -29,10 +29,11 @@ RETIRED_FRONTEND_SOURCE_RANGES = (
|
||||
)
|
||||
AUDITED_FRONTEND_SOURCE_LINE_COUNT = 9283
|
||||
|
||||
# CR-12 removes only declarations that are repeated verbatim by a later
|
||||
# stylesheet layer under the same top-level cascade context. Keeping the exact
|
||||
# source fragments here makes every other byte of the accepted CSS baseline a
|
||||
# preservation requirement.
|
||||
# CR-12 and CR-13 remove only declarations repeated by a later stylesheet
|
||||
# layer under the same cascade context. Entries are either an exact retired
|
||||
# fragment or an exact (source, replacement) pair when surrounding context is
|
||||
# needed to identify one nested occurrence. Every other byte remains part of
|
||||
# the accepted CSS baseline.
|
||||
AUDITED_CSS_RETIREMENTS = {
|
||||
"styles.css": (
|
||||
".workspace-view.active-view {\n display: block;\n}\n\n",
|
||||
@@ -44,6 +45,78 @@ AUDITED_CSS_RETIREMENTS = {
|
||||
" display: block;\n"
|
||||
"}\n\n"
|
||||
),
|
||||
(
|
||||
(
|
||||
"@media (min-width: 721px) and (max-width: 1279px) {\n"
|
||||
" .market-tape {\n"
|
||||
" display: none;\n"
|
||||
" }\n\n"
|
||||
" .app-header {"
|
||||
),
|
||||
(
|
||||
"@media (min-width: 721px) and (max-width: 1279px) {\n"
|
||||
" .app-header {"
|
||||
),
|
||||
),
|
||||
(
|
||||
" .module-nav .nav-brand,\n"
|
||||
" .module-nav .nav-group-label,\n"
|
||||
" .module-nav .market-sub-tab,\n"
|
||||
" .module-nav .sidebar-collapse-button {\n"
|
||||
" display: none;\n"
|
||||
" }\n\n"
|
||||
),
|
||||
(
|
||||
" .module-nav .nav-group,\n"
|
||||
" body.sidebar-collapsed .module-nav .nav-group {\n"
|
||||
" display: contents;\n"
|
||||
" margin: 0;\n"
|
||||
" padding: 0;\n"
|
||||
" border: 0;\n"
|
||||
" }\n\n"
|
||||
),
|
||||
(
|
||||
" .module-nav .module-tab.mobile-primary-tab,\n"
|
||||
" body.sidebar-collapsed .module-nav .module-tab.mobile-primary-tab {\n"
|
||||
" display: flex;\n"
|
||||
" }\n\n"
|
||||
),
|
||||
" body.mentor-directory-open {\n overflow: hidden;\n }\n\n",
|
||||
(
|
||||
" body,\n"
|
||||
" body.sidebar-collapsed {\n"
|
||||
" display: block;\n"
|
||||
" min-height: 100dvh;\n"
|
||||
" padding-bottom: calc(68px + env(safe-area-inset-bottom));\n"
|
||||
" }\n\n"
|
||||
),
|
||||
" .brand-block {\n height: 42px;\n }\n\n",
|
||||
(
|
||||
" .header-actions {\n"
|
||||
" position: absolute;\n"
|
||||
" inset: 56px 10px auto;\n"
|
||||
" display: flex;\n"
|
||||
" justify-content: space-between;\n"
|
||||
" gap: 6px;\n"
|
||||
" }\n\n"
|
||||
),
|
||||
(
|
||||
" .header-date-group {\n"
|
||||
" height: 42px;\n"
|
||||
" min-width: 0;\n"
|
||||
" flex: 1;\n"
|
||||
" }\n\n"
|
||||
),
|
||||
(
|
||||
" .header-actions > .icon-button {\n"
|
||||
" width: 40px;\n"
|
||||
" min-width: 40px;\n"
|
||||
" min-height: 42px;\n"
|
||||
" }\n\n"
|
||||
),
|
||||
" .overview-strip .metric:nth-of-type(1) { grid-column: 2; grid-row: 1; }\n",
|
||||
" .overview-strip .metric:nth-of-type(3) { grid-column: 2; grid-row: 2; }\n",
|
||||
" .curated-strategy-list {\n grid-template-columns: 1fr;\n }\n\n",
|
||||
),
|
||||
"renovation.css": (
|
||||
".overview-strip .sentiment-block { padding-left: 0; }\n",
|
||||
@@ -54,6 +127,27 @@ AUDITED_CSS_RETIREMENTS = {
|
||||
),
|
||||
"redesign-v2.css": (
|
||||
"#dragonView .dragon-operation-table .dragon-col-reason { width: auto; }\n",
|
||||
(
|
||||
" .market-tape { display: none; }\n"
|
||||
" .header-actions { width: 100%; }\n"
|
||||
" .header-command-group { position: absolute; }\n"
|
||||
),
|
||||
(
|
||||
" .sidebar-brand,\n"
|
||||
" .module-nav .nav-group-label,\n"
|
||||
" .sidebar-collapse-button,\n"
|
||||
" .module-nav .market-sub-tab { display: none; }\n"
|
||||
" .module-nav .nav-group,\n"
|
||||
" body.sidebar-collapsed .module-nav .nav-group { display: contents; }\n"
|
||||
" .module-nav .module-tab,\n"
|
||||
" body.sidebar-collapsed .module-nav .module-tab { display: none; }\n"
|
||||
),
|
||||
" .module-nav .module-tab.mobile-primary-tab span { display: inline; }\n",
|
||||
(
|
||||
" .overview-strip .metric:nth-of-type(n + 4),\n"
|
||||
" .overview-strip .metric-wide { display: none; }\n"
|
||||
" .overview-toggle { display: none; }\n"
|
||||
),
|
||||
),
|
||||
}
|
||||
|
||||
@@ -154,8 +248,9 @@ def assert_moved_asset_matches(
|
||||
if original_relative in AUDITED_CSS_RETIREMENTS:
|
||||
original = (ORIGINAL_STATIC / original_relative).read_text(encoding="utf-8")
|
||||
for retired in AUDITED_CSS_RETIREMENTS[original_relative]:
|
||||
testcase.assertEqual(original.count(retired), 1, retired)
|
||||
original = original.replace(retired, "", 1)
|
||||
source, replacement = retired if isinstance(retired, tuple) else (retired, "")
|
||||
testcase.assertEqual(original.count(source), 1, source)
|
||||
original = original.replace(source, replacement, 1)
|
||||
testcase.assertEqual(
|
||||
(FRONTEND_ROOT / target_relative).read_text(encoding="utf-8"),
|
||||
original,
|
||||
|
||||
Reference in New Issue
Block a user