@vercel/client 10.2.3-canary.41 → 10.2.3-canary.45

package/dist/create-deployment.d.ts

@@ -1,5 +1,5 @@
-import { NowConfig, VercelClientOptions, DeploymentOptions, DeploymentEventType } from './types';
-export default function buildCreateDeployment(): (clientOptions: VercelClientOptions, deploymentOptions?: DeploymentOptions, nowConfig?: NowConfig) => AsyncIterableIterator<{
+import { VercelConfig, VercelClientOptions, DeploymentOptions, DeploymentEventType } from './types';
+export default function buildCreateDeployment(): (clientOptions: VercelClientOptions, deploymentOptions?: DeploymentOptions, nowConfig?: VercelConfig) => AsyncIterableIterator<{
     type: DeploymentEventType;
     payload: any;
 }>;

package/dist/create-deployment.js

@@ -1,27 +1,8 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
-const hashes_1 = __importStar(require("./utils/hashes"));
+const hashes_1 = require("./utils/hashes");
 const upload_1 = require("./upload");
 const utils_1 = require("./utils");
 const errors_1 = require("./errors");
@@ -72,7 +53,7 @@ function buildCreateDeployment() {
         else {
             debug(`Provided 'path' is a single file`);
         }
-        let { fileList } = await utils_1.buildFileTree(path, clientOptions.isDirectory, debug, clientOptions.prebuilt);
+        let { fileList } = await utils_1.buildFileTree(path, clientOptions, debug);
         let configPath;
         if (!nowConfig) {
             // If the user did not provide a config file, use the one in the root directory.
@@ -102,7 +83,11 @@ function buildCreateDeployment() {
                 payload: 'There are no files inside your deployment.',
             };
         }
-        const files = await hashes_1.default(fileList);
+        const hashedFileMap = await hashes_1.hashes(fileList);
+        const nftFileList = clientOptions.prebuilt
+            ? await hashes_1.resolveNftJsonFiles(hashedFileMap)
+            : [];
+        const files = await hashes_1.hashes(nftFileList, hashedFileMap);
         debug(`Yielding a 'hashes-calculated' event with ${files.size} hashes`);
         yield { type: 'hashes-calculated', payload: hashes_1.mapToObject(files) };
         if (clientOptions.apiUrl) {

package/dist/types.d.ts

@@ -12,6 +12,7 @@ export interface VercelClientOptions {
     apiUrl?: string;
     force?: boolean;
     prebuilt?: boolean;
+    rootDirectory?: string;
     withCache?: boolean;
     userAgent?: string;
     defaultName?: string;

package/dist/utils/hashes.d.ts

@@ -15,8 +15,9 @@ export declare const mapToObject: (map: Map<string, DeploymentFile>) => {
 /**
  * Computes hashes for the contents of each file given.
  *
- * @param {Array} of {String} full paths
- * @return {Map}
+ * @param files - absolute file paths
+ * @param map - optional map of files to append
+ * @return Map of hash digest to file object
  */
-declare function hashes(files: string[]): Promise<Map<string, DeploymentFile>>;
-export default hashes;
+export declare function hashes(files: string[], map?: Map<string, DeploymentFile>): Promise<Map<string, DeploymentFile>>;
+export declare function resolveNftJsonFiles(hashedFiles: Map<string, DeploymentFile>): Promise<string[]>;

package/dist/utils/hashes.js

@@ -3,10 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mapToObject = void 0;
+exports.resolveNftJsonFiles = exports.hashes = exports.mapToObject = void 0;
 const crypto_1 = require("crypto");
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const async_sema_1 = require("async-sema");
+const path_1 = require("path");
 /**
  * Computes a hash for the given buf.
  *
@@ -14,9 +15,7 @@ const async_sema_1 = require("async-sema");
  * @return {String} hex digest
  */
 function hash(buf) {
-    return crypto_1.createHash('sha1')
-        .update(buf)
-        .digest('hex');
+    return crypto_1.createHash('sha1').update(buf).digest('hex');
 }
 /**
  * Transforms map to object
@@ -34,11 +33,11 @@ exports.mapToObject = mapToObject;
 /**
  * Computes hashes for the contents of each file given.
  *
- * @param {Array} of {String} full paths
- * @return {Map}
+ * @param files - absolute file paths
+ * @param map - optional map of files to append
+ * @return Map of hash digest to file object
  */
-async function hashes(files) {
-    const map = new Map();
+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();
@@ -47,7 +46,9 @@ async function hashes(files) {
         const h = hash(data);
         const entry = map.get(h);
         if (entry) {
-            entry.names.push(name);
+            if (entry.names[0] !== name) {
+                entry.names.push(name);
+            }
         }
         else {
             map.set(h, { names: [name], data, mode });
@@ -56,4 +57,29 @@ async function hashes(files) {
     }));
     return map;
 }
-exports.default = hashes;
+exports.hashes = hashes;
+async function resolveNftJsonFiles(hashedFiles) {
+    const semaphore = new async_sema_1.Sema(100);
+    const existingFiles = Array.from(hashedFiles.values());
+    const resolvedFiles = new Set();
+    await Promise.all(existingFiles.map(async (file) => {
+        await semaphore.acquire();
+        const fsPath = file.names[0];
+        if (fsPath.endsWith('.nft.json')) {
+            const json = file.data.toString('utf8');
+            const { version, files } = JSON.parse(json);
+            if (version === 1 || version === 2) {
+                for (let f of files) {
+                    const relPath = typeof f === 'string' ? f : f.input;
+                    resolvedFiles.add(path_1.join(path_1.dirname(fsPath), relPath));
+                }
+            }
+            else {
+                console.error(`Invalid nft.json version: ${version}`);
+            }
+        }
+        semaphore.release();
+    }));
+    return Array.from(resolvedFiles);
+}
+exports.resolveNftJsonFiles = resolveNftJsonFiles;

package/dist/utils/index.d.ts

@@ -9,11 +9,11 @@ export declare type DeploymentEventType = typeof EVENTS_ARRAY[number];
 export declare const EVENTS: Set<"warning" | "error" | "hashes-calculated" | "file-count" | "file-uploaded" | "all-files-uploaded" | "created" | "building" | "ready" | "alias-assigned" | "notice" | "tip" | "canceled" | "checks-registered" | "checks-completed" | "checks-running" | "checks-conclusion-succeeded" | "checks-conclusion-failed" | "checks-conclusion-skipped" | "checks-conclusion-canceled">;
 export declare function getApiDeploymentsUrl(metadata?: Pick<DeploymentOptions, 'builds' | 'functions'>): "/v10/now/deployments" | "/v13/now/deployments";
 export declare function parseVercelConfig(filePath?: string): Promise<NowConfig>;
-export declare function buildFileTree(path: string | string[], isDirectory: boolean, debug: Debug, prebuilt?: boolean): Promise<{
+export declare function buildFileTree(path: string | string[], { isDirectory, prebuilt, rootDirectory, }: Pick<VercelClientOptions, 'isDirectory' | 'prebuilt' | 'rootDirectory'>, debug: Debug): Promise<{
     fileList: string[];
     ignoreList: string[];
 }>;
-export declare function getVercelIgnore(cwd: string | string[], prebuilt?: boolean): Promise<{
+export declare function getVercelIgnore(cwd: string | string[], prebuilt?: boolean, rootDirectory?: string): Promise<{
     ig: Ignore;
     ignores: string[];
 }>;

package/dist/utils/index.js

@@ -71,10 +71,10 @@ const maybeRead = async function (path, default_) {
         return default_;
     }
 };
-async function buildFileTree(path, isDirectory, debug, prebuilt) {
+async function buildFileTree(path, { isDirectory, prebuilt, rootDirectory, }, debug) {
     const ignoreList = [];
     let fileList;
-    let { ig, ignores } = await getVercelIgnore(path, prebuilt);
+    let { ig, ignores } = await getVercelIgnore(path, prebuilt, rootDirectory);
     debug(`Found ${ignores.length} rules in .vercelignore`);
     debug('Building file tree...');
     if (isDirectory && !Array.isArray(path)) {
@@ -103,10 +103,20 @@ async function buildFileTree(path, isDirectory, debug, prebuilt) {
     return { fileList, ignoreList };
 }
 exports.buildFileTree = buildFileTree;
-async function getVercelIgnore(cwd, prebuilt) {
-    const ignores = prebuilt
-        ? ['*', '!.output', '!.output/**']
-        : [
+async function getVercelIgnore(cwd, prebuilt, rootDirectory) {
+    let ignores = [];
+    const outputDir = path_1.posix.join(rootDirectory || '', '.output');
+    if (prebuilt) {
+        ignores.push('*');
+        const parts = outputDir.split('/');
+        parts.forEach((_, i) => {
+            const level = parts.slice(0, i + 1).join('/');
+            ignores.push(`!${level}`);
+        });
+        ignores.push(`!${outputDir}/**`);
+    }
+    else {
+        ignores = [
             '.hg',
             '.git',
             '.gitmodules',
@@ -131,8 +141,9 @@ async function getVercelIgnore(cwd, prebuilt) {
             '__pycache__',
             'venv',
             'CVS',
-            '.output',
+            `.output`,
         ];
+    }
     const cwds = Array.isArray(cwd) ? cwd : [cwd];
     const files = await Promise.all(cwds.map(async (cwd) => {
         const [vercelignore, nowignore] = await Promise.all([
@@ -192,9 +203,8 @@ const fetch = async (url, token, opts = {}, debugEnabled, useNodeFetch) => {
 exports.fetch = fetch;
 const isWin = process.platform.includes('win');
 const prepareFiles = (files, clientOptions) => {
-    const preparedFiles = [...files.keys()].reduce((acc, sha) => {
-        const next = [...acc];
-        const file = files.get(sha);
+    const preparedFiles = [];
+    for (const [sha, file] of files) {
         for (const name of file.names) {
             let fileName;
             if (clientOptions.isDirectory) {
@@ -209,15 +219,14 @@ const prepareFiles = (files, clientOptions) => {
                 const segments = name.split(path_1.sep);
                 fileName = segments[segments.length - 1];
             }
-            next.push({
+            preparedFiles.push({
                 file: isWin ? fileName.replace(/\\/g, '/') : fileName,
                 size: file.data.byteLength || file.data.length,
                 mode: file.mode,
                 sha,
             });
         }
-        return next;
-    }, []);
+    }
     return preparedFiles;
 };
 exports.prepareFiles = prepareFiles;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/client",
-  "version": "10.2.3-canary.41",
+  "version": "10.2.3-canary.45",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "homepage": "https://vercel.com",
@@ -40,7 +40,7 @@
     ]
   },
   "dependencies": {
-    "@vercel/build-utils": "2.12.3-canary.40",
+    "@vercel/build-utils": "2.12.3-canary.42",
     "@zeit/fetch": "5.2.0",
     "async-retry": "1.2.3",
     "async-sema": "3.0.0",
@@ -52,5 +52,5 @@
     "recursive-readdir": "2.2.2",
     "sleep-promise": "8.0.1"
   },
-  "gitHead": "d31ebbabe4d9533d0e98137d76eb319b01ac8b13"
+  "gitHead": "d3ef240f6e01fff3d11d0499c9aaf892968748e3"
 }