@netlify/cache-utils 5.1.0 → 5.1.2

package/lib/fs.js

@@ -6,33 +6,33 @@ import { isNotJunk } from 'junk';
 import { moveFile } from 'move-file';
 /**
  * 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) {
+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 glob = await getSrcGlob(src);
-    if (glob) {
-        return cpy(glob.srcGlob, dirname(dest), { cwd: glob.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
  */
 export const hasFiles = async function (src) {
-    const glob = await getSrcGlob(src);
-    if (!glob) {
-        return false;
-    }
-    return glob.srcGlob !== undefined && !(await isEmptyDir({ srcGlob: glob.srcGlob, cwd: glob.cwd, isDir: glob.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 }) {
+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;
 };
@@ -42,15 +42,21 @@ const isEmptyDir = async function ({ srcGlob, cwd, isDir }) {
 const getSrcGlob = async function (src) {
     const srcStat = await getStat(src);
     if (srcStat === undefined) {
-        return null;
+        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 (src) => {
     try {
@@ -58,5 +64,6 @@ const getStat = async (src) => {
     }
     catch {
         // continue regardless error
+        return undefined;
     }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/cache-utils",
-  "version": "5.1.0",
+  "version": "5.1.2",
   "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": "e22d6106d734d2b4b7b49d2a2350be21913c0cbf"
+  "gitHead": "d78a65c209ed987d3475cd1f37cf357693b99e3c"
 }