@jcoreio/toolchain 3.10.3 → 3.11.1

package/.eslintrc.js

@@ -1,5 +1,5 @@
 module.exports = {
-  extends: [require.resolve('./eslint.config.cjs')],
+  extends: [require.resolve('./eslintConfig.cjs')],
   env: {
     node: true,
   },

package/githooks/runHook.cjs

@@ -4,7 +4,7 @@ const execa = require('../util/execa.cjs')
 
 module.exports = async function runHook(hookName) {
   try {
-    const gitDir = findGitDir()
+    const gitDir = findGitDir(process.env.INIT_CWD)
     if (!gitDir) {
       throw new Error(`failed to find .git directory`)
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jcoreio/toolchain",
-  "version": "3.10.3",
+  "version": "3.11.1",
   "description": "base JS build toolchain",
   "repository": {
     "type": "git",
@@ -32,6 +32,7 @@
     "resolve-bin": "^1.0.0",
     "semver": "^7.5.3",
     "toposort": "^2.0.2",
+    "yaml": "^2.4.1",
     "zod": "^3.21.4"
   },
   "toolchainManaged": {

package/plugins/getConfigFiles.cjs

@@ -17,18 +17,30 @@ module.exports = [
   async function getConfigFiles() {
     const { env, rules } = (await getRootEslintConfig()) || {}
     const files = {
-      '.eslintrc.cjs': dedent`
+      '.eslintrc.cjs': (prev) =>
+        prev
+          ? prev.replace(
+              new RegExp(`${name}/eslint\\.config\\.cjs`, 'g'),
+              `${name}/eslintConfig.cjs`
+            )
+          : dedent`
         /* eslint-env node, es2018 */
         module.exports = {
-          extends: [require.resolve('${name}/eslint.config.cjs')],${
-        env
-          ? `\nenv: ${JSON.stringify(env, null, 2).replace(/\n/gm, '\n  ')},`
-          : ''
-      }${
-        rules
-          ? `\nrules: ${JSON.stringify(rules, null, 2).replace(/\n/gm, '\n  ')}`
-          : ''
-      }
+          extends: [require.resolve('${name}/eslintConfig.cjs')],${
+              env
+                ? `\nenv: ${JSON.stringify(env, null, 2).replace(
+                    /\n/gm,
+                    '\n  '
+                  )},`
+                : ''
+            }${
+              rules
+                ? `\nrules: ${JSON.stringify(rules, null, 2).replace(
+                    /\n/gm,
+                    '\n  '
+                  )}`
+                : ''
+            }
         }
       `,
       'toolchain.config.cjs': async (existing) => {

package/scripts/init.cjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-const { packageJson } = require('../util/findUps.cjs')
+const { packageJson, isMonorepoRoot } = require('../util/findUps.cjs')
 const fs = require('../util/projectFs.cjs')
 const execa = require('../util/execa.cjs')
 const hasTSFiles = require('../util/hasTSFiles.cjs')
@@ -69,6 +69,7 @@ async function init(args = []) {
   await execa('pnpm', [
     'add',
     '-D',
+    ...(isMonorepoRoot ? ['-w'] : []),
     isTest ? '../packages/base' : `${name}@^${version}`,
     ...(isTest
       ? [...selectedToolchains].map((t) =>

package/scripts/migrate/migrateProjectPackageJson.cjs

@@ -149,11 +149,17 @@ async function migrateProjectPackageJson() {
       const versionRange = managedSection[dep]
       if (isTest && dep.startsWith(`${name}-`)) {
         pkgSection[dep] = `link:${dep.replace(`${name}-`, '../packages/')}`
-      } else if (
-        !pkgSection[dep] ||
-        !semver.satisfies(semver.minVersion(pkgSection[dep]), versionRange)
-      ) {
-        pkgSection[dep] = versionRange
+      } else {
+        try {
+          if (
+            !pkgSection[dep] ||
+            !semver.satisfies(semver.minVersion(pkgSection[dep]), versionRange)
+          ) {
+            pkgSection[dep] = versionRange
+          }
+        } catch (error) {
+          // ignore; package.json probably has a version like workspace:* etc
+        }
       }
     }
   }

package/scripts/migrate.cjs

@@ -4,6 +4,11 @@ const getPluginsAsyncFunction = require('../util/getPluginsAsyncFunction.cjs')
 
 async function migrate(args = []) {
   const execa = require('../util/execa.cjs')
+  const {
+    findGitDir,
+    isMonorepoSubpackage,
+    isMonorepoRoot,
+  } = require('../util/findUps.cjs')
   const installGitHooks = require('./install-git-hooks.cjs')
   const migrateProjectPackageJson = require('./migrate/migrateProjectPackageJson.cjs')
   const migrateEslintConfigs = require('./migrate/migrateEslintConfigs.cjs')
@@ -12,8 +17,10 @@ async function migrate(args = []) {
   const migrateGitignore = require('./migrate/migrateGitignore.cjs')
   const hasYarnOrNpmLockfile = require('../util/hasYarnOrNpmLockfile.cjs')
 
-  await execa('git', ['init'])
-  await installGitHooks.run()
+  if (!isMonorepoSubpackage && !findGitDir()) {
+    await execa('git', ['init'])
+    await installGitHooks.run()
+  }
   await migrateProjectPackageJson()
   if (await hasYarnOrNpmLockfile()) {
     await execa('pnpm', ['import'])
@@ -25,7 +32,11 @@ async function migrate(args = []) {
   await getPluginsAsyncFunction('migrate')(args)
 
   if (!args.includes('--config-only')) {
-    await execa('pnpm', ['i', '--fix-lockfile'])
+    await execa('pnpm', [
+      'i',
+      '--fix-lockfile',
+      ...(isMonorepoRoot ? ['-w'] : []),
+    ])
     await execa('tc', ['format'])
     await execa('tc', ['lint:fix'])
   }

package/scripts/upgrade.cjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-const { packageJson } = require('../util/findUps.cjs')
+const { packageJson, isMonorepoRoot } = require('../util/findUps.cjs')
 const execa = require('../util/execa.cjs')
 const { name } = require('../package.json')
 
@@ -22,6 +22,7 @@ async function upgrade([version] = []) {
   await execa('pnpm', [
     'add',
     '-D',
+    ...(isMonorepoRoot ? ['-w'] : []),
     isTest ? '../packages/base' : `${name}@^${version}`,
     ...(isTest
       ? toolchains.map((t) => t.replace(`${name}-`, '../packages/'))

package/util/findUps.cjs

@@ -6,38 +6,83 @@ const once = require('./once.cjs')
 const { name } = require('../package.json')
 const configSchema = require('./configSchema.cjs')
 
-const findGitDir = once(function findGitDir(
-  cwd = process.env.INIT_CWD || process.cwd()
-) {
-  return findUp.sync('.git', { cwd, type: 'directory' })
-})
-exports.findGitDir = findGitDir
-
 let cwd = process.cwd()
 
 const nodeModulesMatch = /\/node_modules(\/|$)/.exec(cwd)
 if (nodeModulesMatch) cwd = cwd.substring(0, nodeModulesMatch.index)
 
-const packageJsonFile = findUp.sync('package.json', { cwd, type: 'file' })
+const packageJsonFile = (exports.packageJsonFile = findUp.sync('package.json', {
+  cwd,
+  type: 'file',
+}))
 if (!packageJsonFile) {
   throw new Error(
     `failed to find project package.json in a parent directory of ${cwd}`
   )
 }
-exports.packageJsonFile = packageJsonFile
 const packageJson = (exports.packageJson = fs.readJsonSync(packageJsonFile))
 const projectDir = (exports.projectDir = Path.dirname(packageJsonFile))
 
+const pnpmWorkspaceFile = (exports.pnpmWorkspaceFile = findUp.sync(
+  'pnpm-workspace.yaml',
+  {
+    cwd,
+    type: 'file',
+  }
+))
+const pnpmWorkspace = pnpmWorkspaceFile
+  ? require('yaml').parse(fs.readFileSync(pnpmWorkspaceFile, 'utf8'))
+  : undefined
+
+const isMonorepoSubpackage = (exports.isMonorepoSubpackage =
+  pnpmWorkspace && Array.isArray(pnpmWorkspace.packages)
+    ? pnpmWorkspace.packages.some((p) =>
+        new RegExp(`^${p.replace(/\*/g, '[^/]+')}$`).test(
+          Path.relative(Path.dirname(pnpmWorkspaceFile), projectDir)
+        )
+      )
+    : false)
+
+const isMonorepoRoot = (exports.isMonorepoRoot =
+  pnpmWorkspaceFile != null && Path.dirname(pnpmWorkspaceFile) === projectDir)
+
+const monorepoProjectDir = (exports.monorepoProjectDir =
+  isMonorepoSubpackage || isMonorepoRoot
+    ? Path.dirname(pnpmWorkspaceFile)
+    : undefined)
+
+const monorepoPackageJsonFile = (exports.monorepoPackageJsonFile =
+  monorepoProjectDir
+    ? Path.join(monorepoProjectDir, 'package.json')
+    : undefined)
+exports.monorepoPackageJson = monorepoPackageJsonFile
+  ? fs.readJsonSync(monorepoPackageJsonFile)
+  : undefined
+
+const findGitDir = once(function findGitDir(cwd = process.cwd()) {
+  let stopAt = Path.dirname(monorepoProjectDir || projectDir)
+  if (stopAt === '/') stopAt = undefined
+  return findUp.sync((dir) => (dir === stopAt ? findUp.stop : '.git'), {
+    cwd,
+    type: 'directory',
+  })
+})
+exports.findGitDir = findGitDir
+
 const toolchainPackages = (exports.toolchainPackages = [
+  packageJson.name,
   ...Object.keys(packageJson.dependencies || {}),
   ...Object.keys(packageJson.devDependencies || {}),
 ].filter((dep) => dep.startsWith(name)))
 
 const toolchainPackageJsons = (exports.toolchainPackageJsons = {})
 for (const pkg of toolchainPackages) {
-  toolchainPackageJsons[pkg] = require(require.resolve(`${pkg}/package.json`, {
-    paths: [projectDir],
-  }))
+  toolchainPackageJsons[pkg] =
+    pkg === packageJson.name
+      ? packageJson
+      : require(require.resolve(`${pkg}/package.json`, {
+          paths: [projectDir],
+        }))
 }
 
 let toolchainConfigFile