fix(@jcoreio/toolchain): fix bugs with upgrade in monorepos

jcoreio · May 15, 2024 · dcbcce2 · dcbcce2
1 parent aafbd73
commit dcbcce2
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/packages/base/scripts/upgrade.cjs b/packages/base/scripts/upgrade.cjs
@@ -1,14 +1,21 @@
 #!/usr/bin/env node
 
-const { packageJson, monorepoProjectDir } = require('../util/findUps.cjs')
+const {
+  packageJson,
+  isMonorepoRoot,
+  monorepoSubpackageJsons,
+} = require('../util/findUps.cjs')
 const execa = require('../util/execa.cjs')
 const { name } = require('../package.json')
 
 async function upgrade([version] = []) {
-  const { devDependencies = {} } = packageJson
-  const toolchains = Object.keys(devDependencies).filter((pkg) =>
-    pkg.startsWith(`${name}-`)
-  )
+  const toolchains = [
+    ...new Set(
+      [packageJson, ...(isMonorepoRoot ? monorepoSubpackageJsons || [] : [])]
+        .flatMap((p) => Object.keys(p.devDependencies || {}))
+        .filter((pkg) => pkg.startsWith(`${name}-`))
+    ),
+  ]
   const isTest = Boolean(process.env.JCOREIO_TOOLCHAIN_SELF_TEST)
 
   if (!isTest && !version) {
@@ -23,22 +30,22 @@ async function upgrade([version] = []) {
     'pnpm',
     isTest
       ? [
-          ...(monorepoProjectDir ? ['-r'] : []),
+          ...(isMonorepoRoot ? ['-r'] : []),
           'add',
           '-D',
           '--prefer-offline',
           '../packages/base',
           ...toolchains.map((t) => t.replace(`${name}-`, '../packages/')),
         ]
       : [
-          ...(monorepoProjectDir ? ['-r'] : []),
+          ...(isMonorepoRoot ? ['-r'] : []),
           'update',
           '--prefer-offline',
           `${name}@^${version}`,
           ...toolchains.map((t) => `${t}@^${version}`),
         ]
   )
-  if (monorepoProjectDir) await execa('pnpm', ['run', '-r', 'tc', 'migrate'])
+  if (isMonorepoRoot) await execa('pnpm', ['run', '-r', 'tc', 'migrate'])
   else await execa('tc', ['migrate'])
 }
 

diff --git a/packages/base/util/findUps.cjs b/packages/base/util/findUps.cjs
@@ -70,6 +70,10 @@ exports.monorepoSubpackageJsonFiles = pnpmWorkspace
     ].map((f) => Path.resolve(monorepoProjectDir, f))
   : undefined
 
+exports.monorepoSubpackageJsons = exports.monorepoSubpackageJsonFiles
+  ? exports.monorepoSubpackageJsonFiles.map((f) => fs.readJsonSync(f))
+  : undefined
+
 const findGitDir = once(function findGitDir(cwd = process.cwd()) {
   let stopAt = Path.dirname(monorepoProjectDir || projectDir)
   if (stopAt === '/') stopAt = undefined