@vercel/client 10.3.1-canary.8 → 10.4.1

package/dist/create-deployment.js

@@ -53,7 +53,7 @@ function buildCreateDeployment() {
         else {
             debug(`Provided 'path' is a single file`);
         }
-        let { fileList } = await utils_1.buildFileTree(path, clientOptions, debug);
+        const { 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.
@@ -83,11 +83,7 @@ function buildCreateDeployment() {
                 payload: 'There are no files inside your deployment.',
             };
         }
-        const hashedFileMap = await hashes_1.hashes(fileList);
-        const nftFileList = clientOptions.prebuilt
-            ? await hashes_1.resolveNftJsonFiles(hashedFileMap)
-            : [];
-        const files = await hashes_1.hashes(nftFileList, hashedFileMap);
+        const files = await hashes_1.hashes(fileList);
         debug(`Yielding a 'hashes-calculated' event with ${files.size} hashes`);
         yield { type: 'hashes-calculated', payload: hashes_1.mapToObject(files) };
         if (clientOptions.apiUrl) {

package/dist/utils/hashes.d.ts

@@ -20,4 +20,3 @@ export declare const mapToObject: (map: Map<string, DeploymentFile>) => {
  * @return Map of hash digest to file object
  */
 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,11 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveNftJsonFiles = exports.hashes = exports.mapToObject = void 0;
+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.
  *
@@ -66,28 +65,3 @@ async function hashes(files, map = new Map()) {
     return map;
 }
 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

@@ -1,19 +1,19 @@
 import { DeploymentFile } from './hashes';
 import { FetchOptions } from '@zeit/fetch';
 import ignore from 'ignore';
+import { VercelClientOptions, DeploymentOptions, VercelConfig } from '../types';
 declare type Ignore = ReturnType<typeof ignore>;
-import { VercelClientOptions, DeploymentOptions, NowConfig } from '../types';
-export declare const API_FILES = "/v2/now/files";
+export declare const API_FILES = "/v2/files";
 declare const EVENTS_ARRAY: readonly ["hashes-calculated", "file-count", "file-uploaded", "all-files-uploaded", "created", "building", "ready", "alias-assigned", "warning", "error", "notice", "tip", "canceled", "checks-registered", "checks-completed", "checks-running", "checks-conclusion-succeeded", "checks-conclusion-failed", "checks-conclusion-skipped", "checks-conclusion-canceled"];
 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, prebuilt, rootDirectory, }: Pick<VercelClientOptions, 'isDirectory' | 'prebuilt' | 'rootDirectory'>, debug: Debug): Promise<{
+export declare function getApiDeploymentsUrl(metadata?: Pick<DeploymentOptions, 'builds' | 'functions'>): "/v10/deployments" | "/v13/deployments";
+export declare function parseVercelConfig(filePath?: string): Promise<VercelConfig>;
+export declare function buildFileTree(path: string | string[], { isDirectory, prebuilt, }: Pick<VercelClientOptions, 'isDirectory' | 'prebuilt'>, debug: Debug): Promise<{
     fileList: string[];
     ignoreList: string[];
 }>;
-export declare function getVercelIgnore(cwd: string | string[], prebuilt?: boolean, rootDirectory?: string): Promise<{
+export declare function getVercelIgnore(cwd: string | string[], prebuilt?: boolean): Promise<{
     ig: Ignore;
     ignores: string[];
 }>;

package/dist/utils/index.js

@@ -14,7 +14,7 @@ const async_sema_1 = require("async-sema");
 const fs_extra_1 = require("fs-extra");
 const readdir_recursive_1 = __importDefault(require("./readdir-recursive"));
 const semaphore = new async_sema_1.Sema(10);
-exports.API_FILES = '/v2/now/files';
+exports.API_FILES = '/v2/files';
 const EVENTS_ARRAY = [
     // File events
     'hashes-calculated',
@@ -43,9 +43,9 @@ const EVENTS_ARRAY = [
 exports.EVENTS = new Set(EVENTS_ARRAY);
 function getApiDeploymentsUrl(metadata) {
     if (metadata && metadata.builds && !metadata.functions) {
-        return '/v10/now/deployments';
+        return '/v10/deployments';
     }
-    return '/v13/now/deployments';
+    return '/v13/deployments';
 }
 exports.getApiDeploymentsUrl = getApiDeploymentsUrl;
 async function parseVercelConfig(filePath) {
@@ -71,10 +71,10 @@ const maybeRead = async function (path, default_) {
         return default_;
     }
 };
-async function buildFileTree(path, { isDirectory, prebuilt, rootDirectory, }, debug) {
+async function buildFileTree(path, { isDirectory, prebuilt, }, debug) {
     const ignoreList = [];
     let fileList;
-    let { ig, ignores } = await getVercelIgnore(path, prebuilt, rootDirectory);
+    let { ig, ignores } = await getVercelIgnore(path, prebuilt);
     debug(`Found ${ignores.length} rules in .vercelignore`);
     debug('Building file tree...');
     if (isDirectory && !Array.isArray(path)) {
@@ -103,17 +103,19 @@ async function buildFileTree(path, { isDirectory, prebuilt, rootDirectory, }, de
     return { fileList, ignoreList };
 }
 exports.buildFileTree = buildFileTree;
-async function getVercelIgnore(cwd, prebuilt, rootDirectory) {
-    let ignores = [];
-    const outputDir = path_1.posix.join(rootDirectory || '', '.output');
+async function getVercelIgnore(cwd, prebuilt) {
+    const ig = ignore_1.default();
+    let ignores;
     if (prebuilt) {
-        ignores.push('*');
+        const outputDir = '.vercel/output';
+        ignores = ['*'];
         const parts = outputDir.split('/');
         parts.forEach((_, i) => {
             const level = parts.slice(0, i + 1).join('/');
             ignores.push(`!${level}`);
         });
         ignores.push(`!${outputDir}/**`);
+        ig.add(ignores.join('\n'));
     }
     else {
         ignores = [
@@ -141,26 +143,25 @@ async function getVercelIgnore(cwd, prebuilt, rootDirectory) {
             '__pycache__',
             'venv',
             'CVS',
-            `.output`,
         ];
+        const cwds = Array.isArray(cwd) ? cwd : [cwd];
+        const files = await Promise.all(cwds.map(async (cwd) => {
+            const [vercelignore, nowignore] = await Promise.all([
+                maybeRead(path_1.join(cwd, '.vercelignore'), ''),
+                maybeRead(path_1.join(cwd, '.nowignore'), ''),
+            ]);
+            if (vercelignore && nowignore) {
+                throw new build_utils_1.NowBuildError({
+                    code: 'CONFLICTING_IGNORE_FILES',
+                    message: 'Cannot use both a `.vercelignore` and `.nowignore` file. Please delete the `.nowignore` file.',
+                    link: 'https://vercel.link/combining-old-and-new-config',
+                });
+            }
+            return vercelignore || nowignore;
+        }));
+        const ignoreFile = files.join('\n');
+        ig.add(`${ignores.join('\n')}\n${clearRelative(ignoreFile)}`);
     }
-    const cwds = Array.isArray(cwd) ? cwd : [cwd];
-    const files = await Promise.all(cwds.map(async (cwd) => {
-        const [vercelignore, nowignore] = await Promise.all([
-            maybeRead(path_1.join(cwd, '.vercelignore'), ''),
-            maybeRead(path_1.join(cwd, '.nowignore'), ''),
-        ]);
-        if (vercelignore && nowignore) {
-            throw new build_utils_1.NowBuildError({
-                code: 'CONFLICTING_IGNORE_FILES',
-                message: 'Cannot use both a `.vercelignore` and `.nowignore` file. Please delete the `.nowignore` file.',
-                link: 'https://vercel.link/combining-old-and-new-config',
-            });
-        }
-        return vercelignore || nowignore;
-    }));
-    const ignoreFile = files.join('\n');
-    const ig = ignore_1.default().add(`${ignores.join('\n')}\n${clearRelative(ignoreFile)}`);
     return { ig, ignores };
 }
 exports.getVercelIgnore = getVercelIgnore;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/client",
-  "version": "10.3.1-canary.8",
+  "version": "10.4.1",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "homepage": "https://vercel.com",
@@ -41,7 +41,7 @@
     ]
   },
   "dependencies": {
-    "@vercel/build-utils": "2.14.1-canary.8",
+    "@vercel/build-utils": "2.15.1",
     "@zeit/fetch": "5.2.0",
     "async-retry": "1.2.3",
     "async-sema": "3.0.0",
@@ -53,5 +53,5 @@
     "querystring": "^0.2.0",
     "sleep-promise": "8.0.1"
   },
-  "gitHead": "451e0b0cfb7f5f3e0e4f37642471b2c7b4284649"
+  "gitHead": "4a8504fc45092dc4a374bf7a518bd9a07f24fd41"
 }