@netlify/cache-utils 5.1.3 → 5.1.5

package/lib/fs.js

@@ -1,5 +1,5 @@
 import { promises as fs } from 'fs';
-import { basename, dirname } from 'path';
+import { basename, dirname, join } from 'path';
 import cpy from 'cpy';
 import { globby } from 'globby';
 import { isNotJunk } from 'junk';
@@ -15,16 +15,17 @@ export const moveCacheFile = async function (src, dest, move = false) {
     if (move) {
         return moveFile(src, dest, { overwrite: false });
     }
-    const { srcGlob, ...options } = await getSrcGlob(src);
-    if (srcGlob) {
-        return cpy(srcGlob, dirname(dest), { ...options, parents: true, overwrite: false });
+    const { srcGlob, dest: matchedDest, ...options } = await getSrcAndDest(src, dirname(dest));
+    if (srcGlob && matchedDest) {
+        return cpy(srcGlob, matchedDest, { ...options, overwrite: false });
     }
 };
 /**
  * Non-existing files and empty directories are always skipped
  */
 export const hasFiles = async function (src) {
-    const { srcGlob, isDir, ...options } = await getSrcGlob(src);
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    const { srcGlob, isDir, dest, ...options } = await getSrcAndDest(src, '');
     return srcGlob !== undefined && !(await isEmptyDir(srcGlob, isDir, options));
 };
 /** Replicates what `cpy` is doing under the hood. */
@@ -39,7 +40,7 @@ const isEmptyDir = async function (globPattern, isDir, options) {
 /**
  * Get globbing pattern with files to move/copy
  */
-const getSrcGlob = async function (src) {
+const getSrcAndDest = async function (src, dest) {
     const srcStat = await getStat(src);
     if (srcStat === undefined) {
         return { srcGlob: undefined, isDir: false, cwd: '' };
@@ -49,12 +50,13 @@ const getSrcGlob = async function (src) {
     const cwd = dirname(src);
     const baseOptions = {
         srcGlob: srcBasename,
+        dest,
         isDir,
         cwd,
         dot: true, // collect .dot directories as well
     };
     if (isDir) {
-        return { ...baseOptions, srcGlob: `${srcBasename}/**` };
+        return { ...baseOptions, srcGlob: `${srcBasename}/**`, dest: join(dest, srcBasename) };
     }
     return baseOptions;
 };

package/lib/main.js

@@ -1,4 +1,4 @@
-import del from 'del';
+import { rm } from 'fs/promises';
 import { getCacheDir } from './dir.js';
 import { moveCacheFile, hasFiles } from './fs.js';
 import { list } from './list.js';
@@ -16,7 +16,7 @@ const saveOne = async function (path, { move = DEFAULT_MOVE, ttl = DEFAULT_TTL,
     if (identical) {
         return true;
     }
-    await del(cachePath, { force: true });
+    await rm(cachePath, { force: true, recursive: true, maxRetries: 3 });
     await moveCacheFile(srcPath, cachePath, move);
     await writeManifest(manifestInfo);
     return true;
@@ -30,7 +30,7 @@ const restoreOne = async function (path, { move = DEFAULT_MOVE, cacheDir, cwd: c
     if (await isExpired(cachePath)) {
         return false;
     }
-    await del(srcPath, { force: true });
+    await rm(srcPath, { force: true, recursive: true, maxRetries: 3 });
     await moveCacheFile(cachePath, srcPath, move);
     return true;
 };
@@ -40,7 +40,7 @@ const removeOne = async function (path, { cacheDir, cwd: cwdOpt, } = {}) {
     if (!(await hasFiles(cachePath))) {
         return false;
     }
-    await del(cachePath, { force: true });
+    await rm(cachePath, { force: true, recursive: true, maxRetries: 3 });
     await removeManifest(cachePath);
     return true;
 };

package/lib/manifest.js

@@ -1,6 +1,5 @@
-import { promises as fs } from 'fs';
+import { mkdir, readFile, rm, writeFile } from 'fs/promises';
 import { dirname } from 'path';
-import del from 'del';
 import { pathExists } from 'path-exists';
 import { getExpires, checkExpires } from './expire.js';
 import { getHash } from './hash.js';
@@ -20,18 +19,18 @@ const isIdentical = async function ({ hash, manifestPath, manifestString }) {
     if (hash === undefined || !(await pathExists(manifestPath))) {
         return false;
     }
-    const oldManifestString = await fs.readFile(manifestPath, 'utf8');
+    const oldManifestString = await readFile(manifestPath, 'utf8');
     return oldManifestString === manifestString;
 };
 // Persist the cache manifest to filesystem
 export const writeManifest = async function ({ manifestPath, manifestString }) {
-    await fs.mkdir(dirname(manifestPath), { recursive: true });
-    await fs.writeFile(manifestPath, manifestString);
+    await mkdir(dirname(manifestPath), { recursive: true });
+    await writeFile(manifestPath, manifestString);
 };
 // Remove the cache manifest from filesystem
 export const removeManifest = async function (cachePath) {
     const manifestPath = getManifestPath(cachePath);
-    await del(manifestPath, { force: true });
+    await rm(manifestPath, { force: true, recursive: true, maxRetries: 3 });
 };
 // Retrieve the cache manifest filepath
 const getManifestPath = function (cachePath) {
@@ -52,7 +51,7 @@ export const isExpired = async function (cachePath) {
 };
 const readManifest = async function (cachePath) {
     const manifestPath = getManifestPath(cachePath);
-    const manifestString = await fs.readFile(manifestPath, 'utf-8');
+    const manifestString = await readFile(manifestPath, 'utf-8');
     const manifest = JSON.parse(manifestString);
     return manifest;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/cache-utils",
-  "version": "5.1.3",
+  "version": "5.1.5",
   "description": "Utility for caching files in Netlify Build",
   "type": "module",
   "exports": "./lib/main.js",
@@ -50,8 +50,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "cpy": "^8.1.0",
-    "del": "^6.0.0",
+    "cpy": "^9.0.0",
     "get-stream": "^6.0.0",
     "globby": "^13.0.0",
     "junk": "^4.0.0",
@@ -63,11 +62,11 @@
   "devDependencies": {
     "@types/node": "^18.14.2",
     "tmp-promise": "^3.0.0",
-    "typescript": "^4.8.4",
-    "vitest": "^0.24.1"
+    "typescript": "^5.0.0",
+    "vitest": "^0.30.1"
   },
   "engines": {
     "node": "^14.16.0 || >=16.0.0"
   },
-  "gitHead": "35d6533c324d061b9e8e4165d369880a25bab707"
+  "gitHead": "6c093847fef2347fc80740059cbf0ee49ea193fc"
 }