Publish Stable

- @vercel/python@2.0.2

.husky/.gitignore

@@ -0,0 +1 @@
+_

.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+yarn pre-commit

api/package.json

@@ -10,7 +10,7 @@
   "dependencies": {
     "@sentry/node": "5.11.1",
     "got": "10.2.1",
-    "node-fetch": "2.6.0",
+    "node-fetch": "2.6.1",
     "parse-github-url": "1.0.2",
     "tar-fs": "2.0.0",
     "unzip-stream": "0.3.0"

api/yarn.lock

@@ -362,10 +362,10 @@ ms@^2.1.1:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-node-fetch@2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
-  integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==
+node-fetch@2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
+  integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
 
 normalize-url@^4.1.0:
   version "4.5.0"

examples/angular/yarn.lock

@@ -3073,9 +3073,9 @@ hmac-drbg@^1.0.1:
     minimalistic-crypto-utils "^1.0.1"
 
 hosted-git-info@^2.1.4, hosted-git-info@^2.6.0, hosted-git-info@^2.7.1:
-  version "2.8.8"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
-  integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
+  version "2.8.9"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
+  integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
 
 hpack.js@^2.1.6:
   version "2.1.6"
@@ -6204,9 +6204,9 @@ sshpk@^1.7.0:
     tweetnacl "~0.14.0"
 
 ssri@^6.0.0, ssri@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
-  integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz#157939134f20464e7301ddba3e90ffa8f7728ac5"
+  integrity sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==
   dependencies:
     figgy-pudding "^3.5.1"
 

examples/blitzjs/yarn.lock

@@ -4681,9 +4681,9 @@ hmac-drbg@^1.0.1:
     minimalistic-crypto-utils "^1.0.1"
 
 hosted-git-info@^2.1.4:
-  version "2.8.8"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
-  integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
+  version "2.8.9"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
+  integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
 
 hsl-regex@^1.0.0:
   version "1.0.0"
@@ -8195,9 +8195,9 @@ sprintf-js@~1.0.2:
   integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
 
 ssri@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
-  integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz#157939134f20464e7301ddba3e90ffa8f7728ac5"
+  integrity sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==
   dependencies:
     figgy-pudding "^3.5.1"
 

examples/vanilla-pusher-functions/README.md

@@ -1,19 +1,9 @@
-# Realtime Pusher Whiteboard
+# Realtime Pusher Example
 
-This directory is a realtime serverless whiteboard powered by Pusher. The frontend is static vanilla HTML, CSS, and JavaScript and the backend is a single Node.js function.
+This directory is a realtime serverless whiteboard powered by Pusher. The frontend is static vanilla HTML, CSS, and JavaScript and the backend is a single Node.js function both deployed with Vercel and zero configuration.
 
-## Creating This Example
+## Deploy Your Own
 
-To get started with a realtime whiteboard on Vercel, you can use [Vercel CLI](https://vercel.com/download) to initialize the project:
+Deploy your own Pusher project with Vercel.
 
-```shell
-$ vercel init vanilla-pusher-functions
-```
-
-### Deploying From Your Terminal
-
-You can deploy your new project with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
-
-```shell
-$ vercel
-```
+[![Deploy with Vercel](https://vercel.com/button)](https://vercel.com/new/git/external?repository-url=https%3A%2F%2Fgithub.com%2Fvercel%2Fvercel%2Ftree%2Fmain%2Fexamples%2Fvanilla-pusher-functions&env=APP_ID,KEY,SECRET,CLUSTER&envDescription=Pusher%20Channels&envLink=https%3A%2F%2Fpusher.com%2Fchannels)

examples/vanilla-pusher-functions/vercel.json

@@ -1,9 +0,0 @@
-{
-  "version": 2,
-  "env": {
-    "APP_ID": "@pusher-whiteboard-app-id",
-    "KEY": "@pusher-whiteboard-key",
-    "SECRET": "@pusher-whiteboard-secret",
-    "CLUSTER": "us2"
-  }
-}

package.json

@@ -24,7 +24,7 @@
     "eslint": "6.2.2",
     "eslint-config-prettier": "6.1.0",
     "eslint-plugin-jest": "23.8.2",
-    "husky": "3.0.4",
+    "husky": "6.0.0",
     "json5": "2.1.1",
     "lint-staged": "9.2.5",
     "node-fetch": "2.6.1",
@@ -40,11 +40,13 @@
     "changelog": "node utils/changelog.js",
     "build": "node utils/run.js build all",
     "vercel-build": "mkdir -p public && echo '<a href=\"https://vercel.com/import\">Import</a>' > public/output.html",
+    "pre-commit": "lint-staged",
     "test-unit": "node utils/run.js test-unit",
     "test-integration-cli": "node utils/run.js test-integration-cli",
     "test-integration-once": "node utils/run.js test-integration-once",
     "test-integration-dev": "node utils/run.js test-integration-dev",
-    "lint": "eslint . --ext .ts,.js"
+    "lint": "eslint . --ext .ts,.js",
+    "prepare": "husky install"
   },
   "lint-staged": {
     "./{*,{api,packages,test,utils}/**/*}.{js,ts}": [
@@ -57,11 +59,6 @@
       "git add"
     ]
   },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
-  },
   "prettier": {
     "trailingComma": "es5",
     "singleQuote": true,

packages/build-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "2.10.3-canary.1",
+  "version": "2.10.3-canary.4",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",
@@ -29,7 +29,7 @@
     "@types/node-fetch": "^2.1.6",
     "@types/semver": "6.0.0",
     "@types/yazl": "^2.4.1",
-    "@vercel/frameworks": "0.3.3-canary.1",
+    "@vercel/frameworks": "0.3.3-canary.3",
     "@vercel/ncc": "0.24.0",
     "aggregate-error": "3.0.1",
     "async-retry": "1.2.3",

packages/build-utils/test/fixtures/15-yarn-ignore-engines/index.js

@@ -1,9 +0,0 @@
-const scheduler = require('@google-cloud/scheduler');
-
-module.exports = (_, res) => {
-  if (scheduler) {
-    res.end('found:RANDOMNESS_PLACEHOLDER');
-  } else {
-    res.end('nope:RANDOMNESS_PLACEHOLDER');
-  }
-};

packages/build-utils/test/fixtures/15-yarn-ignore-engines/now.json

@@ -1,10 +0,0 @@
-{
-  "version": 2,
-  "builds": [
-    {
-      "src": "index.js",
-      "use": "@vercel/node"
-    }
-  ],
-  "probes": [{ "path": "/", "mustContain": "found:RANDOMNESS_PLACEHOLDER" }]
-}

packages/build-utils/test/fixtures/15-yarn-ignore-engines/package.json

@@ -1,8 +0,0 @@
-{
-  "name": "15-yarn-ignore-engines",
-  "version": "1.0.0",
-  "main": "index.js",
-  "dependencies": {
-    "@google-cloud/scheduler": "0.3.0"
-  }
-}

packages/cli/@types/inquirer/index.d.ts

@@ -1 +0,0 @@
-declare module 'inquirer';

packages/cli/@types/jsonlines/index.d.ts

@@ -0,0 +1,5 @@
+declare module 'jsonlines' {
+  import { Transform } from 'stream';
+
+  function parse(): Transform;
+}

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vercel",
-  "version": "22.0.2-canary.1",
+  "version": "22.0.2-canary.6",
   "preferGlobal": true,
   "license": "Apache-2.0",
   "description": "The command-line interface for Vercel",
@@ -61,10 +61,10 @@
     "node": ">= 12"
   },
   "dependencies": {
-    "@vercel/build-utils": "2.10.3-canary.1",
+    "@vercel/build-utils": "2.10.3-canary.4",
     "@vercel/go": "1.2.2",
-    "@vercel/node": "1.10.0",
-    "@vercel/python": "2.0.1",
+    "@vercel/node": "1.10.1-canary.2",
+    "@vercel/python": "2.0.2",
     "@vercel/ruby": "1.2.6",
     "update-notifier": "4.1.0"
   },
@@ -82,6 +82,7 @@
     "@types/fs-extra": "5.0.5",
     "@types/glob": "7.1.1",
     "@types/http-proxy": "1.16.2",
+    "@types/inquirer": "7.3.1",
     "@types/load-json-file": "2.0.7",
     "@types/mime-types": "2.1.0",
     "@types/minimatch": "3.0.3",
@@ -99,7 +100,7 @@
     "@types/universal-analytics": "0.4.2",
     "@types/which": "1.3.2",
     "@types/write-json-file": "2.2.1",
-    "@vercel/frameworks": "0.3.3-canary.1",
+    "@vercel/frameworks": "0.3.3-canary.3",
     "@vercel/ncc": "0.24.0",
     "@zeit/fun": "0.11.2",
     "@zeit/source-map-support": "0.6.2",

packages/cli/src/commands/alias/set.ts

@@ -19,7 +19,7 @@ import link from '../../util/output/link';
 import { User } from '../../types';
 import { getCommandName } from '../../util/pkg-name';
 import toHost from '../../util/to-host';
-import { NowConfig } from '../../util/dev/types';
+import { VercelConfig } from '../../util/dev/types';
 
 type Options = {
   '--debug': boolean;
@@ -421,7 +421,7 @@ function handleCreateAliasError<T>(
   return error;
 }
 
-function getTargetsForAlias(args: string[], { alias }: NowConfig) {
+function getTargetsForAlias(args: string[], { alias }: VercelConfig) {
   if (args.length) {
     return [args[args.length - 1]]
       .map(target => (target.indexOf('.') !== -1 ? toHost(target) : target))

packages/cli/src/commands/init/init.ts

@@ -111,7 +111,6 @@ async function chooseFromDropdown(message: string, exampleList: string[]) {
 
   return listInput({
     message,
-    separator: false,
     choices,
   });
 }

packages/cli/src/commands/inspect.ts

@@ -3,12 +3,14 @@ import getArgs from '../util/get-args';
 import buildsList from '../util/output/builds';
 import routesList from '../util/output/routes';
 import indent from '../util/output/indent';
-import Now from '../util';
 import logo from '../util/output/logo';
-import elapsed from '../util/output/elapsed.ts';
+import elapsed from '../util/output/elapsed';
 import { handleError } from '../util/error';
-import getScope from '../util/get-scope.ts';
-import { getPkgName, getCommandName } from '../util/pkg-name.ts';
+import getScope from '../util/get-scope';
+import { getPkgName, getCommandName } from '../util/pkg-name';
+import Client from '../util/client';
+import { getDeployment } from '../util/get-deployment';
+import { Deployment } from '@vercel/client';
 
 const help = () => {
   console.log(`
@@ -33,15 +35,15 @@ const help = () => {
 
   ${chalk.gray('–')} Get information about a deployment by its unique URL
 
-    ${chalk.cyan(`$ ${getPkgName()} inspect my-deployment-ji2fjij2.now.sh`)}
+    ${chalk.cyan(`$ ${getPkgName()} inspect my-deployment-ji2fjij2.vercel.app`)}
 
   ${chalk.gray('-')} Get information about the deployment an alias points to
 
-    ${chalk.cyan(`$ ${getPkgName()} inspect my-deployment.now.sh`)}
+    ${chalk.cyan(`$ ${getPkgName()} inspect my-deployment.vercel.app`)}
   `);
 };
 
-export default async function main(client) {
+export default async function main(client: Client) {
   let deployment;
   let argv;
 
@@ -57,14 +59,7 @@ export default async function main(client) {
     return 2;
   }
 
-  const {
-    apiUrl,
-    output,
-    authConfig: { token },
-    config,
-  } = client;
-  const debugEnabled = argv['--debug'];
-  const { print, log, error } = output;
+  const { print, log, error } = client.output;
 
   // extract the first parameter
   const [, deploymentIdOrHost] = argv._;
@@ -75,9 +70,7 @@ export default async function main(client) {
     return 1;
   }
 
-  const { currentTeam } = config;
-
-  let contextName = null;
+  let contextName: string | null = null;
 
   try {
     ({ contextName } = await getScope(client));
@@ -90,22 +83,14 @@ export default async function main(client) {
     throw err;
   }
 
-  const now = new Now({
-    apiUrl,
-    token,
-    debug: debugEnabled,
-    currentTeam,
-    output,
-  });
-
   // resolve the deployment, since we might have been given an alias
   const depFetchStart = Date.now();
-  output.spinner(
+  client.output.spinner(
     `Fetching deployment "${deploymentIdOrHost}" in ${chalk.bold(contextName)}`
   );
 
   try {
-    deployment = await now.findDeployment(deploymentIdOrHost);
+    deployment = await getDeployment(client, deploymentIdOrHost);
   } catch (err) {
     if (err.status === 404) {
       error(
@@ -127,11 +112,11 @@ export default async function main(client) {
     throw err;
   }
 
-  const { id, name, url, created, routes, readyState } = deployment;
+  const { id, name, url, createdAt, routes, readyState } = deployment;
 
   const { builds } =
     deployment.version === 2
-      ? await now.fetch(`/v1/now/deployments/${id}/builds`)
+      ? await client.fetch(`/v1/now/deployments/${id}/builds`)
       : { builds: [] };
 
   log(
@@ -146,10 +131,10 @@ export default async function main(client) {
   print(`    ${chalk.cyan('name')}\t${name}\n`);
   print(`    ${chalk.cyan('readyState')}\t${stateString(readyState)}\n`);
   print(`    ${chalk.cyan('url')}\t\t${url}\n`);
-  if (created) {
+  if (createdAt) {
     print(
-      `    ${chalk.cyan('createdAt')}\t${new Date(created)} ${elapsed(
-        Date.now() - created,
+      `    ${chalk.cyan('createdAt')}\t${new Date(createdAt)} ${elapsed(
+        Date.now() - createdAt,
         true
       )}\n`
     );
@@ -157,7 +142,7 @@ export default async function main(client) {
   print('\n\n');
 
   if (builds.length > 0) {
-    const times = {};
+    const times: { [id: string]: string | null } = {};
 
     for (const build of builds) {
       const { id, createdAt, readyStateAt } = build;
@@ -179,7 +164,7 @@ export default async function main(client) {
 }
 
 // renders the state string
-function stateString(s) {
+function stateString(s: Deployment['readyState']) {
   switch (s) {
     case 'INITIALIZING':
       return chalk.yellow(s);

packages/cli/src/commands/login.ts

@@ -1,11 +1,10 @@
-import inquirer from 'inquirer';
 import { validate as validateEmail } from 'email-validator';
 import chalk from 'chalk';
 import hp from '../util/humanize-path';
 import getArgs from '../util/get-args';
-import error from '../util/output/error';
 import handleError from '../util/handle-error';
 import logo from '../util/output/logo';
+import prompt from '../util/login/prompt';
 import doSsoLogin from '../util/login/sso';
 import doEmailLogin from '../util/login/email';
 import { prependEmoji, emoji } from '../util/emoji';
@@ -13,6 +12,7 @@ import { getCommandName, getPkgName } from '../util/pkg-name';
 import getGlobalPathConfig from '../util/config/global-path';
 import { writeToAuthConfigFile, writeToConfigFile } from '../util/config/files';
 import Client from '../util/client';
+import { LoginParams } from '../util/login/types';
 
 const help = () => {
   console.log(`
@@ -44,35 +44,6 @@ const help = () => {
 `);
 };
 
-const readInput = async () => {
-  let input;
-
-  while (!input) {
-    try {
-      const { val } = await inquirer.prompt({
-        type: 'input',
-        name: 'val',
-        message: 'Enter your email or team slug:',
-      });
-      input = val;
-    } catch (err) {
-      console.log(); // \n
-
-      if (err.isTtyError) {
-        throw new Error(
-          error(
-            `Interactive mode not supported – please run ${getCommandName(
-              `login you@domain.com`
-            )}`
-          )
-        );
-      }
-    }
-  }
-
-  return input;
-};
-
 export default async function login(client: Client): Promise<number> {
   let argv;
   const { apiUrl, output } = client;
@@ -94,21 +65,21 @@ export default async function login(client: Client): Promise<number> {
     return 2;
   }
 
-  const input = argv._[1] || (await readInput());
-
-  // TODO: add proper validation
-  const isValidSlug = true;
+  const input = argv._[1];
 
   let result: number | string = 1;
+  const params: LoginParams = { output, apiUrl };
 
-  if (validateEmail(input)) {
-    result = await doEmailLogin(input, { output, apiUrl });
-  } else if (isValidSlug) {
-    result = await doSsoLogin(input, { output, apiUrl });
+  if (input) {
+    // Email or Team slug was provided via command line
+    if (validateEmail(input)) {
+      result = await doEmailLogin(input, params);
+    } else {
+      result = await doSsoLogin(input, params);
+    }
   } else {
-    output.error(`Invalid input: "${input}"`);
-    output.log(`Please enter a valid email address or team slug`);
-    return 2;
+    // Interactive mode
+    result = await prompt(params);
   }
 
   // The login function failed, so it returned an exit code

packages/cli/src/commands/logout.ts

@@ -1,5 +1,4 @@
 import chalk from 'chalk';
-import fetch from 'node-fetch';
 import logo from '../util/output/logo';
 // @ts-ignore
 import { handleError } from '../util/error';
@@ -48,10 +47,9 @@ export default async function main(client: Client): Promise<number> {
     return 2;
   }
 
-  const { authConfig, config, apiUrl, output } = client;
-  const { token } = authConfig;
+  const { authConfig, config, output } = client;
 
-  if (!token) {
+  if (!authConfig.token) {
     output.note(
       `Not currently logged in, so ${getCommandName('logout')} did nothing`
     );
@@ -59,6 +57,20 @@ export default async function main(client: Client): Promise<number> {
   }
 
   output.spinner('Logging out…', 200);
+  let exitCode = 0;
+
+  try {
+    await client.fetch(`/v3/user/tokens/current`, {
+      method: 'DELETE',
+    });
+  } catch (err) {
+    if (err.status === 403) {
+      output.debug('Token is invalid so it cannot be revoked');
+    } else if (err.status !== 200) {
+      output.debug(err?.message ?? '');
+      exitCode = 1;
+    }
+  }
 
   delete config.currentTeam;
 
@@ -75,26 +87,15 @@ export default async function main(client: Client): Promise<number> {
     writeToAuthConfigFile(authConfig);
     output.debug('Configuration has been deleted');
   } catch (err) {
-    output.error(`Couldn't remove config while logging out`);
-    return 1;
+    output.debug(err?.message ?? '');
+    exitCode = 1;
   }
 
-  const res = await fetch(`${apiUrl}/v3/user/tokens/current`, {
-    method: 'DELETE',
-    headers: {
-      Authorization: `Bearer ${token}`,
-    },
-  });
-
-  if (res.status === 403) {
-    output.debug('Token is invalid so it cannot be revoked');
-  } else if (res.status !== 200) {
-    const err = await res.json();
-    output.error('Failed to revoke token');
-    output.debug(err ? err.message : '');
-    return 1;
+  if (exitCode === 0) {
+    output.log('Logged out!');
+  } else {
+    output.error(`Failed during logout`);
   }
 
-  output.log('Logged out!');
-  return 0;
+  return exitCode;
 }

packages/cli/src/commands/logs.ts

@@ -1,13 +1,13 @@
 import chalk from 'chalk';
-import Now from '../util';
 import logo from '../util/output/logo';
-import elapsed from '../util/output/elapsed.ts';
+import elapsed from '../util/output/elapsed';
 import { maybeURL, normalizeURL } from '../util/url';
-import printEvents from '../util/events';
-import getScope from '../util/get-scope.ts';
-import { getPkgName } from '../util/pkg-name.ts';
-import getArgs from '../util/get-args.ts';
-import handleError from '../util/handle-error.ts';
+import printEvents, { DeploymentEvent } from '../util/events';
+import getScope from '../util/get-scope';
+import { getPkgName } from '../util/pkg-name';
+import getArgs from '../util/get-args';
+import Client from '../util/client';
+import { getDeployment } from '../util/get-deployment';
 
 const help = () => {
   console.log(`
@@ -53,35 +53,25 @@ const help = () => {
 `);
 };
 
-export default async function main(client) {
-  let argv;
-  let deploymentIdOrURL;
-
-  let debug;
+export default async function main(client: Client) {
   let head;
   let limit;
   let follow;
-  let outputMode;
-
   let since;
   let until;
+  let deploymentIdOrURL;
 
-  try {
-    argv = getArgs(client.argv.slice(2), {
-      '--since': String,
-      '--until': String,
-      '--output': String,
-      '--limit': Number,
-      '--head': Boolean,
-      '--follow': Boolean,
-      '-f': '--follow',
-      '-o': '--output',
-      '-n': '--limit',
-    });
-  } catch (error) {
-    handleError(error);
-    return 1;
-  }
+  const argv = getArgs(client.argv.slice(2), {
+    '--since': String,
+    '--until': String,
+    '--output': String,
+    '--limit': Number,
+    '--head': Boolean,
+    '--follow': Boolean,
+    '-f': '--follow',
+    '-o': '--output',
+    '-n': '--limit',
+  });
 
   argv._ = argv._.slice(1);
   deploymentIdOrURL = argv._[0];
@@ -91,12 +81,7 @@ export default async function main(client) {
     return 2;
   }
 
-  const {
-    authConfig: { token },
-    apiUrl,
-    output,
-    config,
-  } = client;
+  const { output } = client;
 
   try {
     since = argv['--since'] ? toTimestamp(argv['--since']) : 0;
@@ -124,40 +109,24 @@ export default async function main(client) {
     deploymentIdOrURL = normalizedURL;
   }
 
-  debug = argv['--debug'];
-
   head = argv['--head'];
   limit = argv['--limit'] || 100;
   follow = argv['--follow'];
   if (follow) until = 0;
-  outputMode = argv['--output'] in logPrinters ? argv['--output'] : 'short';
+  const logPrinter = getLogPrinter(argv['--output'], 'short');
 
-  const { currentTeam } = config;
-  const now = new Now({ apiUrl, token, debug, currentTeam, output });
-  let contextName = null;
+  const { contextName } = await getScope(client);
 
-  try {
-    ({ contextName } = await getScope(client));
-  } catch (err) {
-    if (err.code === 'NOT_AUTHORIZED' || err.code === 'TEAM_DELETED') {
-      output.error(err.message);
-      return 1;
-    }
-
-    throw err;
-  }
-
-  let deployment;
   const id = deploymentIdOrURL;
 
   const depFetchStart = Date.now();
   output.spinner(`Fetching deployment "${id}" in ${chalk.bold(contextName)}`);
 
+  let deployment;
   try {
-    deployment = await now.findDeployment(id);
+    deployment = await getDeployment(client, id);
   } catch (err) {
     output.stopSpinner();
-    now.close();
 
     if (err.status === 404) {
       output.error(
@@ -183,31 +152,28 @@ export default async function main(client) {
     )} ${elapsed(Date.now() - depFetchStart)}`
   );
 
-  let direction = head ? 'forward' : 'backward';
-  if (since && !until) direction = 'forward';
-  const findOpts1 = {
-    direction,
-    limit,
-    since,
-    until,
-  }; // no follow
-  const storage = [];
-  const storeEvent = event => storage.push(event);
+  const storage: DeploymentEvent[] = [];
 
-  await printEvents(now, deployment.uid || deployment.id, currentTeam, {
+  let direction = head ? ('forward' as const) : ('backward' as const);
+  if (since && !until) direction = 'forward';
+
+  await printEvents(client, deployment.id, {
     mode: 'logs',
-    onEvent: storeEvent,
+    onEvent: event => storage.push(event),
     quiet: false,
-    debug,
-    findOpts: findOpts1,
-    output,
+    findOpts: {
+      direction,
+      limit,
+      since,
+      until,
+    },
   });
 
-  const printedEventIds = new Set();
-  const printEvent = event => {
+  const printedEventIds = new Set<string>();
+  const printEvent = (event: DeploymentEvent) => {
     if (printedEventIds.has(event.id)) return 0;
     printedEventIds.add(event.id);
-    return logPrinters[outputMode](event);
+    return logPrinter(event);
   };
   storage.sort(compareEvents).forEach(printEvent);
 
@@ -216,26 +182,22 @@ export default async function main(client) {
     // NOTE: the API ignores `since` on follow mode.
     // (but not sure if it's always true on legacy deployments)
     const since2 = lastEvent ? lastEvent.date : Date.now();
-    const findOpts2 = {
-      direction: 'forward',
-      since: since2,
-      follow: true,
-    };
-    await printEvents(now, deployment.uid || deployment.id, currentTeam, {
+    await printEvents(client, deployment.id, {
       mode: 'logs',
       onEvent: printEvent,
       quiet: false,
-      debug,
-      findOpts: findOpts2,
-      output,
+      findOpts: {
+        direction: 'forward',
+        since: since2,
+        follow: true,
+      },
     });
   }
 
-  now.close();
   return 0;
 }
 
-function compareEvents(d1, d2) {
+function compareEvents(d1: DeploymentEvent, d2: DeploymentEvent) {
   const c1 = d1.date || d1.created;
   const c2 = d2.date || d2.created;
   if (c1 !== c2) return c1 - c2;
@@ -246,10 +208,10 @@ function compareEvents(d1, d2) {
   return d1.created - d2.created; // if date are equal and no serial
 }
 
-function printLogShort(log) {
+function printLogShort(log: any) {
   if (!log.created) return; // keepalive
 
-  let data;
+  let data: string;
   const obj = log.object;
   if (log.type === 'request') {
     data =
@@ -315,7 +277,7 @@ function printLogShort(log) {
   return 0;
 }
 
-function printLogRaw(log) {
+function printLogRaw(log: any) {
   if (!log.created) return; // keepalive
 
   if (log.object) {
@@ -340,7 +302,27 @@ const logPrinters = {
   raw: printLogRaw,
 };
 
-function toTimestamp(datestr) {
+type OutputMode = keyof typeof logPrinters;
+
+const isLogPrinter = (v: any): v is OutputMode => {
+  return v && v in logPrinters;
+};
+
+const getLogPrinter = (mode: string | undefined, def: OutputMode) => {
+  if (mode) {
+    if (isLogPrinter(mode)) {
+      return logPrinters[mode];
+    }
+    throw new TypeError(
+      `Invalid output mode "${mode}". Must be one of: ${Object.keys(
+        logPrinters
+      ).join(', ')}`
+    );
+  }
+  return logPrinters[def];
+};
+
+function toTimestamp(datestr: string) {
   const t = Date.parse(datestr);
   if (isNaN(t)) {
     throw new TypeError('Invalid date string');

packages/cli/src/commands/teams/index.ts

@@ -1,14 +1,15 @@
 import chalk from 'chalk';
-import error from '../util/output/error';
-import NowTeams from '../util/teams';
-import logo from '../util/output/logo';
-import list from './teams/list';
-import add from './teams/add';
-import change from './teams/switch';
-import invite from './teams/invite';
-import { getPkgName } from '../util/pkg-name.ts';
-import getArgs from '../util/get-args.ts';
-import handleError from '../util/handle-error.ts';
+import error from '../../util/output/error';
+import NowTeams from '../../util/teams';
+import logo from '../../util/output/logo';
+import list from './list';
+import add from './add';
+import change from './switch';
+import invite from './invite';
+import { getPkgName } from '../../util/pkg-name';
+import getArgs from '../../util/get-args';
+import handleError from '../../util/handle-error';
+import Client from '../../util/client';
 
 const help = () => {
   console.log(`
@@ -65,7 +66,7 @@ let debug;
 let apiUrl;
 let subcommand;
 
-const main = async client => {
+export default async (client: Client) => {
   try {
     argv = getArgs(client.argv.slice(2), {
       '--since': String,
@@ -113,7 +114,7 @@ const main = async client => {
     }
     case 'switch':
     case 'change': {
-      exitCode = await change(client, argv);
+      exitCode = await change(client, argv._[0]);
       break;
     }
     case 'add':
@@ -139,13 +140,3 @@ const main = async client => {
   teams.close();
   return exitCode || 0;
 };
-
-export default async client => {
-  try {
-    return await main(client);
-  } catch (err) {
-    console.error(err);
-    handleError(err);
-    return 1;
-  }
-};

packages/cli/src/commands/teams/switch.js

@@ -1,190 +0,0 @@
-// Packages
-import chalk from 'chalk';
-
-// Utilities
-import listInput from '../../util/input/list';
-import success from '../../util/output/success';
-import info from '../../util/output/info';
-import error from '../../util/output/error';
-import param from '../../util/output/param.ts';
-import { writeToConfigFile } from '../../util/config/files';
-import getUser from '../../util/get-user.ts';
-import NowTeams from '../../util/teams';
-
-const updateCurrentTeam = (config, newTeam) => {
-  if (newTeam) {
-    config.currentTeam = newTeam.id;
-  } else {
-    delete config.currentTeam;
-  }
-
-  writeToConfigFile(config);
-};
-
-export default async function change(client, argv) {
-  const {
-    apiUrl,
-    authConfig: { token },
-    debug,
-    config,
-    output,
-  } = client;
-  output.spinner('Fetching teams');
-
-  // We're loading the teams here without `currentTeam`, so that
-  // people can use `vercel switch` in the case that their
-  // current team was deleted.
-  const teams = new NowTeams({ apiUrl, token, debug, output });
-  const list = (await teams.ls()).teams;
-
-  let { currentTeam } = config;
-  const accountIsCurrent = !currentTeam;
-
-  output.spinner('Fetching user information');
-  let user;
-  try {
-    user = await getUser(client);
-  } catch (err) {
-    if (err.code === 'NOT_AUTHORIZED' || err.code === 'TEAM_DELETED') {
-      output.error(err.message);
-      return 1;
-    }
-
-    throw err;
-  }
-
-  if (accountIsCurrent) {
-    currentTeam = {
-      slug: user.username || user.email,
-    };
-  } else {
-    currentTeam = list.find(team => team.id === currentTeam);
-
-    if (!currentTeam) {
-      output.error(`You are not a part of the current team anymore`);
-      return 1;
-    }
-  }
-
-  if (argv._.length !== 0) {
-    const desiredSlug = argv._[0];
-    const newTeam = list.find(team => team.slug === desiredSlug);
-
-    if (newTeam) {
-      updateCurrentTeam(config, newTeam);
-      console.log(
-        success(
-          `The team ${chalk.bold(newTeam.name)} (${
-            newTeam.slug
-          }) is now active!`
-        )
-      );
-      return 0;
-    }
-
-    if (desiredSlug === user.username) {
-      output.spinner('Saving');
-      updateCurrentTeam(config);
-
-      output.stopSpinner();
-      console.log(
-        success(`Your account (${chalk.bold(desiredSlug)}) is now active!`)
-      );
-      return 0;
-    }
-
-    console.error(
-      error(`Could not find membership for team ${param(desiredSlug)}`)
-    );
-    return 1;
-  }
-
-  const choices = list.map(({ id, slug, name }) => {
-    name = `${slug} (${name})`;
-
-    if (id === currentTeam.id) {
-      name += ` ${chalk.bold('(current)')}`;
-    }
-
-    return {
-      name,
-      value: slug,
-      short: slug,
-    };
-  });
-
-  const suffix = accountIsCurrent ? ` ${chalk.bold('(current)')}` : '';
-
-  const userEntryName = user.username
-    ? `${user.username} (${user.email})${suffix}`
-    : user.email;
-
-  choices.unshift({
-    name: userEntryName,
-    value: user.email,
-    short: user.username,
-  });
-
-  // Let's bring the current team to the beginning of the list
-  if (!accountIsCurrent) {
-    const index = choices.findIndex(
-      choice => choice.value === currentTeam.slug
-    );
-    const choice = choices.splice(index, 1)[0];
-    choices.unshift(choice);
-  }
-
-  output.stopSpinner();
-
-  let message;
-
-  if (currentTeam) {
-    message = `Switch to:`;
-  }
-
-  const choice = await listInput({
-    message,
-    choices,
-    separator: false,
-    eraseFinalAnswer: true,
-  });
-
-  // Abort
-  if (!choice) {
-    console.log(info('No changes made'));
-    return 0;
-  }
-
-  const newTeam = list.find(item => item.slug === choice);
-
-  // Switch to account
-  if (!newTeam) {
-    if (currentTeam.slug === user.username || currentTeam.slug === user.email) {
-      console.log(info('No changes made'));
-      return 0;
-    }
-
-    output.spinner('Saving');
-    updateCurrentTeam(config);
-
-    output.stopSpinner();
-    console.log(success(`Your account (${chalk.bold(choice)}) is now active!`));
-    return 0;
-  }
-
-  if (newTeam.slug === currentTeam.slug) {
-    console.log(info('No changes made'));
-    return 0;
-  }
-
-  output.spinner('Saving');
-  updateCurrentTeam(config, newTeam);
-
-  output.stopSpinner();
-  console.log(
-    success(
-      `The team ${chalk.bold(newTeam.name)} (${newTeam.slug}) is now active!`
-    )
-  );
-  return 0;
-}

packages/cli/src/commands/teams/switch.ts

@@ -0,0 +1,123 @@
+// Packages
+import chalk from 'chalk';
+
+// Utilities
+import Client from '../../util/client';
+import listInput from '../../util/input/list';
+import getUser from '../../util/get-user';
+import getTeams from '../../util/get-teams';
+import { Team, GlobalConfig } from '../../types';
+import { writeToConfigFile } from '../../util/config/files';
+
+const updateCurrentTeam = (config: GlobalConfig, team?: Team) => {
+  if (team) {
+    config.currentTeam = team.id;
+  } else {
+    delete config.currentTeam;
+  }
+
+  writeToConfigFile(config);
+};
+
+export default async function main(client: Client, desiredSlug?: string) {
+  const { config, output } = client;
+  const personalScopeSelected = !config.currentTeam;
+
+  output.spinner('Fetching teams information');
+  const [user, teams] = await Promise.all([getUser(client), getTeams(client)]);
+
+  const currentTeam = personalScopeSelected
+    ? undefined
+    : teams.find(team => team.id === config.currentTeam);
+
+  if (!personalScopeSelected && !currentTeam) {
+    output.error(`You are not a part of the current team anymore.`);
+    return 1;
+  }
+
+  if (!desiredSlug) {
+    const teamChoices = teams
+      .slice(0)
+      .sort((a, b) => {
+        return a.name.toLowerCase().localeCompare(b.name.toLowerCase());
+      })
+      .map(({ id, slug, name }) => {
+        let title = `${name} (${slug})`;
+        const selected = id === currentTeam?.id;
+
+        if (selected) {
+          title += ` ${chalk.bold('(current)')}`;
+        }
+
+        return {
+          name: title,
+          value: slug,
+          short: slug,
+          selected,
+        };
+      });
+
+    // Add the User scope entry at the top
+    const suffix = personalScopeSelected ? ` ${chalk.bold('(current)')}` : '';
+
+    const choices = [
+      { separator: 'Personal Account' },
+      {
+        name: `${user.email} (${user.username})${suffix}`,
+        value: user.email,
+        short: user.username,
+        selected: personalScopeSelected,
+      },
+      { separator: 'Teams' },
+      ...teamChoices,
+    ];
+
+    output.stopSpinner();
+    desiredSlug = await listInput({
+      message: 'Switch to:',
+      choices,
+      eraseFinalAnswer: true,
+    });
+  }
+
+  // Abort
+  if (!desiredSlug) {
+    output.log('No changes made.');
+    return 0;
+  }
+
+  if (desiredSlug === user.username || desiredSlug === user.email) {
+    // Switch to user's personal account
+    if (personalScopeSelected) {
+      output.log('No changes made');
+      return 0;
+    }
+
+    updateCurrentTeam(config);
+
+    output.success(`Your account (${chalk.bold(desiredSlug)}) is now active!`);
+    return 0;
+  }
+
+  // Switch to selected team
+  const newTeam = teams.find(team => team.slug === desiredSlug);
+
+  if (!newTeam) {
+    output.error(
+      `You do not have permission to access scope ${chalk.bold(desiredSlug)}.`
+    );
+    return 1;
+  }
+
+  if (newTeam.slug === currentTeam?.slug) {
+    output.log('No changes made');
+    return 0;
+  }
+
+  updateCurrentTeam(config, newTeam);
+
+  output.success(
+    `The team ${chalk.bold(newTeam.name)} (${newTeam.slug}) is now active!`
+  );
+  return 0;
+}

packages/cli/src/index.js

@@ -587,10 +587,10 @@ const main = async () => {
   const eventCategory = 'Exit Code';
 
   try {
-    const start = new Date();
+    const start = Date.now();
     const full = require(`./commands/${targetCommand}`).default;
     exitCode = await full(client);
-    const end = new Date() - start;
+    const end = Date.now() - start;
 
     if (shouldCollectMetrics) {
       const category = 'Command Invocation';

packages/cli/src/util/alias/get-deployment-by-alias.ts

@@ -3,7 +3,7 @@ import chalk from 'chalk';
 import Client from '../client';
 import { Output } from '../output';
 import { User } from '../../types';
-import { NowConfig } from '../dev/types';
+import { VercelConfig } from '../dev/types';
 import getDeploymentsByAppName from '../deploy/get-deployments-by-appname';
 import getDeploymentByIdOrHost from '../deploy/get-deployment-by-id-or-host';
 
@@ -35,7 +35,7 @@ export async function getDeploymentForAlias(
   localConfigPath: string | undefined,
   user: User,
   contextName: string,
-  localConfig: NowConfig
+  localConfig: VercelConfig
 ) {
   output.spinner(`Fetching deployment to alias in ${chalk.bold(contextName)}`);
 

packages/cli/src/util/client.ts

@@ -1,14 +1,14 @@
 import { URLSearchParams } from 'url';
 import { EventEmitter } from 'events';
 import { parse as parseUrl } from 'url';
-import fetch, { RequestInit } from 'node-fetch';
+import fetch, { RequestInit, Response } from 'node-fetch';
 import retry, { RetryFunction, Options as RetryOptions } from 'async-retry';
 import { Output } from './output/create-output';
 import responseError from './response-error';
 import ua from './ua';
 import printIndications from './print-indications';
 import { AuthConfig, GlobalConfig } from '../types';
-import { NowConfig } from './dev/types';
+import { VercelConfig } from './dev/types';
 import doSsoLogin from './login/sso';
 import { writeToAuthConfigFile } from './config/files';
 
@@ -28,7 +28,7 @@ export interface ClientOptions {
   authConfig: AuthConfig;
   output: Output;
   config: GlobalConfig;
-  localConfig: NowConfig;
+  localConfig: VercelConfig;
 }
 
 export default class Client extends EventEmitter {
@@ -37,7 +37,7 @@ export default class Client extends EventEmitter {
   authConfig: AuthConfig;
   output: Output;
   config: GlobalConfig;
-  localConfig: NowConfig;
+  localConfig: VercelConfig;
 
   constructor(opts: ClientOptions) {
     super();
@@ -103,10 +103,14 @@ export default class Client extends EventEmitter {
     );
   }
 
+  fetch(url: string, opts: { json: false }): Promise<Response>;
+  fetch<T>(url: string, opts?: FetchOptions): Promise<T>;
   async fetch<T>(url: string, opts: FetchOptions = {}): Promise<T> {
     return this.retry(async bail => {
       const res = await this._fetch(url, opts);
 
+      printIndications(res);
+
       if (!res.ok) {
         const error = await responseError(res);
 
@@ -140,8 +144,6 @@ export default class Client extends EventEmitter {
         return null;
       }
 
-      printIndications(res);
-
       return res.headers.get('content-type').includes('application/json')
         ? res.json()
         : res;

packages/cli/src/util/config/files.ts

@@ -8,7 +8,7 @@ import getLocalPathConfig from './local-path';
 import { NowError } from '../now-error';
 import error from '../output/error';
 import highlight from '../output/highlight';
-import { NowConfig } from '../dev/types';
+import { VercelConfig } from '../dev/types';
 import { AuthConfig, GlobalConfig } from '../../types';
 
 const VERCEL_DIR = getGlobalPathConfig();
@@ -100,8 +100,8 @@ export function getAuthConfigFilePath() {
 
 export function readLocalConfig(
   prefix: string = process.cwd()
-): NowConfig | null {
-  let config: NowConfig | null = null;
+): VercelConfig | null {
+  let config: VercelConfig | null = null;
   let target = '';
 
   try {

packages/cli/src/util/config/read-config.ts

@@ -1,7 +1,7 @@
 import { join } from 'path';
 import { CantParseJSONFile } from '../errors-ts';
 import readJSONFile from '../read-json-file';
-import { NowConfig } from '../dev/types';
+import { VercelConfig } from '../dev/types';
 import getLocalConfigPath from './local-path';
 
 export default async function readConfig(dir: string) {
@@ -13,7 +13,7 @@ export default async function readConfig(dir: string) {
   }
 
   if (result) {
-    return result as NowConfig;
+    return result as VercelConfig;
   }
 
   return null;

packages/cli/src/util/deploy/process-deployment.ts

@@ -9,7 +9,7 @@ import {
 import { Output } from '../output';
 // @ts-ignore
 import Now from '../../util';
-import { NowConfig } from '../dev/types';
+import { VercelConfig } from '../dev/types';
 import { Org } from '../../types';
 import ua from '../ua';
 import { linkFolderToProject } from '../projects/link';
@@ -43,7 +43,7 @@ export default async function processDeployment({
   uploadStamp: () => string;
   deployStamp: () => string;
   quiet: boolean;
-  nowConfig?: NowConfig;
+  nowConfig?: VercelConfig;
   force?: boolean;
   withCache?: boolean;
   org: Org;

packages/cli/src/util/dev/builder.ts

@@ -27,7 +27,7 @@ import { LambdaSizeExceededError } from '../errors-ts';
 import DevServer from './server';
 import { getBuilder } from './builder-cache';
 import {
-  NowConfig,
+  VercelConfig,
   BuildMatch,
   BuildResult,
   BuilderInputs,
@@ -96,7 +96,7 @@ async function createBuildProcess(
 }
 
 export async function executeBuild(
-  nowConfig: NowConfig,
+  nowConfig: VercelConfig,
   devServer: DevServer,
   files: BuilderInputs,
   match: BuildMatch,
@@ -383,7 +383,7 @@ export async function executeBuild(
 }
 
 export async function getBuildMatches(
-  nowConfig: NowConfig,
+  nowConfig: VercelConfig,
   cwd: string,
   output: Output,
   devServer: DevServer,

packages/cli/src/util/dev/router.ts

@@ -4,7 +4,7 @@ import PCRE from 'pcre-to-regexp';
 import isURL from './is-url';
 import DevServer from './server';
 
-import { NowConfig, HttpHeadersConfig, RouteResult } from './types';
+import { VercelConfig, HttpHeadersConfig, RouteResult } from './types';
 import { isHandler, Route, HandleValue } from '@vercel/routing-utils';
 
 export function resolveRouteParameters(
@@ -50,7 +50,7 @@ export async function devRouter(
   reqMethod?: string,
   routes?: Route[],
   devServer?: DevServer,
-  nowConfig?: NowConfig,
+  nowConfig?: VercelConfig,
   previousHeaders?: HttpHeadersConfig,
   missRoutes?: Route[],
   phase?: HandleValue | null

packages/cli/src/util/dev/server.ts

@@ -49,7 +49,7 @@ import sleep from '../sleep';
 import { Output } from '../output';
 import { relative } from '../path-helpers';
 import { getDistTag } from '../get-dist-tag';
-import getNowConfigPath from '../config/local-path';
+import getVercelConfigPath from '../config/local-path';
 import { MissingDotenvVarsError } from '../errors-ts';
 import cliPkg from '../pkg';
 import { getVercelDirectory } from '../projects/link';
@@ -73,7 +73,7 @@ import errorTemplate502 from './templates/error_502';
 import redirectTemplate from './templates/redirect';
 
 import {
-  NowConfig,
+  VercelConfig,
   DevServerOptions,
   BuildMatch,
   BuildResult,
@@ -145,7 +145,7 @@ export default class DevServer {
   private devServerPids: Set<number>;
   private projectSettings?: ProjectSettings;
 
-  private getNowConfigPromise: Promise<NowConfig> | null;
+  private getVercelConfigPromise: Promise<VercelConfig> | null;
   private blockingBuildsPromise: Promise<void> | null;
   private updateBuildersPromise: Promise<void> | null;
   private updateBuildersTimeout: NodeJS.Timeout | undefined;
@@ -181,7 +181,7 @@ export default class DevServer {
     this.inProgressBuilds = new Map();
     this.devCacheDir = join(getVercelDirectory(cwd), 'cache');
 
-    this.getNowConfigPromise = null;
+    this.getVercelConfigPromise = null;
     this.blockingBuildsPromise = null;
     this.updateBuildersPromise = null;
     this.startPromise = null;
@@ -244,7 +244,7 @@ export default class DevServer {
       }
     }
 
-    const nowConfig = await this.getNowConfig();
+    const nowConfig = await this.getVercelConfig();
 
     // Update the build matches in case an entrypoint was created or deleted
     await this.updateBuildMatches(nowConfig);
@@ -375,7 +375,7 @@ export default class DevServer {
   }
 
   async updateBuildMatches(
-    nowConfig: NowConfig,
+    nowConfig: VercelConfig,
     isInitial = false
   ): Promise<void> {
     const fileList = this.resolveBuildFiles(this.files);
@@ -460,7 +460,7 @@ export default class DevServer {
   }
 
   async invalidateBuildMatches(
-    nowConfig: NowConfig,
+    nowConfig: VercelConfig,
     updatedBuilders: string[]
   ): Promise<void> {
     if (updatedBuilders.length === 0) {
@@ -516,25 +516,25 @@ export default class DevServer {
     return {};
   }
 
-  clearNowConfigPromise = () => {
-    this.getNowConfigPromise = null;
+  clearVercelConfigPromise = () => {
+    this.getVercelConfigPromise = null;
   };
 
-  getNowConfig(): Promise<NowConfig> {
-    if (this.getNowConfigPromise) {
-      return this.getNowConfigPromise;
+  getVercelConfig(): Promise<VercelConfig> {
+    if (this.getVercelConfigPromise) {
+      return this.getVercelConfigPromise;
     }
-    this.getNowConfigPromise = this._getNowConfig();
+    this.getVercelConfigPromise = this._getVercelConfig();
 
     // Clean up the promise once it has resolved
-    const clear = this.clearNowConfigPromise;
-    this.getNowConfigPromise.finally(clear);
+    const clear = this.clearVercelConfigPromise;
+    this.getVercelConfigPromise.finally(clear);
 
-    return this.getNowConfigPromise;
+    return this.getVercelConfigPromise;
   }
 
-  async _getNowConfig(): Promise<NowConfig> {
-    const configPath = getNowConfigPath(this.cwd);
+  async _getVercelConfig(): Promise<VercelConfig> {
+    const configPath = getVercelConfigPath(this.cwd);
 
     const [
       pkg = null,
@@ -543,10 +543,10 @@ export default class DevServer {
       config = { version: 2, [fileNameSymbol]: 'vercel.json' },
     ] = await Promise.all([
       this.readJsonFile<PackageJson>('package.json'),
-      this.readJsonFile<NowConfig>(configPath),
+      this.readJsonFile<VercelConfig>(configPath),
     ]);
 
-    await this.validateNowConfig(config);
+    await this.validateVercelConfig(config);
     const { error: routeError, routes: maybeRoutes } = getTransformedRoutes({
       nowConfig: config,
     });
@@ -634,7 +634,7 @@ export default class DevServer {
       config.builds.sort(sortBuilders);
     }
 
-    await this.validateNowConfig(config);
+    await this.validateVercelConfig(config);
 
     this.caseSensitive = hasNewRoutingProperties(config);
     this.apiDir = detectApiDirectory(config.builds || []);
@@ -710,8 +710,8 @@ export default class DevServer {
   }
 
   async tryValidateOrExit(
-    config: NowConfig,
-    validate: (c: NowConfig) => string | null
+    config: VercelConfig,
+    validate: (c: VercelConfig) => string | null
   ): Promise<void> {
     const message = validate(config);
 
@@ -721,7 +721,7 @@ export default class DevServer {
     }
   }
 
-  async validateNowConfig(config: NowConfig): Promise<void> {
+  async validateVercelConfig(config: VercelConfig): Promise<void> {
     if (config.version === 1) {
       this.output.error('Cannot run `version: 1` projects.');
       await this.exit(1);
@@ -855,7 +855,7 @@ export default class DevServer {
       .replace('[::]', 'localhost')
       .replace('127.0.0.1', 'localhost');
 
-    const nowConfig = await this.getNowConfig();
+    const nowConfig = await this.getVercelConfig();
     const devCommandPromise = this.runDevCommand();
 
     const files = await getFiles(this.cwd, { output: this.output });
@@ -982,7 +982,7 @@ export default class DevServer {
 
     if (devProcess) {
       ops.push(
-        new Promise((resolve, reject) => {
+        new Promise<void>((resolve, reject) => {
           devProcess.once('exit', () => resolve());
           try {
             process.kill(devProcess.pid);
@@ -1201,7 +1201,7 @@ export default class DevServer {
     match: BuildMatch,
     requestPath: string | null,
     req: http.IncomingMessage | null,
-    nowConfig: NowConfig,
+    nowConfig: VercelConfig,
     previousBuildResult?: BuildResult,
     filesChanged?: string[],
     filesRemoved?: string[]
@@ -1290,7 +1290,7 @@ export default class DevServer {
     this.output.debug(`${chalk.bold(method)} ${req.url}`);
 
     try {
-      const nowConfig = await this.getNowConfig();
+      const nowConfig = await this.getVercelConfig();
       await this.serveProjectAsNowV2(req, res, nowRequestId, nowConfig);
     } catch (err) {
       console.error(err);
@@ -1339,7 +1339,7 @@ export default class DevServer {
     req: http.IncomingMessage,
     res: http.ServerResponse,
     nowRequestId: string,
-    nowConfig: NowConfig,
+    nowConfig: VercelConfig,
     routes: Route[] | undefined = nowConfig.routes,
     callLevel: number = 0
   ) => {
@@ -1992,7 +1992,7 @@ export default class DevServer {
     return true;
   }
 
-  async hasFilesystem(dest: string, nowConfig: NowConfig): Promise<boolean> {
+  async hasFilesystem(dest: string, nowConfig: VercelConfig): Promise<boolean> {
     if (
       await findBuildMatch(
         this.buildMatches,
@@ -2181,7 +2181,7 @@ async function findBuildMatch(
   files: BuilderInputs,
   requestPath: string,
   devServer: DevServer,
-  nowConfig: NowConfig,
+  nowConfig: VercelConfig,
   isFilesystem = false
 ): Promise<BuildMatch | null> {
   requestPath = requestPath.replace(/^\//, '');
@@ -2219,7 +2219,7 @@ async function shouldServe(
   files: BuilderInputs,
   requestPath: string,
   devServer: DevServer,
-  nowConfig: NowConfig,
+  nowConfig: VercelConfig,
   isFilesystem = false
 ): Promise<boolean> {
   const {
@@ -2284,7 +2284,7 @@ async function findMatchingRoute(
   match: BuildMatch,
   requestPath: string,
   devServer: DevServer,
-  nowConfig: NowConfig
+  nowConfig: VercelConfig
 ): Promise<RouteResult | void> {
   const reqUrl = `/${requestPath}`;
   for (const buildResult of match.buildResults.values()) {
@@ -2305,7 +2305,7 @@ async function findMatchingRoute(
 function findAsset(
   match: BuildMatch,
   requestPath: string,
-  nowConfig: NowConfig
+  nowConfig: VercelConfig
 ): { asset: BuilderOutput; assetKey: string } | void {
   if (!match.buildOutput) {
     return;
@@ -2397,7 +2397,7 @@ function filterFrontendBuilds(build: Builder) {
   return !frontendRuntimeSet.has(name || '');
 }
 
-function hasNewRoutingProperties(nowConfig: NowConfig) {
+function hasNewRoutingProperties(nowConfig: VercelConfig) {
   return (
     typeof nowConfig.cleanUrls !== undefined ||
     typeof nowConfig.headers !== undefined ||

packages/cli/src/util/dev/types.ts

@@ -14,12 +14,12 @@ import {
   Lambda,
   PackageJson,
 } from '@vercel/build-utils';
-import { NowConfig } from '@vercel/client';
+import { VercelConfig } from '@vercel/client';
 import { HandleValue, Route } from '@vercel/routing-utils';
 import { Output } from '../output';
 import { ProjectEnvVariable, ProjectSettings } from '../../types';
 
-export { NowConfig };
+export { VercelConfig };
 
 export interface DevServerOptions {
   output: Output;

packages/cli/src/util/dev/validate.ts

@@ -7,7 +7,7 @@ import {
   rewritesSchema,
   trailingSlashSchema,
 } from '@vercel/routing-utils';
-import { NowConfig } from './types';
+import { VercelConfig } from './types';
 import {
   functionsSchema,
   buildsSchema,
@@ -36,7 +36,7 @@ const vercelConfigSchema = {
 const ajv = new Ajv();
 const validate = ajv.compile(vercelConfigSchema);
 
-export function validateConfig(config: NowConfig): NowBuildError | null {
+export function validateConfig(config: VercelConfig): NowBuildError | null {
   if (!validate(config)) {
     if (validate.errors && validate.errors[0]) {
       const error = validate.errors[0];

packages/cli/src/util/emoji.ts

@@ -1,28 +1,16 @@
-export type EmojiLabel =
-  | 'notice'
-  | 'tip'
-  | 'warning'
-  | 'link'
-  | 'inspect'
-  | 'success';
+export const emojiLabels = {
+  notice: '📝',
+  tip: '💡',
+  warning: '❗️',
+  link: '🔗',
+  inspect: '🔍',
+  success: '✅',
+} as const;
 
-export function emoji(label: EmojiLabel): string | undefined {
-  switch (label) {
-    case 'notice':
-      return '📝';
-    case 'tip':
-      return '💡';
-    case 'warning':
-      return '❗️';
-    case 'link':
-      return '🔗';
-    case 'inspect':
-      return '🔍';
-    case 'success':
-      return '✅';
-    default:
-      return undefined;
-  }
+export type EmojiLabel = keyof typeof emojiLabels;
+
+export function emoji(label: EmojiLabel) {
+  return emojiLabels[label];
 }
 
 export function prependEmoji(message: string, emoji?: string): string {

packages/cli/src/util/events.ts

@@ -2,52 +2,41 @@
 import { URLSearchParams } from 'url';
 
 // Packages
+import retry from 'async-retry';
+import jsonlines from 'jsonlines';
 import { eraseLines } from 'ansi-escapes';
 
-import jsonlines from 'jsonlines';
-import retry from 'async-retry';
+import Client from './client';
+import { getDeployment } from './get-deployment';
+
+export interface FindOpts {
+  direction: 'forward' | 'backward';
+  limit?: number;
+  since?: number;
+  until?: number;
+  follow?: boolean;
+}
+
+export interface PrintEventsOptions {
+  mode: string;
+  onEvent: (event: DeploymentEvent) => void;
+  quiet?: boolean;
+  findOpts: FindOpts;
+}
+
+export interface DeploymentEvent {
+  id: string;
+  created: number;
+  date?: number;
+  serial?: string;
+}
 
 async function printEvents(
-  now,
-  deploymentIdOrURL,
-  currentTeam = null,
-  {
-    mode,
-    onOpen = () => {},
-    onEvent,
-    quiet,
-    debugEnabled,
-    findOpts,
-    output,
-  } = {}
+  client: Client,
+  deploymentIdOrURL: string,
+  { mode, onEvent, quiet, findOpts }: PrintEventsOptions
 ) {
-  const { log, debug } = output;
-
-  let onOpenCalled = false;
-  function callOnOpenOnce() {
-    if (onOpenCalled) return;
-    onOpenCalled = true;
-    onOpen();
-  }
-
-  const query = new URLSearchParams({
-    direction: findOpts.direction,
-    limit: findOpts.limit,
-    since: findOpts.since,
-    until: findOpts.until,
-    follow: findOpts.follow ? '1' : '',
-    format: 'lines',
-  });
-
-  let eventsUrl = `/v1/now/deployments/${deploymentIdOrURL}/events?${query}`;
-  let pollUrl = `/v3/now/deployments/${deploymentIdOrURL}`;
-
-  if (currentTeam) {
-    eventsUrl += `&teamId=${currentTeam.id}`;
-    pollUrl += `?teamId=${currentTeam.id}`;
-  }
-
-  debug(`Events ${eventsUrl}`);
+  const { log, debug } = client.output;
 
   // we keep track of how much we log in case we
   // drop the connection and have to start over
@@ -59,29 +48,34 @@ async function printEvents(
         debug('Retrying events');
       }
 
-      const eventsRes = await now._fetch(eventsUrl);
+      const query = new URLSearchParams({
+        direction: findOpts.direction,
+        follow: findOpts.follow ? '1' : '',
+        format: 'lines',
+      });
+      if (findOpts.limit) query.set('limit', String(findOpts.limit));
+      if (findOpts.since) query.set('since', String(findOpts.since));
+      if (findOpts.until) query.set('until', String(findOpts.until));
+
+      const eventsUrl = `/v1/now/deployments/${deploymentIdOrURL}/events?${query}`;
+      const eventsRes = await client.fetch(eventsUrl, { json: false });
 
       if (eventsRes.ok) {
-        const readable = eventsRes.readable
-          ? await eventsRes.readable()
-          : eventsRes.body;
+        const readable = eventsRes.body;
 
         // handle the event stream and make the promise get rejected
         // if errors occur so we can retry
-        return new Promise((resolve, reject) => {
+        return new Promise<void>((resolve, reject) => {
           const stream = readable.pipe(jsonlines.parse());
 
-          let poller;
+          let poller: ReturnType<typeof setTimeout>;
 
           if (mode === 'deploy') {
             poller = (function startPoller() {
               return setTimeout(async () => {
                 try {
-                  const pollRes = await now._fetch(pollUrl);
-                  if (!pollRes.ok)
-                    throw new Error(`Response ${pollRes.status}`);
-                  const json = await pollRes.json();
-                  if (json.state === 'READY') {
+                  const json = await getDeployment(client, deploymentIdOrURL);
+                  if (json.readyState === 'READY') {
                     stream.end();
                     finish();
                     return;
@@ -96,10 +90,9 @@ async function printEvents(
           }
 
           let finishCalled = false;
-          function finish(error) {
+          function finish(error?: Error) {
             if (finishCalled) return;
             finishCalled = true;
-            callOnOpenOnce();
             clearTimeout(poller);
             if (error) {
               reject(error);
@@ -110,26 +103,24 @@ async function printEvents(
 
           let latestLogDate = 0;
 
-          const onData = data => {
-            const { event } = data;
-            if (event === 'state' && data.payload.value === 'READY') {
+          const onData = (data: any) => {
+            const { event, payload, date } = data;
+            if (event === 'state' && payload.value === 'READY') {
               if (mode === 'deploy') {
                 stream.end();
                 finish();
               }
             } else {
-              latestLogDate = Math.max(latestLogDate, data.date);
-              const linesPrinted = onEvent(data, callOnOpenOnce);
-              o += linesPrinted || 0;
+              latestLogDate = Math.max(latestLogDate, date);
+              onEvent(data);
             }
           };
 
           let onErrorCalled = false;
-          const onError = err => {
+          const onError = (err: Error) => {
             if (finishCalled || onErrorCalled) return;
             onErrorCalled = true;
             o++;
-            callOnOpenOnce();
 
             const errorMessage = `Deployment event stream error: ${err.message}`;
             if (!findOpts.follow) {
@@ -140,7 +131,6 @@ async function printEvents(
             debug(errorMessage);
             clearTimeout(poller);
             stream.destroy(err);
-            readable.destroy(err);
 
             const retryFindOpts = {
               ...findOpts,
@@ -149,12 +139,10 @@ async function printEvents(
 
             setTimeout(() => {
               // retry without maximum amount nor clear past logs etc
-              printEvents(now, deploymentIdOrURL, currentTeam, {
+              printEvents(client, deploymentIdOrURL, {
                 mode,
-                onOpen,
                 onEvent,
                 quiet,
-                debugEnabled,
                 findOpts: retryFindOpts,
               }).then(resolve, reject);
             }, 2000);
@@ -166,7 +154,6 @@ async function printEvents(
           readable.on('error', onError);
         });
       }
-      callOnOpenOnce();
       const err = new Error(`Deployment events status ${eventsRes.status}`);
 
       if (eventsRes.status < 500) {

packages/cli/src/util/get-config.ts

@@ -9,15 +9,15 @@ import {
 import humanizePath from './humanize-path';
 import readJSONFile from './read-json-file';
 import readPackage from './read-package';
-import { NowConfig } from './dev/types';
+import { VercelConfig } from './dev/types';
 import { Output } from './output';
 
-let config: NowConfig;
+let config: VercelConfig;
 
 export default async function getConfig(
   output: Output,
   configFile?: string
-): Promise<NowConfig | Error> {
+): Promise<VercelConfig | Error> {
   // If config was already read, just return it
   if (config) {
     return config;
@@ -44,7 +44,7 @@ export default async function getConfig(
       return localConfig;
     }
     if (localConfig !== null) {
-      config = localConfig as NowConfig;
+      config = localConfig as VercelConfig;
       config[fileNameSymbol] = configFile;
       return config;
     }
@@ -68,13 +68,13 @@ export default async function getConfig(
   }
   if (vercelConfig !== null) {
     output.debug(`Found config in file "${vercelFilePath}"`);
-    config = vercelConfig as NowConfig;
+    config = vercelConfig as VercelConfig;
     config[fileNameSymbol] = 'vercel.json';
     return config;
   }
   if (nowConfig !== null) {
     output.debug(`Found config in file "${nowFilePath}"`);
-    config = nowConfig as NowConfig;
+    config = nowConfig as VercelConfig;
     config[fileNameSymbol] = 'now.json';
     return config;
   }
@@ -87,7 +87,7 @@ export default async function getConfig(
   }
   if (pkgConfig) {
     output.debug(`Found config in package ${pkgFilePath}`);
-    config = pkgConfig as NowConfig;
+    config = pkgConfig as VercelConfig;
     config[fileNameSymbol] = 'package.json';
     return config;
   }

packages/cli/src/util/get-deployment.ts

@@ -0,0 +1,27 @@
+import { stringify } from 'querystring';
+import { Deployment } from '@vercel/client';
+import Client from './client';
+
+export async function getDeployment(
+  client: Client,
+  hostOrId: string
+): Promise<Deployment> {
+  let url = `/v13/deployments`;
+
+  if (hostOrId.includes('.')) {
+    let host = hostOrId.replace(/^https:\/\//i, '');
+
+    if (host.slice(-1) === '/') {
+      host = host.slice(0, -1);
+    }
+
+    url += `/get?${stringify({
+      url: host,
+    })}`;
+  } else {
+    url += `/${encodeURIComponent(hostOrId)}`;
+  }
+
+  const deployment = await client.fetch<Deployment>(url);
+  return deployment;
+}

packages/cli/src/util/get-teams.ts

@@ -1,8 +1,6 @@
 import Client from './client';
-import { APIError, InvalidToken } from './errors-ts';
 import { Team } from '../types';
-// @ts-ignore
-import NowTeams from './teams.js';
+import { APIError, InvalidToken } from './errors-ts';
 
 let teams: Team[] | undefined;
 
@@ -10,15 +8,11 @@ export default async function getTeams(client: Client): Promise<Team[]> {
   if (teams) return teams;
 
   try {
-    // we're using NowTeams because `client.fetch` hangs on windows
-    const teamClient = new NowTeams({
-      apiUrl: client.apiUrl,
-      token: client.authConfig.token,
-      debug: client.output.isDebugEnabled(),
+    const body = await client.fetch<{ teams: Team[] }>('/v1/teams', {
+      useCurrentTeam: false,
     });
-
-    teams = (await teamClient.ls()).teams;
-    return teams || [];
+    teams = body.teams || [];
+    return teams;
   } catch (error) {
     if (error instanceof APIError && error.status === 403) {
       throw new InvalidToken();

packages/cli/src/util/input/list.js

@@ -1,82 +0,0 @@
-import inquirer from 'inquirer';
-import stripAnsi from 'strip-ansi';
-import eraseLines from '../output/erase-lines';
-
-function getLength(string) {
-  let biggestLength = 0;
-  string.split('\n').map(str => {
-    str = stripAnsi(str);
-    if (str.length > biggestLength) {
-      biggestLength = str.length;
-    }
-    return undefined;
-  });
-  return biggestLength;
-}
-
-export default async function({
-  message = 'the question',
-  // eslint-disable-line no-unused-vars
-  choices = [
-    {
-      name: 'something\ndescription\ndetails\netc',
-      value: 'something unique',
-      short: 'generally the first line of `name`',
-    },
-  ],
-  pageSize = 15, // Show 15 lines without scrolling (~4 credit cards)
-  separator = true, // Puts a blank separator between each choice
-  abort = 'end', // Wether the `abort` option will be at the `start` or the `end`,
-  eraseFinalAnswer = false, // If true, the line with the final answee that inquirer prints will be erased before returning
-}) {
-  require('./patch-inquirer-legacy');
-
-  let biggestLength = 0;
-
-  choices = choices.map(choice => {
-    if (choice.name) {
-      const length = getLength(choice.name);
-      if (length > biggestLength) {
-        biggestLength = length;
-      }
-      return choice;
-    }
-    throw new Error('Invalid choice');
-  });
-
-  if (separator === true) {
-    choices = choices.reduce(
-      (prev, curr) => prev.concat(new inquirer.Separator(' '), curr),
-      []
-    );
-  }
-
-  const abortSeparator = new inquirer.Separator('─'.repeat(biggestLength));
-  const _abort = {
-    name: 'Abort',
-    value: undefined,
-  };
-
-  if (abort === 'start') {
-    const blankSep = choices.shift();
-    choices.unshift(abortSeparator);
-    choices.unshift(_abort);
-    choices.unshift(blankSep);
-  } else {
-    choices.push(abortSeparator);
-    choices.push(_abort);
-  }
-
-  const nonce = Date.now();
-  const answer = await inquirer.prompt({
-    name: nonce,
-    type: 'list',
-    message,
-    choices,
-    pageSize,
-  });
-  if (eraseFinalAnswer === true) {
-    process.stdout.write(eraseLines(2));
-  }
-  return answer[nonce];
-}

packages/cli/src/util/input/list.ts

@@ -0,0 +1,123 @@
+import inquirer from 'inquirer';
+import stripAnsi from 'strip-ansi';
+import eraseLines from '../output/erase-lines';
+
+interface ListEntry {
+  name: string;
+  value: string;
+  short: string;
+  selected?: boolean;
+}
+
+interface ListSeparator {
+  separator: string;
+}
+
+type ListChoice = ListEntry | ListSeparator | typeof inquirer.Separator;
+
+interface ListOptions {
+  message: string;
+  choices: ListChoice[];
+  pageSize?: number;
+  separator?: boolean;
+  abort?: 'start' | 'end';
+  eraseFinalAnswer?: boolean;
+}
+
+function getLength(input: string): number {
+  let biggestLength = 0;
+  for (const line of input.split('\n')) {
+    const str = stripAnsi(line);
+    if (str.length > biggestLength) {
+      biggestLength = str.length;
+    }
+  }
+  return biggestLength;
+}
+
+export default async function list({
+  message = 'the question',
+  // eslint-disable-line no-unused-vars
+  choices: _choices = [
+    {
+      name: 'something\ndescription\ndetails\netc',
+      value: 'something unique',
+      short: 'generally the first line of `name`',
+    },
+  ],
+  pageSize = 15, // Show 15 lines without scrolling (~4 credit cards)
+  separator = false, // Puts a blank separator between each choice
+  abort = 'end', // Whether the `abort` option will be at the `start` or the `end`,
+  eraseFinalAnswer = false, // If true, the line with the final answer that inquirer prints will be erased before returning
+}: ListOptions): Promise<string> {
+  require('./patch-inquirer-legacy');
+
+  let biggestLength = 0;
+  let selected: string | undefined;
+
+  // First calculate the biggest length
+  for (const choice of _choices) {
+    if ('name' in choice) {
+      const length = getLength(choice.name);
+      if (length > biggestLength) {
+        biggestLength = length;
+      }
+    }
+  }
+
+  const choices = _choices.map(choice => {
+    if (choice instanceof inquirer.Separator) {
+      return choice;
+    }
+
+    if ('separator' in choice) {
+      const prefix = `── ${choice.separator} `;
+      const suffix = '─'.repeat(biggestLength - getLength(prefix));
+      return new inquirer.Separator(`${prefix}${suffix}`);
+    }
+
+    if ('short' in choice) {
+      if (choice.selected) {
+        if (selected) throw new Error('Only one choice may be selected');
+        selected = choice.short;
+      }
+      return choice;
+    }
+
+    throw new Error('Invalid choice');
+  });
+
+  if (separator) {
+    for (let i = 0; i < choices.length; i += 2) {
+      choices.splice(i, 0, new inquirer.Separator(' '));
+    }
+  }
+
+  const abortSeparator = new inquirer.Separator('─'.repeat(biggestLength));
+  const _abort = {
+    name: 'Abort',
+    value: '',
+    short: '',
+  };
+
+  if (abort === 'start') {
+    choices.unshift(_abort, abortSeparator);
+  } else {
+    choices.push(abortSeparator, _abort);
+  }
+
+  const answer = await inquirer.prompt({
+    name: 'value',
+    type: 'list',
+    default: selected,
+    message,
+    choices,
+    pageSize,
+  });
+
+  if (eraseFinalAnswer === true) {
+    process.stdout.write(eraseLines(2));
+  }
+
+  return answer.value;
+}

packages/cli/src/util/link/setup-and-link.ts

@@ -2,7 +2,7 @@ import { join, basename } from 'path';
 import chalk from 'chalk';
 import { remove } from 'fs-extra';
 import { ProjectLinkResult, ProjectSettings } from '../../types';
-import { NowConfig } from '../dev/types';
+import { VercelConfig } from '../dev/types';
 import {
   getLinkedProject,
   linkFolderToProject,
@@ -134,7 +134,7 @@ export default async function setupAndLink(
     return { status: 'error', exitCode: 1 };
   }
 
-  let localConfig: NowConfig = {};
+  let localConfig: VercelConfig = {};
   if (client.localConfig && !(client.localConfig instanceof Error)) {
     localConfig = client.localConfig;
   }

packages/cli/src/util/login/bitbucket.ts

@@ -0,0 +1,13 @@
+import { URL } from 'url';
+import { LoginParams } from './types';
+import doOauthLogin from './oauth';
+
+export default function doBitbucketLogin(params: LoginParams) {
+  const url = new URL(
+    '/api/registration/bitbucket/connect',
+    // Can't use `apiUrl` here because this URL sets a
+    // cookie that the OAuth callback URL depends on
+    'https://vercel.com'
+  );
+  return doOauthLogin(url, 'Bitbucket', params);
+}

packages/cli/src/util/login/email.ts

@@ -1,70 +1,18 @@
 import ms from 'ms';
-import { stringify as stringifyQuery } from 'querystring';
-import fetch from 'node-fetch';
 import sleep from '../sleep';
-import ua from '../ua';
-import error from '../output/error';
 import highlight from '../output/highlight';
 import eraseLines from '../output/erase-lines';
+import verify from './verify';
 import executeLogin from './login';
 import { LoginParams } from './types';
 
-async function verify(
-  email: string,
-  verificationToken: string,
-  { apiUrl, output }: LoginParams
-): Promise<string> {
-  const query = {
-    email,
-    token: verificationToken,
-  };
-
-  output.debug('GET /now/registration/verify');
-
-  let res;
-
-  try {
-    res = await fetch(
-      `${apiUrl}/now/registration/verify?${stringifyQuery(query)}`,
-      {
-        headers: { 'User-Agent': ua },
-      }
-    );
-  } catch (err) {
-    output.debug(`error fetching /now/registration/verify: ${err.stack}`);
-
-    throw new Error(
-      error(
-        `An unexpected error occurred while trying to verify your login: ${err.message}`
-      )
-    );
-  }
-
-  output.debug('parsing response from GET /now/registration/verify');
-  let body;
-
-  try {
-    body = await res.json();
-  } catch (err) {
-    output.debug(
-      `error parsing the response from /now/registration/verify: ${err.stack}`
-    );
-    throw new Error(
-      error(
-        `An unexpected error occurred while trying to verify your login: ${err.message}`
-      )
-    );
-  }
-
-  return body.token;
-}
-
 export default async function doEmailLogin(
   email: string,
-  { apiUrl, output }: LoginParams
+  params: LoginParams
 ): Promise<number | string> {
   let securityCode;
   let verificationToken;
+  const { apiUrl, output } = params;
 
   output.spinner('Sending you an email');
 
@@ -91,22 +39,18 @@ export default async function doEmailLogin(
   output.spinner('Waiting for your confirmation');
 
   let token = '';
-
   while (!token) {
     try {
       await sleep(ms('1s'));
-      token = await verify(email, verificationToken, { apiUrl, output });
+      token = await verify(email, verificationToken, params);
     } catch (err) {
-      if (/invalid json response body/.test(err.message)) {
-        // /now/registraton is currently returning plain text in that case
-        // we just wait for the user to click on the link
-      } else {
+      if (err.message !== 'Confirmation incomplete') {
         output.error(err.message);
         return 1;
       }
     }
   }
 
-  output.success('Email confirmed');
+  output.success(`Email authentication complete for ${email}`);
   return token;
 }

packages/cli/src/util/login/github.ts

@@ -0,0 +1,13 @@
+import { URL } from 'url';
+import { LoginParams } from './types';
+import doOauthLogin from './oauth';
+
+export default function doGithubLogin(params: LoginParams) {
+  const url = new URL(
+    '/api/registration/login-with-github',
+    // Can't use `apiUrl` here because this URL sets a
+    // cookie that the OAuth callback URL depends on
+    'https://vercel.com'
+  );
+  return doOauthLogin(url, 'GitHub', params);
+}

packages/cli/src/util/login/gitlab.ts

@@ -0,0 +1,10 @@
+import { URL } from 'url';
+import { LoginParams } from './types';
+import doOauthLogin from './oauth';
+
+export default function doGitlabLogin(params: LoginParams) {
+  // Can't use `apiUrl` here because this URL sets a
+  // cookie that the OAuth callback URL depends on
+  const url = new URL('/api/registration/gitlab/connect', 'https://vercel.com');
+  return doOauthLogin(url, 'GitLab', params);
+}

packages/cli/src/util/login/oauth.ts

@@ -0,0 +1,117 @@
+import http from 'http';
+import open from 'open';
+import { URL } from 'url';
+import listen from 'async-listen';
+import { hostname } from 'os';
+import { LoginParams } from './types';
+import prompt from './prompt';
+import verify from './verify';
+import { getTitleName } from '../pkg-name';
+import highlight from '../output/highlight';
+
+export default async function doOauthLogin(
+  url: URL,
+  provider: string,
+  params: LoginParams
+): Promise<number | string> {
+  const { output } = params;
+
+  output.spinner(
+    `Please complete the ${provider} authentication in your web browser`
+  );
+
+  const server = http.createServer();
+  const address = await listen(server, 0, '127.0.0.1');
+  const { port } = new URL(address);
+  url.searchParams.append('mode', 'login');
+  url.searchParams.append('next', `http://localhost:${port}`);
+
+  // Append token name param
+  const hyphens = new RegExp('-', 'g');
+  const host = hostname().replace(hyphens, ' ').replace('.local', '');
+  const tokenName = `${getTitleName()} CLI on ${host} via ${provider}`;
+  url.searchParams.append('tokenName', tokenName);
+
+  try {
+    const [query] = await Promise.all([
+      new Promise<URL['searchParams']>((resolve, reject) => {
+        server.once('request', (req, res) => {
+          const query = new URL(req.url || '/', 'http://localhost')
+            .searchParams;
+          resolve(query);
+
+          // Redirect the user's web browser back to
+          // the Vercel CLI login notification page
+          const location = new URL(
+            'https://vercel.com/notifications/cli-login-'
+          );
+          const loginError = query.get('loginError');
+          const ssoEmail = query.get('ssoEmail');
+          if (loginError) {
+            location.pathname += 'failed';
+            location.searchParams.set('loginError', loginError);
+          } else if (ssoEmail) {
+            location.pathname += 'incomplete';
+            location.searchParams.set('ssoEmail', ssoEmail);
+            const teamName = query.get('teamName');
+            const ssoType = query.get('ssoType');
+            if (teamName) {
+              location.searchParams.set('teamName', teamName);
+            }
+            if (ssoType) {
+              location.searchParams.set('ssoType', ssoType);
+            }
+          } else {
+            location.pathname += 'success';
+            const email = query.get('email');
+            if (email) {
+              location.searchParams.set('email', email);
+            }
+          }
+
+          res.statusCode = 302;
+          res.setHeader('location', location.href);
+          res.end();
+        });
+        server.once('error', reject);
+      }),
+      open(url.href),
+    ]);
+
+    const loginError = query.get('loginError');
+    if (loginError) {
+      const err = JSON.parse(loginError);
+      output.prettyError(err);
+      return 1;
+    }
+
+    // If an `ssoUserId` was returned, then the SAML Profile is not yet connected
+    // to a Team member. Prompt the user to log in to a Vercel account now, which
+    // will complete the connection to the SAML Profile.
+    const ssoUserId = query.get('ssoUserId');
+    if (ssoUserId) {
+      output.log(
+        'Please log in to your Vercel account to complete SAML connection.'
+      );
+      return prompt({ ...params, ssoUserId });
+    }
+
+    const email = query.get('email');
+    const verificationToken = query.get('token');
+    if (!email || !verificationToken) {
+      output.error(
+        'Verification token was not provided. Please contact support.'
+      );
+      return 1;
+    }
+
+    output.spinner('Verifying authentication token');
+    const token = await verify(email, verificationToken, params);
+    output.success(
+      `${provider} authentication complete for ${highlight(email)}`
+    );
+    return token;
+  } finally {
+    server.close();
+  }
+}

packages/cli/src/util/login/prompt.ts

@@ -0,0 +1,77 @@
+import inquirer from 'inquirer';
+import error from '../output/error';
+import listInput from '../input/list';
+import { getCommandName } from '../pkg-name';
+import { LoginParams } from './types';
+import doSsoLogin from './sso';
+import doEmailLogin from './email';
+import doGithubLogin from './github';
+import doGitlabLogin from './gitlab';
+import doBitbucketLogin from './bitbucket';
+
+export default async function prompt(params: LoginParams) {
+  let result: number | string = 1;
+
+  const choices = [
+    { name: 'Continue with GitHub', value: 'github', short: 'github' },
+    { name: 'Continue with GitLab', value: 'gitlab', short: 'gitlab' },
+    { name: 'Continue with Bitbucket', value: 'bitbucket', short: 'bitbucket' },
+    { name: 'Continue with Email', value: 'email', short: 'email' },
+    { name: 'Continue with SAML Single Sign-On', value: 'saml', short: 'saml' },
+  ];
+
+  if (params.ssoUserId) {
+    // Remove SAML login option if we're connecting SAML Profile
+    choices.pop();
+  }
+
+  const choice = await listInput({
+    message: 'Log in to Vercel',
+    choices,
+  });
+
+  if (choice === 'github') {
+    result = await doGithubLogin(params);
+  } else if (choice === 'gitlab') {
+    result = await doGitlabLogin(params);
+  } else if (choice === 'bitbucket') {
+    result = await doBitbucketLogin(params);
+  } else if (choice === 'email') {
+    const email = await readInput('Enter your email address');
+    result = await doEmailLogin(email, params);
+  } else if (choice === 'saml') {
+    const slug = await readInput('Enter your Team slug');
+    result = await doSsoLogin(slug, params);
+  }
+
+  return result;
+}
+
+async function readInput(message: string) {
+  let input;
+
+  while (!input) {
+    try {
+      const { val } = await inquirer.prompt({
+        type: 'input',
+        name: 'val',
+        message,
+      });
+      input = val;
+    } catch (err) {
+      console.log(); // \n
+
+      if (err.isTtyError) {
+        throw new Error(
+          error(
+            `Interactive mode not supported – please run ${getCommandName(
+              `login you@domain.com`
+            )}`
+          )
+        );
+      }
+    }
+  }
+
+  return input;
+}

packages/cli/src/util/login/sso.ts

@@ -1,105 +1,9 @@
-import http from 'http';
-import open from 'open';
-import fetch from 'node-fetch';
-import { hostname } from 'os';
 import { URL } from 'url';
-import listen from 'async-listen';
-import { getTitleName } from '../pkg-name';
-import highlight from '../output/highlight';
 import { LoginParams } from './types';
+import doOauthLogin from './oauth';
 
-export default async function doSsoLogin(
-  teamIdOrSlug: string,
-  { apiUrl, output }: LoginParams
-): Promise<number | string> {
-  output.print(`Logging in to team "${teamIdOrSlug}"`);
-
-  const hyphens = new RegExp('-', 'g');
-  const host = hostname().replace(hyphens, ' ').replace('.local', '');
-  const tokenName = `${getTitleName()} CLI on ${host}`;
-
-  const server = http.createServer();
-  const address = await listen(server, 0, '127.0.0.1');
-  const { port } = new URL(address);
-
-  try {
-    const url = new URL('/auth/sso', apiUrl);
-    url.searchParams.append('mode', 'login');
-    url.searchParams.append('next', `http://localhost:${port}`);
-    url.searchParams.append('teamId', teamIdOrSlug);
-    url.searchParams.append('tokenName', tokenName);
-
-    output.spinner(
-      'Please complete the SAML Single Sign-On authentication in your web browser'
-    );
-    const [query] = await Promise.all([
-      new Promise<URL['searchParams']>((resolve, reject) => {
-        server.once('request', (req, res) => {
-          const query = new URL(req.url || '/', 'http://localhost')
-            .searchParams;
-          resolve(query);
-
-          // Redirect the user's web browser back to
-          // the Vercel CLI login notification page
-          const location = new URL(
-            'https://vercel.com/notifications/cli-login-'
-          );
-          const loginError = query.get('loginError');
-          if (loginError) {
-            location.pathname += 'failed';
-            location.searchParams.set('loginError', loginError);
-          } else {
-            location.pathname += 'success';
-            const email = query.get('email');
-            if (email) {
-              location.searchParams.set('email', email);
-            }
-          }
-
-          res.statusCode = 302;
-          res.setHeader('location', location.href);
-          res.end();
-        });
-        server.once('error', reject);
-      }),
-      open(url.href),
-    ]);
-
-    const loginError = query.get('loginError');
-    if (loginError) {
-      const err = JSON.parse(loginError);
-      output.prettyError(err);
-      return 1;
-    }
-
-    const email = query.get('email');
-    const verificationToken = query.get('token');
-    if (!email || !verificationToken) {
-      output.error(
-        'Verification token was not provided. Please contact support.'
-      );
-      return 1;
-    }
-
-    output.spinner('Verifying authentication token');
-    const verifyUrl = new URL('/registration/verify', apiUrl);
-    verifyUrl.searchParams.append('email', email);
-    verifyUrl.searchParams.append('token', verificationToken);
-
-    const verifyRes = await fetch(verifyUrl.href);
-
-    if (!verifyRes.ok) {
-      output.error(
-        `Unexpected ${verifyRes.status} status code from verify API`
-      );
-      output.debug(await verifyRes.text());
-      return 1;
-    }
-
-    output.success(`SAML authentication complete for ${highlight(email)}`);
-    const body = await verifyRes.json();
-    return body.token;
-  } finally {
-    server.close();
-  }
+export default function doSsoLogin(teamIdOrSlug: string, params: LoginParams) {
+  const url = new URL('/auth/sso', params.apiUrl);
+  url.searchParams.append('teamId', teamIdOrSlug);
+  return doOauthLogin(url, 'SAML Single Sign-On', params);
 }

packages/cli/src/util/login/types.ts

@@ -3,6 +3,7 @@ import { Output } from '../output';
 export interface LoginParams {
   apiUrl: string;
   output: Output;
+  ssoUserId?: string;
 }
 
 export interface LoginData {

packages/cli/src/util/login/verify.ts

@@ -0,0 +1,33 @@
+import { URL } from 'url';
+import fetch from 'node-fetch';
+import ua from '../ua';
+import { LoginParams } from './types';
+
+export default async function verify(
+  email: string,
+  verificationToken: string,
+  { apiUrl, ssoUserId }: LoginParams
+): Promise<string> {
+  const url = new URL('/registration/verify', apiUrl);
+  url.searchParams.append('email', email);
+  url.searchParams.append('token', verificationToken);
+  if (ssoUserId) {
+    url.searchParams.append('ssoUserId', ssoUserId);
+  }
+
+  const res = await fetch(url.href, {
+    headers: { 'User-Agent': ua },
+  });
+
+  const body = await res.json();
+
+  if (!res.ok) {
+    const err = new Error(
+      `Unexpected ${res.status} status code from verify API`
+    );
+    Object.assign(err, body.error);
+    throw err;
+  }
+
+  return body.token;
+}

packages/cli/src/util/read-package.ts

@@ -1,11 +1,11 @@
 import path from 'path';
 import { CantParseJSONFile } from './errors-ts';
 import readJSONFile from './read-json-file';
-import { NowConfig } from './dev/types';
+import { VercelConfig } from './dev/types';
 import { PackageJson } from '@vercel/build-utils';
 
 interface CustomPackage extends PackageJson {
-  now?: NowConfig;
+  now?: VercelConfig;
 }
 
 export default async function readPackage(file?: string) {

packages/cli/test/dev/fixtures/02-angular-node/package.json

@@ -9,9 +9,6 @@
     "lint": "ng lint",
     "e2e": "ng e2e"
   },
-  "engines": {
-    "node": "10.x"
-  },
   "private": true,
   "dependencies": {
     "@angular/animations": "8.1.0",

packages/cli/test/dev/fixtures/02-angular-node/yarn.lock

@@ -997,10 +997,10 @@ bluebird@^3.3.0, bluebird@^3.5.1, bluebird@^3.5.3, bluebird@^3.5.5:
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
 
-bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.4.0:
-  version "4.11.8"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
-  integrity sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==
+bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9:
+  version "4.12.0"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88"
+  integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==
 
 bn.js@^5.1.1:
   version "5.1.1"
@@ -1066,7 +1066,7 @@ braces@~3.0.2:
   dependencies:
     fill-range "^7.0.1"
 
-brorand@^1.0.1:
+brorand@^1.0.1, brorand@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
   integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
@@ -1529,7 +1529,7 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@^2.11.0, commander@^2.12.1, commander@^2.20.0, commander@~2.20.3:
+commander@^2.11.0, commander@^2.12.1, commander@^2.20.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
@@ -2088,17 +2088,17 @@ electron-to-chromium@^1.3.164, electron-to-chromium@^1.3.413:
   integrity sha512-FtEGg/wRKT765QehmpRqMDaUbRam03Y3brE+6nUfoxCr9XgyEl+zAgN4+EraOJeyTGTGh27u7Mdx5Hl9qAhJPQ==
 
 elliptic@^6.0.0, elliptic@^6.5.2:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.2.tgz#05c5678d7173c049d8ca433552224a495d0e3762"
-  integrity sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw==
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb"
+  integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==
   dependencies:
-    bn.js "^4.4.0"
-    brorand "^1.0.1"
+    bn.js "^4.11.9"
+    brorand "^1.1.0"
     hash.js "^1.0.0"
-    hmac-drbg "^1.0.0"
-    inherits "^2.0.1"
-    minimalistic-assert "^1.0.0"
-    minimalistic-crypto-utils "^1.0.0"
+    hmac-drbg "^1.0.1"
+    inherits "^2.0.4"
+    minimalistic-assert "^1.0.1"
+    minimalistic-crypto-utils "^1.0.1"
 
 emoji-regex@^7.0.1:
   version "7.0.3"
@@ -2842,9 +2842,9 @@ handle-thing@^2.0.0:
   integrity sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==
 
 handlebars@^4.0.3:
-  version "4.7.6"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.6.tgz#d4c05c1baf90e9945f77aa68a7a219aa4a7df74e"
-  integrity sha512-1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA==
+  version "4.7.7"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1"
+  integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==
   dependencies:
     minimist "^1.2.5"
     neo-async "^2.6.0"
@@ -2955,7 +2955,7 @@ hash.js@^1.0.0, hash.js@^1.0.3:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.1"
 
-hmac-drbg@^1.0.0:
+hmac-drbg@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
   integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=
@@ -2965,9 +2965,9 @@ hmac-drbg@^1.0.0:
     minimalistic-crypto-utils "^1.0.1"
 
 hosted-git-info@^2.1.4, hosted-git-info@^2.6.0, hosted-git-info@^2.7.1:
-  version "2.8.8"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
-  integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
+  version "2.8.9"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
+  integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
 
 hpack.js@^2.1.6:
   version "2.1.6"
@@ -3948,9 +3948,9 @@ lodash.tail@^4.1.1:
   integrity sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=
 
 lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.4, lodash@^4.17.5:
-  version "4.17.15"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
-  integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
 log4js@^4.0.0:
   version "4.5.1"
@@ -4181,7 +4181,7 @@ minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
   integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
 
-minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
+minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
   integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
@@ -4330,9 +4330,9 @@ negotiator@0.6.2:
   integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
 
 neo-async@^2.5.0, neo-async@^2.6.0:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
-  integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
+  integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
 
 nice-try@^1.0.4:
   version "1.0.5"
@@ -5192,9 +5192,9 @@ querystring@0.2.0:
   integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
 
 querystringify@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.1.tgz#60e5a5fd64a7f8bfa4d2ab2ed6fdf4c85bad154e"
-  integrity sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
+  integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
 
 randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
   version "2.1.0"
@@ -6109,9 +6109,9 @@ sshpk@^1.7.0:
     tweetnacl "~0.14.0"
 
 ssri@^6.0.0, ssri@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
-  integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz#157939134f20464e7301ddba3e90ffa8f7728ac5"
+  integrity sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==
   dependencies:
     figgy-pudding "^3.5.1"
 
@@ -6601,11 +6601,9 @@ typescript@3.4.5:
   integrity sha512-YycBxUb49UUhdNMU5aJ7z5Ej2XGmaIBL0x34vZ82fn3hGvD+bgrMrVDpatgz2f7YxUMJxMkbWxJZeAvDxVe7Vw==
 
 uglify-js@^3.1.4:
-  version "3.9.3"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.9.3.tgz#4a285d1658b8a2ebaef9e51366b3a0f7acd79ec2"
-  integrity sha512-r5ImcL6QyzQGVimQoov3aL2ZScywrOgBXGndbWrdehKoSvGe/RmiE5Jpw/v+GvxODt6l2tpBXwA7n+qZVlHBMA==
-  dependencies:
-    commander "~2.20.3"
+  version "3.13.7"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.13.7.tgz#25468a3b39b1c875df03f0937b2b7036a93f3fee"
+  integrity sha512-1Psi2MmnZJbnEsgJJIlfnd7tFlJfitusmR7zDI8lXlFI0ACD4/Rm/xdrU8bh6zF0i74aiVoBtkRiFulkrmh3AA==
 
 ultron@~1.1.0:
   version "1.1.1"
@@ -6704,9 +6702,9 @@ urix@^0.1.0:
   integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
 
 url-parse@^1.4.3:
-  version "1.4.7"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz#a8a83535e8c00a316e403a5db4ac1b9b853ae278"
-  integrity sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.1.tgz#d5fa9890af8a5e1f274a2c98376510f6425f6e3b"
+  integrity sha512-HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q==
   dependencies:
     querystringify "^2.1.1"
     requires-port "^1.0.0"

packages/cli/test/dev/fixtures/03-aurelia/yarn.lock

@@ -4571,9 +4571,9 @@ hoopy@^0.1.4:
   integrity sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ==
 
 hosted-git-info@^2.1.4:
-  version "2.8.8"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
-  integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
+  version "2.8.9"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
+  integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
 
 hpack.js@^2.1.6:
   version "2.1.6"
@@ -6056,9 +6056,9 @@ lodash.sortby@^4.7.0:
   integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
 
 lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.3, lodash@^4.17.4:
-  version "4.17.15"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
-  integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
 loglevel@^1.6.3:
   version "1.6.8"
@@ -7324,9 +7324,9 @@ querystring@0.2.0:
   integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
 
 querystringify@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.1.tgz#60e5a5fd64a7f8bfa4d2ab2ed6fdf4c85bad154e"
-  integrity sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
+  integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
 
 randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
   version "2.1.0"
@@ -8207,9 +8207,9 @@ sshpk@^1.7.0:
     tweetnacl "~0.14.0"
 
 ssri@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
-  integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz#157939134f20464e7301ddba3e90ffa8f7728ac5"
+  integrity sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==
   dependencies:
     figgy-pudding "^3.5.1"
 
@@ -8903,9 +8903,9 @@ url-loader@1.1.2:
     schema-utils "^1.0.0"
 
 url-parse@^1.4.3:
-  version "1.4.7"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz#a8a83535e8c00a316e403a5db4ac1b9b853ae278"
-  integrity sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.1.tgz#d5fa9890af8a5e1f274a2c98376510f6425f6e3b"
+  integrity sha512-HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q==
   dependencies:
     querystringify "^2.1.1"
     requires-port "^1.0.0"

packages/cli/test/dev/fixtures/04-create-react-app/yarn.lock

@@ -4580,9 +4580,9 @@ hmac-drbg@^1.0.1:
     minimalistic-crypto-utils "^1.0.1"
 
 hosted-git-info@^2.1.4:
-  version "2.8.8"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
-  integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
+  version "2.8.9"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
+  integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
 
 hpack.js@^2.1.6:
   version "2.1.6"
@@ -7896,9 +7896,9 @@ querystring@0.2.0:
   integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
 
 querystringify@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.1.tgz#60e5a5fd64a7f8bfa4d2ab2ed6fdf4c85bad154e"
-  integrity sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
+  integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
 
 raf@^3.4.1:
   version "3.4.1"
@@ -8898,9 +8898,9 @@ sshpk@^1.7.0:
     tweetnacl "~0.14.0"
 
 ssri@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
-  integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz#157939134f20464e7301ddba3e90ffa8f7728ac5"
+  integrity sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==
   dependencies:
     figgy-pudding "^3.5.1"
 
@@ -9529,9 +9529,9 @@ url-loader@1.1.2:
     schema-utils "^1.0.0"
 
 url-parse@^1.4.3:
-  version "1.4.7"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz#a8a83535e8c00a316e403a5db4ac1b9b853ae278"
-  integrity sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.1.tgz#d5fa9890af8a5e1f274a2c98376510f6425f6e3b"
+  integrity sha512-HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q==
   dependencies:
     querystringify "^2.1.1"
     requires-port "^1.0.0"

packages/cli/test/integration.js

@@ -165,7 +165,7 @@ function mockLoginApi(req, res) {
     res.end(JSON.stringify({ token, securityCode }));
   } else if (
     method === 'GET' &&
-    pathname === '/now/registration/verify' &&
+    pathname === '/registration/verify' &&
     query.email === email
   ) {
     res.end(JSON.stringify({ token }));

packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/client",
-  "version": "10.0.1-canary.1",
+  "version": "10.0.1-canary.5",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "homepage": "https://vercel.com",
@@ -40,7 +40,7 @@
     ]
   },
   "dependencies": {
-    "@vercel/build-utils": "2.10.3-canary.1",
+    "@vercel/build-utils": "2.10.3-canary.4",
     "@zeit/fetch": "5.2.0",
     "async-retry": "1.2.3",
     "async-sema": "3.0.0",

packages/client/src/types.ts

@@ -55,7 +55,7 @@ export interface Deployment {
     | 'DEPLOYING'
     | 'READY'
     | 'ERROR';
-  createdAt: string;
+  createdAt: number;
   createdIn: string;
   env: Dictionary<string>;
   build: {

packages/frameworks/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/frameworks",
-  "version": "0.3.3-canary.1",
+  "version": "0.3.3-canary.3",
   "main": "./dist/frameworks.js",
   "types": "./dist/frameworks.d.ts",
   "files": [

packages/frameworks/src/frameworks.ts

@@ -89,6 +89,7 @@ export const frameworks = [
       },
       devCommand: {
         value: 'next dev --port $PORT',
+        placeholder: 'next',
       },
       outputDirectory: {
         placeholder: 'Next.js default',
@@ -135,6 +136,7 @@ export const frameworks = [
       },
       devCommand: {
         value: 'gatsby develop --port $PORT',
+        placeholder: 'gatsby develop',
       },
       outputDirectory: {
         value: 'public',
@@ -222,6 +224,7 @@ export const frameworks = [
       },
       devCommand: {
         value: 'hexo server --port $PORT',
+        placeholder: 'hexo server',
       },
       outputDirectory: {
         value: 'public',
@@ -261,6 +264,7 @@ export const frameworks = [
       },
       devCommand: {
         value: 'npx @11ty/eleventy --serve --watch --port $PORT',
+        placeholder: 'npx @11ty/eleventy --serve',
       },
       outputDirectory: {
         value: '_site',
@@ -301,6 +305,7 @@ export const frameworks = [
       },
       devCommand: {
         value: 'docusaurus start --port $PORT',
+        placeholder: 'docusaurus start',
       },
       outputDirectory: {
         value: 'build',
@@ -393,6 +398,7 @@ export const frameworks = [
       },
       devCommand: {
         value: 'docusaurus-start --port $PORT',
+        placeholder: 'docusaurus-start',
       },
       outputDirectory: {
         value: 'build',
@@ -445,6 +451,7 @@ export const frameworks = [
       },
       devCommand: {
         value: 'preact watch --port $PORT',
+        placeholder: 'preact watch',
       },
       outputDirectory: {
         value: 'build',
@@ -495,6 +502,7 @@ export const frameworks = [
       },
       devCommand: {
         value: 'dojo build -m dev -w -s -p $PORT',
+        placeholder: 'dojo build -m dev -w -s',
       },
       outputDirectory: {
         value: 'output/dist',
@@ -547,6 +555,7 @@ export const frameworks = [
       },
       devCommand: {
         value: 'ember serve --port $PORT',
+        placeholder: 'ember serve',
       },
       outputDirectory: {
         value: 'dist',
@@ -595,6 +604,7 @@ export const frameworks = [
       },
       devCommand: {
         value: 'vue-cli-service serve --port $PORT',
+        placeholder: 'vue-cli-service serve',
       },
       outputDirectory: {
         value: 'dist',
@@ -651,6 +661,7 @@ export const frameworks = [
       },
       devCommand: {
         value: 'ng serve --port $PORT',
+        placeholder: 'ng serve',
       },
       outputDirectory: {
         value: 'dist',
@@ -688,14 +699,14 @@ export const frameworks = [
         placeholder: '`npm run build` or `ng build`',
       },
       devCommand: {
-        value: 'ng start',
+        value: 'ng serve',
       },
       outputDirectory: {
         value: 'www',
       },
     },
     dependency: '@ionic/angular',
-    devCommand: 'ng start',
+    devCommand: 'ng serve',
     buildCommand: 'ng build',
     getOutputDirName: async () => 'www',
     defaultRoutes: [
@@ -736,6 +747,7 @@ export const frameworks = [
       },
       devCommand: {
         value: 'ng serve --port $PORT',
+        placeholder: 'ng serve',
       },
       outputDirectory: {
         value: 'dist',
@@ -797,6 +809,7 @@ export const frameworks = [
       },
       devCommand: {
         value: 'polymer serve --port $PORT',
+        placeholder: 'polymer serve',
       },
       outputDirectory: {
         value: 'build',
@@ -1040,6 +1053,7 @@ export const frameworks = [
       },
       devCommand: {
         value: 'gridsome develop -p $PORT',
+        placeholder: 'gridsome develop',
       },
       outputDirectory: {
         value: 'dist',
@@ -1078,6 +1092,7 @@ export const frameworks = [
       },
       devCommand: {
         value: 'umi dev --port $PORT',
+        placeholder: 'umi dev',
       },
       outputDirectory: {
         value: 'dist',
@@ -1125,6 +1140,7 @@ export const frameworks = [
       },
       devCommand: {
         value: 'sapper dev --port $PORT',
+        placeholder: 'sapper dev',
       },
       outputDirectory: {
         value: '__sapper__/export',
@@ -1163,6 +1179,7 @@ export const frameworks = [
       },
       devCommand: {
         value: 'saber --port $PORT',
+        placeholder: 'saber',
       },
       outputDirectory: {
         value: 'public',
@@ -1215,6 +1232,7 @@ export const frameworks = [
       },
       devCommand: {
         value: 'stencil build --dev --watch --serve --port $PORT',
+        placeholder: 'stencil build --dev --watch --serve',
       },
       outputDirectory: {
         value: 'www',
@@ -1338,6 +1356,7 @@ export const frameworks = [
       },
       devCommand: {
         value: 'yarn rw dev --fwd="--port=$PORT --open=false"',
+        placeholder: 'yarn rw dev',
       },
       outputDirectory: {
         placeholder: 'RedwoodJS default',
@@ -1383,6 +1402,7 @@ export const frameworks = [
       },
       devCommand: {
         value: 'hugo server -D -w -p $PORT',
+        placeholder: 'hugo server -D',
       },
       outputDirectory: {
         placeholder: '`public` or `publishDir` from the `config` file',
@@ -1428,6 +1448,7 @@ export const frameworks = [
       },
       devCommand: {
         value: 'bundle exec jekyll serve --watch --port $PORT',
+        placeholder: 'bundle exec jekyll serve',
       },
       outputDirectory: {
         placeholder: '`_site` or `destination` from `_config.yml`',
@@ -1470,6 +1491,7 @@ export const frameworks = [
       },
       devCommand: {
         value: 'brunch watch --server --port $PORT',
+        placeholder: 'brunch watch --server',
       },
       outputDirectory: {
         value: 'public',
@@ -1505,6 +1527,7 @@ export const frameworks = [
       },
       devCommand: {
         value: 'bundle exec middleman server -p $PORT',
+        placeholder: 'bundle exec middleman server',
       },
       outputDirectory: {
         value: 'build',
@@ -1541,6 +1564,7 @@ export const frameworks = [
       },
       devCommand: {
         value: 'zola serve --port $PORT',
+        placeholder: 'zola serve',
       },
       outputDirectory: {
         value: 'public',

packages/frameworks/src/types.ts

@@ -27,6 +27,7 @@ export interface SettingValue {
    * @example "next dev --port $PORT"
    */
   value: string;
+  placeholder?: string;
 }
 
 export type Setting = SettingValue | SettingPlaceholder;

packages/frameworks/test/frameworks.unit.test.ts

@@ -36,6 +36,9 @@ const SchemaSettings = {
         value: {
           type: 'string',
         },
+        placeholder: {
+          type: 'string',
+        },
       },
     },
     {

packages/node/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/node",
-  "version": "1.10.0",
+  "version": "1.10.1-canary.2",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/node-js",
@@ -33,7 +33,7 @@
     "@types/etag": "1.8.0",
     "@types/test-listen": "1.1.0",
     "@vercel/ncc": "0.24.0",
-    "@vercel/nft": "0.10.0",
+    "@vercel/nft": "0.12.2",
     "content-type": "1.0.4",
     "cookie": "0.4.0",
     "etag": "1.8.1",

packages/node/test/fixtures/20-mixed-modules/js/package.json

@@ -1,5 +1,3 @@
 {
-  "engines": {
-    "node": "10.x"
-  }
+  "private": true
 }

packages/node/test/fixtures/20-mixed-modules/ts/package.json

@@ -1,5 +1,3 @@
 {
-  "engines": {
-    "node": "10.x"
-  }
+  "private": true
 }

packages/node/test/fixtures/35-puppeteer/lighthouse/index.js

@@ -26,7 +26,7 @@ async function getResult(url) {
 }
 
 module.exports = async (req, res) => {
-  const result = await getResult('https://vercel.com/about');
+  const result = await getResult('https://vercel.com/docs');
   if (req && result && result.lhr && result.lhr.categories) {
     res.end('lighthouse:RANDOMNESS_PLACEHOLDER');
   } else {

packages/node/test/fixtures/35-puppeteer/package.json

@@ -1,10 +1,10 @@
 {
   "engines": {
-    "node": "10.x"
+    "node": "14.x"
   },
   "dependencies": {
-    "chrome-aws-lambda": "1.20.4",
-    "lighthouse": "5.6.0",
-    "puppeteer-core": "1.20.0"
+    "chrome-aws-lambda": "7.0.0",
+    "lighthouse": "7.4.0",
+    "puppeteer-core": "7.0.0"
   }
 }

packages/node/test/fixtures/35-puppeteer/vercel.json

@@ -7,7 +7,8 @@
       "config": {
         "functions": {
           "**/*.js": {
-            "memory": 3008
+            "memory": 3008,
+            "maxDuration": 30
           }
         }
       }

packages/node/test/fixtures/41-yarn-workspaces-transpilation/api/package.json

@@ -3,8 +3,5 @@
   "dependencies": {
     "@builders-transpiled-test/lib": "*"
   },
-  "engines": {
-    "node": "10.x"
-  },
   "version": "1.0.0"
 }

packages/node/test/fixtures/42-yarn-workspaces-typescript-dep/api/package.json

@@ -3,8 +3,5 @@
   "dependencies": {
     "@builders-typescript-test/lib": "*"
   },
-  "engines": {
-    "node": "10.x"
-  },
   "version": "1.0.0"
 }

packages/python/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/python",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "main": "./dist/index.js",
   "license": "MIT",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/python",

packages/python/src/index.ts

@@ -86,6 +86,7 @@ export const build = async ({
 
   await installRequirement({
     dependency: 'werkzeug',
+    version: '1.0.1',
     workPath,
     meta,
   });
@@ -109,6 +110,7 @@ export const build = async ({
     const tempDir = await getWriteableDirectory();
     await installRequirement({
       dependency: 'pipfile-requirements',
+      version: '0.3.0',
       workPath: tempDir,
       meta,
       args: ['--no-warn-script-location'],

packages/python/src/install.ts

@@ -61,39 +61,28 @@ async function pipInstall(workPath: string, args: string[]) {
   // distutils.errors.DistutilsOptionError: can't combine user with
   // prefix, exec_prefix/home, or install_(plat)base
   process.env.PIP_USER = '0';
-  debug(
-    `Running "pip install --disable-pip-version-check --target ${target} --upgrade ${args.join(
-      ' '
-    )}"...`
-  );
+  const cmdArgs = [
+    'install',
+    '--disable-pip-version-check',
+    '--target',
+    target,
+    ...args,
+  ];
+  debug(`Running "pip3 ${cmdArgs.join(' ')}"...`);
   try {
-    await execa(
-      pipPath,
-      [
-        'install',
-        '--disable-pip-version-check',
-        '--target',
-        target,
-        '--upgrade',
-        ...args,
-      ],
-      {
-        cwd: workPath,
-        stdio: 'pipe',
-      }
-    );
+    await execa(pipPath, cmdArgs, {
+      cwd: workPath,
+      stdio: 'pipe',
+    });
   } catch (err) {
-    console.log(
-      `Failed to run "pip install --disable-pip-version-check --target ${target} --upgrade ${args.join(
-        ' '
-      )}"...`
-    );
+    console.log(`Failed to run "pip3 ${cmdArgs.join(' ')}"`);
     throw err;
   }
 }
 
 interface InstallRequirementArg {
   dependency: string;
+  version: string;
   workPath: string;
   meta: Meta;
   args?: string[];
@@ -101,6 +90,7 @@ interface InstallRequirementArg {
 
 export async function installRequirement({
   dependency,
+  version,
   workPath,
   meta,
   args = [],
@@ -111,7 +101,8 @@ export async function installRequirement({
     );
     return;
   }
-  await pipInstall(workPath, [dependency, ...args]);
+  const exact = `${dependency}==${version}`;
+  await pipInstall(workPath, [exact, ...args]);
 }
 
 interface InstallRequirementsFileArg {

yarn.lock

@@ -1265,6 +1265,21 @@
     npmlog "^4.1.2"
     write-file-atomic "^2.3.0"
 
+"@mapbox/node-pre-gyp@^1.0.5":
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.5.tgz#2a0b32fcb416fb3f2250fd24cb2a81421a4f5950"
+  integrity sha512-4srsKPXWlIxp5Vbqz5uLfBN+du2fJChBoYn/f2h991WLdk7jUvcSk/McVLSv/X+xQIPI8eGD5GjrnygdyHnhPA==
+  dependencies:
+    detect-libc "^1.0.3"
+    https-proxy-agent "^5.0.0"
+    make-dir "^3.1.0"
+    node-fetch "^2.6.1"
+    nopt "^5.0.0"
+    npmlog "^4.1.2"
+    rimraf "^3.0.2"
+    semver "^7.3.4"
+    tar "^6.1.0"
+
 "@mrmlnc/readdir-enhanced@^2.2.1":
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
@@ -1737,6 +1752,14 @@
     "@types/events" "*"
     "@types/node" "*"
 
+"@types/inquirer@7.3.1":
+  version "7.3.1"
+  resolved "https://registry.yarnpkg.com/@types/inquirer/-/inquirer-7.3.1.tgz#1f231224e7df11ccfaf4cf9acbcc3b935fea292d"
+  integrity sha512-osD38QVIfcdgsPCT0V3lD7eH0OFurX71Jft18bZrsVQWVRt6TuxRzlr0GJLrxoHZR2V5ph7/qP8se/dcnI7o0g==
+  dependencies:
+    "@types/through" "*"
+    rxjs "^6.4.0"
+
 "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0":
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.2.tgz#79d7a78bad4219f4c03d6557a1c72d9ca6ba62d5"
@@ -1978,6 +2001,13 @@
   resolved "https://registry.yarnpkg.com/@types/text-table/-/text-table-0.2.0.tgz#cec067b522598bbb37186375b834ac30411c9af6"
   integrity sha512-om4hNWnI01IKUFCjGQG33JqFcnmt0W5C3WX0G1FVBaucr7oRnL29aAz2hnxpbZnE2t9f8/BR5VOtgcOtsonpLA==
 
+"@types/through@*":
+  version "0.0.30"
+  resolved "https://registry.yarnpkg.com/@types/through/-/through-0.0.30.tgz#e0e42ce77e897bd6aead6f6ea62aeb135b8a3895"
+  integrity sha512-FvnCJljyxhPM3gkRgWmxmDZyAQSiBQQWLI0A0VFL0K7W1oRUrPJSqNO0NvTnLkBcotdlp3lKvaT0JrnyRDkzOg==
+  dependencies:
+    "@types/node" "*"
+
 "@types/universal-analytics@0.4.2":
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/@types/universal-analytics/-/universal-analytics-0.4.2.tgz#d21a122a984bf8261eb206bcb7ccb1c0e8353d04"
@@ -2085,11 +2115,12 @@
   resolved "https://registry.yarnpkg.com/@vercel/ncc/-/ncc-0.24.0.tgz#a2e8783a185caa99b5d8961a57dfc9665de16296"
   integrity sha512-crqItMcIwCkvdXY/V3/TzrHJQx6nbIaRqE1cOopJhgGX6izvNov40SmD//nS5flfEvdK54YGjwVVq+zG6crjOg==
 
-"@vercel/nft@0.10.0":
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/@vercel/nft/-/nft-0.10.0.tgz#6dc99c28abd073633467371a1855f08820460d45"
-  integrity sha512-0WABTmfebmYDR9GKuM9uFNr6MCayfl/zB6uXzkMsWlXrd7LN/ZI7sdbC/Ua+h4HEzJtvEMOrxLkIYYKqfeUf9A==
+"@vercel/nft@0.12.2":
+  version "0.12.2"
+  resolved "https://registry.yarnpkg.com/@vercel/nft/-/nft-0.12.2.tgz#67ea9f231d24639b3783e3e69bef173659972d3b"
+  integrity sha512-H8n44GboVnJaVVX4+WfuOTAaNLDnUIYH4KpMZcXll7KMNIcg0JTd0IFRsIBe/uvuXisqm6nEANp8Tr3/1dlRQw==
   dependencies:
+    "@mapbox/node-pre-gyp" "^1.0.5"
     acorn "^8.1.0"
     acorn-class-fields "^1.0.0"
     acorn-static-class-features "^1.0.0"
@@ -3300,6 +3331,11 @@ chownr@^1.0.1, chownr@^1.1.1, chownr@^1.1.2:
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
   integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
 
+chownr@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
+  integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
+
 chunkd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/chunkd/-/chunkd-1.0.0.tgz#4ead4a3704bcce510c4bb4d4a8be30c557836dd1"
@@ -3501,7 +3537,7 @@ combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@^2.20.0, commander@~2.20.3:
+commander@^2.20.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
@@ -4110,7 +4146,7 @@ detect-indent@^5.0.0:
   resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"
   integrity sha1-OHHMCmoALow+Wzz38zYmRnXwa50=
 
-detect-libc@^1.0.2:
+detect-libc@^1.0.2, detect-libc@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
   integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
@@ -5125,6 +5161,13 @@ fs-minipass@^1.2.5:
   dependencies:
     minipass "^2.6.0"
 
+fs-minipass@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
+  integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==
+  dependencies:
+    minipass "^3.0.0"
+
 fs-write-stream-atomic@^1.0.8:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
@@ -5238,11 +5281,6 @@ get-stdin@^6.0.0:
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b"
   integrity sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==
 
-get-stdin@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-7.0.0.tgz#8d5de98f15171a125c5e516643c7a6d0ea8a96f6"
-  integrity sha512-zRKcywvrXlXsA0v0i9Io4KDRaAw7+a1ZpjRwl9Wox8PFlVCCHra7E9c4kqXCoCM9nR5tBkaTTZRBoCm60bFqTQ==
-
 get-stream@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
@@ -5470,9 +5508,9 @@ growly@^1.3.0:
   integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=
 
 handlebars@^4.7.6:
-  version "4.7.6"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.6.tgz#d4c05c1baf90e9945f77aa68a7a219aa4a7df74e"
-  integrity sha512-1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA==
+  version "4.7.7"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1"
+  integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==
   dependencies:
     minimist "^1.2.5"
     neo-async "^2.6.0"
@@ -5590,9 +5628,9 @@ hasha@^5.0.0:
     type-fest "^0.8.0"
 
 hosted-git-info@^2.1.4, hosted-git-info@^2.6.0, hosted-git-info@^2.7.1:
-  version "2.8.8"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
-  integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
+  version "2.8.9"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
+  integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
 
 html-encoding-sniffer@^1.0.2:
   version "1.0.2"
@@ -5706,6 +5744,14 @@ https-proxy-agent@^4.0.0:
     agent-base "5"
     debug "4"
 
+https-proxy-agent@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2"
+  integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==
+  dependencies:
+    agent-base "6"
+    debug "4"
+
 human-signals@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
@@ -5718,22 +5764,10 @@ humanize-ms@^1.2.1:
   dependencies:
     ms "^2.0.0"
 
-husky@3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-3.0.4.tgz#10a48ac11ab50859b0939750fa0b4e07ad0bf669"
-  integrity sha512-7Rnt8aJfy+MlV28snmYK7O7vWwtOfeVxV6KhLpUFXlmx5ukQ1nQmNUB7QsAwSgdySB5X+bm7q7JIRgazqBUzKA==
-  dependencies:
-    chalk "^2.4.2"
-    cosmiconfig "^5.2.1"
-    execa "^1.0.0"
-    get-stdin "^7.0.0"
-    is-ci "^2.0.0"
-    opencollective-postinstall "^2.0.2"
-    pkg-dir "^4.2.0"
-    please-upgrade-node "^3.2.0"
-    read-pkg "^5.1.1"
-    run-node "^1.0.0"
-    slash "^3.0.0"
+husky@6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-6.0.0.tgz#810f11869adf51604c32ea577edbc377d7f9319e"
+  integrity sha512-SQS2gDTB7tBN486QSoKPKQItZw97BMOd+Kdb6ghfpBc0yXyzrddI0oDV5MkDAbuB4X2mO3/nj60TRMcYxwzZeQ==
 
 iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
   version "0.4.24"
@@ -7238,9 +7272,9 @@ lodash.uniq@^4.5.0:
   integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
 
 lodash@^4.15.0, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.2.1:
-  version "4.17.19"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
-  integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
 log-symbols@^1.0.2:
   version "1.0.2"
@@ -7332,6 +7366,13 @@ lru-cache@^4.0.1:
     pseudomap "^1.0.2"
     yallist "^2.1.2"
 
+lru-cache@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
+  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
+  dependencies:
+    yallist "^4.0.0"
+
 lru_map@0.3.3:
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/lru_map/-/lru_map-0.3.3.tgz#b5c8351b9464cbd750335a79650a0ec0e56118dd"
@@ -7357,7 +7398,7 @@ make-dir@^2.0.0, make-dir@^2.1.0:
     pify "^4.0.1"
     semver "^5.6.0"
 
-make-dir@^3.0.0:
+make-dir@^3.0.0, make-dir@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
   integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
@@ -7673,6 +7714,13 @@ minipass@^2.3.3, minipass@^2.3.4, minipass@^2.3.5, minipass@^2.6.0, minipass@^2.
     safe-buffer "^5.1.2"
     yallist "^3.0.0"
 
+minipass@^3.0.0:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz#7d42ff1f39635482e15f9cdb53184deebd5815fd"
+  integrity sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==
+  dependencies:
+    yallist "^4.0.0"
+
 minizlib@^1.1.0, minizlib@^1.1.1, minizlib@^1.2.1:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d"
@@ -7680,6 +7728,14 @@ minizlib@^1.1.0, minizlib@^1.1.1, minizlib@^1.2.1:
   dependencies:
     minipass "^2.9.0"
 
+minizlib@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
+  integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
+  dependencies:
+    minipass "^3.0.0"
+    yallist "^4.0.0"
+
 mississippi@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
@@ -7711,7 +7767,7 @@ mkdirp-promise@5.0.1, mkdirp-promise@^5.0.1:
   dependencies:
     mkdirp "*"
 
-mkdirp@*:
+mkdirp@*, mkdirp@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
@@ -7834,9 +7890,9 @@ needle@^2.2.1:
     sax "^1.2.4"
 
 neo-async@^2.6.0:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
-  integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
+  integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
 
 nested-error-stacks@^2.0.0, nested-error-stacks@^2.1.0:
   version "2.1.0"
@@ -7873,7 +7929,7 @@ node-fetch@2.6.0:
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
   integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==
 
-node-fetch@2.6.1, node-fetch@^2.2.0, node-fetch@^2.2.1, node-fetch@^2.3.0, node-fetch@^2.5.0:
+node-fetch@2.6.1, node-fetch@^2.2.0, node-fetch@^2.2.1, node-fetch@^2.3.0, node-fetch@^2.5.0, node-fetch@^2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
   integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
@@ -7945,6 +8001,13 @@ nopt@^4.0.1:
     abbrev "1"
     osenv "^0.1.4"
 
+nopt@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88"
+  integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==
+  dependencies:
+    abbrev "1"
+
 normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5, normalize-package-data@^2.4.0, normalize-package-data@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
@@ -8238,11 +8301,6 @@ open@8.0.2:
     is-docker "^2.1.1"
     is-wsl "^2.2.0"
 
-opencollective-postinstall@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz#7a0fff978f6dbfa4d006238fbac98ed4198c3259"
-  integrity sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q==
-
 optionator@^0.8.1, optionator@^0.8.2:
   version "0.8.3"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
@@ -8719,7 +8777,7 @@ pkg-dir@^4.2.0:
   dependencies:
     find-up "^4.0.0"
 
-please-upgrade-node@^3.1.1, please-upgrade-node@^3.2.0:
+please-upgrade-node@^3.1.1:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz#aeddd3f994c933e4ad98b99d9a556efa0e2fe942"
   integrity sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg==
@@ -9059,7 +9117,7 @@ read-pkg@^3.0.0:
     normalize-package-data "^2.3.2"
     path-type "^3.0.0"
 
-read-pkg@^5.1.1, read-pkg@^5.2.0:
+read-pkg@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc"
   integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==
@@ -9423,7 +9481,7 @@ rimraf@2.6.3:
   dependencies:
     glob "^7.1.3"
 
-rimraf@3.0.2, rimraf@^3.0.0:
+rimraf@3.0.2, rimraf@^3.0.0, rimraf@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
   integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
@@ -9465,11 +9523,6 @@ run-async@^2.2.0:
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
   integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
 
-run-node@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/run-node/-/run-node-1.0.0.tgz#46b50b946a2aa2d4947ae1d886e9856fd9cabe5e"
-  integrity sha512-kc120TBlQ3mih1LSzdAJXo4xn/GWS2ec0l3S+syHDXP9uRr0JAT8Qd3mdMuyjqCzeZktgP3try92cEgf9Nks8A==
-
 run-parallel@^1.1.9:
   version "1.1.9"
   resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.9.tgz#c9dd3a7cf9f4b2c4b6244e173a6ed866e61dd679"
@@ -9580,6 +9633,13 @@ semver@^7.3.2:
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
   integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
 
+semver@^7.3.4:
+  version "7.3.5"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
+  integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
+  dependencies:
+    lru-cache "^6.0.0"
+
 serialize-error@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-2.1.0.tgz#50b679d5635cdf84667bdc8e59af4e5b81d5f60a"
@@ -9901,9 +9961,9 @@ sshpk@^1.7.0:
     tweetnacl "~0.14.0"
 
 ssri@^6.0.0, ssri@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
-  integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz#157939134f20464e7301ddba3e90ffa8f7728ac5"
+  integrity sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==
   dependencies:
     figgy-pudding "^3.5.1"
 
@@ -10312,6 +10372,18 @@ tar@^4, tar@^4.4.10, tar@^4.4.12, tar@^4.4.8:
     safe-buffer "^5.1.2"
     yallist "^3.0.3"
 
+tar@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.0.tgz#d1724e9bcc04b977b18d5c573b333a2207229a83"
+  integrity sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA==
+  dependencies:
+    chownr "^2.0.0"
+    fs-minipass "^2.0.0"
+    minipass "^3.0.0"
+    minizlib "^2.1.1"
+    mkdirp "^1.0.3"
+    yallist "^4.0.0"
+
 teeny-request@6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/teeny-request/-/teeny-request-6.0.1.tgz#9b1f512cef152945827ba7e34f62523a4ce2c5b0"
@@ -10682,11 +10754,9 @@ typescript@3.9.3:
   integrity sha512-D/wqnB2xzNFIcoBG9FG8cXRDjiqSTbG2wd8DMZeQyJlP1vfTkIxH4GKveWaEBYySKIg+USu+E+EDIR47SqnaMQ==
 
 uglify-js@^3.1.4:
-  version "3.9.4"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.9.4.tgz#867402377e043c1fc7b102253a22b64e5862401b"
-  integrity sha512-8RZBJq5smLOa7KslsNsVcSH+KOXf1uDU8yqLeNuVKwmT0T3FA0ZoXlinQfRad7SDcbZZRZE4ov+2v71EnxNyCA==
-  dependencies:
-    commander "~2.20.3"
+  version "3.13.5"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.13.5.tgz#5d71d6dbba64cf441f32929b1efce7365bb4f113"
+  integrity sha512-xtB8yEqIkn7zmOyS2zUNBsYCBRhDkvlNxMMY2smuJ/qA8NCHeQvKCF3i9Z4k8FJH4+PJvZRtMrPynfZ75+CSZw==
 
 uid-number@0.0.6:
   version "0.0.6"
@@ -11244,6 +11314,11 @@ yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
   integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
 
+yallist@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
+  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
+
 yargs-parser@10.x, yargs-parser@^10.0.0:
   version "10.1.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"