@jcoreio/toolchain 4.5.2 → 4.5.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@jcoreio/toolchain",
3
- "version": "4.5.2",
3
+ "version": "4.5.4",
4
4
  "description": "base JS build toolchain",
5
5
  "repository": {
6
6
  "type": "git",
@@ -1,14 +1,21 @@
1
1
  #!/usr/bin/env node
2
2
 
3
- const { packageJson, monorepoProjectDir } = require('../util/findUps.cjs')
3
+ const {
4
+ packageJson,
5
+ isMonorepoRoot,
6
+ monorepoSubpackageJsons,
7
+ } = require('../util/findUps.cjs')
4
8
  const execa = require('../util/execa.cjs')
5
9
  const { name } = require('../package.json')
6
10
 
7
11
  async function upgrade([version] = []) {
8
- const { devDependencies = {} } = packageJson
9
- const toolchains = Object.keys(devDependencies).filter((pkg) =>
10
- pkg.startsWith(`${name}-`)
11
- )
12
+ const toolchains = [
13
+ ...new Set(
14
+ [packageJson, ...(isMonorepoRoot ? monorepoSubpackageJsons || [] : [])]
15
+ .flatMap((p) => Object.keys(p.devDependencies || {}))
16
+ .filter((pkg) => pkg.startsWith(`${name}-`))
17
+ ),
18
+ ]
12
19
  const isTest = Boolean(process.env.JCOREIO_TOOLCHAIN_SELF_TEST)
13
20
 
14
21
  if (!isTest && !version) {
@@ -23,7 +30,7 @@ async function upgrade([version] = []) {
23
30
  'pnpm',
24
31
  isTest
25
32
  ? [
26
- ...(monorepoProjectDir ? ['-r'] : []),
33
+ ...(isMonorepoRoot ? ['-r'] : []),
27
34
  'add',
28
35
  '-D',
29
36
  '--prefer-offline',
@@ -31,14 +38,14 @@ async function upgrade([version] = []) {
31
38
  ...toolchains.map((t) => t.replace(`${name}-`, '../packages/')),
32
39
  ]
33
40
  : [
34
- ...(monorepoProjectDir ? ['-r'] : []),
41
+ ...(isMonorepoRoot ? ['-r'] : []),
35
42
  'update',
36
43
  '--prefer-offline',
37
44
  `${name}@^${version}`,
38
45
  ...toolchains.map((t) => `${t}@^${version}`),
39
46
  ]
40
47
  )
41
- if (monorepoProjectDir) await execa('pnpm', ['run', '-r', 'tc', 'migrate'])
48
+ if (isMonorepoRoot) await execa('pnpm', ['run', '-r', 'tc', 'migrate'])
42
49
  else await execa('tc', ['migrate'])
43
50
  }
44
51
 
package/util/findUps.cjs CHANGED
@@ -70,6 +70,10 @@ exports.monorepoSubpackageJsonFiles = pnpmWorkspace
70
70
  ].map((f) => Path.resolve(monorepoProjectDir, f))
71
71
  : undefined
72
72
 
73
+ exports.monorepoSubpackageJsons = exports.monorepoSubpackageJsonFiles
74
+ ? exports.monorepoSubpackageJsonFiles.map((f) => fs.readJsonSync(f))
75
+ : undefined
76
+
73
77
  const findGitDir = once(function findGitDir(cwd = process.cwd()) {
74
78
  let stopAt = Path.dirname(monorepoProjectDir || projectDir)
75
79
  if (stopAt === '/') stopAt = undefined