@netlify/cache-utils 5.0.2 → 5.1.1

package/lib/fs.js

@@ -4,44 +4,61 @@ import cpy from 'cpy';
 import { globby } from 'globby';
 import { isNotJunk } from 'junk';
 import { moveFile } from 'move-file';
-// Move or copy a cached file/directory from/to a local one
-export const moveCacheFile = async function (src, dest, move) {
+/**
+ * Move or copy a cached file/directory from/to a local one
+ * @param src The src directory or file to cache
+ * @param dest The destination location
+ * @param move If the file should be moved, moving is faster but removes the source files locally
+ */
+export const moveCacheFile = async function (src, dest, move = false) {
     // Moving is faster but removes the source files locally
     if (move) {
         return moveFile(src, dest, { overwrite: false });
     }
-    const { srcGlob, cwd } = await getSrcGlob(src);
-    return cpy(srcGlob, dirname(dest), { cwd, parents: true, overwrite: false });
+    const { srcGlob, ...options } = await getSrcGlob(src);
+    if (srcGlob) {
+        return cpy(srcGlob, dirname(dest), { ...options, parents: true, overwrite: false });
+    }
 };
-// Non-existing files and empty directories are always skipped
+/**
+ * Non-existing files and empty directories are always skipped
+ */
 export const hasFiles = async function (src) {
-    const { srcGlob, cwd, isDir } = await getSrcGlob(src);
-    return srcGlob !== undefined && !(await isEmptyDir({ srcGlob, cwd, isDir }));
+    const { srcGlob, isDir, ...options } = await getSrcGlob(src);
+    return srcGlob !== undefined && !(await isEmptyDir(srcGlob, isDir, options));
 };
-// Replicates what `cpy` is doing under the hood.
-const isEmptyDir = async function ({ srcGlob, cwd, isDir }) {
+/** Replicates what `cpy` is doing under the hood. */
+const isEmptyDir = async function (globPattern, isDir, options) {
     if (!isDir) {
         return false;
     }
-    const files = await globby(srcGlob, { cwd });
+    const files = await globby(globPattern, options);
     const filteredFiles = files.filter((file) => isNotJunk(basename(file)));
     return filteredFiles.length === 0;
 };
-// Get globbing pattern with files to move/copy
+/**
+ * Get globbing pattern with files to move/copy
+ */
 const getSrcGlob = async function (src) {
     const srcStat = await getStat(src);
     if (srcStat === undefined) {
-        return {};
+        return { srcGlob: undefined, isDir: false, cwd: '' };
     }
     const isDir = srcStat.isDirectory();
     const srcBasename = basename(src);
     const cwd = dirname(src);
+    const baseOptions = {
+        srcGlob: srcBasename,
+        isDir,
+        cwd,
+        dot: true, // collect .dot directories as well
+    };
     if (isDir) {
-        return { srcGlob: `${srcBasename}/**`, cwd, isDir };
+        return { ...baseOptions, srcGlob: `${srcBasename}/**` };
     }
-    return { srcGlob: srcBasename, cwd, isDir };
+    return baseOptions;
 };
-const getStat = async function (src) {
+const getStat = async (src) => {
     try {
         return await fs.stat(src);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/cache-utils",
-  "version": "5.0.2",
+  "version": "5.1.1",
   "description": "Utility for caching files in Netlify Build",
   "type": "module",
   "exports": "./lib/main.js",
@@ -69,5 +69,5 @@
   "engines": {
     "node": "^14.16.0 || >=16.0.0"
   },
-  "gitHead": "be9da6e85afa0223bdcd6d228c929f4372515538"
+  "gitHead": "356667c6173362b294f9037efdb7b5ef1c726d48"
 }