@vercel/build-utils 5.7.0 → 5.7.2

package/dist/fs/download.d.ts

@@ -4,5 +4,6 @@ export interface DownloadedFiles {
     [filePath: string]: FileFsRef;
 }
 export declare function isSymbolicLink(mode: number): boolean;
+export declare function isDirectory(mode: number): boolean;
 export declare function downloadFile(file: File, fsPath: string): Promise<FileFsRef>;
 export default function download(files: Files, basePath: string, meta?: Meta): Promise<DownloadedFiles>;

package/dist/fs/download.js

@@ -3,18 +3,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.downloadFile = exports.isSymbolicLink = void 0;
+exports.downloadFile = exports.isDirectory = exports.isSymbolicLink = void 0;
 const path_1 = __importDefault(require("path"));
 const debug_1 = __importDefault(require("../debug"));
 const file_fs_ref_1 = __importDefault(require("../file-fs-ref"));
 const fs_extra_1 = require("fs-extra");
 const stream_to_buffer_1 = __importDefault(require("./stream-to-buffer"));
-const S_IFMT = 61440; /* 0170000 type of file */
-const S_IFLNK = 40960; /* 0120000 symbolic link */
+const STAT = new fs_extra_1.Stats();
 function isSymbolicLink(mode) {
-    return (mode & S_IFMT) === S_IFLNK;
+    STAT.mode = mode;
+    return STAT.isSymbolicLink();
 }
 exports.isSymbolicLink = isSymbolicLink;
