@rtorcato/repo-tooling 3.7.2 → 3.7.3

package/dist/cli/commands/setup-presets.js

@@ -1,4 +1,5 @@
 import { swiftFileList } from '../../languages/swift/scaffold.js';
+import { BIOME_CONFIG } from '../generators/linting.js';
 export const PRESET_NAMES = [
     'library',
     'web-app',
@@ -212,7 +213,7 @@ export function computeFileList(config) {
         files.push('tsconfig.json', 'reset.d.ts');
     }
     if (config.linting.tool === 'biome' || config.linting.tool === 'both') {
-        files.push('biome.jsonc');
+        files.push(BIOME_CONFIG);
     }
     if (config.linting.tool === 'eslint' || config.linting.tool === 'both') {
         files.push('eslint.config.mjs');

package/dist/cli/generators/linting.js

@@ -20,13 +20,27 @@ export async function generateLintingConfigs(config, targetDir) {
 }
 export async function generateOxlintConfig(targetDir) {
     // Oxlint's `extends` resolution from npm packages isn't reliably supported,
-    // so we copy the full preset rather than write a thin pointer file (same
-    // pattern as biome.jsonc — the user owns the file once it's in their repo).
+    // so we copy the full preset rather than write a thin pointer file.
     const { copyPreset } = await import('../utils/copy-preset.js');
     await copyPreset('oxlint', targetDir);
 }
+/** The one Biome config filename every code path writes. See BIOME_LEGACY_CONFIG. */
+export const BIOME_CONFIG = 'biome.json';
+/**
+ * The name this generator used to write. Biome resolves `biome.json` first and
+ * says nothing about a `biome.jsonc` sitting next to it, so a repo that had run
+ * both `fix biome` (biome.json) and `fix --resync` (biome.jsonc) ended up with
+ * two configs, one of them silently dead (#365). Both paths now write
+ * BIOME_CONFIG and delete this on the way past, so the ambiguity can't persist.
+ */
+export const BIOME_LEGACY_CONFIG = 'biome.jsonc';
+/**
+ * The thin pointer config — the same shape this repo dogfoods. `fix biome` used
+ * to copy the whole preset inline instead, which meant the scaffolded file
+ * carried no `@rtorcato/repo-tooling/biome` reference for doctor's Biome check
+ * to match, and preset improvements never reached consumers.
+ */
 export async function generateBiomeConfig(targetDir) {
-    const biomeConfigPath = path.join(targetDir, 'biome.jsonc');
     // Biome 2.x schema + shape. The base preset (extends) already defines the
     // file globs via `files.includes`; emitting the old 1.x `include`/`ignore`
     // keys here forced consumers to run `biome migrate` before `biome check`
@@ -35,7 +49,9 @@ export async function generateBiomeConfig(targetDir) {
         $schema: 'https://biomejs.dev/schemas/2.5.0/schema.json',
         extends: ['@rtorcato/repo-tooling/biome'],
     };
-    await fs.writeJson(biomeConfigPath, biomeConfig, { spaces: 2 });
+    await fs.writeJson(path.join(targetDir, BIOME_CONFIG), biomeConfig, { spaces: 2 });
+    await fs.remove(path.join(targetDir, BIOME_LEGACY_CONFIG));
+    return BIOME_CONFIG;
 }
 export async function generateESLintConfig(config, targetDir) {
     const eslintConfigPath = path.join(targetDir, 'eslint.config.mjs');

package/dist/cli/generators/readme.js

@@ -51,7 +51,7 @@ ${config.testing.framework !== 'none' ? '├── tests/              # Test fi
 ├── dist/               # Build output${config.projectType === 'library' ? ' (library)' : ''}
 ├── package.json
 ${config.typescript.enabled ? '├── tsconfig.json        # TypeScript configuration' : ''}
-${config.linting.tool === 'biome' || config.linting.tool === 'both' ? '├── biome.jsonc          # Biome configuration' : ''}
+${config.linting.tool === 'biome' || config.linting.tool === 'both' ? '├── biome.json           # Biome configuration' : ''}
 ${config.linting.tool === 'eslint' || config.linting.tool === 'both' ? '├── eslint.config.mjs    # ESLint configuration' : ''}
 ${config.linting.tool === 'eslint' ? '├── prettier.config.mjs  # Prettier configuration' : ''}
 ${config.testing.framework === 'vitest' ? '├── vitest.config.ts     # Vitest configuration' : ''}

package/dist/languages/js/checks.js

@@ -56,7 +56,9 @@ export const FILE_CHECKS = [
         expected: `extends "${PACKAGE}/biome"`,
         matcher: /@rtorcato\/(?:js|repo)-tooling\/biome/,
         optional: true,
-        hint: 'Run `npx @rtorcato/repo-tooling copy biome` to scaffold',
+        // `fix biome`, not `copy biome`: copy drops the whole preset inline, which
+        // carries no `extends` for the matcher above to find (#365).
+        hint: 'Run `npx @rtorcato/repo-tooling fix biome` to scaffold',
     },
     {
         check: 'ESLint',

package/dist/languages/js/fixers.js

@@ -7,7 +7,7 @@ import { generateHuskyConfig, generatePrePushHook } from '../../cli/generators/g
 import { CI_WORKFLOW, generateGitHubActions } from '../../cli/generators/github-actions.js';
 import { generateGitLabCI } from '../../cli/generators/gitlab-ci.js';
 import { GH_WORKFLOWS, generateGhWorkflow } from '../../cli/generators/github-workflows.js';
-import { generateESLintConfig, generatePrettierConfig } from '../../cli/generators/linting.js';
+import { BIOME_CONFIG, generateBiomeConfig, generateESLintConfig, generatePrettierConfig, } from '../../cli/generators/linting.js';
 import { alignNodeVersion, ensureEnginesNode, ensurePackageManager, generateKnipConfig, generateNvmrc, generateSizeLimitConfig, generateVscodeExtensions, } from '../../cli/generators/misc.js';
 import { scriptsOf } from './ci.js';
 import { composeVerifyScriptFromPkg, ensureScripts } from '../../cli/generators/package-json.js';
@@ -122,13 +122,15 @@ const GH_WORKFLOW_FIXERS = GH_WORKFLOWS.map((name) => ({
 export const FIXERS = [
     {
         target: 'biome',
-        description: 'Scaffold biome.json extending the @rtorcato/repo-tooling preset, plus the scripts that run it',
+        description: `Scaffold ${BIOME_CONFIG} extending the @rtorcato/repo-tooling preset, plus the scripts that run it`,
         appliesTo: ['Biome'],
-        outputs: ['biome.json', 'package.json (scripts)'],
+        outputs: [BIOME_CONFIG, 'package.json (scripts)'],
         canFixDrift: true,
         async run({ targetDir }) {
-            const result = await copyPreset('biome', targetDir);
-            const filesWritten = [result.target];
+            // Shares generateBiomeConfig with the setup/resync path — the two used to
+            // scaffold different filenames with different contents (#365).
+            const written = await generateBiomeConfig(targetDir);
+            const filesWritten = [written];
             // A config with no way to run it left `pnpm check` undefined, which the
             // generated CI called and `fix verify` needed to compose a chain (#364).
             if (await ensureScripts(targetDir, BIOME_SCRIPTS))

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@rtorcato/repo-tooling",
-	"version": "3.7.2",
+	"version": "3.7.3",
 	"description": "One CLI to scaffold, audit and fix your repo's whole toolchain — linting, tests, commits, releases & CI.",
 	"type": "module",
 	"keywords": [