@vercel/client 10.3.1-canary.3 → 10.3.1-canary.6

package/dist/upload.js

@@ -4,10 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.upload = void 0;
-const fs_1 = require("fs");
 const https_1 = require("https");
 const async_retry_1 = __importDefault(require("async-retry"));
 const async_sema_1 = require("async-sema");
+const fs_extra_1 = __importDefault(require("fs-extra"));
 const utils_1 = require("./utils");
 const errors_1 = require("./errors");
 const deploy_1 = require("./deploy");
@@ -67,7 +67,14 @@ async function* upload(files, clientOptions, deploymentOptions) {
             }
             await semaphore.acquire();
             const fPath = file.names[0];
-            const stream = fs_1.createReadStream(fPath);
+            let body = null;
+            const stat = await fs_extra_1.default.lstat(fPath);
+            if (stat.isSymbolicLink()) {
+                body = await fs_extra_1.default.readlink(fPath);
+            }
+            else {
+                body = fs_extra_1.default.createReadStream(fPath);
+            }
             const { data } = file;
             let err;
             let result;
@@ -81,7 +88,7 @@ async function* upload(files, clientOptions, deploymentOptions) {
                         'x-now-digest': sha,
                         'x-now-size': data.length,
                     },
-                    body: stream,
+                    body,
                     teamId,
                     apiUrl,
                     userAgent,
@@ -111,8 +118,10 @@ async function* upload(files, clientOptions, deploymentOptions) {
                 err = new Error(e);
             }
             finally {
-                stream.close();
-                stream.destroy();
+                if (body && typeof body !== 'string') {
+                    body.close();
+                    body.destroy();
+                }
             }
             semaphore.release();
             if (err) {

package/dist/utils/hashes.js

@@ -41,8 +41,16 @@ async function hashes(files, map = new Map()) {
     const semaphore = new async_sema_1.Sema(100);
     await Promise.all(files.map(async (name) => {
         await semaphore.acquire();
-        const data = await fs_extra_1.default.readFile(name);
-        const { mode } = await fs_extra_1.default.stat(name);
+        const stat = await fs_extra_1.default.lstat(name);
+        const mode = stat.mode;
+        let data = null;
+        if (stat.isSymbolicLink()) {
+            const link = await fs_extra_1.default.readlink(name);
+            data = Buffer.from(link, 'utf8');
+        }
+        else {
+            data = await fs_extra_1.default.readFile(name);
+        }
         const h = hash(data);
         const entry = map.get(h);
         if (entry) {

package/dist/utils/index.js

@@ -12,7 +12,7 @@ const pkg_1 = require("../pkg");
 const build_utils_1 = require("@vercel/build-utils");
 const async_sema_1 = require("async-sema");
 const fs_extra_1 = require("fs-extra");
-const recursive_readdir_1 = __importDefault(require("recursive-readdir"));
+const readdir_recursive_1 = __importDefault(require("./readdir-recursive"));
 const semaphore = new async_sema_1.Sema(10);
 exports.API_FILES = '/v2/now/files';
 const EVENTS_ARRAY = [
@@ -87,7 +87,7 @@ async function buildFileTree(path, { isDirectory, prebuilt, rootDirectory, }, de
             }
             return ignored;
         };
-        fileList = await recursive_readdir_1.default(path, [ignores]);
+        fileList = await readdir_recursive_1.default(path, [ignores]);
         debug(`Found ${fileList.length} files in the specified directory`);
     }
     else if (Array.isArray(path)) {

package/dist/utils/readdir-recursive.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="node" />
+import fs from 'fs';
+declare type Ignoreable = (path: string, stats: fs.Stats) => boolean;
+export default function readdir(path: string, ignores: Ignoreable[]): Promise<string[]>;
+export {};

package/dist/utils/readdir-recursive.js

@@ -0,0 +1,100 @@
+"use strict";
+/*
+The MIT License (MIT)
+
+Copyright (c) 2014 Jamison Dance
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+/*
+  based on https://github.com/jergason/recursive-readdir
+  primary changes:
+    - use `lstat` instead of `stat` so that symlinks are not followed
+*/
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const minimatch_1 = __importDefault(require("minimatch"));
+function patternMatcher(pattern) {
+    return function (path, stats) {
+        const minimatcher = new minimatch_1.default.Minimatch(pattern, { matchBase: true });
+        return (!minimatcher.negate || stats.isFile()) && minimatcher.match(path);
+    };
+}
+function toMatcherFunction(ignoreEntry) {
+    if (typeof ignoreEntry === 'function') {
+        return ignoreEntry;
+    }
+    else {
+        return patternMatcher(ignoreEntry);
+    }
+}
+function readdir(path, ignores) {
+    ignores = ignores.map(toMatcherFunction);
+    let list = [];
+    return new Promise(function (resolve, reject) {
+        fs_1.default.readdir(path, function (err, files) {
+            if (err) {
+                return reject(err);
+            }
+            let pending = files.length;
+            if (!pending) {
+                return resolve(list);
+            }
+            files.forEach(function (file) {
+                const filePath = path_1.default.join(path, file);
+                fs_1.default.lstat(filePath, function (_err, stats) {
+                    if (_err) {
+                        return reject(_err);
+                    }
+                    const matches = ignores.some(matcher => matcher(filePath, stats));
+                    if (matches) {
+                        pending -= 1;
+                        if (!pending) {
+                            return resolve(list);
+                        }
+                        return null;
+                    }
+                    if (stats.isDirectory()) {
+                        readdir(filePath, ignores)
+                            .then(function (res) {
+                            list = list.concat(res);
+                            pending -= 1;
+                            if (!pending) {
+                                return resolve(list);
+                            }
+                        })
+                            .catch(reject);
+                    }
+                    else {
+                        list.push(filePath);
+                        pending -= 1;
+                        if (!pending) {
+                            return resolve(list);
+                        }
+                    }
+                });
+            });
+        });
+    });
+}
+exports.default = readdir;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/client",
-  "version": "10.3.1-canary.3",
+  "version": "10.3.1-canary.6",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "homepage": "https://vercel.com",
@@ -25,6 +25,7 @@
     "@types/async-retry": "1.4.1",
     "@types/fs-extra": "7.0.0",
     "@types/jest": "27.0.1",
+    "@types/minimatch": "3.0.5",
     "@types/ms": "0.7.30",
     "@types/node": "12.0.4",
     "@types/node-fetch": "2.5.4",
@@ -40,17 +41,17 @@
     ]
   },
   "dependencies": {
-    "@vercel/build-utils": "2.14.1-canary.3",
+    "@vercel/build-utils": "2.14.1-canary.6",
     "@zeit/fetch": "5.2.0",
     "async-retry": "1.2.3",
     "async-sema": "3.0.0",
     "fs-extra": "8.0.1",
     "ignore": "4.0.6",
+    "minimatch": "5.0.1",
     "ms": "2.1.2",
     "node-fetch": "2.6.1",
     "querystring": "^0.2.0",
-    "recursive-readdir": "2.2.2",
     "sleep-promise": "8.0.1"
   },
-  "gitHead": "a17f3a96ec12483a28667894dcdc3bb57675ead3"
+  "gitHead": "9dde99f19ef62f7ea8addc19fab9a1ff025aa4ae"
 }