fix(ci): rm workspace node_modules

lib/arborist-cmd.js

@@ -10,9 +10,6 @@ class ArboristCmd extends BaseCommand {
   }
 
   static params = [
-    'workspace',
-    'workspaces',
-    'include-workspace-root',
     'install-links',
   ]
 
@@ -44,7 +41,6 @@ class ArboristCmd extends BaseCommand {
   }
 
   async execWorkspaces (args) {
-    await this.setWorkspaces()
     return this.exec(args)
   }
 }

lib/arborist-ws-cmd.js

@@ -0,0 +1,20 @@
+const ArboristCmd = require('./arborist-cmd.js')
+
+// This is the base for all commands whose execWorkspaces just gets
+// a list of workspace names and passes it on to new Arborist() to
+// be able to run a filtered Arborist.reify() at some point.
+class ArboristWsCmd extends ArboristCmd {
+  static params = [
+    'workspace',
+    'workspaces',
+    'include-workspace-root',
+    ...super.params,
+  ]
+
+  async execWorkspaces (args) {
+    await this.setWorkspaces()
+    return this.exec(args)
+  }
+}
+
+module.exports = ArboristWsCmd

lib/commands/audit.js

@@ -1,5 +1,5 @@
 const npmAuditReport = require('npm-audit-report')
-const ArboristWorkspaceCmd = require('../arborist-cmd.js')
+const ArboristWorkspaceCmd = require('../arborist-ws-cmd.js')
 const auditError = require('../utils/audit-error.js')
 const { log, output } = require('proc-log')
 const reifyFinish = require('../utils/reify-finish.js')

lib/commands/ci.js

@@ -3,12 +3,16 @@ const runScript = require('@npmcli/run-script')
 const fs = require('fs/promises')
 const { log, time } = require('proc-log')
 const validateLockfile = require('../utils/validate-lockfile.js')
-const ArboristWorkspaceCmd = require('../arborist-cmd.js')
+const ArboristCmd = require('../arborist-cmd.js')
+const getWorkspaces = require('../utils/get-workspaces.js')
 
