@vercel/build-utils 5.7.2 → 5.7.4

package/dist/clone-env.js

@@ -23,7 +23,9 @@ function cloneEnv(...envs) {
             // however we lose this proxied value when we destructure and
             // thus we must explicitly copy it, but we must also remove the
             // `Path` property since we can't have both a `PATH` and `Path`
-            obj.PATH = obj.Path;
+            if (obj.Path !== undefined) {
+                obj.PATH = obj.Path;
+            }
             delete obj.Path;
         }
         return obj;

package/dist/fs/download.d.ts

@@ -4,6 +4,5 @@ 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,23 +3,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.downloadFile = exports.isDirectory = exports.isSymbolicLink = void 0;
+exports.downloadFile = 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 STAT = new fs_extra_1.Stats();
+const S_IFMT = 61440; /* 0170000 type of file */
+const S_IFLNK = 40960; /* 0120000 symbolic link */
 function isSymbolicLink(mode) {
-    STAT.mode = mode;
-    return STAT.isSymbolicLink();
+    return (mode & S_IFMT) === S_IFLNK;
 }
 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') {
@@ -38,10 +33,6 @@ 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,7 +12,13 @@ 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) {
-    const options = typeof opts === 'string' ? { cwd: opts } : opts;
+    let options;
+    if (typeof opts === 'string') {
+        options = { cwd: opts };
+    }
+    else {
+        options = opts;
+    }
     if (!options.cwd) {
         throw new Error('Second argument (basePath) must be specified for names of resulting files');
     }
@@ -21,32 +27,20 @@ async function glob(pattern, opts, mountpoint) {
     }
     const results = {};
     const statCache = {};
-    const symlinks = {};
-    const files = await vanillaGlob(pattern, {
-        ...options,
-        symlinks,
-        statCache,
-        stat: true,
-        dot: true,
-    });
-    const dirs = new Set();
-    const dirsWithEntries = new Set();
+    options.symlinks = {};
+    options.statCache = statCache;
+    options.stat = true;
+    options.dot = true;
+    const files = await vanillaGlob(pattern, options);
     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 = symlinks[fsPath];
-        if (isSymlink || stat.isFile() || stat.isDirectory()) {
+        const isSymlink = options.symlinks[fsPath];
+        if (isSymlink || stat.isFile()) {
             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);
@@ -54,18 +48,6 @@ 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

@@ -30139,7 +30139,9 @@ function cloneEnv(...envs) {
             // however we lose this proxied value when we destructure and
             // thus we must explicitly copy it, but we must also remove the
             // `Path` property since we can't have both a `PATH` and `Path`
-            obj.PATH = obj.Path;
+            if (obj.Path !== undefined) {
+                obj.PATH = obj.Path;
+            }
             delete obj.Path;
         }
         return obj;
@@ -30517,23 +30519,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.downloadFile = exports.isDirectory = exports.isSymbolicLink = void 0;
+exports.downloadFile = 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 STAT = new fs_extra_1.Stats();
+const S_IFMT = 61440; /* 0170000 type of file */
+const S_IFLNK = 40960; /* 0120000 symbolic link */
 function isSymbolicLink(mode) {
-    STAT.mode = mode;
-    return STAT.isSymbolicLink();
+    return (mode & S_IFMT) === S_IFLNK;
 }
 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') {
@@ -30552,10 +30549,6 @@ 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.
@@ -30659,7 +30652,13 @@ 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) {
-    const options = typeof opts === 'string' ? { cwd: opts } : opts;
+    let options;
+    if (typeof opts === 'string') {
+        options = { cwd: opts };
+    }
+    else {
+        options = opts;
+    }
     if (!options.cwd) {
         throw new Error('Second argument (basePath) must be specified for names of resulting files');
     }
@@ -30668,32 +30667,20 @@ async function glob(pattern, opts, mountpoint) {
     }
     const results = {};
     const statCache = {};
-    const symlinks = {};
-    const files = await vanillaGlob(pattern, {
-        ...options,
-        symlinks,
-        statCache,
-        stat: true,
-        dot: true,
-    });
-    const dirs = new Set();
-    const dirsWithEntries = new Set();
+    options.symlinks = {};
+    options.statCache = statCache;
+    options.stat = true;
+    options.dot = true;
+    const files = await vanillaGlob(pattern, options);
     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 = symlinks[fsPath];
-        if (isSymlink || stat.isFile() || stat.isDirectory()) {
+        const isSymlink = options.symlinks[fsPath];
+        if (isSymlink || stat.isFile()) {
             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);
@@ -30701,18 +30688,6 @@ 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.2",
+  "version": "5.7.4",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",
@@ -47,5 +47,5 @@
     "typescript": "4.3.4",
     "yazl": "2.5.1"
   },
-  "gitHead": "cb29bfdd684893cace5454f50a11a777407a9e45"
+  "gitHead": "721cd3afcbff994fa96704b4eb79e5f6da7ab73c"
 }