Cut duplicated and speculative code across the package
An over-engineering audit of the whole tree, applied in five reviewed batches. Behaviour stays the same except where UPGRADE.md says otherwise. PHP: the showcase and error-page stylesheets are prebuilt into resources/dist by bin/stylesheets.mjs, through Vite's own postcss-import (first occurrence kept, the order an application's build gives), instead of Stylesheets::bundle() inlining imports on every request; only the import walk DesignGuard needs stays. SchemeStylesheet::withProfiles() replaces three copies of the scheme-plus-profiles loop, material:scheme leaves spec and contrast checks to the node script that already made them, and the error page's scheme cache, the hashed view namespace, the translations path with no lang/ folder and DesignGuard's 1.x-name hints are gone. JS: the androidx shape port progress.js and both bin scripts each carried lives once in resources/js/shapes.js (the generated SVGs are unchanged); util.js holds ringIndex(), ms(), reopenGuard() and remember(), which were written out several times; listeners are released through AbortController; tooltip.js's hoverPopover() serves the rich tooltip too. CSS: every rule for an element inside the navigation rail queries `--md-navigation-rail-value` instead of repeating the seven collapsed conditions under five media branches; badge, alert, progress, slider and button read one non-inheriting colour-role table (components/color.css); the dialog chrome, the submenu's popover chrome, the chip's state layer and touch target, and the visually-hidden inputs use the shared rules they copied; foundation/tokens.css is folded into foundation.css. Views: Support\Field and Support\Link replace the error-key, bound-value and link-attribute blocks copied into the fields and link components; the timepicker period group, the menu filter and the showcase head are partials; the datepicker's steppers and entry fields are loops; component docblocks no longer restate SKILL.md. Tests and tooling: one dataset-driven ComponentStylesheetsTest replaces four per-group files, DesignGuardTest and the layout-component tests use datasets, browser tests share one ready() helper, CSS parsing lives in ComponentStylesheet alone. docs/audits and the finding IDs citing it are removed, as are pestphp/pest-plugin-laravel, the unused composer scripts and check:font; the lint job runs in the feature job, which now installs node packages so the prebuilt-stylesheet staleness test runs in CI. Feature suite 1177 passed, Chrome browser suite 299 passed. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 5
parent
471d927e64
commit
247c596c3a
@@ -53,7 +53,16 @@ final class ComponentStylesheet
|
||||
|
||||
public static function path(string $name): string
|
||||
{
|
||||
return dirname(__DIR__, 2)."/resources/css/components/{$name}.css";
|
||||
return self::cssPath("components/{$name}.css");
|
||||
}
|
||||
|
||||
/**
|
||||
* resources/css itself, or a path under it — the root every stylesheet test resolves paths
|
||||
* from.
|
||||
*/
|
||||
public static function cssPath(string $relative = ''): string
|
||||
{
|
||||
return dirname(__DIR__, 2).'/resources/css'.($relative === '' ? '' : "/{$relative}");
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -73,10 +82,33 @@ final class ComponentStylesheet
|
||||
*/
|
||||
public function imports(): array
|
||||
{
|
||||
return array_values(array_filter(array_map(
|
||||
fn (string $statement): ?string => preg_match('/^@import\s+([\'"])(.+?)\1;$/', $statement, $match) === 1 ? $match[2] : null,
|
||||
$this->statements,
|
||||
)));
|
||||
return array_values(array_filter(array_map(self::importPath(...), $this->statements)));
|
||||
}
|
||||
|
||||
/**
|
||||
* The file a plain `@import '<path>';` statement names, or null for anything else (a
|
||||
* statement with `layer()`/`supports()`/media after the path, or not an import at all).
|
||||
*/
|
||||
public static function importPath(string $statement): ?string
|
||||
{
|
||||
return preg_match('/^@import\s+([\'"])(.+?)\1;$/', $statement, $match) === 1 ? $match[2] : null;
|
||||
}
|
||||
|
||||
/**
|
||||
* The declarations of a flat block body — no nested rule inside it, just `property: value;`
|
||||
* pairs (a `:root` block, a media query's own single nested rule already unwrapped by the
|
||||
* caller). declarations() above is for a selector inside the full, nested stylesheet; this is
|
||||
* for a body a caller already has in hand.
|
||||
*
|
||||
* @return array<string, string>
|
||||
*/
|
||||
public static function flatDeclarations(string $body): array
|
||||
{
|
||||
return collect(explode(';', $body))
|
||||
->map(fn (string $declaration): string => trim($declaration))
|
||||
->filter()
|
||||
->mapWithKeys(fn (string $declaration): array => [trim(strstr($declaration, ':', true)) => trim(substr(strstr($declaration, ':'), 1))])
|
||||
->all();
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -240,18 +272,24 @@ final class ComponentStylesheet
|
||||
return trim((string) preg_replace('/\s+/', ' ', $text));
|
||||
}
|
||||
|
||||
private static function withoutComments(string $css): string
|
||||
/**
|
||||
* `$css` with every comment and quoted string blanked out (the quoted string kept, the comment
|
||||
* dropped) — shared by every test that has to tell a `/* … *\/` in a stylesheet from real CSS.
|
||||
*/
|
||||
public static function withoutComments(string $css): string
|
||||
{
|
||||
return (string) preg_replace('~("(?:\\\\.|[^"\\\\])*"|\'(?:\\\\.|[^\'\\\\])*\')|/\*.*?\*/~s', '$1', $css);
|
||||
}
|
||||
|
||||
/**
|
||||
* The statements and blocks at the top of a piece of CSS. Inside a rule a declaration may end
|
||||
* at the closing brace without a semicolon.
|
||||
* at the closing brace without a semicolon. `$css` must already be comment-free
|
||||
* (withoutComments()) — this does not strip them itself, so a caller walking nested bodies
|
||||
* (already substrings of a stripped source) does not pay for it twice.
|
||||
*
|
||||
* @return list<array{statement: string}|array{prelude: string, body: string}>
|
||||
*/
|
||||
private static function items(string $css, bool $declarations = false): array
|
||||
public static function items(string $css, bool $declarations = false): array
|
||||
{
|
||||
$items = [];
|
||||
$start = 0;
|
||||
|
||||
Reference in New Issue
Block a user