@rtorcato/repo-tooling 3.2.0 → 3.2.2

package/dist/cli/generators/docs-site.js

@@ -1,8 +1,22 @@
 import path from 'node:path';
 import fs from 'fs-extra';
+import selfPackageJson from '../../../package.json' with { type: 'json' };
 import { copyPreset, PRESETS } from '../utils/copy-preset.js';
 import { buildBadgeRow, parseRepository } from './badges.js';
 import { inferSubpathsFromExports } from './treeshake.js';
+/**
+ * What a scaffolded docs site should depend on for *this* CLI — read from the
+ * running version rather than written down, because a literal here goes stale
+ * silently. It had drifted to `^2.47.0`, two majors behind, so every site
+ * scaffolded since was handed a pre-rename version predating the peer-dependency
+ * split.
+ *
+ * The floor is the exact running version, not `^<major>.0.0`: the config being
+ * generated is the one this version emits, and claiming compatibility back to
+ * the start of the major would be the same over-wide-range problem doctor's
+ * `Config schema versions` check exists to catch (#330).
+ */
+const SELF_RANGE = `^${selfPackageJson.version}`;
 /**
  * Docs-site (Docusaurus) generator — the Phase 2 counterpart to the shared
  * assets shipped in #54. Scaffolds a working Docusaurus site under `apps/docs`,
@@ -179,8 +193,12 @@ ${typedocPlugins}    [
       ],
       copyright: \`Copyright © \${new Date().getFullYear()} ${meta.title}. Built with Docusaurus.\`,
     },
+    // \`theme\` is the LIGHT-mode Prism theme and \`darkTheme\` the dark one. Both
+    // were vsDark here, which is why the shared stylesheet had to pin fenced
+    // blocks dark in light mode too (#324). Keep this pairing and the CSS in
+    // step — vsDark tokens on a light surface are unreadable.
     prism: {
-      theme: prismThemes.vsDark,
+      theme: prismThemes.vsLight,
       darkTheme: prismThemes.vsDark,
       additionalLanguages: ['bash', 'json', 'typescript'],
     },
@@ -222,7 +240,7 @@ const TSCONFIG = `// Improves IDE type-checking; not used by \`docusaurus start/
 `;
 function customCss(accent) {
     // Import the shared tokens, then override only the accent (per #54's model).
-    return `/* Site theme: shared @rtorcato tokens + this project's accent. */
+    return `/* Site theme: the shared design tokens + this project's accent. */
 @import "./_jt-tokens.css";
 
 :root {
@@ -239,7 +257,7 @@ function customCss(accent) {
 function docsPackageJson(meta, typedoc) {
     const typedocDevDeps = typedoc
         ? {
-            '@rtorcato/repo-tooling': '^2.47.0',
+            '@rtorcato/repo-tooling': SELF_RANGE,
             'docusaurus-plugin-typedoc': '^1.4.0',
             typedoc: '^0.28.0',
             'typedoc-plugin-markdown': '^4.9.0',
@@ -278,7 +296,7 @@ function docsPackageJson(meta, typedoc) {
             '@docusaurus/tsconfig': '^3.8.1',
             '@docusaurus/types': '^3.10.2',
             '@playwright/test': '^1.49.0',
-            '@rtorcato/repo-tooling': '^2.47.0',
+            '@rtorcato/repo-tooling': SELF_RANGE,
             '@types/react': '^19.0.0',
             typescript: '~5.6.3',
             ...typedocDevDeps,

package/dist/cli/generators/index.js

@@ -4,7 +4,7 @@ import { fileURLToPath } from 'node:url';
 import { generateSwiftProject } from '../../languages/swift/scaffold.js';
 import { installAiSetup } from './agent-rules.js';
 import { bundlerNeedsEsbuild, ensureBuildApprovals, generateBuildConfigs } from './build.js';
-import { ensurePnpmSettings } from './pnpm-workspace.js';
+import { ensurePnpmSettings, familyGlob } from './pnpm-workspace.js';
 import { generateGitConfigs } from './git.js';
 import { generateGitHubActions } from './github-actions.js';
 import { generateLintingConfigs } from './linting.js';
@@ -84,7 +84,7 @@ export async function generateConfigs(config, targetDir) {
     await ensureBuildApprovals(config, targetDir);
     // Family-wide pnpm settings (#314). Runs last of the workspace writers so it
     // merges into whatever they wrote rather than racing them for the file.
-    await ensurePnpmSettings(targetDir, bundlerNeedsEsbuild(config));
+    await ensurePnpmSettings(targetDir, bundlerNeedsEsbuild(config), familyGlob(config.projectName));
     // Turborepo task pipeline (pnpm-workspace monorepos, when opted-in)
     if (config.turborepo) {
         await generateTurborepo(targetDir);

package/dist/cli/generators/pnpm-workspace.js

@@ -12,12 +12,24 @@ import fs from 'fs-extra';
 export const WORKSPACE_FILE = 'pnpm-workspace.yaml';
 /**
  * pnpm's `minimumReleaseAge` cutoff holds back freshly published versions —
- * good against a typosquat-hijack, but it also stalls every consumer of a
- * same-day `@rtorcato/*` fix for 24h. One glob covers the whole family: pnpm
- * matches these entries with `@pnpm/config.matcher`, so there's no package list
- * to keep in sync with `@rtorcato/shared-docs`'s `FAMILY`.
+ * good against a typosquat or a hijacked account, but it also stalls every
+ * consumer of a same-day fix in a sibling package for 24h. Exempting the
+ * repo's *own* scope trades that off only for packages it already publishes.
+ *
+ * Derived from the consuming package's name rather than hardcoded: this is a
+ * public CLI, and writing one organisation's scope into a stranger's config
+ * would loosen a supply-chain guard for packages they neither use nor chose.
+ * An unscoped package gets no such setting at all — there is no "family" to
+ * infer, and guessing one would be worse than leaving it alone.
+ *
+ * One glob covers a whole scope: pnpm matches these entries with
+ * `@pnpm/config.matcher`, so there's no package list to keep in sync.
  */