+function isDirectory(mode) {
+    STAT.mode = mode;
+    return STAT.isDirectory();
+}
+exports.isDirectory = isDirectory;
 async function prepareSymlinkTarget(file, fsPath) {
     const mkdirPromise = fs_extra_1.mkdirp(path_1.default.dirname(fsPath));
     if (file.type === 'FileFsRef') {
@@ -33,6 +38,10 @@ async function prepareSymlinkTarget(file, fsPath) {
 }
 async function downloadFile(file, fsPath) {
     const { mode } = file;
+    if (isDirectory(mode)) {
+        await fs_extra_1.mkdirp(fsPath);
+        return file_fs_ref_1.default.fromFsPath({ mode, fsPath });
+    }
     // If the source is a symlink, try to create it instead of copying the file.
     // Note: creating symlinks on Windows requires admin priviliges or symlinks
     // enabled in the group policy. We may want to improve the error message.

package/dist/fs/glob.js

@@ -12,13 +12,7 @@ const normalize_path_1 = require("./normalize-path");
 const file_fs_ref_1 = __importDefault(require("../file-fs-ref"));
 const vanillaGlob = util_1.promisify(glob_1.default);
 async function glob(pattern, opts, mountpoint) {
-    let options;
-    if (typeof opts === 'string') {
-        options = { cwd: opts };
-    }
-    else {
-        options = opts;
-    }
+    const options = typeof opts === 'string' ? { cwd: opts } : opts;
     if (!options.cwd) {
         throw new Error('Second argument (basePath) must be specified for names of resulting files');
     }
@@ -27,20 +21,32 @@ async function glob(pattern, opts, mountpoint) {
     }
     const results = {};
     const statCache = {};
-    options.symlinks = {};
-    options.statCache = statCache;
-    options.stat = true;
-    options.dot = true;
-    const files = await vanillaGlob(pattern, options);
+    const symlinks = {};
+    const files = await vanillaGlob(pattern, {
+        ...options,
+        symlinks,
+        statCache,
+        stat: true,
+        dot: true,
+    });
+    const dirs = new Set();
+    const dirsWithEntries = new Set();
     for (const relativePath of files) {
         const fsPath = normalize_path_1.normalizePath(path_1.default.join(options.cwd, relativePath));
         let stat = statCache[fsPath];
         assert_1.default(stat, `statCache does not contain value for ${relativePath} (resolved to ${fsPath})`);
-        const isSymlink = options.symlinks[fsPath];
-        if (isSymlink || stat.isFile()) {
+        const isSymlink = symlinks[fsPath];
+        if (isSymlink || stat.isFile() || stat.isDirectory()) {
             if (isSymlink) {
                 stat = await fs_extra_1.lstat(fsPath);
             }
+            // Some bookkeeping to track which directories already have entries within
+            const dirname = path_1.default.dirname(relativePath);
+            dirsWithEntries.add(dirname);
+            if (stat.isDirectory()) {
+                dirs.add(relativePath);
+                continue;
+            }
             let finalPath = relativePath;
             if (mountpoint) {
                 finalPath = path_1.default.join(mountpoint, finalPath);
@@ -48,6 +54,18 @@ async function glob(pattern, opts, mountpoint) {
             results[finalPath] = new file_fs_ref_1.default({ mode: stat.mode, fsPath });
         }
     }
+    // Add empty directory entries
+    for (const relativePath of dirs) {
+        if (dirsWithEntries.has(relativePath))
+            continue;
+        let finalPath = relativePath;
+        if (mountpoint) {
+            finalPath = path_1.default.join(mountpoint, finalPath);
+        }
+        const fsPath = normalize_path_1.normalizePath(path_1.default.join(options.cwd, relativePath));
+        const stat = statCache[fsPath];
+        results[finalPath] = new file_fs_ref_1.default({ mode: stat.mode, fsPath });
+    }
     return results;
 }
 exports.default = glob;

package/dist/index.js

@@ -30517,18 +30517,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.downloadFile = exports.isSymbolicLink = void 0;
+exports.downloadFile = exports.isDirectory = exports.isSymbolicLink = void 0;
 const path_1 = __importDefault(__webpack_require__(5622));
 const debug_1 = __importDefault(__webpack_require__(1868));
 const file_fs_ref_1 = __importDefault(__webpack_require__(9331));
 const fs_extra_1 = __webpack_require__(5392);
 const stream_to_buffer_1 = __importDefault(__webpack_require__(2560));
-const S_IFMT = 61440; /* 0170000 type of file */
-const S_IFLNK = 40960; /* 0120000 symbolic link */
+const STAT = new fs_extra_1.Stats();
 function isSymbolicLink(mode) {
-    return (mode & S_IFMT) === S_IFLNK;
+    STAT.mode = mode;
+    return STAT.isSymbolicLink();
 }
 exports.isSymbolicLink = isSymbolicLink;
+function isDirectory(mode) {
+    STAT.mode = mode;
+    return STAT.isDirectory();
+}
+exports.isDirectory = isDirectory;
 async function prepareSymlinkTarget(file, fsPath) {
     const mkdirPromise = fs_extra_1.mkdirp(path_1.default.dirname(fsPath));
     if (file.type === 'FileFsRef') {
@@ -30547,6 +30552,10 @@ async function prepareSymlinkTarget(file, fsPath) {
 }
 async function downloadFile(file, fsPath) {
     const { mode } = file;
+    if (isDirectory(mode)) {
+        await fs_extra_1.mkdirp(fsPath);
+        return file_fs_ref_1.default.fromFsPath({ mode, fsPath });
+    }
     // If the source is a symlink, try to create it instead of copying the file.
     // Note: creating symlinks on Windows requires admin priviliges or symlinks
     // enabled in the group policy. We may want to improve the error message.
@@ -30650,13 +30659,7 @@ const normalize_path_1 = __webpack_require__(6261);
 const file_fs_ref_1 = __importDefault(__webpack_require__(9331));
 const vanillaGlob = util_1.promisify(glob_1.default);
 async function glob(pattern, opts, mountpoint) {
-    let options;
-    if (typeof opts === 'string') {
-        options = { cwd: opts };
-    }
-    else {
-        options = opts;
-    }
+    const options = typeof opts === 'string' ? { cwd: opts } : opts;
     if (!options.cwd) {
         throw new Error('Second argument (basePath) must be specified for names of resulting files');
     }
@@ -30665,20 +30668,32 @@ async function glob(pattern, opts, mountpoint) {
     }
     const results = {};
     const statCache = {};
-    options.symlinks = {};
-    options.statCache = statCache;
-    options.stat = true;
-    options.dot = true;
-    const files = await vanillaGlob(pattern, options);
+    const symlinks = {};
+    const files = await vanillaGlob(pattern, {
+        ...options,
+        symlinks,
+        statCache,
+        stat: true,
+        dot: true,
+    });
+    const dirs = new Set();
+    const dirsWithEntries = new Set();
     for (const relativePath of files) {
         const fsPath = normalize_path_1.normalizePath(path_1.default.join(options.cwd, relativePath));
         let stat = statCache[fsPath];
         assert_1.default(stat, `statCache does not contain value for ${relativePath} (resolved to ${fsPath})`);
-        const isSymlink = options.symlinks[fsPath];
-        if (isSymlink || stat.isFile()) {
+        const isSymlink = symlinks[fsPath];
+        if (isSymlink || stat.isFile() || stat.isDirectory()) {
             if (isSymlink) {
                 stat = await fs_extra_1.lstat(fsPath);
             }
+            // Some bookkeeping to track which directories already have entries within
+            const dirname = path_1.default.dirname(relativePath);
+            dirsWithEntries.add(dirname);
+            if (stat.isDirectory()) {
+                dirs.add(relativePath);
+                continue;
+            }
             let finalPath = relativePath;
             if (mountpoint) {
                 finalPath = path_1.default.join(mountpoint, finalPath);
@@ -30686,6 +30701,18 @@ async function glob(pattern, opts, mountpoint) {
             results[finalPath] = new file_fs_ref_1.default({ mode: stat.mode, fsPath });
         }
     }
+    // Add empty directory entries
+    for (const relativePath of dirs) {
+        if (dirsWithEntries.has(relativePath))
+            continue;
+        let finalPath = relativePath;
+        if (mountpoint) {
+            finalPath = path_1.default.join(mountpoint, finalPath);
+        }
+        const fsPath = normalize_path_1.normalizePath(path_1.default.join(options.cwd, relativePath));
+        const stat = statCache[fsPath];
+        results[finalPath] = new file_fs_ref_1.default({ mode: stat.mode, fsPath });
+    }
     return results;
 }
 exports.default = glob;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "5.7.0",
+  "version": "5.7.2",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",
@@ -47,5 +47,5 @@
     "typescript": "4.3.4",
     "yazl": "2.5.1"
   },
-  "gitHead": "b37ac5f798acbfb8f04e047301766440ad0d4c59"
+  "gitHead": "cb29bfdd684893cace5454f50a11a777407a9e45"
 }