fix/clear removed workspace 5478 v2

test/lib/commands/install.js

@@ -7,6 +7,7 @@ const {
 } = require('../../fixtures/clean-snapshot.js')
 
 const path = require('node:path')
+const { rmSync } = require('node:fs')
 const t = require('tap')
 
 t.cleanSnapshot = (str) => cleanPackumentCache(cleanDate(cleanTime(cleanCwd(str))))
@@ -428,6 +429,38 @@ t.test('should show install keeps dirty --workspace flag', async t => {
   assert.packageInstalled('node_modules/[email protected]')
 })
 
+t.test('should remove non-existent workspace from package-lock.json', async t => {
+  const cwd = process.cwd()
+
+  t.afterEach(() => {
+    process.chdir(cwd)
+  })
+
+  const localPrefix = path.join(t.testdir(), 'prefix')
+  const { npm } = await loadMockNpm(t)
+
+  process.chdir(localPrefix)
+  // init and install root package and its workspaces
+  npm.config.set('yes', true)
+  await npm.exec('init', [])
+  npm.config.set('workspace', ['packages/a', 'packages/b'])
+  await npm.exec('init', [])
+  await npm.exec('install', [])
+
+  // remove one workspace node and reinstall
+  rmSync(path.join(localPrefix, 'packages/b'), { recursive: true, force: true })
+  await npm.exec('install', [])
+  const lockJson = require(path.join(localPrefix, 'package-lock.json'))
+
+  t.strictSame(lockJson.packages[''].workspaces, ['packages/a'], 'remove non-exist ws node')
+  t.equal(lockJson.packages['packages/b'], undefined, 'remove non-exist ws package')
+  t.equal(lockJson.packages['node_modules/b'],
+    undefined,
+    'remove non-exist ws node_modules package'
+  )
+  t.equal(lockJson.dependencies.b, undefined, 'remove non-exist ws dependency')
+})
+
 t.test('devEngines', async t => {
   const mockArguments = {
     globals: {

workspaces/arborist/lib/shrinkwrap.js

@@ -927,7 +927,18 @@ class Shrinkwrap {
         if (node === this.tree || node.isRoot || node.location === '') {
           continue
         }
+
         const loc = relpath(this.path, node.path)
+
+        // extraneous ws node should not commit
+        if (node.extraneous && root.workspaces && root.workspaces.length) {
+          const wsIndex = root.workspaces.findIndex(ws => ws === loc)
+          if (wsIndex > -1) {
+            root.workspaces.splice(wsIndex, 1)
+            continue
+          }
+        }
+
         this.data.packages[loc] = Shrinkwrap.metaFromNode(
           node,
           this.path,