Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"preview": "vite preview",
"prepare": "svelte-kit sync || echo ''",
"test": "node --test \"test/*.test.ts\"",
"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
"check": "web-config check && svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch"
},
"devDependencies": {
Expand All @@ -33,6 +33,6 @@
"#lib/*": "./src/lib/*"
},
"dependencies": {
"@kleinbem/web-config": "git+https://github.com/kleinbem/web-config.git#91a902ed6aec552ba103aa90b5597b1d2081148d"
"@kleinbem/web-config": "github:kleinbem/web-config#v0.2.0"
}
}
2 changes: 1 addition & 1 deletion package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ buildNpmPackage (finalAttrs: {
hash = "sha256-woIULw/zSGgHmh6hZ/s4q/4xcUColTskWosdUs0nzvg=";
};

npmDepsHash = "sha256-czKPAWFx+bMvsDd3ChQ2cXNWHgAQo5/ZfQcAHua3Q+c=";
npmDepsHash = "sha256-yty7tFMnfDvRzyq72A6qXjmRYhqPHV/jn2dfkNj4CFg=";
# npm 11 creates _cacache/tmp when installing git dependencies from the offline cache.
makeCacheWritable = true;

Expand Down
19 changes: 3 additions & 16 deletions src/app.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,9 @@
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="color-scheme" content="dark light" />
<title>Attic UI — Nix Binary Cache</title>
<script>
try {
const p = localStorage.getItem('fleet-theme');
const m = window.matchMedia('(prefers-color-scheme: dark)').matches;
const t = p === 'dark' || p === 'light' ? p : m ? 'dark' : 'light';
document.documentElement.dataset.theme = t;
document.documentElement.classList.toggle('dark', t === 'dark');
document.documentElement.classList.toggle('light', t === 'light');

const s = localStorage.getItem('fleet-font-size');
if (s === 'small' || s === 'large' || s === 'larger') {
document.documentElement.dataset.fontSize = s;
document.documentElement.classList.add('font-size-' + s);
}
} catch {}
</script>
<!-- web-config:init (written by `web-config sync`, do not edit) -->
<script>try{const p=localStorage.getItem("fleet-theme");const m=window.matchMedia('(prefers-color-scheme: dark)').matches;const t=p==='dark'||p==='light'?p:(m?'dark':'light');document.documentElement.dataset.theme=t;document.documentElement.classList.toggle('dark',t==='dark');document.documentElement.classList.toggle('light',t==='light');}catch(e){}try{const s=localStorage.getItem("fleet-font-size");if(s==='large'||s==='larger'){document.documentElement.dataset.fontSize=s;document.documentElement.classList.add('font-size-'+s);}}catch(e){}</script>
<!-- /web-config:init -->
%sveltekit.head%
</head>
<body class="min-h-screen bg-bg text-heading antialiased transition-colors selection:bg-accent/20" data-sveltekit-preload-data="hover">
Expand Down
8 changes: 0 additions & 8 deletions src/routes/+layout.svelte
Original file line number Diff line number Diff line change
@@ -1,15 +1,7 @@
<script lang="ts">
import '../app.css';
import { theme } from '@kleinbem/web-config/theme/state';

let { children } = $props();

$effect(() => {
const active = theme.current;
document.documentElement.dataset.theme = active;
document.documentElement.classList.toggle('dark', active === 'dark');
document.documentElement.classList.toggle('light', active === 'light');
});
</script>

<a
Expand Down
6 changes: 3 additions & 3 deletions test/ui-contracts.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ async function listFiles(dir: string): Promise<string[]> {
}

describe('Frontend static, security, and accessibility contracts', () => {
it('app.html declares lang, viewport, color-scheme, and strict theme/font-size bootstrap', async () => {
it('app.html declares lang, viewport, color-scheme, and the web-config init block', async () => {
const html = await readFile('src/app.html', 'utf8');
assert.match(html, /<html\s+lang="en"/);
assert.match(html, /name="viewport"/);
assert.match(html, /name="color-scheme"\s+content="dark light"/);
assert.match(html, /localStorage\.getItem\('fleet-theme'\)/);
assert.match(html, /s === 'small' \|\| s === 'large' \|\| s === 'larger'/);
// The bootstrap script itself is owned and verified by `web-config check`.
assert.match(html, /<!-- web-config:init /);
assert.match(html, /%sveltekit\.head%/);
assert.match(html, /%sveltekit\.body%/);
});
Expand Down
26 changes: 5 additions & 21 deletions vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,26 +22,10 @@ export default defineConfig(({ mode }) => {
}
};

const base = defineWebConfig({
adapter: 'static',
adapterOptions: {
fallback: '200.html',
pages: 'build',
assets: 'build'
},
server: {
port: 4173,
host: true,
proxy
}
});
const serve = { port: 4173, host: true, proxy };

return {
...base,
preview: {
port: 4173,
host: true,
proxy
}
};
return defineWebConfig({
server: serve,
vite: { preview: serve }
});
});
Loading