@rtorcato/repo-tooling 3.7.4 → 3.8.0

package/dist/cli/commands/doctor.js

@@ -17,7 +17,7 @@ import { checkGitIdentity } from '../../base/git-identity.js';
 import { LOCKFILE_VERSION, readLockfile } from '../utils/lockfile.js';
 import { declinedInLock, getFixTargetForCheck } from './fix-targets.js';
 import { checkAiSetup, checkCodeowners, checkCodeQL, checkCommunityHealth, checkCoverageUpload, checkDependabot, checkEditorConfig, checkFile, checkGitHooks, checkGitHubActions, checkGitLabCI, checkNestedLanguages, checkPrePushHook, checkReadmeBadges, COMMITLINT_FILE_CHECK, } from '../../base/checks.js';
-import { allDeps, checkAreTheTypesWrong, checkConfigSchemaVersions, checkDocsSite, checkEnginesNode, checkGitDependencies, checkKnip, checkLintStaged, checkNodeVersionConsistency, checkNodeVersionPin, checkPackageJson, checkPublint, checkSemanticRelease, checkSizeLimit, checkTailwind, checkBuildApprovals, checkPnpmWorkspace, checkTreeshakeSetup, checkTurborepo, checkTypedoc, checkVerifyScript, checkVscodeExtensions, evaluateNodeVersion, FILE_CHECKS, findDocsAppDir, jsBadgeAudience, jsGitHooksProfile, readPackageJson, } from '../../languages/js/checks.js';
+import { allDeps, checkAreTheTypesWrong, checkConfigSchemaVersions, checkDocsSite, checkEnginesNode, checkGitDependencies, checkKnip, checkLintStaged, checkNodeVersionConsistency, checkNodeVersionPin, checkPackageJson, checkPackageManager, checkPublint, checkSemanticRelease, checkSizeLimit, checkTailwind, checkBuildApprovals, checkPnpmWorkspace, checkTreeshakeSetup, checkTurborepo, checkTypedoc, checkVerifyScript, checkVscodeExtensions, evaluateNodeVersion, FILE_CHECKS, findDocsAppDir, jsBadgeAudience, jsGitHooksProfile, readPackageJson, } from '../../languages/js/checks.js';
 export { evaluateNodeVersion };
 const PACKAGE = '@rtorcato/repo-tooling';
 // Detects the broken-release-on-protected-main footgun: a workflow that runs
