-
- Save
-
-
- Reset to defaults
-
-
- Export JSON
-
+
+ Save
+ Reset to defaults
+ Export JSON
Import JSON (replace)
-
+
Import replaces your saved overrides entirely (same as Save). Use Export to capture the
current effective settings, including cleared optional fields as
null.
diff --git a/packages/extension/src/options/main.ts b/packages/extension/src/options/main.ts
index 2dcb856..a2c79f1 100644
--- a/packages/extension/src/options/main.ts
+++ b/packages/extension/src/options/main.ts
@@ -1,4 +1,5 @@
import './styles.css';
+import './theme';
import { findClosestTtl, TTL_OPTIONS, type ConfigOverride, type ExtensionConfig } from '../config';
import { parseConfigOverride } from '../configSchema';
import { toExportOverride } from '../configMerge';
diff --git a/packages/extension/src/options/styles.css b/packages/extension/src/options/styles.css
index 13c32bd..9edbabd 100644
--- a/packages/extension/src/options/styles.css
+++ b/packages/extension/src/options/styles.css
@@ -1,58 +1,33 @@
@import 'tailwindcss';
+@import '@crypt.fyi/theme/tokens.css';
-/* Match packages/web design tokens (neutral black/white brand). */
-@theme {
- --font-sans: 'Segoe UI', 'Helvetica Neue', ui-sans-serif, sans-serif;
- --color-ink: hsl(0 0% 5%);
- --color-ink-muted: hsl(0 0% 47%);
- --color-paper: hsl(0 0% 100%);
- --color-paper-elevated: hsl(0 0% 100%);
- --color-line: hsl(0 0% 91%);
- --color-primary: hsl(0 0% 11%);
- --color-primary-fg: hsl(0 0% 98%);
- --color-muted: hsl(0 0% 96%);
- --color-danger: hsl(0 84% 40%);
- --color-danger-soft: hsl(0 84% 96%);
- --color-ok-soft: hsl(0 0% 96%);
-}
-
-@media (prefers-color-scheme: dark) {
- @theme {
- --color-ink: hsl(0 0% 98%);
- --color-ink-muted: hsl(0 0% 65%);
- --color-paper: hsl(0 0% 5%);
- --color-paper-elevated: hsl(0 0% 5%);
- --color-line: hsl(0 0% 25%);
- --color-primary: hsl(0 0% 98%);
- --color-primary-fg: hsl(0 0% 11%);
- --color-muted: hsl(0 0% 17%);
- --color-danger: hsl(0 65% 68%);
- --color-danger-soft: hsl(0 40% 16%);
- --color-ok-soft: hsl(0 0% 17%);
- }
+/*
+ Unlayered on purpose: Chrome injects its own font-family and 75% font-size on extension
+ pages, and that unlayered rule would beat the body styles in the theme's base layer.
+*/
+body {
+ font-family: var(--font-sans);
+ font-size: 1rem;
}
+/* Plain HTML equivalents of the web client's Input, Button and Card components. */
@layer base {
- html {
- color-scheme: light dark;
- }
-
- body {
- @apply m-0 min-h-screen bg-paper font-sans text-ink antialiased;
- }
-
input[type='url'],
input[type='text'],
input[type='number'],
select {
- @apply w-full rounded-md border border-line bg-paper-elevated px-3 py-2.5 text-ink shadow-sm outline-none transition;
+ @apply h-11 w-full rounded-lg border border-border bg-muted px-3 py-1 text-sm text-foreground outline-hidden transition-colors hover:border-input;
}
- input:focus,
- select:focus,
+ input[type='checkbox'] {
+ @apply size-4 shrink-0 accent-primary;
+ }
+
+ input:focus-visible,
+ select:focus-visible,
button:focus-visible,
- .file-btn:focus-within {
- @apply ring-2 ring-primary/25 ring-offset-2 ring-offset-paper;
+ .btn:focus-within {
+ @apply ring-2 ring-ring ring-offset-2 ring-offset-background outline-hidden;
}
input:disabled,
@@ -60,3 +35,45 @@
@apply cursor-not-allowed opacity-50;
}
}
+
+@layer components {
+ .card {
+ @apply space-y-4 rounded-xl border bg-card p-5 text-card-foreground shadow-[var(--card-shadow)] sm:p-6;
+ }
+
+ .card-title {
+ @apply font-display text-base font-semibold tracking-tight;
+ }
+
+ .field {
+ @apply block space-y-1.5;
+ }
+
+ .field-label {
+ @apply block text-sm font-medium;
+ }
+
+ .field-hint {
+ @apply block text-xs text-muted-foreground;
+ }
+
+ .option-row {
+ @apply flex items-center gap-2.5 text-sm;
+ }
+
+ .btn {
+ @apply inline-flex h-11 cursor-pointer items-center justify-center rounded-lg px-4 text-sm font-semibold whitespace-nowrap transition-colors;
+ }
+
+ .btn-primary {
+ @apply bg-primary text-primary-foreground hover:bg-primary/85;
+ }
+
+ .btn-outline {
+ @apply border border-border bg-card hover:border-input hover:bg-accent;
+ }
+
+ .theme-option {
+ @apply grid size-8 cursor-pointer place-items-center rounded-md text-muted-foreground transition-colors hover:text-foreground aria-pressed:bg-accent aria-pressed:text-foreground;
+ }
+}
diff --git a/packages/extension/src/options/theme.ts b/packages/extension/src/options/theme.ts
new file mode 100644
index 0000000..cfc2e40
--- /dev/null
+++ b/packages/extension/src/options/theme.ts
@@ -0,0 +1,45 @@
+import '@crypt.fyi/theme/fonts/inter';
+import '@crypt.fyi/theme/fonts/space-grotesk';
+import {
+ applyResolvedTheme,
+ isThemePreference,
+ readStoredPreference,
+ resolveTheme,
+ subscribeToStoredPreference,
+ subscribeToSystemTheme,
+ systemPrefersDark,
+ type ThemePreference,
+ writeStoredPreference,
+} from '@crypt.fyi/theme';
+
+const options = document.querySelectorAll('[data-theme-option]');
+
+let preference = readStoredPreference();
+
+function render() {
+ applyResolvedTheme(resolveTheme(preference, systemPrefersDark()));
+ for (const option of options) {
+ option.setAttribute('aria-pressed', String(option.dataset.themeOption === preference));
+ }
+}
+
+function setPreference(next: ThemePreference) {
+ preference = next;
+ writeStoredPreference(next);
+ render();
+}
+
+for (const option of options) {
+ option.addEventListener('click', () => {
+ const next = option.dataset.themeOption;
+ if (isThemePreference(next)) setPreference(next);
+ });
+}
+
+subscribeToSystemTheme(render);
+subscribeToStoredPreference(() => {
+ preference = readStoredPreference();
+ render();
+});
+
+render();
diff --git a/packages/extension/vite.config.ts b/packages/extension/vite.config.ts
index 9032e5d..09e1057 100644
--- a/packages/extension/vite.config.ts
+++ b/packages/extension/vite.config.ts
@@ -1,6 +1,7 @@
import { defineConfig } from 'vite';
import webExtension from 'vite-plugin-web-extension';
import tailwindcss from '@tailwindcss/vite';
+import { themeInitScript } from '@crypt.fyi/theme/vite';
import path from 'path';
import fs from 'fs';
@@ -16,6 +17,7 @@ export default defineConfig({
},
plugins: [
tailwindcss(),
+ themeInitScript(),
{
name: 'emit-managed-schema',
generateBundle() {
diff --git a/packages/theme/README.md b/packages/theme/README.md
new file mode 100644
index 0000000..30527fb
--- /dev/null
+++ b/packages/theme/README.md
@@ -0,0 +1,14 @@
+# @crypt.fyi/theme
+
+The design language shared by `@crypt.fyi/web` and `@crypt.fyi/extension`. It is private and has no build step: consumers compile its sources with their own Vite and Tailwind.
+
+| Export | Contents |
+| --- | --- |
+| `@crypt.fyi/theme/tokens.css` | Light and dark tokens, Tailwind theme mapping, base element styles. Import after `tailwindcss`. |
+| `@crypt.fyi/theme` | Framework-agnostic preference logic: storage, OS tracking, applying a theme. |
+| `@crypt.fyi/theme/fonts/{inter,space-grotesk,jetbrains-mono}` | Self-hosted fonts. Import only the ones a surface uses. |
+| `@crypt.fyi/theme/vite` | `themeInitScript()`, a plugin that serves `src/theme-init.js` and adds its script tag to the page. |
+
+UI components are deliberately not shared. The web client uses React and shadcn, and the extension's settings page stays plain HTML, so a shared component library would add React to the extension for a single form.
+
+A preference is stored in `localStorage`, which is per origin. The web client and the extension therefore keep separate choices.
diff --git a/packages/theme/package.json b/packages/theme/package.json
new file mode 100644
index 0000000..f06ab2e
--- /dev/null
+++ b/packages/theme/package.json
@@ -0,0 +1,33 @@
+{
+ "name": "@crypt.fyi/theme",
+ "license": "Apache-2.0",
+ "version": "0.0.0",
+ "private": true,
+ "type": "module",
+ "exports": {
+ ".": "./src/index.ts",
+ "./tokens.css": "./src/tokens.css",
+ "./fonts/*": "./src/fonts/*.ts",
+ "./vite": {
+ "types": "./vite.d.ts",
+ "default": "./vite.js"
+ }
+ },
+ "scripts": {
+ "lint": "eslint src",
+ "typecheck": "tsc --noEmit",
+ "test": "vitest run"
+ },
+ "dependencies": {
+ "@fontsource-variable/inter": "5.3.0",
+ "@fontsource-variable/jetbrains-mono": "5.3.0",
+ "@fontsource-variable/space-grotesk": "5.3.0"
+ },
+ "devDependencies": {
+ "@types/node": "^22.18.0",
+ "eslint": "^9.34.0",
+ "typescript": "~5.9.2",
+ "vite": "^8.1.6",
+ "vitest": "4.1.12"
+ }
+}
diff --git a/packages/theme/src/fonts/inter.ts b/packages/theme/src/fonts/inter.ts
new file mode 100644
index 0000000..9403a45
--- /dev/null
+++ b/packages/theme/src/fonts/inter.ts
@@ -0,0 +1 @@
+import '@fontsource-variable/inter/wght.css';
diff --git a/packages/theme/src/fonts/jetbrains-mono.ts b/packages/theme/src/fonts/jetbrains-mono.ts
new file mode 100644
index 0000000..3c16faa
--- /dev/null
+++ b/packages/theme/src/fonts/jetbrains-mono.ts
@@ -0,0 +1 @@
+import '@fontsource-variable/jetbrains-mono/wght.css';
diff --git a/packages/theme/src/fonts/space-grotesk.ts b/packages/theme/src/fonts/space-grotesk.ts
new file mode 100644
index 0000000..a66de18
--- /dev/null
+++ b/packages/theme/src/fonts/space-grotesk.ts
@@ -0,0 +1 @@
+import '@fontsource-variable/space-grotesk/wght.css';
diff --git a/packages/theme/src/index.ts b/packages/theme/src/index.ts
new file mode 100644
index 0000000..fa7300c
--- /dev/null
+++ b/packages/theme/src/index.ts
@@ -0,0 +1,78 @@
+export const THEME_PREFERENCES = ['system', 'light', 'dark'] as const;
+export type ThemePreference = (typeof THEME_PREFERENCES)[number];
+export type ResolvedTheme = Exclude;
+
+export const THEME_STORAGE_KEY = 'theme';
+
+/** Browser chrome colors; mirror --background in tokens.css and theme-init.js. */
+export const THEME_CHROME_COLOR: Record = {
+ light: '#f5f6f7',
+ dark: '#0e0f12',
+};
+
+const darkQuery = () => window.matchMedia('(prefers-color-scheme: dark)');
+
+export function isThemePreference(value: unknown): value is ThemePreference {
+ return THEME_PREFERENCES.includes(value as ThemePreference);
+}
+
+export function resolveTheme(preference: ThemePreference, systemIsDark: boolean): ResolvedTheme {
+ if (preference !== 'system') return preference;
+ return systemIsDark ? 'dark' : 'light';
+}
+
+export function systemPrefersDark() {
+ return darkQuery().matches;
+}
+
+export function subscribeToSystemTheme(onChange: () => void) {
+ const query = darkQuery();
+ query.addEventListener('change', onChange);
+ return () => query.removeEventListener('change', onChange);
+}
+
+export function readStoredPreference(): ThemePreference {
+ try {
+ const stored = localStorage.getItem(THEME_STORAGE_KEY);
+ return isThemePreference(stored) ? stored : 'system';
+ } catch {
+ return 'system';
+ }
+}
+
+export function writeStoredPreference(preference: ThemePreference) {
+ try {
+ if (preference === 'system') {
+ localStorage.removeItem(THEME_STORAGE_KEY);
+ } else {
+ localStorage.setItem(THEME_STORAGE_KEY, preference);
+ }
+ } catch {
+ // Blocked storage only costs persistence; the choice still applies to this page.
+ }
+}
+
+/** Fires when another tab changes the stored preference. */
+export function subscribeToStoredPreference(onChange: () => void) {
+ const handleStorageChange = (e: StorageEvent) => {
+ // A null key means another tab cleared storage entirely.
+ if (e.key === THEME_STORAGE_KEY || e.key === null) {
+ onChange();
+ }
+ };
+ window.addEventListener('storage', handleStorageChange);
+ return () => window.removeEventListener('storage', handleStorageChange);
+}
+
+export function applyResolvedTheme(resolved: ResolvedTheme) {
+ const root = document.documentElement;
+ // Repainting every token at once should be instant, not a staggered color fade.
+ root.classList.add('theme-switching');
+ root.classList.toggle('dark', resolved === 'dark');
+ document
+ .querySelector('meta[name="theme-color"]')
+ ?.setAttribute('content', THEME_CHROME_COLOR[resolved]);
+ requestAnimationFrame(() => {
+ requestAnimationFrame(() => root.classList.remove('theme-switching'));
+ });
+}
diff --git a/packages/web/public/theme-init.js b/packages/theme/src/theme-init.js
similarity index 90%
rename from packages/web/public/theme-init.js
rename to packages/theme/src/theme-init.js
index bf1a2ab..33050d8 100644
--- a/packages/web/public/theme-init.js
+++ b/packages/theme/src/theme-init.js
@@ -1,12 +1,14 @@
+/* global window, document */
// Runs synchronously before first paint so a stored or OS-preferred theme never
// flashes the wrong colors. Lives in its own file because CSP forbids inline scripts
-// (script-src 'self'). Keep the colors in sync with --background in src/index.css.
+// (script-src 'self'). Keep the colors in sync with --background in tokens.css;
+// theme.test.ts enforces this.
(function () {
var preference = 'system';
try {
var stored = window.localStorage.getItem('theme');
if (stored === 'light' || stored === 'dark') preference = stored;
- } catch (_) {
+ } catch {
// Storage can be blocked (private modes, policies); fall back to the OS preference.
}
var isDark =
diff --git a/packages/theme/src/theme.test.ts b/packages/theme/src/theme.test.ts
new file mode 100644
index 0000000..7c91d63
--- /dev/null
+++ b/packages/theme/src/theme.test.ts
@@ -0,0 +1,117 @@
+import fs from 'node:fs';
+import vm from 'node:vm';
+import { afterEach, describe, expect, it, vi } from 'vitest';
+import {
+ THEME_CHROME_COLOR,
+ THEME_STORAGE_KEY,
+ isThemePreference,
+ readStoredPreference,
+ resolveTheme,
+ writeStoredPreference,
+} from './index';
+
+const read = (file: string) => fs.readFileSync(new URL(file, import.meta.url), 'utf8');
+
+const fakeStorage = (initial: Record = {}) => {
+ const values = new Map(Object.entries(initial));
+ return {
+ getItem: (key: string) => values.get(key) ?? null,
+ setItem: (key: string, value: string) => void values.set(key, value),
+ removeItem: (key: string) => void values.delete(key),
+ };
+};
+
+const runThemeInit = ({ stored, osDark }: { stored?: string; osDark: boolean }) => {
+ const toggle = vi.fn();
+ const setAttribute = vi.fn();
+ vm.runInNewContext(read('./theme-init.js'), {
+ window: {
+ localStorage: fakeStorage(stored ? { [THEME_STORAGE_KEY]: stored } : {}),
+ matchMedia: () => ({ matches: osDark }),
+ },
+ document: {
+ documentElement: { classList: { toggle } },
+ querySelector: () => ({ setAttribute }),
+ },
+ });
+ return { isDark: toggle.mock.calls[0]?.[1], chromeColor: setAttribute.mock.calls[0]?.[1] };
+};
+
+afterEach(() => {
+ vi.unstubAllGlobals();
+});
+
+describe('resolveTheme', () => {
+ it('prefers an explicit choice over the OS', () => {
+ expect(resolveTheme('light', true)).toBe('light');
+ expect(resolveTheme('dark', false)).toBe('dark');
+ });
+
+ it('follows the OS for the system preference', () => {
+ expect(resolveTheme('system', true)).toBe('dark');
+ expect(resolveTheme('system', false)).toBe('light');
+ });
+});
+
+describe('isThemePreference', () => {
+ it('rejects anything but the known preferences', () => {
+ expect(isThemePreference('dark')).toBe(true);
+ expect(isThemePreference('sepia')).toBe(false);
+ expect(isThemePreference(null)).toBe(false);
+ });
+});
+
+describe('stored preference', () => {
+ it('falls back to system for missing or invalid values', () => {
+ vi.stubGlobal('localStorage', fakeStorage({ [THEME_STORAGE_KEY]: 'sepia' }));
+ expect(readStoredPreference()).toBe('system');
+ });
+
+ it('falls back to system when storage is blocked', () => {
+ vi.stubGlobal('localStorage', {
+ getItem: () => {
+ throw new Error('blocked');
+ },
+ });
+ expect(readStoredPreference()).toBe('system');
+ });
+
+ it('stores explicit choices and clears the key for system', () => {
+ const storage = fakeStorage();
+ vi.stubGlobal('localStorage', storage);
+ writeStoredPreference('dark');
+ expect(readStoredPreference()).toBe('dark');
+ writeStoredPreference('system');
+ expect(storage.getItem(THEME_STORAGE_KEY)).toBeNull();
+ });
+});
+
+describe('theme-init.js', () => {
+ it.each([
+ { stored: 'dark', osDark: false, isDark: true },
+ { stored: 'light', osDark: true, isDark: false },
+ { stored: undefined, osDark: true, isDark: true },
+ { stored: 'sepia', osDark: false, isDark: false },
+ ])('resolves stored=$stored osDark=$osDark to dark=$isDark', ({ stored, osDark, isDark }) => {
+ expect(runThemeInit({ stored, osDark }).isDark).toBe(isDark);
+ });
+
+ // The script cannot import, so its colors are copies. Fail here rather than flash wrong colors.
+ it('uses the same chrome colors as index.ts', () => {
+ expect(runThemeInit({ stored: 'dark', osDark: false }).chromeColor).toBe(
+ THEME_CHROME_COLOR.dark,
+ );
+ expect(runThemeInit({ stored: 'light', osDark: true }).chromeColor).toBe(
+ THEME_CHROME_COLOR.light,
+ );
+ });
+});
+
+describe('tokens.css', () => {
+ it('uses the chrome colors as --background', () => {
+ const backgrounds = [...read('./tokens.css').matchAll(/--background: (#[0-9a-f]{6});/g)].map(
+ (match) => match[1],
+ );
+ expect(backgrounds).toEqual([THEME_CHROME_COLOR.light, THEME_CHROME_COLOR.dark]);
+ });
+});
diff --git a/packages/theme/src/tokens.css b/packages/theme/src/tokens.css
new file mode 100644
index 0000000..3abfdeb
--- /dev/null
+++ b/packages/theme/src/tokens.css
@@ -0,0 +1,113 @@
+@custom-variant dark (&:where(.dark, .dark *));
+
+@theme {
+ --font-sans: 'Inter Variable', system-ui, sans-serif;
+ --font-display: 'Space Grotesk Variable', 'Inter Variable', system-ui, sans-serif;
+ --font-mono: 'JetBrains Mono Variable', ui-monospace, monospace;
+}
+
+/* Inline so utilities read the semantic tokens below, which change with the .dark class. */
+@theme inline {
+ --radius-xl: calc(var(--radius) + 6px);
+ --radius-lg: var(--radius);
+ --radius-md: calc(var(--radius) - 2px);
+ --radius-sm: calc(var(--radius) - 4px);
+
+ --color-background: var(--background);
+ --color-foreground: var(--foreground);
+ --color-card: var(--card);
+ --color-card-foreground: var(--foreground);
+ --color-popover: var(--popover);
+ --color-popover-foreground: var(--foreground);
+ --color-primary: var(--primary);
+ --color-primary-foreground: var(--primary-foreground);
+ --color-secondary: var(--muted);
+ --color-secondary-foreground: var(--foreground);
+ --color-muted: var(--muted);
+ --color-muted-foreground: var(--muted-foreground);
+ --color-accent: var(--accent);
+ --color-accent-foreground: var(--foreground);
+ --color-destructive: var(--ember);
+ --color-destructive-foreground: var(--primary-foreground);
+ --color-ember: var(--ember);
+ --color-ember-tint: var(--ember-tint);
+ --color-sealed: var(--sealed);
+ --color-sealed-tint: var(--sealed-tint);
+ --color-border: var(--border);
+ --color-input: var(--input);
+ --color-ring: var(--ring);
+}
+
+@layer base {
+ /*
+ Semantic tokens only: components never pick a shade per theme. Text tokens hold
+ WCAG AA (4.5:1) on background, card and muted in both themes. --input holds 3:1 for
+ controls with no other affordance (checkbox, switch) and is the hover border on
+ fields, which otherwise read through their fill and label to stay visually quiet.
+ --background is mirrored in theme-init.js and index.ts for the browser chrome color.
+ */
+ :root {
+ color-scheme: light;
+ --background: #f5f6f7;
+ --foreground: #14161a;
+ --card: #ffffff;
+ --popover: #ffffff;
+ --muted: #eef0f2;
+ --muted-foreground: #565c66;
+ --accent: #eef0f2;
+ --primary: #14161a;
+ --primary-foreground: #ffffff;
+ --border: #dde0e4;
+ --input: #868d97;
+ --ring: #14161a;
+ --ember: #b5390d;
+ --ember-tint: #fcede6;
+ --sealed: #0a7259;
+ --sealed-tint: #e2f3ee;
+ --card-shadow: 0 1px 2px rgb(20 22 26 / 5%), 0 8px 24px -12px rgb(20 22 26 / 12%);
+ --radius: 0.625rem;
+ }
+ .dark {
+ color-scheme: dark;
+ --background: #0e0f12;
+ --foreground: #eceef1;
+ --card: #16181c;
+ --popover: #1e2126;
+ --muted: #0a0b0d;
+ --muted-foreground: #a0a6b0;
+ --accent: #23262c;
+ --primary: #eceef1;
+ --primary-foreground: #14161a;
+ --border: #2a2e34;
+ --input: #667079;
+ --ring: #eceef1;
+ --ember: #ff8a5c;
+ --ember-tint: #2b1a13;
+ --sealed: #4fd1ae;
+ --sealed-tint: #10261f;
+ --card-shadow: 0 1px 2px rgb(0 0 0 / 40%), 0 8px 24px -12px rgb(0 0 0 / 60%);
+ }
+
+ *,
+ ::after,
+ ::before,
+ ::backdrop,
+ ::file-selector-button {
+ border-color: var(--border);
+ }
+
+ body {
+ @apply bg-background font-sans text-foreground antialiased;
+ }
+
+ ::placeholder {
+ color: var(--muted-foreground);
+ opacity: 1;
+ }
+}
+
+/* See applyResolvedTheme: a theme change repaints at once instead of fading per element. */
+.theme-switching,
+.theme-switching * {
+ transition: none !important;
+}
diff --git a/packages/theme/tsconfig.json b/packages/theme/tsconfig.json
new file mode 100644
index 0000000..32725fe
--- /dev/null
+++ b/packages/theme/tsconfig.json
@@ -0,0 +1,17 @@
+{
+ "compilerOptions": {
+ "target": "ES2020",
+ "lib": ["ES2020", "DOM", "DOM.Iterable"],
+ "module": "ESNext",
+ "moduleResolution": "Bundler",
+ "types": ["node"],
+ "skipLibCheck": true,
+ "isolatedModules": true,
+ "noEmit": true,
+ "strict": true,
+ "noUnusedLocals": true,
+ "noUnusedParameters": true,
+ "noFallthroughCasesInSwitch": true
+ },
+ "include": ["src", "vite.d.ts"]
+}
diff --git a/packages/theme/vite.d.ts b/packages/theme/vite.d.ts
new file mode 100644
index 0000000..b810bf8
--- /dev/null
+++ b/packages/theme/vite.d.ts
@@ -0,0 +1,3 @@
+import type { Plugin } from 'vite';
+
+export function themeInitScript(): Plugin;
diff --git a/packages/theme/vite.js b/packages/theme/vite.js
new file mode 100644
index 0000000..49e44f7
--- /dev/null
+++ b/packages/theme/vite.js
@@ -0,0 +1,33 @@
+import fs from 'node:fs';
+
+const SCRIPT_PATH = '/theme-init.js';
+
+const readScript = () => fs.readFileSync(new URL('./src/theme-init.js', import.meta.url), 'utf8');
+
+/**
+ * Serves the pre-paint theme script from this package. It has to stay a same-origin classic
+ * script: CSP forbids inline scripts, and module scripts are deferred until after first paint.
+ *
+ * @returns {import('vite').Plugin}
+ */
+export function themeInitScript() {
+ return {
+ name: 'crypt-fyi-theme-init',
+ configureServer(server) {
+ server.middlewares.use(SCRIPT_PATH, (_req, res) => {
+ res.setHeader('Content-Type', 'text/javascript');
+ res.end(readScript());
+ });
+ },
+ generateBundle() {
+ this.emitFile({ type: 'asset', fileName: 'theme-init.js', source: readScript() });
+ },
+ transformIndexHtml: {
+ order: 'post',
+ handler() {
+ // In the body, not the head: the script updates the theme-color meta tag, which must exist.
+ return [{ tag: 'script', attrs: { src: SCRIPT_PATH }, injectTo: 'body-prepend' }];
+ },
+ },
+ };
+}
diff --git a/packages/web/e2e/theme.spec.ts b/packages/web/e2e/theme.spec.ts
index 3e4d18f..b2c1247 100644
--- a/packages/web/e2e/theme.spec.ts
+++ b/packages/web/e2e/theme.spec.ts
@@ -44,7 +44,7 @@ test.describe('theme', () => {
test('applies the stored theme before the app bundle renders', async ({ page }) => {
await page.emulateMedia({ colorScheme: 'light' });
await page.addInitScript(() => localStorage.setItem('theme', 'dark'));
- // Block the bundle: only public/theme-init.js can have set the class.
+ // Block the bundle: only theme-init.js can have set the class.
await page.route('**/assets/*.js', (route) => route.abort());
await page.goto('/about');
expect(await isDark(page)).toBe(true);
diff --git a/packages/web/index.html b/packages/web/index.html
index 826d654..5d052ce 100644
--- a/packages/web/index.html
+++ b/packages/web/index.html
@@ -104,8 +104,6 @@
-
-
diff --git a/packages/web/package.json b/packages/web/package.json
index be5b623..f086cf8 100644
--- a/packages/web/package.json
+++ b/packages/web/package.json
@@ -15,9 +15,7 @@
},
"dependencies": {
"@crypt.fyi/core": "workspace:*",
- "@fontsource-variable/inter": "5.3.0",
- "@fontsource-variable/jetbrains-mono": "5.3.0",
- "@fontsource-variable/space-grotesk": "5.3.0",
+ "@crypt.fyi/theme": "workspace:*",
"@hookform/resolvers": "^5.2.1",
"@radix-ui/react-checkbox": "^1.3.3",
"@radix-ui/react-collapsible": "^1.1.12",
diff --git a/packages/web/src/index.css b/packages/web/src/index.css
index 95dd517..f5c9c9f 100644
--- a/packages/web/src/index.css
+++ b/packages/web/src/index.css
@@ -1,82 +1,8 @@
@import 'tailwindcss';
+@import '@crypt.fyi/theme/tokens.css';
@config '../tailwind.config.js';
-@layer base {
- /*
- Semantic tokens only: components never pick a shade per theme. Text tokens hold
- WCAG AA (4.5:1) on background, card and muted in both themes. --input holds 3:1 for
- controls with no other affordance (checkbox, switch) and is the hover border on
- fields, which otherwise read through their fill and label to stay visually quiet.
- --background is mirrored in public/theme-init.js and src/theme/theme.ts for the
- browser chrome color.
- */
- :root {
- color-scheme: light;
- --background: #f5f6f7;
- --foreground: #14161a;
- --card: #ffffff;
- --popover: #ffffff;
- --muted: #eef0f2;
- --muted-foreground: #565c66;
- --accent: #eef0f2;
- --primary: #14161a;
- --primary-foreground: #ffffff;
- --border: #dde0e4;
- --input: #868d97;
- --ring: #14161a;
- --ember: #b5390d;
- --ember-tint: #fcede6;
- --sealed: #0a7259;
- --sealed-tint: #e2f3ee;
- --card-shadow: 0 1px 2px rgb(20 22 26 / 5%), 0 8px 24px -12px rgb(20 22 26 / 12%);
- --radius: 0.625rem;
- }
- .dark {
- color-scheme: dark;
- --background: #0e0f12;
- --foreground: #eceef1;
- --card: #16181c;
- --popover: #1e2126;
- --muted: #0a0b0d;
- --muted-foreground: #a0a6b0;
- --accent: #23262c;
- --primary: #eceef1;
- --primary-foreground: #14161a;
- --border: #2a2e34;
- --input: #667079;
- --ring: #eceef1;
- --ember: #ff8a5c;
- --ember-tint: #2b1a13;
- --sealed: #4fd1ae;
- --sealed-tint: #10261f;
- --card-shadow: 0 1px 2px rgb(0 0 0 / 40%), 0 8px 24px -12px rgb(0 0 0 / 60%);
- }
-
- *,
- ::after,
- ::before,
- ::backdrop,
- ::file-selector-button {
- border-color: var(--border);
- }
-
- body {
- @apply bg-background font-sans text-foreground antialiased;
- }
-
- ::placeholder {
- color: var(--muted-foreground);
- opacity: 1;
- }
-}
-
-/* See ThemeProvider: a theme change repaints at once instead of fading per element. */
-.theme-switching,
-.theme-switching * {
- transition: none !important;
-}
-
.prose-link {
@apply text-foreground underline underline-offset-4 hover:text-muted-foreground;
}
diff --git a/packages/web/src/main.tsx b/packages/web/src/main.tsx
index e2488c7..caa1fa5 100644
--- a/packages/web/src/main.tsx
+++ b/packages/web/src/main.tsx
@@ -1,7 +1,7 @@
import { createRoot } from 'react-dom/client';
-import '@fontsource-variable/inter/wght.css';
-import '@fontsource-variable/jetbrains-mono/wght.css';
-import '@fontsource-variable/space-grotesk/wght.css';
+import '@crypt.fyi/theme/fonts/inter';
+import '@crypt.fyi/theme/fonts/jetbrains-mono';
+import '@crypt.fyi/theme/fonts/space-grotesk';
import './index.css';
import './i18n';
import { migrateLegacyQueryKey } from './lib/secretUrl';
diff --git a/packages/web/src/theme/ThemeProvider.tsx b/packages/web/src/theme/ThemeProvider.tsx
index ba631d7..eade717 100644
--- a/packages/web/src/theme/ThemeProvider.tsx
+++ b/packages/web/src/theme/ThemeProvider.tsx
@@ -1,75 +1,29 @@
import { ReactNode, useEffect, useMemo, useState, useSyncExternalStore } from 'react';
import {
- ResolvedTheme,
- THEME_CHROME_COLOR,
- THEME_STORAGE_KEY,
- ThemeContext,
+ applyResolvedTheme,
+ readStoredPreference,
+ resolveTheme,
+ subscribeToStoredPreference,
+ subscribeToSystemTheme,
+ systemPrefersDark,
ThemePreference,
- themePreferenceSchema,
-} from './theme';
-
-const darkQuery = () => window.matchMedia('(prefers-color-scheme: dark)');
-
-function subscribeToSystemTheme(onChange: () => void) {
- const query = darkQuery();
- query.addEventListener('change', onChange);
- return () => query.removeEventListener('change', onChange);
-}
-
-function readStoredPreference(): ThemePreference {
- try {
- const result = themePreferenceSchema.safeParse(localStorage.getItem(THEME_STORAGE_KEY));
- return result.success ? result.data : 'system';
- } catch {
- return 'system';
- }
-}
-
-function writeStoredPreference(preference: ThemePreference) {
- try {
- if (preference === 'system') {
- localStorage.removeItem(THEME_STORAGE_KEY);
- } else {
- localStorage.setItem(THEME_STORAGE_KEY, preference);
- }
- } catch {
- // Blocked storage only costs persistence; the choice still applies to this page.
- }
-}
-
-function applyResolvedTheme(resolved: ResolvedTheme) {
- const root = document.documentElement;
- // Repainting every token at once should be instant, not a staggered color fade.
- root.classList.add('theme-switching');
- root.classList.toggle('dark', resolved === 'dark');
- document
- .querySelector('meta[name="theme-color"]')
- ?.setAttribute('content', THEME_CHROME_COLOR[resolved]);
- requestAnimationFrame(() => {
- requestAnimationFrame(() => root.classList.remove('theme-switching'));
- });
-}
+ writeStoredPreference,
+} from '@crypt.fyi/theme';
+import { ThemeContext } from './theme';
export function ThemeProvider({ children }: { children: ReactNode }) {
const [preference, setPreferenceState] = useState(readStoredPreference);
- const systemIsDark = useSyncExternalStore(subscribeToSystemTheme, () => darkQuery().matches);
- const resolved: ResolvedTheme =
- preference === 'system' ? (systemIsDark ? 'dark' : 'light') : preference;
+ const systemIsDark = useSyncExternalStore(subscribeToSystemTheme, systemPrefersDark);
+ const resolved = resolveTheme(preference, systemIsDark);
useEffect(() => {
applyResolvedTheme(resolved);
}, [resolved]);
- useEffect(() => {
- const handleStorageChange = (e: StorageEvent) => {
- // A null key means another tab cleared storage entirely.
- if (e.key === THEME_STORAGE_KEY || e.key === null) {
- setPreferenceState(readStoredPreference());
- }
- };
- window.addEventListener('storage', handleStorageChange);
- return () => window.removeEventListener('storage', handleStorageChange);
- }, []);
+ useEffect(
+ () => subscribeToStoredPreference(() => setPreferenceState(readStoredPreference())),
+ [],
+ );
const value = useMemo(
() => ({
diff --git a/packages/web/src/theme/theme.ts b/packages/web/src/theme/theme.ts
index 9a9666f..c76493a 100644
--- a/packages/web/src/theme/theme.ts
+++ b/packages/web/src/theme/theme.ts
@@ -1,17 +1,5 @@
import { createContext, useContext } from 'react';
-import { z } from 'zod';
-
-export const themePreferenceSchema = z.enum(['system', 'light', 'dark']);
-export type ThemePreference = z.infer;
-export type ResolvedTheme = Exclude;
-
-export const THEME_STORAGE_KEY = 'theme';
-
-/** Browser chrome colors; mirror --background in index.css and public/theme-init.js. */
-export const THEME_CHROME_COLOR: Record = {
- light: '#f5f6f7',
- dark: '#0e0f12',
-};
+import type { ResolvedTheme, ThemePreference } from '@crypt.fyi/theme';
type ThemeContextType = {
preference: ThemePreference;
diff --git a/packages/web/tailwind.config.js b/packages/web/tailwind.config.js
index 9a12add..bea8d67 100644
--- a/packages/web/tailwind.config.js
+++ b/packages/web/tailwind.config.js
@@ -1,39 +1,8 @@
import tailwindAnimate from 'tailwindcss-animate';
+/** Tokens, fonts and radii live in @crypt.fyi/theme/tokens.css, shared with the extension. */
/** @type {import('tailwindcss').Config} */
export default {
- darkMode: ['class'],
content: ['./index.html', './src/**/*.{ts,tsx,js,jsx}'],
- theme: {
- extend: {
- fontFamily: {
- sans: ['"Inter Variable"', 'system-ui', 'sans-serif'],
- display: ['"Space Grotesk Variable"', '"Inter Variable"', 'system-ui', 'sans-serif'],
- mono: ['"JetBrains Mono Variable"', 'ui-monospace', 'monospace'],
- },
- borderRadius: {
- xl: 'calc(var(--radius) + 6px)',
- lg: 'var(--radius)',
- md: 'calc(var(--radius) - 2px)',
- sm: 'calc(var(--radius) - 4px)',
- },
- colors: {
- background: 'var(--background)',
- foreground: 'var(--foreground)',
- card: { DEFAULT: 'var(--card)', foreground: 'var(--foreground)' },
- popover: { DEFAULT: 'var(--popover)', foreground: 'var(--foreground)' },
- primary: { DEFAULT: 'var(--primary)', foreground: 'var(--primary-foreground)' },
- secondary: { DEFAULT: 'var(--muted)', foreground: 'var(--foreground)' },
- muted: { DEFAULT: 'var(--muted)', foreground: 'var(--muted-foreground)' },
- accent: { DEFAULT: 'var(--accent)', foreground: 'var(--foreground)' },
- destructive: { DEFAULT: 'var(--ember)', foreground: 'var(--primary-foreground)' },
- ember: { DEFAULT: 'var(--ember)', tint: 'var(--ember-tint)' },
- sealed: { DEFAULT: 'var(--sealed)', tint: 'var(--sealed-tint)' },
- border: 'var(--border)',
- input: 'var(--input)',
- ring: 'var(--ring)',
- },
- },
- },
plugins: [tailwindAnimate],
};
diff --git a/packages/web/vite.config.ts b/packages/web/vite.config.ts
index 2bcb144..47d80ff 100644
--- a/packages/web/vite.config.ts
+++ b/packages/web/vite.config.ts
@@ -5,6 +5,7 @@ import { TanStackRouterVite } from '@tanstack/router-vite-plugin';
import path from 'node:path';
import { execSync } from 'node:child_process';
import fs from 'node:fs';
+import { themeInitScript } from '@crypt.fyi/theme/vite';
import { loadProductionCsp } from './csp';
const getGitHash = () => {
@@ -28,7 +29,7 @@ const previewCsp = process.env.CRYPT_FYI_PREVIEW_CSP ?? loadProductionCsp(apiUrl
// https://vite.dev/config/
export default defineConfig({
- plugins: [react(), TanStackRouterVite(), svgr()],
+ plugins: [react(), TanStackRouterVite(), svgr(), themeInitScript()],
server: {
port: 5173,
},
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index fdc70f2..c3bea44 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -186,6 +186,9 @@ importers:
'@crypt.fyi/core':
specifier: workspace:*
version: link:../core
+ '@crypt.fyi/theme':
+ specifier: workspace:*
+ version: link:../theme
webextension-polyfill:
specifier: ^0.12.0
version: 0.12.0
@@ -370,13 +373,10 @@ importers:
version: 8.12.3
vitest:
specifier: ^4.1.12
- version: 4.1.12(@opentelemetry/api@1.9.1)(@types/node@22.20.1)(@vitest/coverage-v8@4.1.12)(vite@8.3.5(@types/node@22.20.1)(esbuild@0.25.0)(jiti@2.7.0)(yaml@2.9.0))
+ version: 4.1.12(@opentelemetry/api@1.9.1)(@types/node@22.20.1)(@vitest/coverage-v8@4.1.12)(esbuild@0.25.0)(jiti@2.7.0)(vite@8.3.5(@types/node@22.20.1)(esbuild@0.25.0)(jiti@2.7.0)(yaml@2.9.0))(yaml@2.9.0)
- packages/web:
+ packages/theme:
dependencies:
- '@crypt.fyi/core':
- specifier: workspace:*
- version: link:../core
'@fontsource-variable/inter':
specifier: 5.3.0
version: 5.3.0
@@ -386,6 +386,31 @@ importers:
'@fontsource-variable/space-grotesk':
specifier: 5.3.0
version: 5.3.0
+ devDependencies:
+ '@types/node':
+ specifier: ^22.18.0
+ version: 22.20.1
+ eslint:
+ specifier: ^9.34.0
+ version: 9.39.2(jiti@2.7.0)(supports-color@10.2.2)
+ typescript:
+ specifier: ~5.9.2
+ version: 5.9.2
+ vite:
+ specifier: 8.3.5
+ version: 8.3.5(@types/node@22.20.1)(esbuild@0.25.0)(jiti@2.7.0)(yaml@2.9.0)
+ vitest:
+ specifier: 4.1.12
+ version: 4.1.12(@opentelemetry/api@1.9.1)(@types/node@22.20.1)(@vitest/coverage-v8@4.1.12)(esbuild@0.25.0)(jiti@2.7.0)(vite@8.3.5(@types/node@22.20.1)(esbuild@0.25.0)(jiti@2.7.0)(yaml@2.9.0))(yaml@2.9.0)
+
+ packages/web:
+ dependencies:
+ '@crypt.fyi/core':
+ specifier: workspace:*
+ version: link:../core
+ '@crypt.fyi/theme':
+ specifier: workspace:*
+ version: link:../theme
'@hookform/resolvers':
specifier: ^5.2.1
version: 5.5.7(@sinclair/typebox@0.34.52)(@standard-schema/spec@1.1.0)(ajv@8.20.0)(react-hook-form@7.83.0(react@19.2.8))(zod@4.4.3)
@@ -545,7 +570,7 @@ importers:
version: 8.3.5(@types/node@22.20.1)(esbuild@0.25.0)(jiti@2.7.0)(yaml@2.9.0)
vitest:
specifier: 4.1.12
- version: 4.1.12(@opentelemetry/api@1.9.1)(@types/node@22.20.1)(@vitest/coverage-v8@4.1.12)(vite@8.3.5(@types/node@22.20.1)(esbuild@0.25.0)(jiti@2.7.0)(yaml@2.9.0))
+ version: 4.1.12(@opentelemetry/api@1.9.1)(@types/node@22.20.1)(@vitest/coverage-v8@4.1.12)(esbuild@0.25.0)(jiti@2.7.0)(vite@8.3.5(@types/node@22.20.1)(esbuild@0.25.0)(jiti@2.7.0)(yaml@2.9.0))(yaml@2.9.0)
packages:
@@ -10707,7 +10732,7 @@ snapshots:
obug: 2.1.4
std-env: 4.2.0
tinyrainbow: 3.1.0
- vitest: 4.1.12(@opentelemetry/api@1.9.1)(@types/node@22.20.1)(@vitest/coverage-v8@4.1.12)(vite@8.3.5(@types/node@22.20.1)(esbuild@0.25.0)(jiti@2.7.0)(yaml@2.9.0))
+ vitest: 4.1.12(@opentelemetry/api@1.9.1)(@types/node@22.20.1)(@vitest/coverage-v8@4.1.12)(esbuild@0.25.0)(jiti@2.7.0)(vite@8.3.5(@types/node@22.20.1)(esbuild@0.25.0)(jiti@2.7.0)(yaml@2.9.0))(yaml@2.9.0)
'@vitest/expect@4.1.12':
dependencies:
@@ -14109,7 +14134,7 @@ snapshots:
jiti: 2.7.0
yaml: 2.9.0
- vitest@4.1.12(@opentelemetry/api@1.9.1)(@types/node@22.20.1)(@vitest/coverage-v8@4.1.12)(vite@8.3.5(@types/node@22.20.1)(esbuild@0.25.0)(jiti@2.7.0)(yaml@2.9.0)):
+ vitest@4.1.12(@opentelemetry/api@1.9.1)(@types/node@22.20.1)(@vitest/coverage-v8@4.1.12)(esbuild@0.25.0)(jiti@2.7.0)(vite@8.3.5(@types/node@22.20.1)(esbuild@0.25.0)(jiti@2.7.0)(yaml@2.9.0))(yaml@2.9.0):
dependencies:
'@vitest/expect': 4.1.12
'@vitest/mocker': 4.1.12(vite@8.3.5(@types/node@22.20.1)(esbuild@0.25.0)(jiti@2.7.0)(yaml@2.9.0))
@@ -14136,7 +14161,18 @@ snapshots:
'@types/node': 22.20.1
'@vitest/coverage-v8': 4.1.12(vitest@4.1.12)
transitivePeerDependencies:
+ - '@vitejs/devtools'
+ - esbuild
+ - jiti
+ - less
- msw
+ - sass
+ - sass-embedded
+ - stylus
+ - sugarss
+ - terser
+ - tsx
+ - yaml
void-elements@3.1.0: {}