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>
159 lines
6.9 KiB
PHP
159 lines
6.9 KiB
PHP
<?php
|
|
|
|
use Illuminate\Support\Facades\Vite;
|
|
use Illuminate\Support\Str;
|
|
use NoNameWeb\LivewireMaterial\Http\Controllers\ShowcaseAssetController;
|
|
use NoNameWeb\LivewireMaterial\Support\Scheme;
|
|
use NoNameWeb\LivewireMaterial\Support\SchemeStylesheet;
|
|
|
|
/**
|
|
* 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.
|
|
*/
|
|
it('serves the bundle as long-cached CSS at the hash of its own content', function () {
|
|
$response = $this->get(ShowcaseAssetController::url())
|
|
->assertOk()
|
|
->assertHeader('Content-Type', 'text/css; charset=utf-8')
|
|
->assertHeader('Cache-Control', 'immutable, max-age=31536000, public');
|
|
|
|
expect($response->getContent())
|
|
->toContain('[data-md-showcase-brand]')
|
|
->toContain('[data-md-pane]')
|
|
->toContain('@layer material.reset, material.tokens');
|
|
});
|
|
|
|
it('redirects a hash that does not match the current bundle to the current one', function () {
|
|
$stale = route('livewire-material.stylesheet', ['hash' => '0000000000000000']);
|
|
|
|
$this->get($stale)->assertRedirect(ShowcaseAssetController::url());
|
|
});
|
|
|
|
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);
|
|
|
|
$this->get($fontUrl)
|
|
->assertOk()
|
|
->assertHeader('Content-Type', 'font/woff2')
|
|
->assertHeader('Cache-Control', 'immutable, max-age=31536000, public');
|
|
|
|
$this->get($svgUrl)
|
|
->assertOk()
|
|
->assertHeader('Content-Type', 'image/svg+xml');
|
|
});
|
|
|
|
it('404s a path that climbs out of the two served folders', function () {
|
|
$this->get('/material/assets/fonts/../../composer.json')->assertNotFound();
|
|
});
|
|
|
|
it('404s every other way out of the two served folders', function (string $path) {
|
|
$this->get('/material/assets/'.$path)->assertNotFound();
|
|
})->with([
|
|
'encoded dot segments' => 'fonts/%2e%2e/%2e%2e/composer.json',
|
|
'encoded slashes' => 'fonts/..%2f..%2fcomposer.json',
|
|
'backslashes' => 'fonts/google-sans-flex/..%5c..%5c..%5ccomposer.json',
|
|
'an absolute path' => '/etc/hosts',
|
|
'an absolute path inside a folder' => 'fonts//etc/hosts',
|
|
'a null byte' => 'fonts/google-sans-flex/GoogleSansFlex-Latin.woff2%00.txt',
|
|
'a directory' => 'svg/symbols',
|
|
'a folder itself' => 'fonts/',
|
|
'a very long path' => 'fonts/'.str_repeat('a/', 3000).'x.woff2',
|
|
]);
|
|
|
|
it('404s a symbolic link inside a served folder that points out of it', function () {
|
|
$link = __DIR__.'/../../resources/svg/showcase-assets-test-link.svg';
|
|
symlink(realpath(__DIR__.'/../../composer.json'), $link);
|
|
|
|
try {
|
|
$this->get('/material/assets/svg/showcase-assets-test-link.svg')->assertNotFound();
|
|
} finally {
|
|
unlink($link);
|
|
}
|
|
});
|
|
|
|
it('404s a folder the showcase does not serve', function () {
|
|
$this->get('/material/assets/css/all.css')->assertNotFound();
|
|
});
|
|
|
|
it('404s an extension the showcase does not serve, even inside a served folder', function () {
|
|
$this->get('/material/assets/fonts/google-sans-flex/OFL.txt')->assertNotFound();
|
|
});
|
|
|
|
it('bundles the application generated scheme, unlayered, when one sits beside its configured JSON', function () {
|
|
$dir = sys_get_temp_dir().'/livewire-material-showcase-scheme-'.Str::random(8);
|
|
mkdir($dir);
|
|
|
|
file_put_contents($dir.'/material-scheme.css', ":root { --md-showcase-test-marker: #123456; }\n");
|
|
config(['livewire-material.scheme' => $dir.'/material-scheme.json']);
|
|
|
|
try {
|
|
$this->get(ShowcaseAssetController::url())
|
|
->assertOk()
|
|
->assertSee('--md-showcase-test-marker: #123456', false);
|
|
} finally {
|
|
unlink($dir.'/material-scheme.css');
|
|
rmdir($dir);
|
|
}
|
|
});
|
|
|
|
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']);
|
|
|
|
$css = $this->get(ShowcaseAssetController::url())->assertOk()->getContent();
|
|
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 () {
|
|
putenv('MATERIAL_SHOWCASE=false');
|
|
$_ENV['MATERIAL_SHOWCASE'] = $_SERVER['MATERIAL_SHOWCASE'] = 'false';
|
|
$this->refreshApplication();
|
|
|
|
try {
|
|
$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');
|
|
$_ENV['MATERIAL_SHOWCASE'] = $_SERVER['MATERIAL_SHOWCASE'] = 'true';
|
|
$this->refreshApplication();
|
|
}
|
|
});
|
|
|
|
it('passes Vite the application entries but its stylesheets, on every kind of showcase page', function () {
|
|
$hot = sys_get_temp_dir().'/livewire-material-showcase-hot-'.Str::random(8);
|
|
file_put_contents($hot, 'http://vite.test');
|
|
Vite::useHotFile($hot);
|
|
|
|
config(['livewire-material.showcase.vite' => ['resources/css/app.css', 'resources/sass/extra.scss', 'resources/js/app.js']]);
|
|
|
|
try {
|
|
expect(ShowcaseAssetController::scripts())->toBe(['resources/js/app.js']);
|
|
|
|
foreach (['/material', '/material/progress', '/material/layout/feed', '/material/shell'] as $page) {
|
|
$this->get($page)
|
|
->assertOk()
|
|
->assertSee('http://vite.test/resources/js/app.js', false)
|
|
->assertDontSee('http://vite.test/resources/css/app.css', false)
|
|
->assertDontSee('http://vite.test/resources/sass/extra.scss', false)
|
|
->assertSee(ShowcaseAssetController::url(), false);
|
|
}
|
|
|
|
// A list of stylesheets alone leaves @vite() out, rather than reading a manifest for nothing.
|
|
config(['livewire-material.showcase.vite' => ['resources/css/app.css']]);
|
|
|
|
expect(ShowcaseAssetController::scripts())->toBe([]);
|
|
|
|
$this->get('/material/progress')->assertOk()->assertDontSee('http://vite.test', false);
|
|
} finally {
|
|
unlink($hot);
|
|
}
|
|
});
|