-class CI extends ArboristWorkspaceCmd {
+class CI extends ArboristCmd {
   static description = 'Clean install a project'
   static name = 'ci'
 
+  static workspaces = true
+  static ignoreImplicitWorkspace = true
+
   // These are in the order they will show up in when running "-h"
   static params = [
     'install-strategy',
@@ -33,14 +37,19 @@ class CI extends ArboristWorkspaceCmd {
       })
     }
 
+    const workspacePaths = await getWorkspaces([], {
+      path: this.npm.localPrefix,
+      includeWorkspaceRoot: true,
+    })
+
     const where = this.npm.prefix
     const Arborist = require('@npmcli/arborist')
     const opts = {
       ...this.npm.flatOptions,
       packageLock: true, // npm ci should never skip lock files
       path: where,
       save: false, // npm ci should never modify the lockfile or package.json
-      workspaces: this.workspaceNames,
+      workspaces: [...workspacePaths.keys()],
     }
 
     const arb = new Arborist(opts)
@@ -79,11 +88,14 @@ class CI extends ArboristWorkspaceCmd {
       // Only remove node_modules after we've successfully loaded the virtual
       // tree and validated the lockfile
       await time.start('npm-ci:rm', async () => {
-        const path = `${where}/node_modules`
-        // get the list of entries so we can skip the glob for performance
-        const entries = await fs.readdir(path, null).catch(() => [])
-        return Promise.all(entries.map(f => fs.rm(`${path}/${f}`,
-          { force: true, recursive: true })))
+        return await Promise.all([...workspacePaths.values()].map(async modulePath => {
+          const path = `${modulePath}/node_modules`
+          // get the list of entries so we can skip the glob for performance
+          const entries = await fs.readdir(path, null).catch(() => [])
+          return Promise.all(entries.map(f => {
+            return fs.rm(`${path}/${f}`, { force: true, recursive: true })
+          }))
+        }))
       })
     }
 

lib/commands/dedupe.js

@@ -1,5 +1,5 @@
 const reifyFinish = require('../utils/reify-finish.js')
-const ArboristWorkspaceCmd = require('../arborist-cmd.js')
+const ArboristWorkspaceCmd = require('../arborist-ws-cmd.js')
 
 // dedupe duplicated packages, or find them in the tree
 class Dedupe extends ArboristWorkspaceCmd {

lib/commands/explain.js

@@ -4,7 +4,7 @@ const semver = require('semver')
 const { relative, resolve } = require('path')
 const validName = require('validate-npm-package-name')
 const { output } = require('proc-log')
-const ArboristWorkspaceCmd = require('../arborist-cmd.js')
+const ArboristWorkspaceCmd = require('../arborist-ws-cmd.js')
 
 class Explain extends ArboristWorkspaceCmd {
   static description = 'Explain installed packages'

lib/commands/find-dupes.js

@@ -1,4 +1,4 @@
-const ArboristWorkspaceCmd = require('../arborist-cmd.js')
+const ArboristWorkspaceCmd = require('../arborist-ws-cmd.js')
 
 // dedupe duplicated packages, or find them in the tree
 class FindDupes extends ArboristWorkspaceCmd {

lib/commands/fund.js

@@ -6,7 +6,7 @@ const npa = require('npm-package-arg')
 const { depth } = require('treeverse')
 const { readTree: getFundingInfo, normalizeFunding, isValidFunding } = require('libnpmfund')
 const { openUrl } = require('../utils/open-url.js')
-const ArboristWorkspaceCmd = require('../arborist-cmd.js')
+const ArboristWorkspaceCmd = require('../arborist-ws-cmd.js')
 
 const getPrintableName = ({ name, version }) => {
   const printableVersion = version ? `@${version}` : ''

lib/commands/install.js

@@ -5,7 +5,7 @@ const runScript = require('@npmcli/run-script')
 const pacote = require('pacote')
 const checks = require('npm-install-checks')
 const reifyFinish = require('../utils/reify-finish.js')
-const ArboristWorkspaceCmd = require('../arborist-cmd.js')
+const ArboristWorkspaceCmd = require('../arborist-ws-cmd.js')
 
 class Install extends ArboristWorkspaceCmd {
   static description = 'Install a package'

lib/commands/link.js

@@ -4,7 +4,7 @@ const npa = require('npm-package-arg')
 const pkgJson = require('@npmcli/package-json')
 const semver = require('semver')
 const reifyFinish = require('../utils/reify-finish.js')
-const ArboristWorkspaceCmd = require('../arborist-cmd.js')
+const ArboristWorkspaceCmd = require('../arborist-ws-cmd.js')
 
 class Link extends ArboristWorkspaceCmd {
   static description = 'Symlink a package folder'

lib/commands/ls.js

@@ -3,7 +3,7 @@ const archy = require('archy')
 const { breadth } = require('treeverse')
 const npa = require('npm-package-arg')
 const { output } = require('proc-log')
-const ArboristWorkspaceCmd = require('../arborist-cmd.js')
+const ArboristWorkspaceCmd = require('../arborist-ws-cmd.js')
 const localeCompare = require('@isaacs/string-locale-compare')('en')
 
 const relativePrefix = `.${sep}`

lib/commands/outdated.js

@@ -6,7 +6,7 @@ const npa = require('npm-package-arg')
 const pickManifest = require('npm-pick-manifest')
 const { output } = require('proc-log')
 const localeCompare = require('@isaacs/string-locale-compare')('en')
-const ArboristWorkspaceCmd = require('../arborist-cmd.js')
+const ArboristWorkspaceCmd = require('../arborist-ws-cmd.js')
 
 class Outdated extends ArboristWorkspaceCmd {
   static description = 'Check for outdated packages'

lib/commands/prune.js

@@ -1,5 +1,5 @@
 const reifyFinish = require('../utils/reify-finish.js')
-const ArboristWorkspaceCmd = require('../arborist-cmd.js')
+const ArboristWorkspaceCmd = require('../arborist-ws-cmd.js')
 
 // prune extraneous packages
 class Prune extends ArboristWorkspaceCmd {

lib/commands/rebuild.js

@@ -2,7 +2,7 @@ const { resolve } = require('path')
 const { output } = require('proc-log')
 const npa = require('npm-package-arg')
 const semver = require('semver')
-const ArboristWorkspaceCmd = require('../arborist-cmd.js')
+const ArboristWorkspaceCmd = require('../arborist-ws-cmd.js')
 
 class Rebuild extends ArboristWorkspaceCmd {
   static description = 'Rebuild a package'

lib/commands/uninstall.js

@@ -2,7 +2,7 @@ const { resolve } = require('path')
 const pkgJson = require('@npmcli/package-json')
 const reifyFinish = require('../utils/reify-finish.js')
 const completion = require('../utils/installed-shallow.js')
-const ArboristWorkspaceCmd = require('../arborist-cmd.js')
+const ArboristWorkspaceCmd = require('../arborist-ws-cmd.js')
 
 class Uninstall extends ArboristWorkspaceCmd {
   static description = 'Remove a package'

lib/commands/update.js

@@ -1,7 +1,7 @@
 const path = require('path')
 const { log } = require('proc-log')
 const reifyFinish = require('../utils/reify-finish.js')
-const ArboristWorkspaceCmd = require('../arborist-cmd.js')
+const ArboristWorkspaceCmd = require('../arborist-ws-cmd.js')
 
 class Update extends ArboristWorkspaceCmd {
   static description = 'Update packages'

mock-registry/lib/index.js

@@ -439,6 +439,50 @@ class MockRegistry {
       ...packument,
     }
   }
+
+  /**
+   * this is a simpler convience method for creating mockable registry with
+   * tarballs for specific versions
+   */
+  async setup (packages) {
+    const format = Object.keys(packages).map(v => {
+      const [name, version] = v.split('@')
+      return { name, version }
+    }).reduce((acc, inc) => {
+      const exists = acc.find(pkg => pkg.name === inc.name)
+      if (exists) {
+        exists.tarballs = {
+          ...exists.tarballs,
+          [inc.version]: packages[`${inc.name}@${inc.version}`],
+        }
+      } else {
+        acc.push({ name: inc.name,
+          tarballs: {
+            [inc.version]: packages[`${inc.name}@${inc.version}`],
+          },
+        })
+      }
+      return acc
+    }, [])
+    const registry = this
+    for (const pkg of format) {
+      const { name, tarballs } = pkg
+      const versions = Object.keys(tarballs)
+      const manifest = await registry.manifest({ name, versions })
+
+      for (const version of versions) {
+        const tarballPath = pkg.tarballs[version]
+        if (!tarballPath) {
+          throw new Error(`Tarball path not provided for version ${version}`)
+        }
+
+        await registry.tarball({
+          manifest: manifest.versions[version],
+          tarball: tarballPath,
+        })
+      }
+    }
+  }
 }
 
 module.exports = MockRegistry

smoke-tests/tap-snapshots/test/index.js.test.cjs

@@ -59,9 +59,7 @@ npm error [--install-strategy <hoisted|nested|shallow|linked>] [--legacy-bundlin
 npm error [--global-style] [--omit <dev|optional|peer> [--omit <dev|optional|peer> ...]]
 npm error [--include <prod|dev|optional|peer> [--include <prod|dev|optional|peer> ...]]
 npm error [--strict-peer-deps] [--foreground-scripts] [--ignore-scripts] [--no-audit]
-npm error [--no-bin-links] [--no-fund] [--dry-run]
-npm error [-w|--workspace <workspace-name> [-w|--workspace <workspace-name> ...]]
-npm error [-ws|--workspaces] [--include-workspace-root] [--install-links]
+npm error [--no-bin-links] [--no-fund] [--dry-run] [--install-links]
 npm error
 npm error aliases: clean-install, ic, install-clean, isntall-clean
 npm error

tap-snapshots/test/lib/docs.js.test.cjs

@@ -2710,9 +2710,7 @@ Options:
 [--global-style] [--omit <dev|optional|peer> [--omit <dev|optional|peer> ...]]
 [--include <prod|dev|optional|peer> [--include <prod|dev|optional|peer> ...]]
 [--strict-peer-deps] [--foreground-scripts] [--ignore-scripts] [--no-audit]
-[--no-bin-links] [--no-fund] [--dry-run]
-[-w|--workspace <workspace-name> [-w|--workspace <workspace-name> ...]]
-[-ws|--workspaces] [--include-workspace-root] [--install-links]
+[--no-bin-links] [--no-fund] [--dry-run] [--install-links]
 
 aliases: clean-install, ic, install-clean, isntall-clean
 
@@ -2736,9 +2734,6 @@ aliases: clean-install, ic, install-clean, isntall-clean
 #### \`bin-links\`
 #### \`fund\`
 #### \`dry-run\`
-#### \`workspace\`
-#### \`workspaces\`
-#### \`include-workspace-root\`
 #### \`install-links\`
 `
 
@@ -3329,9 +3324,7 @@ Options:
 [--global-style] [--omit <dev|optional|peer> [--omit <dev|optional|peer> ...]]
 [--include <prod|dev|optional|peer> [--include <prod|dev|optional|peer> ...]]
 [--strict-peer-deps] [--foreground-scripts] [--ignore-scripts] [--no-audit]
-[--no-bin-links] [--no-fund] [--dry-run]
-[-w|--workspace <workspace-name> [-w|--workspace <workspace-name> ...]]
-[-ws|--workspaces] [--include-workspace-root] [--install-links]
+[--no-bin-links] [--no-fund] [--dry-run] [--install-links]
 
 aliases: cit, clean-install-test, sit
 
@@ -3355,9 +3348,6 @@ aliases: cit, clean-install-test, sit
 #### \`bin-links\`
 #### \`fund\`
 #### \`dry-run\`
-#### \`workspace\`
-#### \`workspaces\`
-#### \`include-workspace-root\`
 #### \`install-links\`
 `