fix(install): add an option to track the original lockfile version

npm · Jan 8, 2024 · 4c8c602 · 4c8c602
1 parent 2999cc4
commit 4c8c602
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/commands/install.js b/lib/commands/install.js
@@ -10,7 +10,6 @@ const pacote = require('pacote')
 const checks = require('npm-install-checks')
 
 const ArboristWorkspaceCmd = require('../arborist-cmd.js')
-const { defaultLockfileVersion } = require('@npmcli/arborist/lib/shrinkwrap.js')
 class Install extends ArboristWorkspaceCmd {
   static description = 'Install a package'
   static name = 'install'
@@ -151,7 +150,7 @@ class Install extends ArboristWorkspaceCmd {
     const arb = new Arborist(opts)
     await arb.reify(opts)
 
-    if (arb.options.lockfileVersion && arb.options.lockfileVersion < defaultLockfileVersion) {
+    if (arb.originalLockfileVersionOld) {
       await arb.reify(opts)
     }
 

diff --git a/workspaces/arborist/lib/arborist/build-ideal-tree.js b/workspaces/arborist/lib/arborist/build-ideal-tree.js
@@ -128,6 +128,7 @@ module.exports = cls => class IdealTreeBuilder extends cls {
     this.idealTree = idealTree
     this.installLinks = installLinks
     this.legacyPeerDeps = legacyPeerDeps
+    this.originalLockfileVersionOld = false
 
     this[_usePackageLock] = packageLock
     this[_global] = !!global
@@ -690,6 +691,7 @@ module.exports = cls => class IdealTreeBuilder extends cls {
     const heading = ancient ? 'ancient lockfile' : 'old lockfile'
     if (ancient || !this.options.lockfileVersion ||
         this.options.lockfileVersion >= defaultLockfileVersion) {
+      this.originalLockfileVersionOld = true
       log.warn(heading,
         `
 The ${meta.type} file was created with an old version of npm,