fully uninstall installed plugins, reduce noise

isaacs · isaacs · commit cd17ec3bb3b8 · 2024-06-29T22:13:56.000-07:00
diff --git a/src/run/src/npm.ts b/src/run/src/npm.ts
@@ -69,14 +69,14 @@ const npmFg = (
 }
 
 // suppress all non-essential npm output
-const quiet = ['--no-audit', '--loglevel=error', '--no-progress']
+const quiet = ['--silent', '--log-level=silent', '--no-audit', '--loglevel=error', '--no-progress', '--no-fund']
 
 export const install = async (
   pkgs: string[],
   config: LoadedConfig,
 ) => {
   const npmCwd = await npmFindCwd(config.projectRoot)
-  const args = ['install', ...quiet, '--save-dev', ...pkgs]
+  const args = ['install', ...quiet, '--save', ...pkgs]
   await new Promise<void>((res, rej) => {
     npmFg(args, npmCwd, (code, signal) => {
       // allow error exit to proceed
diff --git a/src/run/src/plugin.ts b/src/run/src/plugin.ts
@@ -173,8 +173,20 @@ const rm = async (args: string[], config: LoadedConfig) => {
     if (pc.includes(plugin)) {
       pc.splice(pc.indexOf(plugin), 1)
     }
-    // if it's not a file on disk, then we probably need to uninstall a pkg
-    if (!(await exists(plugin))) needRemove.add(plugin)
+
+    // if it's an installed plugin, remove it
+    if (
+      !(await exists(plugin)) &&
+      await exists(
+        resolve(
+          config.projectRoot,
+          '.tap/plugins/node_modules',
+          plugin,
+        ),
+      )
+    ) {
+      needRemove.add(plugin)
+    }
   }
 
   if (!removed.size) {
@@ -198,12 +210,7 @@ const rm = async (args: string[], config: LoadedConfig) => {
   console.log('successfully removed plugin(s):')
   console.log([...removed].join('\n'))
   if (needRemove.size) {
-    console.log('The following packages can likely be removed:')
-    console.log(
-      `npm rm ${[...needRemove]
-        .map(p => JSON.stringify(p))
-        .join(' ')}`,
-    )
+    await uninstall([...needRemove], config)
   }
 }
 
diff --git a/src/run/tap-snapshots/test/npm.ts.test.cjs b/src/run/tap-snapshots/test/npm.ts.test.cjs
@@ -11,10 +11,13 @@ Array [
     "npm",
     Array [
       "install",
+      "--silent",
+      "--log-level=silent",
       "--no-audit",
       "--loglevel=error",
       "--no-progress",
-      "--save-dev",
+      "--no-fund",
+      "--save",
       "a",
       "b",
     ],
@@ -57,9 +60,12 @@ Array [
     "npm",
     Array [
       "rm",
+      "--silent",
+      "--log-level=silent",
       "--no-audit",
       "--loglevel=error",
       "--no-progress",
+      "--no-fund",
       "a",
       "b",
     ],
@@ -81,10 +87,13 @@ Array [
     "npm",
     Array [
       "install",
+      "--silent",
+      "--log-level=silent",
       "--no-audit",
       "--loglevel=error",
       "--no-progress",
-      "--save-dev",
+      "--no-fund",
+      "--save",
       "a",
       "b",
     ],
@@ -127,9 +136,12 @@ Array [
     "npm",
     Array [
       "rm",
+      "--silent",
+      "--log-level=silent",
       "--no-audit",
       "--loglevel=error",
       "--no-progress",
+      "--no-fund",
       "a",
       "b",
     ],
diff --git a/src/run/test/plugin.ts b/src/run/test/plugin.ts
@@ -4,6 +4,7 @@ import { LoadedConfig } from '@tapjs/config'
 import { resolve } from 'node:path'
 import { pathToFileURL } from 'node:url'
 import { resolveImport } from 'resolve-import'
+import * as npm from '../dist/esm/npm.js'
 
 const CWD = process.cwd().toUpperCase()
 const deCwd = <T extends any>(obj: T): T => {
@@ -113,8 +114,6 @@ t.test('remove plugin', async t => {
     t.strictSame(logs.args(), [
       ['successfully removed plugin(s):'],
       ['a'],
-      ['The following packages can likely be removed:'],
-      ['npm rm "a"'],
     ])
   })
 
@@ -194,6 +193,62 @@ t.test('remove plugin', async t => {
     ])
   })
 
+  t.test('remove installed plugin', async t => {
+    t.testdir({
+      '.tap': {
+        plugins: {
+          node_modules: {
+            'my-plugin': {
+              'package.json': JSON.stringify({
+                name: 'my-plugin',
+                exports: {
+                  import: './index.mjs',
+                  require: './index.cjs',
+                },
+              }),
+              'index.mjs': 'export const plugin = () => ({})',
+              'index.cjs': 'exports.plugin = () => ({})',
+            },
+          },
+        },
+      },
+    })
+    const p = 'my-plugin'
+    let buildRan = false
+    const config = new MockConfig(t)
+    config.pluginList.push(p)
+    config.values.plugin.push(p)
+
+    let uninstalled: string[] = []
+    const { plugin } = await t.mockImport<
+      typeof import('../dist/esm/plugin.js')
+    >('../dist/esm/plugin.js', {
+      '../dist/esm/npm.js': t.createMock(npm, {
+        uninstall: (pkgs: string[]) => {
+          uninstalled = pkgs
+        },
+      }),
+      '../dist/esm/build.js': {
+        build: () => (buildRan = true),
+        'foreground-child': {
+          foregroundChild: nope,
+        },
+      },
+    })
+
+    await plugin(['rm', p], config.l)
+    t.strictSame(config.edited, {
+      plugin: ['a', 'b', 'c'],
+    })
+    t.strictSame(config.values.plugin, ['a', 'b', 'c'])
+    t.equal(buildRan, true)
+    t.strictSame(logs.args(), [
+      ['successfully removed plugin(s):'],
+      [p],
+    ])
+    t.strictSame(uninstalled, ['my-plugin'])
+  })
+
   t.test('remove already missing plugin', async t => {
     const config = new MockConfig(t)
     let buildRan = false
