eidotter 0.41.0 → 0.41.2

package/dist/utils/cn.d.ts

@@ -5,5 +5,7 @@
  * @example
  * cn('bg-dos-bg-primary text-dos-text-primary', 'bg-dos-bg-secondary')
  * // → 'text-dos-text-primary bg-dos-bg-secondary'
+ * cn('text-dos-text-brand', 'text-dos-text-sm')
+ * // → 'text-dos-text-brand text-dos-text-sm' (colour and size both kept)
  */
 export declare function cn(...inputs: (string | undefined | null | false)[]): string;

package/dist/utils/cn.js

@@ -1,4 +1,34 @@
-import { twMerge } from 'tailwind-merge';
+import { extendTailwindMerge } from 'tailwind-merge';
+import { DOS_FONT_SIZES } from './dosFontSizes.js';
+/**
+ * tailwind-merge knows nothing about eidotter's preset, so it reads any
+ * `text-<unknown>` class as a text colour. `text-dos-text-sm` (a font size)
+ * then "conflicts" with `text-dos-text-brand` (a colour) and the colour is
+ * dropped. Registering the dos font sizes as a font-size group keeps both.
+ * The list is generated from the preset (scripts/generate-tailwind-safelist.mjs),
+ * so a new size token joins automatically.
+ *
+ * It is a group of its own rather than tailwind-merge's `font-size`, because
+ * that group also removes any earlier `leading-*` class (stock Tailwind sizes
+ * carry a line height). Button and Badge pair a dos size with a leading class,
+ * and the dos sizes defer to it (their line height, where they set one, reads
+ * Tailwind's leading variable first).
+ * A dos size and a stock size still replace each other.
+ *
+ * Keep stock size class names out of comments in src: Tailwind scans these
+ * files and would compile any it finds into dist/eidotter.css.
+ */
+const twMerge = extendTailwindMerge({
+    extend: {
+        classGroups: {
+            'dos-font-size': [{ text: [...DOS_FONT_SIZES] }],
+        },
+        conflictingClassGroups: {
+            'dos-font-size': ['font-size'],
+            'font-size': ['dos-font-size'],
+        },
+    },
+});
 /**
  * Merge Tailwind CSS classes with conflict resolution.
  * Wraps tailwind-merge for consistent class merging across eidotter components.
@@ -6,6 +36,8 @@ import { twMerge } from 'tailwind-merge';
  * @example
  * cn('bg-dos-bg-primary text-dos-text-primary', 'bg-dos-bg-secondary')
  * // → 'text-dos-text-primary bg-dos-bg-secondary'
+ * cn('text-dos-text-brand', 'text-dos-text-sm')
+ * // → 'text-dos-text-brand text-dos-text-sm' (colour and size both kept)
  */
 export function cn(...inputs) {
     return twMerge(inputs.filter(Boolean));

package/dist/utils/dosFontSizes.d.ts

@@ -0,0 +1,2 @@
+/** The eidotter font-size keys (`text-<key>` classes), registered with tailwind-merge by cn(). */
+export declare const DOS_FONT_SIZES: readonly string[];

package/dist/utils/dosFontSizes.js

@@ -0,0 +1,17 @@
+// GENERATED by scripts/generate-tailwind-safelist.mjs from tailwind.preset.cjs.
+// Do not edit; run `npm run build-tokens`.
+/** The eidotter font-size keys (`text-<key>` classes), registered with tailwind-merge by cn(). */
+export const DOS_FONT_SIZES = [
+    'dos-text-base',
+    'dos-text-xs',
+    'dos-text-sm',
+    'dos-text-md',
+    'dos-text-lg',
+    'dos-text-xl',
+    'dos-display-xs',
+    'dos-display-sm',
+    'dos-display-md',
+    'dos-display-lg',
+    'dos-display-xl',
+    'dos-display-2xl',
+];

package/llms.txt

@@ -28,7 +28,7 @@ Apps default to the amber theme and offer the light theme via a consistent setti
 ## Upgrading
 - Every minor with breaking/visible changes ships a guide at `node_modules/eidotter/migrations/<version>.md` (index: `migrations/README.md`).
 - Read every guide between the installed and the target version, oldest first, and follow its checklist. First guide: `migrations/0.41.0.md`.
-- 0.x caret gotcha: `^0.40.x` never resolves to 0.41.0; bump the range explicitly.
+- 0.x caret gotcha: `^0.40.x` never resolves to 0.41.0; bump the range explicitly, to `^0.41.2` (0.41.0 shipped before its review fixes).
 
 ## Token Categories
 - `--color-semantic-*`: USE THESE for components (background, text, border, status)

package/migrations/0.41.0.md

@@ -10,6 +10,8 @@ You are reading this from `node_modules/eidotter/migrations/0.41.0.md`, or from
 the repository's `migrations/` folder. If you are upgrading across several
 minors, read [`README.md`](./README.md) in this folder first.
 
+> **Install 0.41.1 or later.** 0.41.0 was published before the release review fixes. It lacks the eidotter token utilities that section 2 promises, its reset still cancels Tailwind v4 utilities, and `Stat` loses its colours. 0.41.1 fixes all of this with no API change, and everything in this guide applies to it.
+
 ## Who must act
 
 Every consumer. 0.41.0 is a 0.x **minor**, so it carries visible changes, and a
@@ -49,7 +51,7 @@ Older ranges such as `^0.38.0`, `^0.37.0` or `^0.33.0` are the same: none of
 them reach 0.41.0. Change the range explicitly:
 
 ```bash
-npm install eidotter@^0.41.0
+npm install eidotter@^0.41.2
 # check what actually resolved
 npm ls eidotter
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eidotter",
-  "version": "0.41.0",
+  "version": "0.41.2",
   "type": "module",
   "description": "A DOS Themed Design System",
   "main": "./dist/index.umd.js",
@@ -88,7 +88,7 @@
     "fetch-icons": "node scripts/icons/fetch-svgs.mjs",
     "generate-icons": "node scripts/icons/build-tsx.mjs && node scripts/icons/build-barrels.mjs",
     "prepublishOnly": "npm run build",
-    "build-tokens": "node style-dictionary.config.mjs && node scripts/generate-shadcn-shim.mjs",
+    "build-tokens": "node style-dictionary.config.mjs && node scripts/generate-shadcn-shim.mjs && node scripts/generate-tailwind-safelist.mjs",
     "lint": "eslint src/ --report-unused-disable-directives --max-warnings 0",
     "lint-tokens": "node scripts/lint-token-refs.mjs",
     "check-contrast": "node scripts/check-contrast.mjs",

package/src/styles/dos-utilities.css

@@ -43,9 +43,12 @@
   font-synthesis: none;
 }
 
-/* Text floor (DMNC-1579): nothing in eidotter renders below 16px (--typography-font-size-text-base,
- * Tailwind text-dos-text-base). The DOS VGA font's native cell is 9x16, so 16px is the authentic
- * size. The preset aliases Tailwind text-xs/text-sm to the same 1rem. Never go below body size.
+/* Text floor (DMNC-1579): body text, labels and controls never render below 16px
+ * (--typography-font-size-text-base, Tailwind text-dos-text-base). The DOS VGA font's native cell
+ * is 9x16, so 16px is the authentic size. The preset aliases Tailwind text-xs/text-sm to the same
+ * 1rem. Named exceptions, and the only ones: em-relative secondary glyphs that scale with their
+ * parent (CalendarHeatmap day labels 0.6em, ProgressRing centre label 0.5em, Stat/VitalsStrip unit
+ * suffix 0.5em of the display-size value). LegalPage sits on the floor since DMNC-1610.
  */
 
 /* Body tier — JetBrains Mono Nerd Font (multi-weight; includes Nerd Font glyphs).

package/src/styles/shadcn.css

@@ -8,8 +8,9 @@
  * then delete your own :root/.dark/etc. colour definitions. Re-themes via
  * [data-theme]. Opt-in — NOT part of eidotter/styles.
  *
- * sidebar-* and chart-* are best-effort amber-family aliases; override per
- * surface for real sidebar/data-viz needs.
+ * sidebar-* are best-effort aliases of the core roles; chart-* are five
+ * series chosen per theme (>=3:1 on --background, pairwise distinct).
+ * Override per surface for real sidebar/data-viz needs.
  * ========================================================================== */
 
 :root {
@@ -41,9 +42,9 @@
   --sidebar-border: 37 75% 41%;
   --sidebar-ring: 45 77% 55%;
   --chart-1: 41 100% 50%;
-  --chart-2: 34 100% 30%;
+  --chart-2: 37 75% 41%;
   --chart-3: 27 96% 81%;
-  --chart-4: 45 77% 55%;
+  --chart-4: 40 66% 48%;
   --chart-5: 34 100% 30%;
 }
 
@@ -78,7 +79,7 @@
   --chart-1: 41 100% 50%;
   --chart-2: 37 75% 41%;
   --chart-3: 27 96% 81%;
-  --chart-4: 45 77% 55%;
+  --chart-4: 40 66% 48%;
   --chart-5: 34 100% 30%;
 }
 
@@ -111,10 +112,10 @@
   --sidebar-border: 37 5% 66%;
   --sidebar-ring: 41 100% 50%;
   --chart-1: 41 100% 50%;
-  --chart-2: 30 100% 33%;
-  --chart-3: 27 96% 81%;
-  --chart-4: 41 100% 50%;
-  --chart-5: 34 100% 30%;
+  --chart-2: 180 100% 67%;
+  --chart-3: 300 100% 67%;
+  --chart-4: 120 100% 67%;
+  --chart-5: 37 5% 66%;
 }
 
 [data-theme="cga-mode4-p0"], .theme-cga-mode4-p0 {
@@ -146,10 +147,10 @@
   --sidebar-border: 120 100% 50%;
   --sidebar-ring: 60 100% 50%;
   --chart-1: 60 100% 50%;
-  --chart-2: 60 100% 50%;
-  --chart-3: 60 100% 50%;
-  --chart-4: 120 100% 50%;
-  --chart-5: 120 100% 50%;
+  --chart-2: 120 100% 50%;
+  --chart-3: 0 100% 50%;
+  --chart-4: 180 100% 33%;
+  --chart-5: 0 0% 100%;
 }
 
 [data-theme="cga-mode4-p1"], .theme-cga-mode4-p1 {
@@ -181,10 +182,10 @@
   --sidebar-border: 180 100% 50%;
   --sidebar-ring: 38 100% 98%;
   --chart-1: 180 100% 50%;
-  --chart-2: 38 100% 98%;
+  --chart-2: 300 100% 50%;
   --chart-3: 38 100% 98%;
-  --chart-4: 180 100% 50%;
-  --chart-5: 180 100% 50%;
+  --chart-4: 120 100% 33%;
+  --chart-5: 0 100% 67%;
 }
 
 [data-theme="cga-mode5"], .theme-cga-mode5 {
@@ -216,10 +217,10 @@
   --sidebar-border: 180 100% 50%;
   --sidebar-ring: 38 100% 98%;
   --chart-1: 180 100% 50%;
-  --chart-2: 38 100% 98%;
+  --chart-2: 0 100% 50%;
   --chart-3: 38 100% 98%;
-  --chart-4: 180 100% 50%;
-  --chart-5: 180 100% 50%;
+  --chart-4: 120 100% 33%;
+  --chart-5: 180 100% 33%;
 }
 
 [data-theme="light"], .theme-light {
@@ -250,11 +251,11 @@
   --sidebar-accent-foreground: 33 17% 10%;
   --sidebar-border: 40 18% 80%;
   --sidebar-ring: 34 100% 30%;
-  --chart-1: 41 100% 50%;
+  --chart-1: 34 100% 30%;
   --chart-2: 39 8% 40%;
-  --chart-3: 41 100% 44%;
-  --chart-4: 34 100% 30%;
-  --chart-5: 42 83% 91%;
+  --chart-3: 34 100% 24%;
+  --chart-4: 28 74% 21%;
+  --chart-5: 33 17% 10%;
 }
 
 [data-theme="amber-paper"], .theme-amber-paper {
@@ -286,8 +287,8 @@
   --sidebar-border: 280 100% 1%;
   --sidebar-ring: 280 100% 1%;
   --chart-1: 280 100% 1%;
-  --chart-2: 28 74% 21%;
-  --chart-3: 22 87% 9%;
-  --chart-4: 37 100% 5%;
-  --chart-5: 29 80% 16%;
+  --chart-2: 25 83% 14%;
+  --chart-3: 28 74% 21%;
+  --chart-4: 34 100% 24%;
+  --chart-5: 0 100% 33%;
 }

package/src/styles/tokens.css

@@ -47,7 +47,7 @@
   --typography-font-family-primary: 'Perfect DOS VGA 437', monospace; /** Perfect DOS VGA 437 by Zeh Fernando (free-for-any-use; ships with bundled LICENSE.txt). Pixel-perfect-vector TTF — every glyph outline is axis-aligned, scales cleanly to any size. The `monospace` fallback preserves DOS aesthetic on @font-face failure. Used for display/heading tiers (dos-hero, dos-h1…h5). */
   --typography-font-family-body: 'JetBrains Mono Nerd Font', monospace; /** JetBrains Mono Nerd Font (OFL-1.1; ships with bundled JetBrainsMonoNerdFont_OFL.txt). Multi-weight monospace body font — includes Nerd Font glyph extensions (powerline, devicons, language logos) for terminal-aesthetic UIs alongside pixelarticons. Ships as four per-weight woff2 files (Regular/Medium/SemiBold/Bold). Used for body/prose tiers (dos-body, dos-body-lg, dos-caption, dos-micro). Use fontWeight.body-* tokens for real weight variation (DMNC-885). */
   --typography-font-family-fallback: monospace; /** Bare `monospace` stack — fail-loud diagnostic counterpart to `primary`. Compose with `primary` when consumers want strict Perfect-DOS-or-nothing rendering. */
-  --typography-font-size-text-base: 1rem; /** 16px — body floor (DOS VGA native 9x16 cell); nothing in eidotter renders text smaller (DMNC-1579) */
+  --typography-font-size-text-base: 1rem; /** 16px — body floor (DOS VGA native 9x16 cell) for body text, labels and controls (DMNC-1579). Named exceptions: em-relative secondary glyphs that scale with their parent (CalendarHeatmap day labels 0.6em, ProgressRing centre label 0.5em, Stat/VitalsStrip unit suffix 0.5em of the display-size value) */
   --typography-font-size-text-xs: 1.125rem; /** 18px — smallest body text */
   --typography-font-size-text-sm: 1.25rem; /** 20px — secondary body text */
   --typography-font-size-text-md: 1.375rem; /** 22px — default body text */