-const FAMILY_GLOB = '@rtorcato/*';
+export function familyGlob(packageName) {
+    const name = typeof packageName === 'string' ? packageName : '';
+    const scope = /^(@[^/]+)\//.exec(name)?.[1];
+    return scope ? `${scope}/*` : null;
+}
 /** Bundlers that pull in esbuild, whose install script pnpm 11 refuses to run unapproved. */
 const ESBUILD_BUNDLERS = ['esbuild', 'tsup', 'vite'];
 /** True when the repo depends on a bundler that drags esbuild in. */
@@ -43,7 +55,29 @@ function section(yaml, key) {
     }
     return body;
 }
-const SETTINGS = [
+/**
+ * The managed settings for one repo. A function rather than a constant because
+ * the release-age exemption is scope-derived, and a repo with no scope to
+ * derive doesn't get that setting at all.
+ */
+function settingsFor(glob) {
+    return glob ? [...BASE_SETTINGS, releaseAgeSetting(glob)] : BASE_SETTINGS;
+}
+function releaseAgeSetting(glob) {
+    return {
+        label: `minimumReleaseAgeExclude: ${glob}`,
+        applies: () => true,
+        satisfied: (yaml) => (section(yaml, 'minimumReleaseAgeExclude') ?? []).some((l) => l.includes(glob)),
+        key: 'minimumReleaseAgeExclude',
+        block: `# Exempt this package's own scope from pnpm's minimumReleaseAge cutoff, so a
+# same-day fix in a sibling package is installable today rather than tomorrow.
+minimumReleaseAgeExclude:
+  - '${glob}'
+`,
+        item: `  - '${glob}'`,
+    };
+}
+const BASE_SETTINGS = [
     {
         label: 'verifyDepsBeforeRun: false',
         applies: () => true,
@@ -57,18 +91,6 @@ verifyDepsBeforeRun: false
 `,
         item: '',
     },
-    {
-        label: `minimumReleaseAgeExclude: ${FAMILY_GLOB}`,
-        applies: () => true,
-        satisfied: (yaml) => (section(yaml, 'minimumReleaseAgeExclude') ?? []).some(hasFamilyGlob),
-        key: 'minimumReleaseAgeExclude',
-        block: `# Exempt the @rtorcato family from pnpm's minimumReleaseAge cutoff, so a
-# same-day fix in a sibling package is installable today rather than tomorrow.
-minimumReleaseAgeExclude:
-  - '${FAMILY_GLOB}'
-`,
-        item: `  - '${FAMILY_GLOB}'`,
-    },
     {
         label: 'allowBuilds: esbuild',
         applies: (needsEsbuild) => needsEsbuild,
@@ -82,12 +104,11 @@ allowBuilds:
         item: '  esbuild: true',
     },
 ];
-function hasFamilyGlob(line) {
-    return line.includes(FAMILY_GLOB);
-}
 /** Managed settings absent from `yaml`, named as doctor reports them. */
-export function missingPnpmSettings(yaml, needsEsbuild) {
-    return SETTINGS.filter((s) => s.applies(needsEsbuild) && !s.satisfied(yaml)).map((s) => s.label);
+export function missingPnpmSettings(yaml, needsEsbuild, glob) {
+    return settingsFor(glob)
+        .filter((s) => s.applies(needsEsbuild) && !s.satisfied(yaml))
+        .map((s) => s.label);
 }
 /** Insert `item` directly under an existing `key:` line, keeping the rest untouched. */
 function insertUnder(yaml, key, item) {
@@ -97,9 +118,9 @@ function insertUnder(yaml, key, item) {
     return lines.join('\n');
 }
 /** Merge every missing managed setting into `yaml` and return the new contents. */
-export function upsertPnpmSettings(yaml, needsEsbuild) {
+export function upsertPnpmSettings(yaml, needsEsbuild, glob) {
     let next = yaml;
-    for (const setting of SETTINGS) {
+    for (const setting of settingsFor(glob)) {
         if (!setting.applies(needsEsbuild) || setting.satisfied(next))
             continue;
         if (setting.item && section(next, setting.key)) {
@@ -115,10 +136,10 @@ export function upsertPnpmSettings(yaml, needsEsbuild) {
  * Merge the managed pnpm settings into `pnpm-workspace.yaml`, creating it when
  * absent. Returns the relative path if anything changed, else null.
  */
-export async function ensurePnpmSettings(targetDir, needsEsbuild) {
+export async function ensurePnpmSettings(targetDir, needsEsbuild, glob) {
     const file = path.join(targetDir, WORKSPACE_FILE);
     const current = (await fs.pathExists(file)) ? await fs.readFile(file, 'utf-8') : '';
-    const next = upsertPnpmSettings(current, needsEsbuild);
+    const next = upsertPnpmSettings(current, needsEsbuild, glob);
     if (next === current)
         return null;
     await fs.writeFile(file, next.replace(/^\n+/, ''));

package/dist/languages/js/checks.js

@@ -1,7 +1,7 @@
 import path from 'node:path';
 import fs from 'fs-extra';
 import { hookHasUncommented } from '../../base/checks.js';
-import { WORKSPACE_FILE, dependsOnEsbuild, missingPnpmSettings, } from '../../cli/generators/pnpm-workspace.js';
+import { WORKSPACE_FILE, dependsOnEsbuild, familyGlob, missingPnpmSettings, } from '../../cli/generators/pnpm-workspace.js';
 const PACKAGE = '@rtorcato/repo-tooling';
 const NODE_MIN_MAJOR = 22;
 const NODE_LTS_REQUIREMENTS = {
@@ -849,7 +849,7 @@ export async function checkPnpmWorkspace(dir, pkg) {
         return { check, status: 'ok', detail: 'not a pnpm repo' };
     }
     const yaml = exists ? await fs.readFile(file, 'utf-8') : '';
-    const missing = missingPnpmSettings(yaml, dependsOnEsbuild(allDeps(pkg)));
+    const missing = missingPnpmSettings(yaml, dependsOnEsbuild(allDeps(pkg)), familyGlob(pkg?.name));
     if (missing.length === 0) {
         return { check, status: 'ok', detail: `${WORKSPACE_FILE} carries the managed settings` };
     }

package/dist/languages/js/fixers.js

@@ -10,7 +10,7 @@ import { GH_WORKFLOWS, generateGhWorkflow } from '../../cli/generators/github-wo
 import { generateESLintConfig, generatePrettierConfig } from '../../cli/generators/linting.js';
 import { alignNodeVersion, ensureEnginesNode, generateKnipConfig, generateNvmrc, generateSizeLimitConfig, generateVscodeExtensions, } from '../../cli/generators/misc.js';
 import { composeVerifyScriptFromPkg } from '../../cli/generators/package-json.js';
-import { WORKSPACE_FILE, dependsOnEsbuild, ensurePnpmSettings, } from '../../cli/generators/pnpm-workspace.js';
+import { WORKSPACE_FILE, dependsOnEsbuild, ensurePnpmSettings, familyGlob, } from '../../cli/generators/pnpm-workspace.js';
 import { generatePostcss } from '../../cli/generators/postcss.js';
 import { generateCypressConfig, generateVitestConfig } from '../../cli/generators/testing.js';
 import { generateTreeshakeCheck, inferSubpathsFromExports } from '../../cli/generators/treeshake.js';
@@ -351,7 +351,7 @@ export const FIXERS = [
                 ...(pkg?.dependencies ?? {}),
                 ...(pkg?.devDependencies ?? {}),
             };
-            const written = await ensurePnpmSettings(targetDir, dependsOnEsbuild(deps));
+            const written = await ensurePnpmSettings(targetDir, dependsOnEsbuild(deps), familyGlob(pkg?.name));
             return { filesWritten: written ? [written] : [] };
         },
     },

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@rtorcato/repo-tooling",
-	"version": "3.2.0",
+	"version": "3.2.2",
 	"description": "One CLI to scaffold, audit and fix your repo's whole toolchain — linting, tests, commits, releases & CI.",
 	"type": "module",
 	"keywords": [
@@ -277,7 +277,7 @@
 		"vitest": "^4.1.10"
 	},
 	"peerDependencies": {
-		"@biomejs/biome": "^2.0.0",
+		"@biomejs/biome": "^2.5.0",
 		"@commitlint/cli": "^20.0.0 || ^21.0.0",
 		"@commitlint/config-conventional": "^21.2.0",
 		"@commitlint/types": "^21.2.0",

package/tooling/docusaurus/theme.css

@@ -185,10 +185,15 @@ body,
 }
 
 /* ---------- Code ----------
-   Prism is vsDark in both light & dark mode (to match the navy aesthetic),
-   so fenced code blocks must stay dark in BOTH themes — otherwise the pale
-   vsDark tokens wash out on a light background. Inline code (the `code` pills)
-   keeps the themed --ifm-code-background and stays readable. */
+   Every surface and text colour here comes from the theme tokens, which already
+   flip between light and dark — the values that used to be hardcoded (#0c111b,
+   #dfe5ee, #94a1b4) were simply the dark side of tokens that existed all along.
+
+   This pairs with `prism.theme: vsLight` / `prism.darkTheme: vsDark` in
+   docusaurus.config.ts. The two must move together (#324): vsDark tokens on a
+   light surface are pale and unreadable, which is why the background was pinned
+   dark in both modes in the first place. If a fenced block still renders dark in
+   light mode, that config is the thing to check. */
 code {
 	background: var(--jt-code-bg);
 	border: 1px solid var(--jt-border);
@@ -202,23 +207,30 @@ div[class*="codeBlockContainer"],
 pre[class*="language-"] {
 	border: 1px solid var(--jt-border);
 	border-radius: 12px;
-	background: #0c111b !important;
+	/* !important beats the inline background the Prism theme sets on the <pre>. */
+	background: var(--jt-code-bg) !important;
 }
 .theme-code-block code,
 pre[class*="language-"] code {
 	background: transparent !important;
 	border: none !important;
-	color: #dfe5ee;
+	/* Base colour for anything Prism does not tokenise. */
+	color: var(--jt-text);
 }
 div[class*="codeBlockTitle"] {
-	background: #0a0e16 !important;
-	color: #94a1b4 !important;
+	background: var(--jt-surface2) !important;
+	color: var(--jt-muted) !important;
 	border-bottom: 1px solid var(--jt-border);
 }
+/* In dark the title sits a shade *below* the block; in light there is no token
+   darker than --jt-code-bg, so the bottom border does the separating instead. */
+[data-theme="dark"] div[class*="codeBlockTitle"] {
+	background: var(--jt-bg) !important;
+}
 [data-theme="light"] .theme-code-block,
 [data-theme="light"] div[class*="codeBlockContainer"],
 [data-theme="light"] pre[class*="language-"] {
-	border-color: rgba(12, 18, 28, 0.16);
+	border-color: var(--jt-border2);
 	box-shadow: 0 8px 24px -18px rgba(12, 18, 28, 0.5);
 }