cacache 17.0.5 → 17.0.7

package/lib/content/write.js

@@ -4,8 +4,8 @@ const events = require('events')
 
 const contentPath = require('./path')
 const fs = require('fs/promises')
-const moveFile = require('../util/move-file')
-const Minipass = require('minipass')
+const { moveFile } = require('@npmcli/fs')
+const { Minipass } = require('minipass')
 const Pipeline = require('minipass-pipeline')
 const Flush = require('minipass-flush')
 const path = require('path')
@@ -161,8 +161,14 @@ async function moveToDestination (tmp, cache, sri, opts) {
   const destDir = path.dirname(destination)
 
   await fs.mkdir(destDir, { recursive: true })
-  await moveFile(tmp.target, destination)
-  tmp.moved = true
+  try {
+    await moveFile(tmp.target, destination, { overwrite: false })
+    tmp.moved = true
+  } catch (err) {
+    if (!err.message.startsWith('The destination file exists')) {
+      throw Object.assign(err, { code: 'EEXIST' })
+    }
+  }
 }
 
 function sizeError (expected, found) {

package/lib/entry-index.js

@@ -9,7 +9,7 @@ const {
   rm,
   writeFile,
 } = require('fs/promises')
-const Minipass = require('minipass')
+const { Minipass } = require('minipass')
 const path = require('path')
 const ssri = require('ssri')
 const uniqueFilename = require('unique-filename')

package/lib/get.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const Collect = require('minipass-collect')
-const Minipass = require('minipass')
+const { Minipass } = require('minipass')
 const Pipeline = require('minipass-pipeline')
 
 const index = require('./entry-index')

package/lib/util/glob.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const glob = require('glob')
+const { glob } = require('glob')
 
 const globify = (pattern) => pattern.split('//').join('/')
 module.exports = (path, options) => glob(globify(path), options)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cacache",
-  "version": "17.0.5",
+  "version": "17.0.7",
   "cache-version": {
     "content": "2",
     "index": "5"
@@ -47,21 +47,20 @@
   "dependencies": {
     "@npmcli/fs": "^3.1.0",
     "fs-minipass": "^3.0.0",
-    "glob": "^9.3.1",
+    "glob": "^10.2.2",
     "lru-cache": "^7.7.1",
-    "minipass": "^4.0.0",
+    "minipass": "^5.0.0",
     "minipass-collect": "^1.0.2",
     "minipass-flush": "^1.0.5",
     "minipass-pipeline": "^1.2.4",
     "p-map": "^4.0.0",
-    "promise-inflight": "^1.0.1",
     "ssri": "^10.0.0",
     "tar": "^6.1.11",
     "unique-filename": "^3.0.0"
   },
   "devDependencies": {
     "@npmcli/eslint-config": "^4.0.0",
-    "@npmcli/template-oss": "4.12.0",
+    "@npmcli/template-oss": "4.14.1",
     "tap": "^16.0.0"
   },
   "engines": {
@@ -70,7 +69,8 @@
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
     "windowsCI": false,
-    "version": "4.12.0"
+    "version": "4.14.1",
+    "publish": "true"
   },
   "author": "GitHub Inc.",
   "tap": {

package/lib/util/move-file.js

@@ -1,56 +0,0 @@
-'use strict'
-
-const fs = require('fs/promises')
-const { moveFile: move } = require('@npmcli/fs')
-const pinflight = require('promise-inflight')
-
-module.exports = moveFile
-
-async function moveFile (src, dest) {
-  const isWindows = process.platform === 'win32'
-
-  // This isn't quite an fs.rename -- the assumption is that
-  // if `dest` already exists, and we get certain errors while
-  // trying to move it, we should just not bother.
-  //
-  // In the case of cache corruption, users will receive an
-  // EINTEGRITY error elsewhere, and can remove the offending
-  // content their own way.
-  //
-  // Note that, as the name suggests, this strictly only supports file moves.
-  try {
-    await fs.link(src, dest)
-  } catch (err) {
-    if (isWindows && err.code === 'EPERM') {
-      // XXX This is a really weird way to handle this situation, as it
-      // results in the src file being deleted even though the dest
-      // might not exist.  Since we pretty much always write files to
-      // deterministic locations based on content hash, this is likely
-      // ok (or at worst, just ends in a future cache miss).  But it would
-      // be worth investigating at some time in the future if this is
-      // really what we want to do here.
-    } else if (err.code === 'EEXIST' || err.code === 'EBUSY') {
-      // file already exists, so whatever
-    } else {
-      throw err
-    }
-  }
-  try {
-    await Promise.all([
-      fs.unlink(src),
-      !isWindows && fs.chmod(dest, '0444'),
-    ])
-  } catch (e) {
-    return pinflight('cacache-move-file:' + dest, async () => {
-      await fs.stat(dest).catch((err) => {
-        if (err.code !== 'ENOENT') {
-          // Something else is wrong here. Bail bail bail
-          throw err
-        }
-      })
-      // file doesn't already exist! let's try a rename -> copy fallback
-      // only delete if it successfully copies
-      return move(src, dest)
-    })
-  }
-}