@@ -282,6 +282,7 @@ export async function runDoctor(dir) {
     results.push(evaluateNodeVersion(process.version));
     results.push(checkPackageJson(pkg));
     results.push(checkEnginesNode(pkg));
+    results.push(await checkPackageManager(targetDir, pkg));
     results.push(await checkConfigSchemaVersions(targetDir, pkg));
     results.push(checkGitDependencies(pkg));
     results.push(await checkVscodeExtensions(targetDir));

package/dist/cli/commands/fix-targets.js

@@ -1,6 +1,7 @@
 export const FIX_TARGETS = {
     'package.json': 'package-json',
     'engines.node': 'engines',
+    packageManager: 'engines',
     EditorConfig: 'editorconfig',
     'VS Code extensions': 'vscode-extensions',
     'Node version pin': 'nvmrc',

package/dist/languages/js/checks.js

@@ -156,6 +156,38 @@ export function checkPackageJson(pkg) {
         hint: `Run \`pnpm add -D ${PACKAGE}\``,
     };
 }
+/**
+ * Whether the repo installs with pnpm. Three independent signals, any of which
+ * is enough: the workspace file, the lockfile, or a `packageManager` that
+ * already names pnpm. Shared so `packageManager` and `pnpm settings` agree on
+ * what "a pnpm repo" means.
+ */
+export async function usesPnpm(dir, pkg) {
+    return ((await fs.pathExists(path.join(dir, WORKSPACE_FILE))) ||
+        (await fs.pathExists(path.join(dir, 'pnpm-lock.yaml'))) ||
+        (pkg?.packageManager ?? '').startsWith('pnpm'));
+}
+/**
+ * `packageManager` pins the pnpm that `pnpm/action-setup` resolves (#364). The
+ * generated workflow passes no `version:` input, so a pnpm repo without this
+ * field fails CI at setup — before a single check runs (#372).
+ */
+export async function checkPackageManager(dir, pkg) {
+    const check = 'packageManager';
+    if (!(await usesPnpm(dir, pkg))) {
+        return { check, status: 'ok', detail: 'not a pnpm repo' };
+    }
+    const declared = pkg?.packageManager ?? '';
+    if (declared.trim() !== '') {
+        return { check, status: 'ok', detail: `packageManager = ${declared}` };
+    }
+    return {
+        check,
+        status: 'drift',
+        detail: 'packageManager not set in package.json',
+        hint: `Run \`npx ${PACKAGE} fix engines\` to pin the pnpm version CI resolves`,
+    };
+}
 export function checkEnginesNode(pkg) {
     if (!pkg) {
         return {
@@ -844,10 +876,7 @@ export async function checkPnpmWorkspace(dir, pkg) {
     const hint = `Run \`npx ${PACKAGE} fix pnpm-workspace\` to merge them in`;
     const file = path.join(dir, WORKSPACE_FILE);
     const exists = await fs.pathExists(file);
-    const usesPnpm = exists ||
-        (await fs.pathExists(path.join(dir, 'pnpm-lock.yaml'))) ||
-        (pkg?.packageManager ?? '').startsWith('pnpm');
-    if (!usesPnpm) {
+    if (!(await usesPnpm(dir, pkg))) {
         return { check, status: 'ok', detail: 'not a pnpm repo' };
     }
     const yaml = exists ? await fs.readFile(file, 'utf-8') : '';

package/dist/languages/js/fixers.js

@@ -10,6 +10,7 @@ import { GH_WORKFLOWS, generateGhWorkflow } from '../../cli/generators/github-wo
 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 { usesPnpm } from './checks.js';
 import { composeVerifyScriptFromPkg, ensureScripts } from '../../cli/generators/package-json.js';
 /** Kept in step with the biome branch of getScripts() in package-json.ts. */
 const BIOME_SCRIPTS = {
@@ -18,6 +19,15 @@ const BIOME_SCRIPTS = {
     check: 'biome check .',
     'check:fix': 'biome check --fix .',
 };
+/** Kept in step with the eslint branch of getScripts() in package-json.ts. */
+const ESLINT_SCRIPTS = {
+    lint: 'eslint .',
+    'lint:fix': 'eslint . --fix',
+};
+/** Kept in step with the eslint branch of getScripts() in package-json.ts. */
+const PRETTIER_SCRIPTS = {
+    format: 'prettier --write .',
+};
 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';
@@ -151,24 +161,32 @@ export const FIXERS = [
     },
     {
         target: 'eslint',
-        description: 'Scaffold eslint.config.mjs importing the @rtorcato/repo-tooling preset',
+        description: 'Scaffold eslint.config.mjs importing the @rtorcato/repo-tooling preset, plus the scripts that run it',
         appliesTo: ['ESLint'],
-        outputs: ['eslint.config.mjs'],
+        outputs: ['eslint.config.mjs', 'package.json (scripts)'],
         canFixDrift: true,
         async run({ targetDir, pkg }) {
             await generateESLintConfig(inferProjectConfig(pkg), targetDir);
-            return { filesWritten: ['eslint.config.mjs'] };
+            const filesWritten = ['eslint.config.mjs'];
+            // Without `lint` the generated CI drops its lint step and `fix verify`
+            // composes a chain with no linting in it at all (#371).
+            if (await ensureScripts(targetDir, ESLINT_SCRIPTS))
+                filesWritten.push('package.json');
+            return { filesWritten };
         },
     },
     {
         target: 'prettier',
-        description: 'Scaffold prettier.config.mjs re-exporting the preset',
+        description: 'Scaffold prettier.config.mjs re-exporting the preset, plus the `format` script',
         appliesTo: ['Prettier'],
-        outputs: ['prettier.config.mjs'],
+        outputs: ['prettier.config.mjs', 'package.json (scripts)'],
         canFixDrift: true,
         async run({ targetDir }) {
             await generatePrettierConfig(targetDir);
-            return { filesWritten: ['prettier.config.mjs'] };
+            const filesWritten = ['prettier.config.mjs'];
+            if (await ensureScripts(targetDir, PRETTIER_SCRIPTS))
+                filesWritten.push('package.json');
+            return { filesWritten };
         },
     },
     {
@@ -459,14 +477,22 @@ export const FIXERS = [
     },
     {
         target: 'engines',
-        description: 'Add engines.node to package.json',
-        appliesTo: ['engines.node'],
-        outputs: ['package.json (engines.node field)'],
+        description: 'Add engines.node and packageManager to package.json',
+        appliesTo: ['engines.node', 'packageManager'],
+        outputs: ['package.json (engines.node + packageManager fields)'],
         riskLevel: 'safe-merge',
         canFixDrift: true,
-        async run({ targetDir }) {
-            const result = await ensureEnginesNode(targetDir);
-            return { filesWritten: result === 'added' ? ['package.json'] : [] };
+        async run({ targetDir, pkg }) {
+            // Same concern as engines.node — declaring the toolchain the repo
+            // expects. `fix github-actions` also pins it, but only reaches repos
+            // whose ci.yml is already drifted (#372). Guarded on pnpm because the
+            // value we write is a pnpm range; an npm or yarn repo must not get one.
+            const engines = await ensureEnginesNode(targetDir);
+            const manager = (await usesPnpm(targetDir, pkg))
+                ? await ensurePackageManager(targetDir)
+                : 'already-set';
+            const changed = engines === 'added' || manager === 'added';
+            return { filesWritten: changed ? ['package.json'] : [] };
         },
     },
     {

package/package.json

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