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
@@ -3,17 +3,14 @@
|
||||
use Illuminate\Support\Facades\Vite;
|
||||
use Illuminate\Support\Str;
|
||||
use NoNameWeb\LivewireMaterial\Http\Controllers\ShowcaseAssetController;
|
||||
use NoNameWeb\LivewireMaterial\Support\Stylesheets;
|
||||
use NoNameWeb\LivewireMaterial\Support\Scheme;
|
||||
use NoNameWeb\LivewireMaterial\Support\SchemeStylesheet;
|
||||
|
||||
/**
|
||||
* The showcase's own stylesheet route (plan step 38): `all.css` plus `showcase.css`, bundled by
|
||||
* `Stylesheets::bundle()` and served without the application's Vite build, and the two package
|
||||
* The showcase's own stylesheet route (plan step 38): `all.css` plus `showcase.css`, prebuilt into
|
||||
* resources/dist/showcase.css and served without the application's Vite build, and the two package
|
||||
* folders its relative `url()`s point into.
|
||||
*/
|
||||
afterEach(function () {
|
||||
Stylesheets::resetCache();
|
||||
});
|
||||
|
||||
it('serves the bundle as long-cached CSS at the hash of its own content', function () {
|
||||
$response = $this->get(ShowcaseAssetController::url())
|
||||
->assertOk()
|
||||
@@ -35,11 +32,14 @@ it('redirects a hash that does not match the current bundle to the current one',
|
||||
it('serves the font and svg files the bundle references, mime-typed by extension', function () {
|
||||
$css = $this->get(ShowcaseAssetController::url())->getContent();
|
||||
|
||||
// The stylesheet sits in assets/css/, so its relative `../fonts/…` and `../svg/…` land on the asset route.
|
||||
expect(dirname(parse_url(ShowcaseAssetController::url(), PHP_URL_PATH)))->toBe(route('livewire-material.asset', ['path' => 'css'], false))
|
||||
->and($css)->toContain("url('../fonts/google-sans-flex/GoogleSansFlex-Latin.woff2')")
|
||||
->toContain('url("../svg/symbols/outlined/check.svg")');
|
||||
|
||||
$fontUrl = route('livewire-material.asset', ['path' => 'fonts/google-sans-flex/GoogleSansFlex-Latin.woff2'], false);
|
||||
$svgUrl = route('livewire-material.asset', ['path' => 'svg/symbols/outlined/check.svg'], false);
|
||||
|
||||
expect($css)->toContain($fontUrl)->toContain($svgUrl);
|
||||
|
||||
$this->get($fontUrl)
|
||||
->assertOk()
|
||||
->assertHeader('Content-Type', 'font/woff2')
|
||||
@@ -93,7 +93,6 @@ it('bundles the application generated scheme, unlayered, when one sits beside it
|
||||
|
||||
file_put_contents($dir.'/material-scheme.css', ":root { --md-showcase-test-marker: #123456; }\n");
|
||||
config(['livewire-material.scheme' => $dir.'/material-scheme.json']);
|
||||
Stylesheets::resetCache();
|
||||
|
||||
try {
|
||||
$this->get(ShowcaseAssetController::url())
|
||||
@@ -105,15 +104,12 @@ it('bundles the application generated scheme, unlayered, when one sits beside it
|
||||
}
|
||||
});
|
||||
|
||||
it('falls back to Scheme::load() in the default shape when no generated stylesheet is found', function () {
|
||||
it('falls back to the scheme JSON in the generated shape when no generated stylesheet is found', function () {
|
||||
config(['livewire-material.scheme' => sys_get_temp_dir().'/livewire-material-showcase-missing-'.Str::random(8).'.json']);
|
||||
Stylesheets::resetCache();
|
||||
|
||||
$css = $this->get(ShowcaseAssetController::url())->assertOk()->getContent();
|
||||
|
||||
// The fallback's own one-line selector list, distinct from tokens/scheme.css's multi-line one
|
||||
// (already in all.css), so its presence here can only come from the appended fallback block.
|
||||
expect($css)->toContain("[data-contrast='medium'], [data-contrast='medium'][data-theme='light'], [data-contrast='medium'] [data-theme='light']");
|
||||
expect($css)->toEndWith(SchemeStylesheet::withProfiles(...Scheme::forStylesheet()))
|
||||
->toContain("[data-contrast='medium'][data-theme='dark']");
|
||||
});
|
||||
|
||||
it('mounts none of the showcase asset routes when the showcase is off', function () {
|
||||
@@ -122,7 +118,7 @@ it('mounts none of the showcase asset routes when the showcase is off', function
|
||||
$this->refreshApplication();
|
||||
|
||||
try {
|
||||
$this->get('/material/showcase.0000000000000000.css')->assertNotFound();
|
||||
$this->get('/material/assets/css/showcase.0000000000000000.css')->assertNotFound();
|
||||
$this->get('/material/assets/fonts/google-sans-flex/GoogleSansFlex-Latin.woff2')->assertNotFound();
|
||||
} finally {
|
||||
putenv('MATERIAL_SHOWCASE=true');
|
||||
|
||||
Reference in New Issue
Block a user