@jcoreio/toolchain 5.1.2 → 5.2.0

package/githooks.cjs

@@ -1,5 +1,26 @@
 module.exports = {
-  'pre-commit': 'lint-staged',
+  'pre-commit': async (...args) => {
+    const execa = require('./util/execa.cjs')
+    await execa('lint-staged', args)
+
+    const pnpmVersion = (
+      await execa('pnpm', ['-v'], { stdio: 'pipe', maxBuffer: 10 * 1024 })
+    ).stdout
+    const projectFs = require('./util/projectFs.cjs')
+    const { packageManager } = await projectFs.readJson('package.json')
+    const expectedPnpmVersion = packageManager.replace(/^pnpm@/, '')
+    if (pnpmVersion !== expectedPnpmVersion) {
+      const chalk = require('chalk')
+      // eslint-disable-next-line no-console
+      console.error(
+        chalk`{red Error: the pnpm on your $PATH is version ${pnpmVersion}, but your package.json has "packageManager": ${JSON.stringify(packageManager)}.
+This may mean your pnpm-lock.yaml is the wrong version, which would cause installing dependencies in CI to fail.
+It's recommended to use corepack (https://nodejs.org/api/corepack.html) to manage pnpm instead of installing it globally,
+since corepack can automatically select the pnpm version specified in "packageManager"}`
+      )
+      process.exit(1)
+    }
+  },
   'commit-msg': async (file) => {
     const fs = require('./util/projectFs.cjs')
     const parseCommitMessage = require('./util/parseCommitMessage.cjs')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jcoreio/toolchain",
-  "version": "5.1.2",
+  "version": "5.2.0",
   "description": "base JS build toolchain",
   "repository": {
     "type": "git",
@@ -23,6 +23,7 @@
     "find-up": "^5.0.0",
     "fs-extra": "^10.0.0",
     "glob": "^11.0.0",
+    "js-yaml": "4.1.0",
     "json5": "^2.2.1",
     "lint-staged": "^15.2.2",
     "minimatch": "^10.0.1",
@@ -39,7 +40,7 @@
     "engines": {
       "node": ">=16"
     },
-    "packageManager": "pnpm@8.11.0",
+    "packageManager": "pnpm@10.6.5",
     "devDependencies": {
       "eslint": "*",
       "@jcoreio/eslint-plugin-implicit-dependencies": "*"

package/scripts/migrate/migrateProjectPackageJson.cjs

@@ -147,6 +147,17 @@ async function migrateProjectPackageJson({ fromVersion }) {
           },
         },
     pick(toolchainManaged, 'engines', 'packageManager'),
+    {
+      packageManager:
+        !packageJson.packageManager ||
+        !packageJson.packageManager.startsWith('pnpm@') ||
+        semver.lt(
+          packageJson.packageManager.replace(/^pnpm@/, ''),
+          toolchainManaged.packageManager.replace(/^pnpm@/, '')
+        )
+          ? toolchainManaged.packageManager
+          : packageJson.packageManager,
+    },
     pick(packageJson, 'engines')
   )
   if (!fromVersion && isEmpty(packageJson.config)) delete packageJson.config