feat: workspace config for run command

package.json

@@ -283,7 +283,7 @@
     "micromark-extension-gfm-strikethrough": "^2.0.0",
     "micromark-extension-gfm-table": "^2.0.0",
     "micromark-extension-gfm-task-list-item": "^2.0.1",
-    "minimatch": "^9.0.0",
+    "fast-glob": "^3.3.2",
     "mocha": "^10.0.0",
     "npm-package-json-lint": "^7.0.0",
     "nyc": "^15.1.0",

src/check-project/index.js

@@ -10,8 +10,8 @@ import prompt from 'prompt'
 import semver from 'semver'
 import yargsParser from 'yargs-parser'
 import {
+  getSubprojectDirectories,
   isMonorepoProject,
-  glob,
   usesReleasePlease
 } from '../utils.js'
 import { checkBuildFiles } from './check-build-files.js'
@@ -114,32 +114,27 @@ async function processMonorepo (projectDir, manifest, branchName, repoUrl, ciFil
 
   const projectDirs = []
 
-  for (const workspace of workspaces) {
-    for await (const subProjectDir of glob('.', workspace, {
-      cwd: projectDir,
-      absolute: true
-    })) {
-      const stat = await fs.stat(subProjectDir)
+  for (const subProjectDir of await getSubprojectDirectories(workspaces, projectDir)) {
+    const stat = await fs.stat(subProjectDir)
 
-      if (!stat.isDirectory()) {
-        continue
-      }
+    if (!stat.isDirectory()) {
+      continue
+    }
 
-      const manfest = path.join(subProjectDir, 'package.json')
+    const manfest = path.join(subProjectDir, 'package.json')
 
-      if (!fs.existsSync(manfest)) {
-        continue
-      }
+    if (!fs.existsSync(manfest)) {
+      continue
+    }
 
-      const pkg = fs.readJSONSync(manfest)
-      const homePage = `${repoUrl}/tree/${branchName}${subProjectDir.substring(projectDir.length)}`
+    const pkg = fs.readJSONSync(manfest)
+    const homePage = `${repoUrl}/tree/${branchName}${subProjectDir.substring(projectDir.length)}`
 
-      console.info('Found monorepo project', pkg.name)
+    console.info('Found monorepo project', pkg.name)
 
-      await processModule(subProjectDir, pkg, branchName, repoUrl, homePage, ciFile, manifest)
+    await processModule(subProjectDir, pkg, branchName, repoUrl, homePage, ciFile, manifest)
 
-      projectDirs.push(subProjectDir)
-    }
+    projectDirs.push(subProjectDir)
   }
 
   await alignMonorepoProjectDependencies(projectDirs)

src/cmds/run.js

@@ -1,5 +1,6 @@
 import { loadUserConfig } from '../config/user.js'
 import runCmd from '../run.js'
+import { listWorkspaces } from '../utils.js'
 
 /**
  * @typedef {import("yargs").Argv} Argv
@@ -39,6 +40,14 @@ export default {
           type: 'number',
           describe: 'How many scripts to run at the same time',
           default: userConfig.run.concurrency
+        },
+
+        workspaces: {
+          // an array of strings
+          array: true,
+          describe: 'Run the script in a specific workspace',
+          default: await listWorkspaces(process.cwd()),
+          alias: ['workspace', 'roots']
         }
       })
       .positional('script', {

src/docs/readme-updater-plugin.js

@@ -15,7 +15,7 @@ export function load (app) {
   let projects = {}
 
   if (isMonorepoParent) {
-    projects = parseProjects(process.cwd(), pkg.workspaces)
+    projects = parseProjects(pkg.workspaces)
   }
 
   // when rendering has finished, work out which UrlMappings refer to the index

src/exec.js

@@ -14,7 +14,7 @@ export default {
   async run (ctx) {
     const forwardArgs = ctx['--'] ? ctx['--'] : []
 
-    await everyMonorepoProject(process.cwd(), async (project) => {
+    await everyMonorepoProject(async (project) => {
       console.info('') // eslint-disable-line no-console
       console.info(kleur.grey(`${project.manifest.name}:`), `> ${ctx.command}${forwardArgs.length > 0 ? ` ${forwardArgs.join(' ')}` : ''}`) // eslint-disable-line no-console
 

src/release-rc.js

@@ -22,7 +22,7 @@ async function releaseMonorepoRcs (commit, ctx) {
   /** @type {Record<string, string>} */
   const versions = {}
 
-  await everyMonorepoProject(process.cwd(), async (project) => {
+  await everyMonorepoProject(async (project) => {
     if (project.manifest.private === true) {
       console.info(`Skipping private package ${project.manifest.name}`)
       return
@@ -43,7 +43,7 @@ async function releaseMonorepoRcs (commit, ctx) {
   console.info('')
 
   // publish packages
-  await everyMonorepoProject(process.cwd(), async (project) => {
+  await everyMonorepoProject(async (project) => {
     if (project.manifest.private === true) {
       console.info(`Skipping private package ${project.manifest.name}`)
       return

src/release.js

@@ -5,7 +5,7 @@ import { execa } from 'execa'
 import fs from 'fs-extra'
 import Listr from 'listr'
 import { calculateSiblingVersion } from './check-project/utils.js'
-import { isMonorepoProject, isMonorepoRoot, hasDocs, glob } from './utils.js'
+import { isMonorepoProject, isMonorepoRoot, hasDocs, getSubprojectDirectories } from './utils.js'
 
 /**
  * @typedef {import("./types").GlobalOptions} GlobalOptions
@@ -69,7 +69,7 @@ const tasks = new Listr([
       const {
         siblingVersions,
         packageDirs
-      } = await calculateSiblingVersions(rootDir, workspaces)
+      } = await calculateSiblingVersions(workspaces, rootDir)
 
       // check these dependency types for monorepo siblings
       const dependencyTypes = [
@@ -142,27 +142,22 @@ const tasks = new Listr([
 ], { renderer: 'verbose' })
 
 /**
- * @param {string} rootDir
  * @param {string[]} workspaces
+ * @param {string} rootDir
  */
-async function calculateSiblingVersions (rootDir, workspaces) {
+async function calculateSiblingVersions (workspaces, rootDir) {
   const packageDirs = []
 
   /** @type {Record<string, string>} */
   const siblingVersions = {}
 
-  for (const workspace of workspaces) {
-    for await (const subProjectDir of glob(rootDir, workspace, {
-      cwd: rootDir,
-      absolute: true
-    })) {
-      const pkg = JSON.parse(fs.readFileSync(path.join(subProjectDir, 'package.json'), {
-        encoding: 'utf-8'
-      }))
-
-      siblingVersions[pkg.name] = calculateSiblingVersion(pkg.version)
-      packageDirs.push(subProjectDir)
-    }
+  for (const subProjectDir of await getSubprojectDirectories(workspaces, rootDir)) {
+    const pkg = JSON.parse(fs.readFileSync(path.join(subProjectDir, 'package.json'), {
+      encoding: 'utf-8'
+    }))
+
+    siblingVersions[pkg.name] = calculateSiblingVersion(pkg.version)
+    packageDirs.push(subProjectDir)
   }
 
   return {

src/run.js

@@ -20,7 +20,7 @@ export default {
 
     const forwardArgs = ctx['--'] == null ? [] : ['--', ...ctx['--']]
 
-    await everyMonorepoProject(process.cwd(), async (project) => {
+    await everyMonorepoProject(async (project) => {
       for (const script of scripts) {
         if (project.manifest.scripts[script] == null) {
           continue
@@ -45,6 +45,7 @@ export default {
         }
       }
     }, {
+      workspaces: ctx.workspaces,
       concurrency: ctx.concurrency
     })
   }

src/test-dependant/index.js

@@ -4,8 +4,7 @@ import os from 'os'
 import path from 'path'
 import fs from 'fs-extra'
 import {
-  exec,
-  glob
+  exec, getSubprojectDirectories
 } from '../utils.js'
 
 /**
@@ -197,10 +196,8 @@ const testMonoRepo = async (targetDir, deps, scriptName) => {
   }
 
   // test each package that depends on passed deps
-  for (const pattern of config.workspaces) {
-    for await (const match of glob(targetDir, pattern)) {
-      await testModule(path.join(targetDir, match), deps, scriptName)
-    }
+  for (const match of await getSubprojectDirectories(config.workspaces, targetDir)) {
+    await testModule(path.join(targetDir, match), deps, scriptName)
   }
 }
 

src/types.ts

@@ -109,6 +109,7 @@ interface GlobalOptions {
    * Full config from configuration file
    */
   fileConfig: Options
+
 }
 
 interface BuildOptions {
@@ -391,9 +392,11 @@ interface ExecOptions {
    * Run commands in parallel up to this limit
    */
   concurrency?: number
+
 }
 
 interface RunOptions {
+
   /**
    * If false, the script will continue to be run in other packages
    */
@@ -408,6 +411,12 @@ interface RunOptions {
    * Run scripts in parallel up to this limit
    */
   concurrency?: number
+
+  /**
+   * Workspaces to run the command in
+   */
+  workspaces?: string[]
+
 }
 
 export type {