@npmcli/arborist 6.0.0-pre.2 → 6.0.0-pre.4

package/lib/arborist/build-ideal-tree.js

@@ -330,8 +330,7 @@ Try using the package name instead, e.g:
           if (tree.children.size) {
             root.meta.loadedFromDisk = true
             // set these so that we don't try to ancient lockfile reload it
-            root.meta.originalLockfileVersion = defaultLockfileVersion
-            root.meta.lockfileVersion = defaultLockfileVersion
+            root.meta.originalLockfileVersion = root.meta.lockfileVersion = this.options.lockfileVersion || defaultLockfileVersion
           }
         }
         root.meta.inferFormattingOptions(root.package)
@@ -758,7 +757,9 @@ This is a one-time fix-up, please be patient...
     // yes, yes, this isn't the "original" version, but now that it's been
     // upgraded, we need to make sure we don't do the work to upgrade it
     // again, since it's now as new as can be.
-    meta.originalLockfileVersion = defaultLockfileVersion
+    if (!this.options.lockfileVersion && !meta.hiddenLockfile) {
+      meta.originalLockfileVersion = defaultLockfileVersion
+    }
     this.finishTracker('idealTree:inflate')
     process.emit('timeEnd', 'idealTree:inflate')
   }
@@ -833,6 +834,7 @@ This is a one-time fix-up, please be patient...
       await cacache.tmp.withTmp(this.cache, opt, async path => {
         await pacote.extract(node.resolved, path, {
           ...opt,
+          Arborist,
           resolved: node.resolved,
           integrity: node.integrity,
         })

package/lib/arborist/reify.js

@@ -35,6 +35,9 @@ const optionalSet = require('../optional-set.js')
 const calcDepFlags = require('../calc-dep-flags.js')
 const { saveTypeMap, hasSubKey } = require('../add-rm-pkg-deps.js')
 
+const Shrinkwrap = require('../shrinkwrap.js')
+const { defaultLockfileVersion } = Shrinkwrap
+
 const _retiredPaths = Symbol('retiredPaths')
 const _retiredUnchanged = Symbol('retiredUnchanged')
 const _sparseTreeDirs = Symbol('sparseTreeDirs')
@@ -676,6 +679,7 @@ module.exports = cls => class Reifier extends cls {
       })
       await pacote.extract(res, node.path, {
         ...this.options,
+        Arborist: this.constructor,
         resolved: node.resolved,
         integrity: node.integrity,
       })
@@ -1513,11 +1517,16 @@ module.exports = cls => class Reifier extends cls {
     this.idealTree.meta.filename =
       this.idealTree.realpath + '/node_modules/.package-lock.json'
     this.idealTree.meta.hiddenLockfile = true
+    const resetMeta = this.idealTree.meta && this.idealTree.meta.lockfileVersion !== defaultLockfileVersion
+    this.idealTree.meta.lockfileVersion = defaultLockfileVersion
 
     this.actualTree = this.idealTree
     this.idealTree = null
 
     if (!this[_global]) {
+      if (resetMeta) {
+        await this.actualTree.meta.reset()
+      }
       await this.actualTree.meta.save()
       const ignoreScripts = !!this.options.ignoreScripts
       // if we aren't doing a dry run or ignoring scripts and we actually made changes to the dep

package/lib/shrinkwrap.js

@@ -10,7 +10,7 @@
 // definitely not before npm v8.
 
 const localeCompare = require('@isaacs/string-locale-compare')('en')
-const defaultLockfileVersion = 2
+const defaultLockfileVersion = 3
 
 // for comparing nodes to yarn.lock entries
 const mismatch = (a, b) => a && b && a !== b
@@ -60,7 +60,7 @@ const readdir = async (path, opt) => {
   return ents
 }
 
-const { resolve, basename } = require('path')
+const { resolve, basename, relative } = require('path')
 const specFromLock = require('./spec-from-lock.js')
 const versionFromTgz = require('./version-from-tgz.js')
 const npa = require('npm-package-arg')
@@ -224,6 +224,7 @@ const _buildLegacyLockfile = Symbol('_buildLegacyLockfile')
 const _filenameSet = Symbol('_filenameSet')
 const _maybeRead = Symbol('_maybeRead')
 const _maybeStat = Symbol('_maybeStat')
+
 class Shrinkwrap {
   static get defaultLockfileVersion () {
     return defaultLockfileVersion
@@ -252,17 +253,6 @@ class Shrinkwrap {
     s.loadedFromDisk = !!(sw || lock)
     s.type = basename(s.filename)
 
-    try {
-      if (s.loadedFromDisk && !s.lockfileVersion) {
-        const json = parseJSON(await maybeReadFile(s.filename))
-        if (json.lockfileVersion > defaultLockfileVersion) {
-          s.lockfileVersion = json.lockfileVersion
-        }
-      }
-    } catch {
-      // ignore errors
-    }
-
     return s
   }
 
@@ -342,6 +332,7 @@ class Shrinkwrap {
     this.lockfileVersion = hiddenLockfile ? 3
       : lockfileVersion ? parseInt(lockfileVersion, 10)
       : null
+
     this[_awaitingUpdate] = new Map()
     this.tree = null
     this.path = resolve(path || '.')
@@ -398,6 +389,7 @@ class Shrinkwrap {
     this[_awaitingUpdate] = new Map()
     const lockfileVersion = this.lockfileVersion || defaultLockfileVersion
     this.originalLockfileVersion = lockfileVersion
+
     this.data = {
       lockfileVersion,
       requires: true,
@@ -496,8 +488,14 @@ class Shrinkwrap {
       this.ancientLockfile = false
       return {}
     }).then(lock => {
-      const lockfileVersion = this.lockfileVersion ? this.lockfileVersion
-        : Math.max(lock.lockfileVersion || 0, defaultLockfileVersion)
+      // auto convert v1 lockfiles to v3
+      // leave v2 in place unless configured
+      // v3 by default
+      const lockfileVersion =
+        this.lockfileVersion ? this.lockfileVersion
+        : lock.lockfileVersion === 1 ? defaultLockfileVersion
+        : lock.lockfileVersion || defaultLockfileVersion
+
       this.data = {
         ...lock,
         lockfileVersion: lockfileVersion,
@@ -507,6 +505,7 @@ class Shrinkwrap {
       }
 
       this.originalLockfileVersion = lock.lockfileVersion
+
       // use default if it wasn't explicitly set, and the current file is
       // less than our default.  otherwise, keep whatever is in the file,
       // unless we had an explicit setting already.
@@ -1135,7 +1134,17 @@ class Shrinkwrap {
     if (!this.data) {
       throw new Error('run load() before saving data')
     }
+
     const json = this.toString(options)
+    if (
+      !this.hiddenLockfile
+      && this.originalLockfileVersion !== undefined
+      && this.originalLockfileVersion !== this.lockfileVersion
+    ) {
+      log.warn(
+      `Converting lock file (${relative(process.cwd(), this.filename)}) from v${this.originalLockfileVersion} -> v${this.lockfileVersion}`
+      )
+    }
     return Promise.all([
       writeFile(this.filename, json).catch(er => {
         if (this.hiddenLockfile) {

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@npmcli/arborist",
-  "version": "6.0.0-pre.2",
+  "version": "6.0.0-pre.4",
   "description": "Manage node_modules trees",
   "dependencies": {
     "@isaacs/string-locale-compare": "^1.1.0",
     "@npmcli/installed-package-contents": "^1.0.7",
     "@npmcli/map-workspaces": "^2.0.3",
-    "@npmcli/metavuln-calculator": "^3.0.1",
+    "@npmcli/metavuln-calculator": "^4.0.0",
     "@npmcli/move-file": "^2.0.0",
     "@npmcli/name-from-folder": "^1.0.1",
     "@npmcli/node-gyp": "^2.0.0",
@@ -27,7 +27,7 @@
     "npm-pick-manifest": "^7.0.2",
     "npm-registry-fetch": "^13.0.0",
     "npmlog": "^6.0.2",
-    "pacote": "^13.6.1",
+    "pacote": "^14.0.0",
     "parse-conflict-json": "^2.0.1",
     "proc-log": "^2.0.0",
     "promise-all-reject-late": "^1.0.0",
@@ -42,7 +42,7 @@
   },
   "devDependencies": {
     "@npmcli/eslint-config": "^3.1.0",
-    "@npmcli/template-oss": "4.4.1",
+    "@npmcli/template-oss": "4.5.0",
     "benchmark": "^2.1.4",
     "chalk": "^4.1.0",
     "minify-registry-metadata": "^2.1.0",
@@ -104,7 +104,7 @@
   },
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "4.4.1",
+    "version": "4.5.0",
     "content": "../../scripts/template-oss/index.js"
   }
 }