basalt-ui 1.21.0 → 1.22.0

package/dist/guard/index.js

@@ -253,7 +253,8 @@ const MAX_CSS_CONTINUATION_LINES = 8;
 const MAX_COMMENT_BLOCK_LINES = 8;
 const COMMENT_OPENER_BEFORE = /(?:\/\/|\/\*|<!--)\s*$/;
 const COMMENT_ONLY_LINE = /^\s*(?:\{\s*\/\*|\/\/|\/\*|\*|<!--)/;
-const ANNOTATION_PREFIX = /(?:^|\/\/|\/\*|<!--|^\s*\*)\s*$/;
+const JSX_COMMENT_CLOSE = /\*\/\s*\}\s*$/;
+const ANNOTATION_PREFIX = /(?:^|\/\/|\/\*\*?|<!--|^\s*\*)\s*$/;
 function escapeRegExp(value) {
   return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
@@ -300,7 +301,8 @@ 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 code = stripped.trim();
+    const isCommentOnlyLine = code === "" || COMMENT_ONLY_LINE.test(line) || code === "}" && JSX_COMMENT_CLOSE.test(line);
     if (syntax === "markup") {
       for (const m of line.matchAll(jsonKey)) {
         record(i, parseAllowAnnotation(m[2] ?? "", m[1] === void 0 ? "line" : "file"), false);
@@ -997,13 +999,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

@@ -80,7 +80,10 @@ 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. */
+    /**
+     * Icon links + manifest icon paths. `false` skips BOTH — the head `<link>` icons and the
+     * manifest's `icons` array — so a manifest is never emitted pointing at files that 404.
+     */
     icons?: false | {
         dir?: string;
     };

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,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;;;OAGG;IACH,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;AA4gBD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,gBAAgB,GAAG,YAAY,EAAE,CAMzE"}

package/dist/vite.js

@@ -296,6 +296,7 @@ function buildManifestJson(input) {
     display,
     schemeColor,
     backgroundColor,
+    iconsEnabled,
     iconsDir,
     base
   } = input;
@@ -311,19 +312,25 @@ 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.
+    ...iconsEnabled ? {
+      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"
+        }
+      ]
+    } : {}
   };
   return JSON.stringify(manifest, null, 2);
 }
@@ -364,6 +371,7 @@ function createMainPlugin(options) {
         display,
         schemeColor,
         backgroundColor,
+        iconsEnabled,
         iconsDir,
         base
       });

package/llms.txt

@@ -1,4 +1,4 @@
-# basalt-ui v1.21.0
+# basalt-ui v1.22.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.22.0
 
 ## basalt-ui
 Import: import { ... } from 'basalt-ui'

package/package.json

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

package/src/cli/check-theme.test.ts

@@ -742,3 +742,38 @@ describe('severity — warnings report, errors fail', () => {
     expect(err).toContain('✖ Theme guard')
   })
 })
+
+// ── the manifest waiver hint, gated on the profile ────────────────────────────────────────────
+//
+// rollhook. The hint leads with `basaltAppPlugin`, which is right for a Mantine app — a hex in a
+// manifest can never be right, and the plugin removes the hand-copy entirely. A `tokens-only`
+// consumer has definitionally opted out of that layer: rollhook's Astro site has no index.html to
+// transform, imports no basalt JavaScript at all, and owns maskable icons the plugin does not emit.
+// Leading with it there is advice the consumer cannot take.
+
+describe('check-theme — the manifest waiver hint follows the profile', () => {
+  function manifestFixture(basalt: Record<string, unknown>): void {
+    writeFileSync(resolve(dir, 'package.json'), JSON.stringify({ name: 'fixture', basalt }))
+    mkdirSync(resolve(dir, 'src'), { recursive: true })
+    writeFileSync(resolve(dir, 'src', 'app.tsx'), 'export const App = () => null\n')
+    mkdirSync(resolve(dir, 'public'), { recursive: true })
+    writeFileSync(
+      resolve(dir, 'public', 'site.webmanifest'),
+      JSON.stringify({ name: 'x', theme_color: '#18181b' }, null, 2),
+    )
+  }
+
+  it('offers basaltAppPlugin first to a framework consumer', () => {
+    manifestFixture({ roots: ['src'] })
+    const { err } = run()
+    expect(err).toContain('let basaltAppPlugin emit it')
+  })
+
+  it('leads with the member for a tokens-only consumer, and says which remedy it withheld', () => {
+    manifestFixture({ roots: ['src'], profile: 'tokens-only' })
+    const { err } = run()
+    expect(err).toContain('JSON has no comments — declare a deliberate exception')
+    expect(err).not.toContain('let basaltAppPlugin emit it')
+    expect(err).toContain('a tokens-only consumer has opted out of')
+  })
+})

package/src/cli/help.test.ts

@@ -4,7 +4,7 @@
  * matched `cmd === 'sync'` first and `--help` was just another item in `flags`, ignored).
  */
 import { afterEach, beforeEach, describe, expect, it } from 'bun:test'
-import { existsSync, mkdtempSync, readdirSync, rmSync, writeFileSync } from 'node:fs'
+import { existsSync, mkdirSync, mkdtempSync, readdirSync, rmSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { resolve } from 'node:path'
 
@@ -86,6 +86,10 @@ describe('run() --help short-circuits before dispatch', () => {
   })
 
   it('`sync` without --help still runs for real and writes the manifest (control case)', () => {
+    // `sync` refuses to scaffold where nothing was ever installed, so the control case has to be a
+    // repo that HAS an install — which is what `sync` is for.
+    mkdirSync(resolve(dir, '.basalt'), { recursive: true })
+    writeFileSync(resolve(dir, MANIFEST_PATH), JSON.stringify({ version: 1, files: {} }))
     const { code } = capture(() => run(['sync'], dir))
     expect(code).toBe(0)
     expect(existsSync(resolve(dir, MANIFEST_PATH))).toBe(true)