diff --git a/package-lock.json b/package-lock.json index ce4194c..0d38d38 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "0.1.0", "license": "MIT", "dependencies": { - "@kleinbem/web-config": "git+https://github.com/kleinbem/web-config.git#91a902ed6aec552ba103aa90b5597b1d2081148d" + "@kleinbem/web-config": "github:kleinbem/web-config#v0.2.0" }, "devDependencies": { "@sveltejs/adapter-static": "^4.0.1", @@ -72,15 +72,17 @@ } }, "node_modules/@kleinbem/web-config": { - "version": "0.1.0", - "resolved": "git+https://github.com/kleinbem/web-config.git#91a902ed6aec552ba103aa90b5597b1d2081148d", - "integrity": "sha512-XqUO7npxlAhko4hnS1wnGGkU5aiGaJUs5izJ9NhoLQe4+B+YljZfWOtw537krasninUJ/KG1JaTSZNtwi7em2g==", + "version": "0.2.0", + "resolved": "git+https://github.com/kleinbem/web-config.git#e3644893b33300d089faab95cdd88f49a733af1f", "license": "MIT", + "bin": { + "web-config": "bin/web-config.js" + }, "peerDependencies": { "@sveltejs/adapter-static": "^3.0.0 || ^4.0.0", "@sveltejs/kit": "^3.1.0", "@tailwindcss/vite": "^4.0.0", - "svelte": "^5.36.0", + "svelte": "^5.57.0", "tailwindcss": "^4.0.0", "vite": "^8.0.0" } diff --git a/package.json b/package.json index 61e2157..672f181 100644 --- a/package.json +++ b/package.json @@ -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": { @@ -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" } } diff --git a/package.nix b/package.nix index 2fd54aa..f6f6812 100644 --- a/package.nix +++ b/package.nix @@ -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; diff --git a/src/app.html b/src/app.html index 7267549..0f7ca61 100644 --- a/src/app.html +++ b/src/app.html @@ -6,22 +6,9 @@ Attic UI — Nix Binary Cache - + + + %sveltekit.head% diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 710ed95..83969dd 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -1,15 +1,7 @@ { } 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, / { } }; - 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 } + }); });