basalt-ui 1.21.0 → 1.23.0

package/dist/guard/index.js

@@ -108,7 +108,7 @@ const RADIUS_PROP_RE = /\bradius=(?:\{[0-9]+\}|"[0-9]+")/g;
 const MOTION_TRANSITION_NUMERIC = /\btransition\s*=\s*\{\{[^}]*\b(?:duration|stiffness|damping|mass)\s*:\s*-?\d/g;
 const MOTION_TRANSITION_EASE_ARRAY = /\btransition\s*=\s*\{\{[^}]*\bease\s*:\s*\[/g;
 const RAW_CHART_LEGEND_ARRAY = /<ChartLegend\b[^>]*?\bitems\s*=\s*\{\s*\[/g;
-const CHART_ENTRY_POINT_TAG = /<(?:MultiLine|Bars|Donut|DualPanel|Heatmap|ZonedLine|StackedArea|LineSparkline|BarSparkline)\b(?:<[^<>]*>)?(?:=>|[^>])*?>/g;
+const CHART_ENTRY_POINT_TAG = /<(?:MultiLine|Bars|BandStrip|Donut|DualPanel|Heatmap|MirroredBars|ZonedLine|StackedArea|LineSparkline|BarSparkline)\b(?:<[^<>]*>)?(?:=>|[^>])*?>/g;
 const HAS_ARIA_LABEL_PROP = /\bariaLabel\s*=/;
 const RAW_FORM_CONTROL = /<(?:input|select|textarea)\b/g;
 const RAW_FORM_CONTROL_TAG = /<(?:input|select|textarea)\b(?:=>|[^>])*?>/g;
@@ -250,10 +250,24 @@ function parseAllowAnnotation(rest, scope) {
   return { rules, unknownRules, hasReason: reason.length >= MIN_ALLOW_REASON_LENGTH, scope };
 }
 const MAX_CSS_CONTINUATION_LINES = 8;
-const MAX_COMMENT_BLOCK_LINES = 8;
+function commentBlockEnd(lines, index, tokenAt, syntax) {
+  const line = lines[index] ?? "";
+  if (syntax === "ts" && /\/\/\s*$/.test(line.slice(0, tokenAt))) return index;
+  const closer = syntax === "markup" ? "-->" : "*/";
+  if (line.slice(tokenAt).includes(closer)) return index;
+  for (let ahead = index + 1; ahead < lines.length; ahead++) {
+    if ((lines[ahead] ?? "").includes(closer)) return ahead;
+  }
+  return index;
+}
 const COMMENT_OPENER_BEFORE = /(?:\/\/|\/\*|<!--)\s*$/;
 const COMMENT_ONLY_LINE = /^\s*(?:\{\s*\/\*|\/\/|\/\*|\*|<!--)/;
-const ANNOTATION_PREFIX = /(?:^|\/\/|\/\*|<!--|^\s*\*)\s*$/;
+const JSX_COMMENT_CLOSE = /\*\/\s*\}\s*$/;
+function isCommentOnly(raw, stripped) {
+  const code = stripped.trim();
+  return code === "" || COMMENT_ONLY_LINE.test(raw) || code === "}" && JSX_COMMENT_CLOSE.test(raw);
+}
+const ANNOTATION_PREFIX = /(?:^|\/\/|\/\*\*?|<!--|^\s*\*)\s*$/;
 function escapeRegExp(value) {
   return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
@@ -272,7 +286,7 @@ function collectAllowAnnotations(lines, codeLines, allowComment, syntax) {
     list.push(annotation);
     byLine.set(index, list);
   };
-  const record = (index, annotation, trailing) => {
+  const record = (index, annotation, trailing, tokenAt) => {
     declared.push({ line: index + 1, annotation });
     if (annotation.scope === "file") {
       fileScoped.push(annotation);
@@ -280,11 +294,14 @@ function collectAllowAnnotations(lines, codeLines, allowComment, syntax) {
     }
     add(index, annotation);
     if (!trailing) {
-      for (let ahead = 1; ahead <= MAX_COMMENT_BLOCK_LINES; ahead++) {
-        const raw = lines[index + ahead] ?? "";
-        add(index + ahead, annotation);
-        if (raw.trim() !== "" && (codeLines[index + ahead] ?? "").trim() !== "") break;
+      const closesAt = commentBlockEnd(lines, index, tokenAt, syntax);
+      for (let ahead = 1; index + ahead < lines.length; ahead++) {
+        const at = index + ahead;
+        add(at, annotation);
+        if (at <= closesAt) continue;
+        const raw = lines[at] ?? "";
         if (raw.trim() === "") break;
+        if (!isCommentOnly(raw, codeLines[at] ?? "")) break;
       }
       return;
     }
@@ -300,10 +317,15 @@ function collectAllowAnnotations(lines, codeLines, allowComment, syntax) {
   for (let i = 0; i < lines.length; i++) {
     const line = lines[i] ?? "";
     const stripped = codeLines[i] ?? "";
-    const isCommentOnlyLine = stripped.trim() === "" || COMMENT_ONLY_LINE.test(line);
+    const isCommentOnlyLine = isCommentOnly(line, stripped);
     if (syntax === "markup") {
       for (const m of line.matchAll(jsonKey)) {
-        record(i, parseAllowAnnotation(m[2] ?? "", m[1] === void 0 ? "line" : "file"), false);
+        record(
+          i,
+          parseAllowAnnotation(m[2] ?? "", m[1] === void 0 ? "line" : "file"),
+          false,
+          m.index
+        );
       }
     }
     for (const m of line.matchAll(token)) {
@@ -315,7 +337,8 @@ function collectAllowAnnotations(lines, codeLines, allowComment, syntax) {
       record(
         i,
         parseAllowAnnotation(rest, m[1] === void 0 ? "line" : "file"),
-        !isCommentOnlyLine
+        !isCommentOnlyLine,
+        at
       );
     }
   }
@@ -997,13 +1020,49 @@ function checkSource(text, relPath, cfg) {
     severity: severityOf(f.kind, cfg)
   }));
 }
+function findAllowAnnotations(text, relPath, cfg) {
+  const lines = text.split("\n");
+  const syntax = guardSyntaxFor(relPath);
+  const codeText = syntax === "markup" ? stripMarkupComments(text) : stripComments(text, syntax);
+  const { declared } = collectAllowAnnotations(
+    lines,
+    codeText.split("\n"),
+    cfg.allowComment,
+    syntax
+  );
+  return declared.map(({ line, annotation }) => ({
+    line,
+    scope: annotation.scope,
+    rules: [...annotation.rules],
+    guardKinds: annotation.rules.filter((id) => Object.hasOwn(GUARD_RULES, id)),
+    pluginRules: annotation.rules.filter(
+      (id) => !Object.hasOwn(GUARD_RULES, id) && PLUGIN_RULE_IDS.has(id)
+    ),
+    unknownRules: [...annotation.unknownRules],
+    hasReason: annotation.hasReason,
+    bare: annotation.rules.length === 0 && annotation.unknownRules.length === 0,
+    text: lines[line - 1] ?? ""
+  }));
+}
+const NEUTRALIZED_ALLOW_TOKEN = "basalt-audit-neutralized";
+function neutralizeAllowAnnotation(text, line, cfg) {
+  const lines = text.split("\n");
+  const target = lines[line - 1];
+  if (target === void 0) return text;
+  lines[line - 1] = target.replaceAll(cfg.allowComment, NEUTRALIZED_ALLOW_TOKEN);
+  return lines.join("\n");
+}
 export {
   DEFAULT_GUARD_CONFIG,
   GENERATED_HEADER_LINE,
   GUARD_RULES,
+  NEUTRALIZED_ALLOW_TOKEN,
+  PLUGIN_RULE_IDS,
   TOKENS_ONLY_DISABLED_KINDS,
   checkSource,
+  findAllowAnnotations,
   guardKindRemedy,
   guardWaiverHint,
+  neutralizeAllowAnnotation,
   unmatchedExemptPatterns
 };

package/dist/vite.d.ts

@@ -33,6 +33,29 @@ export type BasaltViteOptions = {
     enforcementNotice?: boolean;
 };
 export declare function basaltViteConfig(opts: BasaltViteOptions): UserConfig;
+/**
+ * One icon a consumer names itself — a manifest `icons` member, plus optionally the head `<link>`
+ * that points at the same file.
+ *
+ * The field names are the manifest's own, verbatim, so what a consumer writes here is what ships in
+ * `site.webmanifest`. `src` is root-relative (`'/favicon.svg'` or `'favicon.svg'`, both resolve the
+ * same) and is prefixed with Vite's `base` exactly like basalt's built-in set.
+ */
+export type BasaltAppIcon = {
+    /** Root-relative path under `public/`. Prefixed with Vite's resolved `base`. */
+    src: string;
+    /** Manifest `sizes`. `'any'` for a scalable SVG; `'192x192'` for a raster. */
+    sizes?: string;
+    /** MIME type, e.g. `'image/svg+xml'`. */
+    type?: string;
+    /** Manifest `purpose`, e.g. `'any maskable'`. */
+    purpose?: string;
+    /**
+     * Emit a head `<link rel="…">` for this icon too. Omitted → manifest only, which is what an app
+     * that links its own favicon from `index.html` wants.
+     */
+    rel?: 'icon' | 'shortcut icon' | 'apple-touch-icon' | 'mask-icon';
+};
 export type BasaltAppOptions = {
     /** App display name — used verbatim as the manifest `name` and (unless overridden) OG title. */
     name: string;
@@ -80,10 +103,29 @@ export type BasaltAppOptions = {
     scope?: string;
     /** Manifest `id`. Default: the resolved `startUrl` (default- or explicitly-derived, per above). */
     id?: string;
-    /** Icon links + manifest icon paths. `false` skips the head `<link>` icons entirely. */
+    /**
+     * Which icons the plugin knows about — three forms, one question each.
+     *
+     * - **omitted / `{ dir }`** — basalt's own six-filename set (the realfavicongenerator layout argo
+     *   ships), optionally under a subdirectory of `public/`. Unchanged default.
+     * - **`false`** — no head `<link>` icons and no manifest `icons` member, so a manifest is never
+     *   emitted pointing at files that 404.
+     * - **an array** — the icons this app ACTUALLY has, named by the consumer.
+     *
+     * The array is the form for every app that was not scaffolded from basalt's icon set, which is
+     * most of them. `{ dir }` can only move the six fixed filenames; it cannot rename one, so an app
+     * whose single icon is `favicon.svg` had no way to say so and had to keep a hand-written manifest
+     * beside the generated head — the last thing standing between rb and deleting a file carrying a
+     * permanent `theme-allow-file`. One SVG at `sizes: 'any'` is a complete, installable icon set.
+     *
+     * Every entry becomes a manifest icon; an entry becomes a head `<link>` only when it names a
+     * {@link BasaltAppIcon.rel}. That split is deliberate — an app that already links its favicon
+     * from its own `index.html` wants the manifest fixed without a duplicate tag, and an app that
+     * wants the plugin to own the head says so per icon. An empty array reads as `false`.
+     */
     icons?: false | {
         dir?: string;
-    };
+    } | readonly BasaltAppIcon[];
     /** Emits `<meta name="darkreader-lock">` when `'lock'` (default). Pass `false` to omit it. */
     darkreader?: 'lock' | false;
     /** Site-wide SEO metadata — only the keys provided are emitted, no per-page SEO. */

package/dist/vite.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vite.d.ts","sourceRoot":"","sources":["../src/vite.ts"],"names":[],"mappings":"AAuBA,OAAO,KAAK,EAA6B,YAAY,EAAE,UAAU,EAAE,MAAM,MAAM,CAAA;AAI/E,MAAM,MAAM,iBAAiB,GAAG;IAC9B,4FAA4F;IAC5F,IAAI,EAAE,MAAM,CAAA;IACZ,6EAA6E;IAC7E,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;IACvB;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;IACvB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,kFAAkF;IAClF,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB;;;;OAIG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAA;CAC5B,CAAA;AA6CD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,iBAAiB,GAAG,UAAU,CAgFpE;AAgBD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,gGAAgG;IAChG,IAAI,EAAE,MAAM,CAAA;IACZ,0DAA0D;IAC1D,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,gGAAgG;IAChG,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,GAAG;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAA;IACrD;;;;;;;;;OASG;IACH,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,KAAK,CAAA;IAC/C;;;OAGG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,wDAAwD;IACxD,OAAO,CAAC,EAAE,YAAY,GAAG,YAAY,GAAG,YAAY,GAAG,SAAS,CAAA;IAChE;;;;OAIG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,mGAAmG;IACnG,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,wFAAwF;IACxF,KAAK,CAAC,EAAE,KAAK,GAAG;QAAE,GAAG,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;IAChC,8FAA8F;IAC9F,UAAU,CAAC,EAAE,MAAM,GAAG,KAAK,CAAA;IAC3B,oFAAoF;IACpF,GAAG,CAAC,EAAE;QAAE,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,SAAS,GAAG,qBAAqB,CAAA;KAAE,CAAA;IACvF,8FAA8F;IAC9F,QAAQ,CAAC,EAAE,KAAK,CAAA;IAChB;;;;;OAKG;IACH,aAAa,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAClD,CAAA;AAigBD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,gBAAgB,GAAG,YAAY,EAAE,CAMzE"}
+{"version":3,"file":"vite.d.ts","sourceRoot":"","sources":["../src/vite.ts"],"names":[],"mappings":"AAuBA,OAAO,KAAK,EAA6B,YAAY,EAAE,UAAU,EAAE,MAAM,MAAM,CAAA;AAI/E,MAAM,MAAM,iBAAiB,GAAG;IAC9B,4FAA4F;IAC5F,IAAI,EAAE,MAAM,CAAA;IACZ,6EAA6E;IAC7E,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;IACvB;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;IACvB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,kFAAkF;IAClF,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB;;;;OAIG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAA;CAC5B,CAAA;AA6CD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,iBAAiB,GAAG,UAAU,CAgFpE;AAgBD;;;;;;;GAOG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B,gFAAgF;IAChF,GAAG,EAAE,MAAM,CAAA;IACX,8EAA8E;IAC9E,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,yCAAyC;IACzC,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,iDAAiD;IACjD,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB;;;OAGG;IACH,GAAG,CAAC,EAAE,MAAM,GAAG,eAAe,GAAG,kBAAkB,GAAG,WAAW,CAAA;CAClE,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,gGAAgG;IAChG,IAAI,EAAE,MAAM,CAAA;IACZ,0DAA0D;IAC1D,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,gGAAgG;IAChG,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,GAAG;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAA;IACrD;;;;;;;;;OASG;IACH,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,KAAK,CAAA;IAC/C;;;OAGG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,wDAAwD;IACxD,OAAO,CAAC,EAAE,YAAY,GAAG,YAAY,GAAG,YAAY,GAAG,SAAS,CAAA;IAChE;;;;OAIG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,mGAAmG;IACnG,EAAE,CAAC,EAAE,MAAM,CAAA;IACX;;;;;;;;;;;;;;;;;;;OAmBG;IACH,KAAK,CAAC,EAAE,KAAK,GAAG;QAAE,GAAG,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS,aAAa,EAAE,CAAA;IAC3D,8FAA8F;IAC9F,UAAU,CAAC,EAAE,MAAM,GAAG,KAAK,CAAA;IAC3B,oFAAoF;IACpF,GAAG,CAAC,EAAE;QAAE,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,SAAS,GAAG,qBAAqB,CAAA;KAAE,CAAA;IACvF,8FAA8F;IAC9F,QAAQ,CAAC,EAAE,KAAK,CAAA;IAChB;;;;;OAKG;IACH,aAAa,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAClD,CAAA;AA0kBD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,gBAAgB,GAAG,YAAY,EAAE,CAMzE"}

package/dist/vite.js

@@ -133,6 +133,18 @@ function withIconPath(dir, file) {
 function withBase(base, path) {
   return base + path.slice(1);
 }
+function isIconList(icons) {
+  return Array.isArray(icons);
+}
+function resolveIcons(icons) {
+  if (icons === false) return { mode: "none" };
+  if (icons === void 0) return { mode: "default", dir: void 0 };
+  if (!isIconList(icons)) return { mode: "default", dir: icons.dir };
+  return icons.length === 0 ? { mode: "none" } : { mode: "explicit", icons };
+}
+function iconHref(base, src) {
+  return withBase(base, src.startsWith("/") ? src : `/${src}`);
+}
 function hasViewportMeta(html) {
   return /<meta\s+[^>]*name=["']viewport["']/i.test(html);
 }
@@ -207,8 +219,7 @@ function buildStaticTags(input) {
     shortName,
     themeColor,
     bootStyle,
-    iconsEnabled,
-    iconsDir,
+    icons,
     darkreader,
     manifestEnabled,
     base,
@@ -234,13 +245,13 @@ function buildStaticTags(input) {
     }
   );
   tags.push({ tag: "style", children: bootStyle });
-  if (iconsEnabled) {
+  if (icons.mode === "default") {
     tags.push(
       {
         tag: "link",
         attrs: {
           rel: "shortcut icon",
-          href: withBase(base, withIconPath(iconsDir, ICON_FILES.favicon))
+          href: withBase(base, withIconPath(icons.dir, ICON_FILES.favicon))
         }
       },
       {
@@ -248,7 +259,7 @@ function buildStaticTags(input) {
         attrs: {
           rel: "icon",
           type: "image/svg+xml",
-          href: withBase(base, withIconPath(iconsDir, ICON_FILES.svg))
+          href: withBase(base, withIconPath(icons.dir, ICON_FILES.svg))
         }
       },
       {
@@ -256,7 +267,7 @@ function buildStaticTags(input) {
         attrs: {
           rel: "icon",
           sizes: "96x96",
-          href: withBase(base, withIconPath(iconsDir, ICON_FILES.png96))
+          href: withBase(base, withIconPath(icons.dir, ICON_FILES.png96))
         }
       },
       {
@@ -264,11 +275,25 @@ function buildStaticTags(input) {
         attrs: {
           rel: "apple-touch-icon",
           sizes: "180x180",
-          href: withBase(base, withIconPath(iconsDir, ICON_FILES.appleTouch))
+          href: withBase(base, withIconPath(icons.dir, ICON_FILES.appleTouch))
         }
       }
     );
   }
+  if (icons.mode === "explicit") {
+    for (const icon of icons.icons) {
+      if (icon.rel === void 0) continue;
+      tags.push({
+        tag: "link",
+        attrs: {
+          rel: icon.rel,
+          ...icon.type === void 0 ? {} : { type: icon.type },
+          ...icon.sizes === void 0 ? {} : { sizes: icon.sizes },
+          href: iconHref(base, icon.src)
+        }
+      });
+    }
+  }
   tags.push(
     { tag: "meta", attrs: { name: "apple-mobile-web-app-title", content: shortName } },
     { tag: "meta", attrs: { name: "apple-mobile-web-app-capable", content: "yes" } },
@@ -286,6 +311,34 @@ function buildStaticTags(input) {
   );
   return tags;
 }
+function manifestIcons(icons, base) {
+  if (icons.mode === "none") return {};
+  if (icons.mode === "default") {
+    return {
+      icons: [
+        {
+          src: withBase(base, withIconPath(icons.dir, ICON_FILES.manifest192)),
+          sizes: "192x192",
+          type: "image/png"
+        },
+        {
+          src: withBase(base, withIconPath(icons.dir, ICON_FILES.manifest512)),
+          sizes: "512x512",
+          type: "image/png",
+          purpose: "any maskable"
+        }
+      ]
+    };
+  }
+  return {
+    icons: icons.icons.map((icon) => ({
+      src: iconHref(base, icon.src),
+      ...icon.sizes === void 0 ? {} : { sizes: icon.sizes },
+      ...icon.type === void 0 ? {} : { type: icon.type },
+      ...icon.purpose === void 0 ? {} : { purpose: icon.purpose }
+    }))
+  };
+}
 function buildManifestJson(input) {
   const {
     options,
@@ -296,7 +349,7 @@ function buildManifestJson(input) {
     display,
     schemeColor,
     backgroundColor,
-    iconsDir,
+    icons,
     base
   } = input;
   const manifest = {
@@ -311,19 +364,13 @@ function buildManifestJson(input) {
     // `<meta name="theme-color">` pair. Unchanged for the default (`'dark'`) and for `'auto'`.
     theme_color: schemeColor,
     background_color: backgroundColor,
-    icons: [
-      {
-        src: withBase(base, withIconPath(iconsDir, ICON_FILES.manifest192)),
-        sizes: "192x192",
-        type: "image/png"
-      },
-      {
-        src: withBase(base, withIconPath(iconsDir, ICON_FILES.manifest512)),
-        sizes: "512x512",
-        type: "image/png",
-        purpose: "any maskable"
-      }
-    ]
+    // `icons: false` reaches HERE too, not just the head links. The array was unconditional, so
+    // `{ manifest: true, icons: false }` shipped a manifest pointing at two PNGs the app never
+    // ships — an installable app with broken icons, and the reason rb went hybrid (plugin for the
+    // head, a hand-written manifest for the rest). A manifest with NO icons member is valid.
+    // The `'explicit'` arm is the other half of that fix: honest about icons it cannot see was
+    // only worth having once a consumer could tell it which icons it DOES have.
+    ...manifestIcons(icons, base)
   };
   return JSON.stringify(manifest, null, 2);
 }
@@ -331,8 +378,7 @@ function createMainPlugin(options) {
   const shortName = options.shortName ?? options.name;
   const display = options.display ?? "standalone";
   const darkreader = options.darkreader ?? "lock";
-  const iconsEnabled = options.icons !== false;
-  const iconsDir = options.icons === false ? void 0 : options.icons?.dir;
+  const icons = resolveIcons(options.icons);
   const manifestEnabled = options.manifest !== false;
   const themeColor = resolveThemeColors(options.themeColor);
   const colorScheme = options.colorScheme ?? "dark";
@@ -364,7 +410,7 @@ function createMainPlugin(options) {
         display,
         schemeColor,
         backgroundColor,
-        iconsDir,
+        icons,
         base
       });
       staticTags = buildStaticTags({
@@ -372,8 +418,7 @@ function createMainPlugin(options) {
         shortName,
         themeColor,
         bootStyle,
-        iconsEnabled,
-        iconsDir,
+        icons,
         darkreader,
         manifestEnabled,
         base,

package/llms.txt

@@ -1,4 +1,4 @@
-# basalt-ui v1.21.0
+# basalt-ui v1.23.0
 # Opinionated framework for Mantine-based React apps — theme, app shell, visx charts, toolchain presets
 #
 # basalt-ui is an opinionated framework for Mantine-based React apps.
@@ -19,7 +19,7 @@
 # ./tokens.css subpath. Guide: docs/FRAMEWORK-FREE.md in the repo.
 
 Package: basalt-ui
-Version: 1.21.0
+Version: 1.23.0
 
 ## basalt-ui
 Import: import { ... } from 'basalt-ui'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "basalt-ui",
-  "version": "1.21.0",
+  "version": "1.23.0",
   "description": "Opinionated framework for Mantine-based React apps — theme, app shell, visx charts, toolchain presets",
   "keywords": [
     "charts",