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
@@ -0,0 +1,58 @@
|
||||
/**
|
||||
* Builds resources/dist/, the stylesheets the package serves on its own, outside an application's
|
||||
* Vite build: the showcase's (`ShowcaseAssetController`) and the error page's
|
||||
* (`ErrorPage::layoutStyles()`, `ErrorPage::fallbackStyles()`).
|
||||
*
|
||||
* Rebuild with `npm run build:stylesheets` after changing anything under resources/css; the
|
||||
* output is committed so applications need no Node, and tests/Feature/StylesheetsBundleTest.php
|
||||
* fails while it is stale. `node bin/stylesheets.mjs <dir>` writes the same files elsewhere.
|
||||
*
|
||||
* The `@import`s are inlined by Vite's own `preprocessCSS()` — postcss-import, the same inlining an
|
||||
* application's build does, each file once, first occurrence kept — so these bundles cannot
|
||||
* order a rule differently from an application's. A relative `url()` is rebased onto
|
||||
* resources/dist/, the folder the showcase serves beside the fonts and SVGs. The fallback drops
|
||||
* every `@font-face`: without a build nothing serves the font, and the brand typeface's stack
|
||||
* (tokens/type.css) falls back to the system fonts on its own.
|
||||
*/
|
||||
import { mkdir, writeFile } from 'node:fs/promises'
|
||||
import { dirname, relative, resolve } from 'node:path'
|
||||
import { preprocessCSS, resolveConfig } from 'vite'
|
||||
|
||||
const css = resolve(import.meta.dirname, '../resources/css')
|
||||
const dist = resolve(import.meta.dirname, '../resources/dist')
|
||||
const out = resolve(process.argv[2] ?? dist)
|
||||
|
||||
const BUNDLES = {
|
||||
'showcase.css': ['all.css', 'showcase.css'],
|
||||
'error-page.css': ['components/error-page.css'],
|
||||
'error-page-fallback.css': ['foundation.css', 'components/error-page.css'],
|
||||
}
|
||||
|
||||
const rebase = {
|
||||
postcssPlugin: 'livewire-material',
|
||||
OnceExit(root, { result }) {
|
||||
// The prose lives in resources/css; the bundle only has to be served.
|
||||
root.walkComments((comment) => comment.remove())
|
||||
|
||||
root.walkDecls((decl) => {
|
||||
decl.value = decl.value.replace(/url\((['"]?)(?![a-z][a-z0-9+.-]*:|\/|#)([^'")]+)\1\)/gi, (_, quote, url) =>
|
||||
`url(${quote}${relative(dist, resolve(dirname(decl.source.input.file), url))}${quote})`)
|
||||
})
|
||||
|
||||
if (result.opts.from.endsWith('error-page-fallback.css')) {
|
||||
root.walkAtRules('font-face', (rule) => rule.remove())
|
||||
}
|
||||
},
|
||||
}
|
||||
|
||||
const config = await resolveConfig({ configFile: false, logLevel: 'error', css: { postcss: { plugins: [rebase] } } }, 'build')
|
||||
|
||||
await mkdir(out, { recursive: true })
|
||||
|
||||
for (const [name, files] of Object.entries(BUNDLES)) {
|
||||
const entry = files.map((file) => `@import './${file}';`).join('\n')
|
||||
// The entry is named after the bundle, beside the files it imports, but is never read from disk.
|
||||
const { code } = await preprocessCSS(entry, `${css}/bundle-${name}`, config)
|
||||
|
||||
await writeFile(`${out}/${name}`, `${code.trim()}\n`)
|
||||
}
|
||||
Reference in New Issue
Block a user