Publish Canary

- @vercel/build-utils@2.16.1-canary.2 - vercel@24.2.1-canary.2 - @vercel/client@11.0.1-canary.2 - @vercel/frameworks@0.8.1-canary.0 - @vercel/go@1.4.1-canary.2 - @vercel/node@1.15.1-canary.2 - @vercel/python@2.3.1-canary.2 - @vercel/redwood@0.8.1-canary.2 - @vercel/ruby@1.3.4-canary.2 - @vercel/static-build@0.24.1-canary.2
[build-utils] add pnpm7 to path when lockfile v5.4 is detected (#7758 )
2025-12-12 04:22:14 +00:00 · 2022-05-06 14:16:00 -06:00 · 2022-05-06 19:47:41 +00:00 · 2022-05-06 07:06:07 +00:00 · 2022-05-05 19:13:44 -07:00 · 2022-05-05 22:40:26 +00:00
161 changed files with 11646 additions and 1878 deletions
--- a/.vercelignore
+++ b/.vercelignore
@@ -6,6 +6,7 @@
 !.yarnrc
 !yarn.lock
 !package.json
+!turbo.json

 # api
 !api/
@@ -14,4 +15,4 @@
 # packages
 !packages/
 !packages/frameworks
-!packages/frameworks/**
+!packages/frameworks/**
--- a/DEVELOPING_A_RUNTIME.md
+++ b/DEVELOPING_A_RUNTIME.md
@@ -307,15 +307,15 @@ This is a [class](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Refere

 This is an abstract enumeration type that is implemented by one of the following possible `String` values:

+- `nodejs14.x`
 - `nodejs12.x`
- `nodejs10.x`
 - `go1.x`
 - `java11`
 - `python3.9`
- `python3.6`
- `dotnetcore2.1`
- `ruby2.5`
- `provided`
+- `dotnet6`
+- `dotnetcore3.1`
+- `ruby2.7`
+- `provided.al2`

 ## `@vercel/build-utils` Helper Functions

--- a/errors/domain-verification.md
+++ b/errors/domain-verification.md
@@ -16,4 +16,4 @@ If you would not like to verify your domain, you can remove it from your account

 #### Resources

- [Vercel Custom Domains Documentation](https://vercel.com/docs/v2/custom-domains)
+- [Vercel Custom Domains Documentation](https://vercel.com/docs/concepts/projects/custom-domains)
--- a/errors/missing-env-file.md
+++ b/errors/missing-env-file.md
@@ -2,7 +2,7 @@

 #### Why This Error Occurred

-You ran `vercel dev` inside a project that contains a `vercel.json` file with `env` or `build.env` properties that use [Vercel Secrets](https://vercel.com/docs/v2/build-step#environment-variables).
+You ran `vercel dev` inside a project that contains a `vercel.json` file with `env` or `build.env` properties that use [Vercel Secrets](https://vercel.com/docs/concepts/projects/environment-variables).

 In order to use environment variables in your project locally that have values defined using the Vercel Secrets format (e.g. `@my-secret-value`), you will need to provide the value as an environment variable using a `.env`.

@@ -24,4 +24,4 @@ TEST=value

 In the above example, `TEST` represents the name of the environment variable and `value` its value.

-For more information on Environment Variables in development, [see the documentation](https://vercel.com/docs/v2/build-step#environment-variables).
+For more information on Environment Variables in development, [see the documentation](https://vercel.com/docs/concepts/projects/environment-variables).
--- a/examples/amp/.gitignore
+++ b/examples/amp/.gitignore
@@ -1 +0,0 @@
-.env
--- a/examples/amp/README.md
+++ b/examples/amp/README.md
@@ -1,19 +0,0 @@
-# AMP Example
-
-This directory is a brief example of an [AMP](https://amp.dev/) site that can be deployed to Vercel with zero configuration.
-
-## Deploy Your Own
-
-Deploy your own AMP project with Vercel.
-
-[![Deploy with Vercel](https://vercel.com/button)](https://vercel.com/new/clone?repository-url=https://github.com/vercel/vercel/tree/main/examples/amp)
-
-_Live Example: https://amp-template.vercel.app_
-
-### How We Created This Example
-
-To get started deploying AMP with Vercel, you can use the [Vercel CLI](https://vercel.com/download) to initialize the project:
-
-```shell
-$ vercel init amp
-```
--- a/examples/amp/favicon.png
+++ b/examples/amp/favicon.png
--- a/examples/amp/index.html
+++ b/examples/amp/index.html
@@ -1,72 +0,0 @@
-<!DOCTYPE html>
-<html ⚡>
-  <head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width,minimum-scale=1" />
-    <link rel="shortcut icon" href="favicon.png">
-    <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
-    <link rel="canonical" href="index.html" />
-    <title>AMP Website</title>
-    <script async src="https://cdn.ampproject.org/v0.js"></script>
-    <style amp-custom>
-      body > * {
-        margin: 3rem 1rem;
-        font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
-        color: #525252;
-      }
-
-      h3 {
-        font-size: 2rem;
-      }
-
-      h4 {
-        margin-top: 2rem;
-      }
-
-      p {
-        font-size: 1.2rem;
-        line-height: 2rem;
-      }
-
-      .links {
-        display: flex;
-        justify-content: center;
-        margin-bottom: 3rem;
-      }
-
-      .links a {
-        margin: 0 10px;
-        font-size: 1rem;
-        color: #005af0;
-      }
-    </style>
-  </head>
-  <body>
-    <center>
-      <amp-img width=150 height=150 layout="fixed" class="logo" src="logo.png"></amp-img>
-      <h3>Welcome to your AMP page</h3>
-      <p>AMP is a web component framework to <br> easily create user-first websites, stories, ads and emails.</p>
-
-      <h4>Links</h4>
-      <div class="links">
-        <a href="https://amp.dev/">Homepage</a>
-        <a href="https://amp.dev/documentation/guides-and-tutorials/?format=websites">Tutorials</a>
-        <a href="https://amp.dev/documentation/examples/">Examples</a>
-        <a href="https://blog.amp.dev">Blog</a>
-      </div>
-
-      <h4>Ready to get started?</h4>
-      <div class="links">
-        <a href="https://amp.dev/documentation/guides-and-tutorials/start/create/?format=websites">Create your first AMP page</a>
-      </div>
-
-      <h4>Get involved</h4>
-      <div class="links">
-        <a href="https://twitter.com/amphtml">Twitter</a>
-        <a href="https://amphtml.slack.com">Slack</a>
-        <a href="https://amp.dev/events/amp-conf-2019">AMP Conf</a>
-        <a href="https://amp.dev/events/amp-roadshow">AMP Roadshow</a>
-      </div>
-    </center>
-  </body>
-</html>
--- a/examples/amp/logo.png
+++ b/examples/amp/logo.png
--- a/examples/dojo/README.md
+++ b/examples/dojo/README.md
@@ -6,7 +6,7 @@ This directory is a brief example of a [Dojo](https://dojo.io) site that can be

 Deploy your own Dojo project with Vercel.

-[![Deploy with Vercel](https://vercel.com/button)](https://vercel.com/new/clone?repository-url=https://github.com/vercel/vercel/tree/main/dojo&template=dojo)
+[![Deploy with Vercel](https://vercel.com/button)](https://vercel.com/new/clone?repository-url=https://github.com/vercel/vercel/tree/main/examples/dojo&template=dojo)

 ### How We Created This Example

--- a/examples/ember/.travis.yml
+++ b/examples/ember/.travis.yml
@@ -15,7 +15,7 @@ cache:

 env:
  global:
-    # See https://git.io/vdao3 for details.
+    # See https://github.com/ember-cli/ember-cli/blob/master/docs/build-concurrency.md
    - JOBS=1

 script:
--- a/package.json
+++ b/package.json
@@ -14,37 +14,24 @@
  "dependencies": {
    "lerna": "3.16.4"
  },
-  "turbo": {
-    "baseBranch": "origin/main",
-    "pipeline": {
-      "build": {
-        "dependsOn": [
-          "^build"
-        ],
-        "outputs": [
-          "dist/**"
-        ]
-      }
-    }
-  },
  "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "4.28.0",
-    "@typescript-eslint/parser": "4.28.0",
+    "@typescript-eslint/eslint-plugin": "5.21.0",
+    "@typescript-eslint/parser": "5.21.0",
    "async-retry": "1.2.3",
    "buffer-replace": "1.0.0",
-    "eslint": "7.29.0",
-    "eslint-config-prettier": "8.3.0",
-    "eslint-plugin-jest": "24.3.6",
-    "husky": "6.0.0",
-    "jest": "27.3.1",
+    "eslint": "8.14.0",
+    "eslint-config-prettier": "8.5.0",
+    "eslint-plugin-jest": "26.1.5",
+    "husky": "7.0.4",
+    "jest": "28.0.2",
    "json5": "2.1.1",
    "lint-staged": "9.2.5",
    "node-fetch": "2.6.1",
    "npm-package-arg": "6.1.0",
-    "prettier": "2.3.1",
+    "prettier": "2.6.2",
    "ts-eager": "2.0.2",
-    "ts-jest": "27.0.4",
-    "turbo": "1.1.9"
+    "ts-jest": "28.0.0-next.1",
+    "turbo": "1.2.5"
  },
  "scripts": {
    "lerna": "lerna",
--- a/packages/build-utils/package.json
+++ b/packages/build-utils/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/build-utils",
-  "version": "2.15.1",
+  "version": "2.16.1-canary.2",
  "license": "MIT",
  "main": "./dist/index.js",
  "types": "./dist/index.d.js",
@@ -23,14 +23,14 @@
    "@types/end-of-stream": "^1.4.0",
    "@types/fs-extra": "9.0.13",
    "@types/glob": "^7.1.1",
-    "@types/jest": "27.0.1",
+    "@types/jest": "27.4.1",
    "@types/js-yaml": "3.12.1",
    "@types/ms": "0.7.31",
    "@types/multistream": "2.1.1",
    "@types/node-fetch": "^2.1.6",
    "@types/semver": "6.0.0",
-    "@types/yazl": "^2.4.1",
-    "@vercel/frameworks": "0.7.1",
+    "@types/yazl": "2.4.2",
+    "@vercel/frameworks": "0.8.1-canary.0",
    "@vercel/ncc": "0.24.0",
    "aggregate-error": "3.0.1",
    "async-retry": "1.2.3",
@@ -47,6 +47,6 @@
    "node-fetch": "2.6.1",
    "semver": "6.1.1",
    "typescript": "4.3.4",
-    "yazl": "2.4.3"
+    "yazl": "2.5.1"
  }
 }
--- a/packages/build-utils/src/detect-builders.ts
+++ b/packages/build-utils/src/detect-builders.ts
@@ -538,7 +538,7 @@ function getMissingBuildScriptError() {
    code: 'missing_build_script',
    message:
      'Your `package.json` file is missing a `build` property inside the `scripts` property.' +
-      '\nLearn More: https://vercel.com/docs/v2/platform/frequently-asked-questions#missing-build-script',
+      '\nLearn More: https://vercel.link/missing-build-script',
  };
 }

--- a/packages/build-utils/src/fs/run-user-scripts.ts
+++ b/packages/build-utils/src/fs/run-user-scripts.ts
@@ -1,15 +1,19 @@
 import assert from 'assert';
 import fs from 'fs-extra';
 import path from 'path';
-import debug from '../debug';
+import Sema from 'async-sema';
 import spawn from 'cross-spawn';
 import { SpawnOptions } from 'child_process';
 import { deprecate } from 'util';
+import debug from '../debug';
 import { NowBuildError } from '../errors';
 import { Meta, PackageJson, NodeVersion, Config } from '../types';
 import { getSupportedNodeVersion, getLatestNodeVersion } from './node-version';
 import { readConfigFile } from './read-config-file';

+// Only allow one `runNpmInstall()` invocation to run concurrently
+const runNpmInstallSema = new Sema(1);
+
 export type CliType = 'yarn' | 'npm' | 'pnpm';

 export interface ScanParentDirsResult {
@@ -17,6 +21,11 @@ export interface ScanParentDirsResult {
   * "yarn", "npm", or "pnpm" depending on the presence of lockfiles.
   */
  cliType: CliType;
+  /**
+   * The file path of found `package.json` file, or `undefined` if none was
+   * found.
+   */
+  packageJsonPath?: string;
  /**
   * The contents of found `package.json` file, when the `readPackageJson`
   * option is enabled.
@@ -213,6 +222,12 @@ export async function getNodeVersion(
    const latest = getLatestNodeVersion();
    return { ...latest, runtime: 'nodejs' };
  }
+  if (process.env.ENABLE_EXPERIMENTAL_NODE16 === '1') {
+    console.warn(
+      'Warning: Using experimental Node.js 16.x due to ENABLE_EXPERIMENTAL_NODE16=1'
+    );
+    return { major: 16, range: '16.x', runtime: 'nodejs16.x' };
+  }
  const { packageJson } = await scanParentDirs(destPath, true);
  let { nodeVersion } = config;
  let isAuto = true;
@@ -237,12 +252,13 @@ export async function scanParentDirs(

  let cliType: CliType = 'yarn';
  let packageJson: PackageJson | undefined;
+  let packageJsonPath: string | undefined;
  let currentDestPath = destPath;
  let lockfileVersion: number | undefined;

  // eslint-disable-next-line no-constant-condition
  while (true) {
-    const packageJsonPath = path.join(currentDestPath, 'package.json');
+    packageJsonPath = path.join(currentDestPath, 'package.json');
    // eslint-disable-next-line no-await-in-loop
    if (await fs.pathExists(packageJsonPath)) {
      // Only read the contents of the *first* `package.json` file found,
@@ -269,15 +285,17 @@ export async function scanParentDirs(
        ),
      ]);

-      if (packageLockJson && !hasYarnLock && !pnpmLockYaml) {
-        cliType = 'npm';
-        lockfileVersion = packageLockJson.lockfileVersion;
-      }
-
-      if (!packageLockJson && !hasYarnLock && pnpmLockYaml) {
+      // Priority order is Yarn > pnpm > npm
+      // - find highest priority lock file and use that
+      if (hasYarnLock) {
+        cliType = 'yarn';
+      } else if (pnpmLockYaml) {
        cliType = 'pnpm';
        // just ensure that it is read as a number and not a string
        lockfileVersion = Number(pnpmLockYaml.lockfileVersion);
+      } else if (packageLockJson) {
+        cliType = 'npm';
+        lockfileVersion = packageLockJson.lockfileVersion;
      }

      // Only stop iterating if a lockfile was found, because it's possible
@@ -293,7 +311,7 @@ export async function scanParentDirs(
    currentDestPath = newDestPath;
  }

-  return { cliType, packageJson, lockfileVersion };
+  return { cliType, packageJson, lockfileVersion, packageJsonPath };
 }

 export async function walkParentDirs({
@@ -319,55 +337,87 @@ export async function walkParentDirs({
  return null;
 }

+function isSet<T>(v: any): v is Set<T> {
+  return v?.constructor?.name === 'Set';
+}
+
 export async function runNpmInstall(
  destPath: string,
  args: string[] = [],
  spawnOpts?: SpawnOptions,
  meta?: Meta,
  nodeVersion?: NodeVersion
-) {
+): Promise<boolean> {
  if (meta?.isDev) {
    debug('Skipping dependency installation because dev mode is enabled');
-    return;
+    return false;
  }

  assert(path.isAbsolute(destPath));
-  debug(`Installing to ${destPath}`);

-  const { cliType, lockfileVersion } = await scanParentDirs(destPath);
-  const opts: SpawnOptionsExtended = { cwd: destPath, ...spawnOpts };
-  const env = opts.env ? { ...opts.env } : { ...process.env };
-  delete env.NODE_ENV;
-  opts.env = getEnvForPackageManager({
-    cliType,
-    lockfileVersion,
-    nodeVersion,
-    env,
-  });
-  let commandArgs: string[];
+  try {
+    await runNpmInstallSema.acquire();
+    const { cliType, packageJsonPath, lockfileVersion } = await scanParentDirs(
+      destPath
+    );

-  if (cliType === 'npm') {
-    opts.prettyCommand = 'npm install';
-    commandArgs = args
-      .filter(a => a !== '--prefer-offline')
-      .concat(['install', '--no-audit', '--unsafe-perm']);
-  } else if (cliType === 'pnpm') {
-    // PNPM's install command is similar to NPM's but without the audit nonsense
-    // @see options https://pnpm.io/cli/install
-    opts.prettyCommand = 'pnpm install';
-    commandArgs = args
-      .filter(a => a !== '--prefer-offline')
-      .concat(['install', '--unsafe-perm']);
-  } else {
-    opts.prettyCommand = 'yarn install';
-    commandArgs = ['install', ...args];
+    // Only allow `runNpmInstall()` to run once per `package.json`
+    // when doing a default install (no additional args)
+    if (meta && packageJsonPath && args.length === 0) {
+      if (!isSet<string>(meta.runNpmInstallSet)) {
+        meta.runNpmInstallSet = new Set<string>();
+      }
+      if (isSet<string>(meta.runNpmInstallSet)) {
+        if (meta.runNpmInstallSet.has(packageJsonPath)) {
+          return false;
+        } else {
+          meta.runNpmInstallSet.add(packageJsonPath);
+        }
+      }
+    }
+
+    const installTime = Date.now();
+    console.log('Installing dependencies...');
+    debug(`Installing to ${destPath}`);
+
+    const opts: SpawnOptionsExtended = { cwd: destPath, ...spawnOpts };
+    const env = opts.env ? { ...opts.env } : { ...process.env };
+    delete env.NODE_ENV;
+    opts.env = getEnvForPackageManager({
+      cliType,
+      lockfileVersion,
+      nodeVersion,
+      env,
+    });
+    let commandArgs: string[];
+
+    if (cliType === 'npm') {
+      opts.prettyCommand = 'npm install';
+      commandArgs = args
+        .filter(a => a !== '--prefer-offline')
+        .concat(['install', '--no-audit', '--unsafe-perm']);
+    } else if (cliType === 'pnpm') {
+      // PNPM's install command is similar to NPM's but without the audit nonsense
+      // @see options https://pnpm.io/cli/install
+      opts.prettyCommand = 'pnpm install';
+      commandArgs = args
+        .filter(a => a !== '--prefer-offline')
+        .concat(['install', '--unsafe-perm']);
+    } else {
+      opts.prettyCommand = 'yarn install';
+      commandArgs = ['install', ...args];
+    }
+
+    if (process.env.NPM_ONLY_PRODUCTION) {
+      commandArgs.push('--production');
+    }
+
+    await spawnAsync(cliType, commandArgs, opts);
+    debug(`Install complete [${Date.now() - installTime}ms]`);
+    return true;
+  } finally {
+    runNpmInstallSema.release();
  }
-
-  if (process.env.NPM_ONLY_PRODUCTION) {
-    commandArgs.push('--production');
-  }
-
-  return spawnAsync(cliType, commandArgs, opts);
 }

 export function getEnvForPackageManager({
@@ -392,6 +442,16 @@ export function getEnvForPackageManager({
      newEnv.PATH = `/node16/bin-npm7:${env.PATH}`;
      console.log('Detected `package-lock.json` generated by npm 7...');
    }
+  } else if (cliType === 'pnpm') {
+    if (
+      typeof lockfileVersion === 'number' &&
+      lockfileVersion === 5.4 &&
+      (nodeVersion?.major || 0) > 12
+    ) {
+      // Ensure that pnpm 7 is at the beginning of the `$PATH`
+      newEnv.PATH = `/pnpm7/pnpm:${env.PATH}`;
+      console.log('Detected `pnpm-lock.yaml` generated by pnpm 7...');
+    }
  } else {
    // Yarn v2 PnP mode may be activated, so force "node-modules" linker style
    if (!env.YARN_NODE_LINKER) {
@@ -502,7 +562,7 @@ export async function runPipInstall(
  meta?: Meta
 ) {
  if (meta && meta.isDev) {
-    debug('Skipping dependency installation because dev mode is enabled');
+    debug('Skipping dependency installation because dev mode is enabled');
    return;
  }

--- a/packages/build-utils/src/index.ts
+++ b/packages/build-utils/src/index.ts
@@ -33,7 +33,6 @@ import {
  getDiscontinuedNodeVersions,
 } from './fs/node-version';
 import streamToBuffer from './fs/stream-to-buffer';
-import shouldServe from './should-serve';
 import debug from './debug';
 import getIgnoreFilter from './get-ignore-filter';
 import { getPlatformEnv } from './get-platform-env';
@@ -73,7 +72,6 @@ export {
  getSpawnOptions,
  getPlatformEnv,
  streamToBuffer,
-  shouldServe,
  debug,
  isSymbolicLink,
  getLambdaOptionsFromFunction,
@@ -94,6 +92,7 @@ export { DetectorFilesystem } from './detectors/filesystem';
 export { readConfigFile } from './fs/read-config-file';
 export { normalizePath } from './fs/normalize-path';

+export * from './should-serve';
 export * from './schemas';
 export * from './types';
 export * from './errors';
@@ -116,3 +115,5 @@ export const isOfficialRuntime = (desired: string, name?: string): boolean => {
 export const isStaticRuntime = (name?: string): boolean => {
  return isOfficialRuntime('static', name);
 };
+
+export { workspaceManagers } from './workspaces/workspace-managers';
--- a/packages/build-utils/src/should-serve.ts
+++ b/packages/build-utils/src/should-serve.ts
@@ -1,12 +1,12 @@
 import { parse } from 'path';
-import { ShouldServeOptions } from './types';
-import FileFsRef from './file-fs-ref';
+import type FileFsRef from './file-fs-ref';
+import type { ShouldServe } from './types';

-export default function shouldServe({
+export const shouldServe: ShouldServe = ({
  entrypoint,
  files,
  requestPath,
-}: ShouldServeOptions): boolean {
+}) => {
  requestPath = requestPath.replace(/\/$/, ''); // sanitize trailing '/'
  entrypoint = entrypoint.replace(/\\/, '/'); // windows compatibility

@@ -20,7 +20,7 @@ export default function shouldServe({
  }

  return false;
-}
+};

 function hasProp(obj: { [path: string]: FileFsRef }, key: string): boolean {
  return Object.hasOwnProperty.call(obj, key);
--- a/packages/build-utils/src/types.ts
+++ b/packages/build-utils/src/types.ts
@@ -332,6 +332,7 @@ export interface ProjectSettings {
  sourceFilesOutsideRootDirectory?: boolean;
  directoryListing?: boolean;
  gitForkProtection?: boolean;
+  commandForIgnoringBuildStep?: string | null;
 }

 export interface BuilderV2 {
@@ -344,6 +345,7 @@ export interface BuilderV3 {
  version: 3;
  build: BuildV3;
  prepareCache?: PrepareCache;
+  shouldServe?: ShouldServe;
  startDevServer?: StartDevServer;
 }

@@ -356,7 +358,29 @@ export interface Images {
  formats?: ImageFormat[];
 }

-export interface BuildResultV2 {
+/**
+ * If a Builder ends up creating filesystem outputs conforming to
+ * the Build Output API, then the Builder should return this type.
+ */
+export interface BuildResultBuildOutput {
+  /**
+   * Version number of the Build Output API that was created.
+   * Currently only `3` is a valid value.
+   * @example 3
+   */
+  buildOutputVersion: 3;
+  /**
+   * Filesystem path to the Build Output directory.
+   * @example "/path/to/.vercel/output"
+   */
+  buildOutputPath: string;
+}
+
+/**
+ * When a Builder implements `version: 2`, the `build()` function is expected
+ * to return this type.
+ */
+export interface BuildResultV2Typical {
  // TODO: use proper `Route` type from `routing-utils` (perhaps move types to a common package)
  routes?: any[];
  images?: Images;
@@ -369,6 +393,8 @@ export interface BuildResultV2 {
  }>;
 }

+export type BuildResultV2 = BuildResultV2Typical | BuildResultBuildOutput;
+
 export interface BuildResultV3 {
  output: Lambda;
 }
@@ -376,6 +402,9 @@ export interface BuildResultV3 {
 export type BuildV2 = (options: BuildOptions) => Promise<BuildResultV2>;
 export type BuildV3 = (options: BuildOptions) => Promise<BuildResultV3>;
 export type PrepareCache = (options: PrepareCacheOptions) => Promise<Files>;
+export type ShouldServe = (
+  options: ShouldServeOptions
+) => boolean | Promise<boolean>;
 export type StartDevServer = (
  options: StartDevServerOptions
 ) => Promise<StartDevServerResult>;
--- a/packages/build-utils/src/workspaces/workspace-managers.ts
+++ b/packages/build-utils/src/workspaces/workspace-managers.ts
@@ -0,0 +1,129 @@
+import type { Framework } from '@vercel/frameworks';
+
+/**
+ * The supported list of workspace managers.
+ *
+ * This list is designed to work with the @see {@link detectFramework} function.
+ *
+ * @example
+ *   import { workspaceManagers as frameworkList } from '@vercel/build-utils/workspaces'
+ *   import { detectFramework } from '@vercel/build-utils'
+ *
+ *   const fs = new GitDetectorFilesystem(...)
+ *   detectFramwork({ fs, frameworkList }) // returns the 'slug' field if detected, otherwise null
+ *
+ * @todo Will be used by the detect-eligible-projects API endpoint for a given git url.
+ */
+export const workspaceManagers: Array<Framework> = [
+  {
+    name: 'Yarn',
+    slug: 'yarn',
+    detectors: {
+      every: [
+        {
+          path: 'package.json',
+          matchContent:
+            '"workspaces":\\s*(?:\\[[^\\]]*]|{[^}]*"packages":[^}]*})',
+        },
+        {
+          path: 'yarn.lock',
+        },
+      ],
+    },
+    // unused props - needed for typescript
+    description: '',
+    logo: '',
+    settings: {
+      buildCommand: {
+        value: '',
+        placeholder: '',
+      },
+      devCommand: {
+        value: '',
+        placeholder: '',
+      },
+      installCommand: {
+        value: '',
+        placeholder: '',
+      },
+      outputDirectory: {
+        value: '',
+        placeholder: '',
+      },
+    },
+    getOutputDirName: () => Promise.resolve(''),
+  },
+  {
+    name: 'pnpm',
+    slug: 'pnpm',
+    detectors: {
+      every: [
+        {
+          path: 'pnpm-workspace.yaml',
+        },
+      ],
+    },
+    // unused props - needed for typescript
+    description: '',
+    logo: '',
+    settings: {
+      buildCommand: {
+        value: '',
+        placeholder: '',
+      },
+      devCommand: {
+        value: '',
+        placeholder: '',
+      },
+      installCommand: {
+        value: '',
+        placeholder: '',
+      },
+      outputDirectory: {
+        value: '',
+        placeholder: '',
+      },
+    },
+    getOutputDirName: () => Promise.resolve(''),
+  },
+  {
+    name: 'npm',
+    slug: 'npm',
+    detectors: {
+      every: [
+        {
+          path: 'package.json',
+          matchContent:
+            '"workspaces":\\s*(?:\\[[^\\]]*]|{[^}]*"packages":[^}]*})',
+        },
+        {
+          path: 'package-lock.json',
+        },
+      ],
+    },
+    // unused props - needed for typescript
+    description: '',
+    logo: '',
+    settings: {
+      buildCommand: {
+        value: '',
+        placeholder: '',
+      },
+      devCommand: {
+        value: '',
+        placeholder: '',
+      },
+      installCommand: {
+        value: '',
+        placeholder: '',
+      },
+      outputDirectory: {
+        value: '',
+        placeholder: '',
+      },
+    },
+    getOutputDirName: () => Promise.resolve(''),
+  },
+];
+
+export default workspaceManagers;
--- a/packages/build-utils/test/fixtures/02-zero-config-api/yarn.lock
+++ b/packages/build-utils/test/fixtures/02-zero-config-api/yarn.lock
@@ -0,0 +1,4 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
--- a/packages/build-utils/test/fixtures/25-multiple-lock-files-yarn/package-lock.json
+++ b/packages/build-utils/test/fixtures/25-multiple-lock-files-yarn/package-lock.json
--- a/packages/build-utils/test/fixtures/25-multiple-lock-files-yarn/package.json
+++ b/packages/build-utils/test/fixtures/25-multiple-lock-files-yarn/package.json
@@ -0,0 +1,14 @@
+{
+  "private": "true",
+  "name": "25-multiple-lock-files-yarn",
+  "workspaces": [
+    "a",
+    "b"
+  ],
+  "scripts": {
+    "build": "mkdir -p public && (printf \"yarn version: \" && yarn -v) > public/index.txt"
+  },
+  "dependencies": {
+    "once": "^1.4.0"
+  }
+}
--- a/packages/build-utils/test/fixtures/25-multiple-lock-files-yarn/pnpm-lock.yaml
+++ b/packages/build-utils/test/fixtures/25-multiple-lock-files-yarn/pnpm-lock.yaml
@@ -0,0 +1,19 @@
+lockfileVersion: 5.3
+
+specifiers:
+  once: ^1.4.0
+
+dependencies:
+  once: 1.4.0
+
+packages:
+
+  /once/1.4.0:
+    resolution: {integrity: sha1-WDsap3WWHUsROsF9nFC6753Xa9E=}
+    dependencies:
+      wrappy: 1.0.2
+    dev: false
+
+  /wrappy/1.0.2:
+    resolution: {integrity: sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=}
+    dev: false
--- a/packages/build-utils/test/fixtures/25-multiple-lock-files-yarn/vercel.json
+++ b/packages/build-utils/test/fixtures/25-multiple-lock-files-yarn/vercel.json
@@ -0,0 +1,11 @@
+{
+  "version": 2,
+  "builds": [{ "src": "package.json", "use": "@vercel/static-build" }],
+  "probes": [
+    {
+      "path": "/",
+      "mustContain": "yarn version: 1",
+      "logMustContain": "yarn run build"
+    }
+  ]
+}
--- a/packages/build-utils/test/fixtures/25-multiple-lock-files-yarn/yarn.lock
+++ b/packages/build-utils/test/fixtures/25-multiple-lock-files-yarn/yarn.lock
@@ -0,0 +1,15 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+once@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
+  dependencies:
+    wrappy "1"
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
--- a/packages/build-utils/test/fixtures/26-multiple-lock-files-pnpm/package-lock.json
+++ b/packages/build-utils/test/fixtures/26-multiple-lock-files-pnpm/package-lock.json
@@ -0,0 +1,44 @@
+{
+  "name": "26-multiple-lock-files-pnpm",
+  "version": "1.0.0",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "26-multiple-lock-files-pnpm",
+      "version": "1.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "once": "^1.4.0"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+    }
+  },
+  "dependencies": {
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+    }
+  }
+}
--- a/packages/build-utils/test/fixtures/26-multiple-lock-files-pnpm/package.json
+++ b/packages/build-utils/test/fixtures/26-multiple-lock-files-pnpm/package.json
@@ -0,0 +1,14 @@
+{
+  "private": "true",
+  "name": "26-multiple-lock-files-pnpm",
+  "workspaces": [
+    "a",
+    "b"
+  ],
+  "scripts": {
+    "build": "mkdir -p public && (printf \"pnpm version: \" && pnpm -v) > public/index.txt"
+  },
+  "dependencies": {
+    "once": "^1.4.0"
+  }
+}
--- a/packages/build-utils/test/fixtures/26-multiple-lock-files-pnpm/pnpm-lock.yaml
+++ b/packages/build-utils/test/fixtures/26-multiple-lock-files-pnpm/pnpm-lock.yaml
@@ -0,0 +1,19 @@
+lockfileVersion: 5.3
+
+specifiers:
+  once: ^1.4.0
+
+dependencies:
+  once: 1.4.0
+
+packages:
+
+  /once/1.4.0:
+    resolution: {integrity: sha1-WDsap3WWHUsROsF9nFC6753Xa9E=}
+    dependencies:
+      wrappy: 1.0.2
+    dev: false
+
+  /wrappy/1.0.2:
+    resolution: {integrity: sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=}
+    dev: false
--- a/packages/build-utils/test/fixtures/26-multiple-lock-files-pnpm/pnpm-workspace.yaml
+++ b/packages/build-utils/test/fixtures/26-multiple-lock-files-pnpm/pnpm-workspace.yaml
@@ -0,0 +1,3 @@
+packages:
+  - 'a'
+  - 'b'
--- a/packages/build-utils/test/fixtures/26-multiple-lock-files-pnpm/vercel.json
+++ b/packages/build-utils/test/fixtures/26-multiple-lock-files-pnpm/vercel.json
@@ -0,0 +1,11 @@
+{
+  "version": 2,
+  "builds": [{ "src": "package.json", "use": "@vercel/static-build" }],
+  "probes": [
+    {
+      "path": "/",
+      "mustContain": "pnpm version: 6",
+      "logMustContain": "pnpm run build"
+    }
+  ]
+}
--- a/packages/build-utils/test/fixtures/27-yarn-workspaces/a/package.json
+++ b/packages/build-utils/test/fixtures/27-yarn-workspaces/a/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "a",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "debug": "^4.3.2"
+  }
+}
--- a/packages/build-utils/test/fixtures/27-yarn-workspaces/b/package.json
+++ b/packages/build-utils/test/fixtures/27-yarn-workspaces/b/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "b",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "cowsay": "^1.5.0"
+  }
+}
--- a/packages/build-utils/test/fixtures/27-yarn-workspaces/package.json
+++ b/packages/build-utils/test/fixtures/27-yarn-workspaces/package.json
@@ -0,0 +1,9 @@
+{
+  "name": "21-npm-workspaces",
+  "version": "1.0.0",
+  "private": true,
+  "workspaces": [
+    "a",
+    "b"
+  ]
+}
--- a/packages/build-utils/test/fixtures/27-yarn-workspaces/yarn.lock
+++ b/packages/build-utils/test/fixtures/27-yarn-workspaces/yarn.lock
@@ -0,0 +1,232 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+ansi-regex@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.1.tgz#123d6479e92ad45ad897d4054e3c7ca7db4944e1"
+  integrity sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==
+
+ansi-regex@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
+  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
+
+ansi-styles@^4.0.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
+  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
+  dependencies:
+    color-convert "^2.0.1"
+
+camelcase@^5.0.0:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
+  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
+
+cliui@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1"
+  integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.0"
+    wrap-ansi "^6.2.0"
+
+color-convert@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
+  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
+  dependencies:
+    color-name "~1.1.4"
+
+color-name@~1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
+  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
+
+cowsay@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/cowsay/-/cowsay-1.5.0.tgz#4a2a453b8b59383c7d7a50e44d765c5de0bf615f"
+  integrity sha512-8Ipzr54Z8zROr/62C8f0PdhQcDusS05gKTS87xxdji8VbWefWly0k8BwGK7+VqamOrkv3eGsCkPtvlHzrhWsCA==
+  dependencies:
+    get-stdin "8.0.0"
+    string-width "~2.1.1"
+    strip-final-newline "2.0.0"
+    yargs "15.4.1"
+
+debug@^4.3.2:
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
+  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
+  dependencies:
+    ms "2.1.2"
+
+decamelize@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
+
+emoji-regex@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
+  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
+
+find-up@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
+  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
+  dependencies:
+    locate-path "^5.0.0"
+    path-exists "^4.0.0"
+
+get-caller-file@^2.0.1:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
+
+get-stdin@8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-8.0.0.tgz#cbad6a73feb75f6eeb22ba9e01f89aa28aa97a53"
+  integrity sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==
+
+is-fullwidth-code-point@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
+
+is-fullwidth-code-point@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
+  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
+
+locate-path@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
+  integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
+  dependencies:
+    p-locate "^4.1.0"
+
+ms@2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+
+p-limit@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
+  integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
+  dependencies:
+    p-try "^2.0.0"
+
+p-locate@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
+  integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
+  dependencies:
+    p-limit "^2.2.0"
+
+p-try@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
+  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
+
+path-exists@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
+  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
+
+require-directory@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
+
+require-main-filename@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
+  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
+
+set-blocking@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
+
+string-width@^4.1.0, string-width@^4.2.0:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+string-width@~2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
+  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
+  dependencies:
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^4.0.0"
+
+strip-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
+  dependencies:
+    ansi-regex "^3.0.0"
+
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+strip-final-newline@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
+  integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
+
+which-module@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
+  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
+
+wrap-ansi@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
+  integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
+y18n@^4.0.0:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
+  integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==
+
+yargs-parser@^18.1.2:
+  version "18.1.3"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
+  integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
+  dependencies:
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
+
+yargs@15.4.1:
+  version "15.4.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
+  integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==
+  dependencies:
+    cliui "^6.0.0"
+    decamelize "^1.2.0"
+    find-up "^4.1.0"
+    get-caller-file "^2.0.1"
+    require-directory "^2.1.1"
+    require-main-filename "^2.0.0"
+    set-blocking "^2.0.0"
+    string-width "^4.2.0"
+    which-module "^2.0.0"
+    y18n "^4.0.0"
+    yargs-parser "^18.1.2"
--- a/packages/build-utils/test/fixtures/28-pnpm-7/package.json
+++ b/packages/build-utils/test/fixtures/28-pnpm-7/package.json
@@ -0,0 +1,9 @@
+{
+  "private": "true",
+  "scripts": {
+    "build": "mkdir -p public && (printf \"pnpm version: \" && pnpm -v) > public/index.txt"
+  },
+  "dependencies": {
+    "once": "^1.4.0"
+  }
+}
--- a/packages/build-utils/test/fixtures/28-pnpm-7/pnpm-lock.yaml
+++ b/packages/build-utils/test/fixtures/28-pnpm-7/pnpm-lock.yaml
@@ -0,0 +1,19 @@
+lockfileVersion: 5.4
+
+specifiers:
+  once: ^1.4.0
+
+dependencies:
+  once: 1.4.0
+
+packages:
+
+  /once/1.4.0:
+    resolution: {integrity: sha1-WDsap3WWHUsROsF9nFC6753Xa9E=}
+    dependencies:
+      wrappy: 1.0.2
+    dev: false
+
+  /wrappy/1.0.2:
+    resolution: {integrity: sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=}
+    dev: false
--- a/packages/build-utils/test/fixtures/28-pnpm-7/vercel.json
+++ b/packages/build-utils/test/fixtures/28-pnpm-7/vercel.json
@@ -0,0 +1,11 @@
+{
+  "version": 2,
+  "builds": [{ "src": "package.json", "use": "@vercel/static-build" }],
+  "probes": [
+    {
+      "path": "/",
+      "mustContain": "pnpm version: 7",
+      "logMustContain": "pnpm run build"
+    }
+  ]
+}
--- a/packages/build-utils/test/integration.test.ts
+++ b/packages/build-utils/test/integration.test.ts
@@ -32,6 +32,7 @@ const skipFixtures: string[] = [
  '08-zero-config-middleman',
  '21-npm-workspaces',
  '23-pnpm-workspaces',
+  '27-yarn-workspaces',
 ];

 // eslint-disable-next-line no-restricted-syntax
--- a/packages/build-utils/test/unit.detect-workspace-managers.test.ts
+++ b/packages/build-utils/test/unit.detect-workspace-managers.test.ts
@@ -0,0 +1,31 @@
+import path from 'path';
+import { detectFramework } from '../src/detect-framework';
+import workspaceManagers from '../src/workspaces/workspace-managers';
+import { FixtureFilesystem } from './utils/fixture-filesystem';
+
+describe('workspace-managers', () => {
+  describe.each([
+    ['npm', '21-npm-workspaces'],
+    ['pnpm', '23-pnpm-workspaces'],
+    ['yarn', '27-yarn-workspaces'],
+    ['yarn', '25-multiple-lock-files-yarn'],
+    ['pnpm', '26-multiple-lock-files-pnpm'],
+    [null, '22-pnpm'],
+  ])('with detectFramework', (frameworkSlug, fixturePath) => {
+    const testName = frameworkSlug
+      ? `should detect a ${frameworkSlug} workspace for ${fixturePath}`
+      : `should not detect framework for ${fixturePath}`;
+
+    it(testName, async () => {
+      const fixture = path.join(__dirname, 'fixtures', fixturePath);
+      const fs = new FixtureFilesystem(fixture);
+
+      const result = await detectFramework({
+        fs,
+        frameworkList: workspaceManagers,
+      });
+
+      expect(result).toBe(frameworkSlug);
+    });
+  });
+});
--- a/packages/build-utils/test/unit.get-env-for-package-manager.test.ts
+++ b/packages/build-utils/test/unit.get-env-for-package-manager.test.ts
@@ -1,16 +1,17 @@
 import assert from 'assert';
-import { getEnvForPackageManager, NodeVersion } from '../src';
-import { CliType } from '../src/fs/run-user-scripts';
+import { getEnvForPackageManager } from '../src';

 describe('Test `getEnvForPackageManager()`', () => {
-  const cases = [
+  const cases: Array<{
+    name: string;
+    args: Parameters<typeof getEnvForPackageManager>[0];
+    want: unknown;
+  }> = [
    {
      name: 'should do nothing to env for npm < 6 and node < 16',
      args: {
-        cliType: 'npm' as CliType,
-        nodeVersion: {
-          major: 14,
-        } as NodeVersion,
+        cliType: 'npm',
+        nodeVersion: { major: 14, range: '14.x', runtime: 'nodejs14.x' },
        lockfileVersion: 1,
        env: {
          FOO: 'bar',
@@ -23,10 +24,8 @@ describe('Test `getEnvForPackageManager()`', () => {
    {
      name: 'should set path if npm 7+ is detected and node < 16',
      args: {
-        cliType: 'npm' as CliType,
-        nodeVersion: {
-          major: 14,
-        } as NodeVersion,
+        cliType: 'npm',
+        nodeVersion: { major: 14, range: '14.x', runtime: 'nodejs14.x' },
        lockfileVersion: 2,
        env: {
          FOO: 'bar',
@@ -41,10 +40,8 @@ describe('Test `getEnvForPackageManager()`', () => {
    {
      name: 'should not set path if node is 16 and npm 7+ is detected',
      args: {
-        cliType: 'npm' as CliType,
-        nodeVersion: {
-          major: 16,
-        } as NodeVersion,
+        cliType: 'npm',
+        nodeVersion: { major: 16, range: '16.x', runtime: 'nodejs16.x' },
        lockfileVersion: 2,
        env: {
          FOO: 'bar',
@@ -59,10 +56,8 @@ describe('Test `getEnvForPackageManager()`', () => {
    {
      name: 'should set YARN_NODE_LINKER w/yarn if it is not already defined',
      args: {
-        cliType: 'yarn' as CliType,
-        nodeVersion: {
-          major: 16,
-        } as NodeVersion,
+        cliType: 'yarn',
+        nodeVersion: { major: 16, range: '16.x', runtime: 'nodejs16.x' },
        lockfileVersion: 2,
        env: {
          FOO: 'bar',
@@ -76,10 +71,8 @@ describe('Test `getEnvForPackageManager()`', () => {
    {
      name: 'should not set YARN_NODE_LINKER if it already exists',
      args: {
-        cliType: 'yarn' as CliType,
-        nodeVersion: {
-          major: 16,
-        } as NodeVersion,
+        cliType: 'yarn',
+        nodeVersion: { major: 16, range: '16.x', runtime: 'nodejs16.x' },
        lockfileVersion: 2,
        env: {
          FOO: 'bar',
@@ -91,6 +84,50 @@ describe('Test `getEnvForPackageManager()`', () => {
        YARN_NODE_LINKER: 'exists',
      },
    },
+    {
+      name: 'should set path if pnpm 7+ is detected and Node version is greater than 12',
+      args: {
+        cliType: 'pnpm',
+        nodeVersion: { major: 16, range: '16.x', runtime: 'nodejs16.x' },
+        lockfileVersion: 5.4,
+        env: {
+          FOO: 'bar',
+          PATH: 'foo',
+        },
+      },
+      want: {
+        FOO: 'bar',
+        PATH: '/pnpm7/pnpm:foo',
+      },
+    },
+    {
+      name: 'should not set path if pnpm 7+ is detected and Node version is less than or equal to 12',
+      args: {
+        cliType: 'pnpm',
+        nodeVersion: { major: 12, range: '12.x', runtime: 'nodejs12.x' },
+        lockfileVersion: 5.4,
+        env: {
+          FOO: 'bar',
+        },
+      },
+      want: {
+        FOO: 'bar',
+      },
+    },
+    {
+      name: 'should not set path if pnpm 6 is detected',
+      args: {
+        cliType: 'pnpm',
+        nodeVersion: { major: 14, range: '14.x', runtime: 'nodejs14.x' },
+        lockfileVersion: 5.3,
+        env: {
+          FOO: 'bar',
+        },
+      },
+      want: {
+        FOO: 'bar',
+      },
+    },
  ];

  for (const { name, want, args } of cases) {
--- a/packages/build-utils/test/unit.test.ts
+++ b/packages/build-utils/test/unit.test.ts
@@ -15,6 +15,7 @@ import {
  runPackageJsonScript,
  scanParentDirs,
  FileBlob,
+  Meta,
 } from '../src';

 async function expectBuilderError(promise: Promise<any>, pattern: string) {
@@ -276,6 +277,16 @@ it('should not warn when package.json engines matches project setting from confi
  expect(warningMessages).toStrictEqual([]);
 });

+it('should select nodejs16.x with ENABLE_EXPERIMENTAL_NODE16', async () => {
+  process.env.ENABLE_EXPERIMENTAL_NODE16 = '1';
+  const result = await getNodeVersion('/tmp', undefined, {}, {});
+  delete process.env.ENABLE_EXPERIMENTAL_NODE16;
+  expect(result).toEqual({ major: 16, range: '16.x', runtime: 'nodejs16.x' });
+  expect(warningMessages).toStrictEqual([
+    'Warning: Using experimental Node.js 16.x due to ENABLE_EXPERIMENTAL_NODE16=1',
+  ]);
+});
+
 it('should get latest node version', async () => {
  expect(getLatestNodeVersion()).toHaveProperty('major', 14);
 });
@@ -413,3 +424,39 @@ it('should detect pnpm Workspaces', async () => {
  expect(result.cliType).toEqual('pnpm');
  expect(result.lockfileVersion).toEqual(5.3);
 });
+
+it('should only invoke `runNpmInstall()` once per `package.json` file (serial)', async () => {
+  const meta: Meta = {};
+  const fixture = path.join(__dirname, 'fixtures', '02-zero-config-api');
+  const apiDir = path.join(fixture, 'api');
+  const run1 = await runNpmInstall(apiDir, [], undefined, meta);
+  expect(run1).toEqual(true);
+  expect(
+    (meta.runNpmInstallSet as Set<string>).has(
+      path.join(fixture, 'package.json')
+    )
+  ).toEqual(true);
+  const run2 = await runNpmInstall(apiDir, [], undefined, meta);
+  expect(run2).toEqual(false);
+  const run3 = await runNpmInstall(fixture, [], undefined, meta);
+  expect(run3).toEqual(false);
+});
+
+it('should only invoke `runNpmInstall()` once per `package.json` file (parallel)', async () => {
+  const meta: Meta = {};
+  const fixture = path.join(__dirname, 'fixtures', '02-zero-config-api');
+  const apiDir = path.join(fixture, 'api');
+  const [run1, run2, run3] = await Promise.all([
+    runNpmInstall(apiDir, [], undefined, meta),
+    runNpmInstall(apiDir, [], undefined, meta),
+    runNpmInstall(fixture, [], undefined, meta),
+  ]);
+  expect(run1).toEqual(true);
+  expect(run2).toEqual(false);
+  expect(run3).toEqual(false);
+  expect(
+    (meta.runNpmInstallSet as Set<string>).has(
+      path.join(fixture, 'package.json')
+    )
+  ).toEqual(true);
+});
--- a/packages/build-utils/test/utils/fixture-filesystem.ts
+++ b/packages/build-utils/test/utils/fixture-filesystem.ts
@@ -0,0 +1,35 @@
+import { promises } from 'fs';
+import path from 'path';
+
+import { DetectorFilesystem } from '../../src';
+
+const { stat, readFile } = promises;
+
+export class FixtureFilesystem extends DetectorFilesystem {
+  private rootPath: string;
+
+  constructor(fixturePath: string) {
+    super();
+
+    this.rootPath = fixturePath;
+  }
+
+  async _hasPath(name: string): Promise<boolean> {
+    try {
+      const filePath = path.join(this.rootPath, name);
+      await stat(filePath);
+
+      return true;
+    } catch {
+      return false;
+    }
+  }
+  async _readFile(name: string): Promise<Buffer> {
+    const filePath = path.join(this.rootPath, name);
+    return readFile(filePath);
+  }
+  async _isFile(name: string): Promise<boolean> {
+    const filePath = path.join(this.rootPath, name);
+    return (await stat(filePath)).isFile();
+  }
+}
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
  "name": "vercel",
-  "version": "24.1.0",
+  "version": "24.2.1-canary.2",
  "preferGlobal": true,
  "license": "Apache-2.0",
  "description": "The command-line interface for Vercel",
@@ -43,14 +43,15 @@
    "node": ">= 12"
  },
  "dependencies": {
-    "@vercel/build-utils": "2.15.1",
-    "@vercel/go": "1.3.2",
-    "@vercel/node": "1.14.1",
-    "@vercel/python": "2.2.2",
-    "@vercel/ruby": "1.3.2",
+    "@vercel/build-utils": "2.16.1-canary.2",
+    "@vercel/go": "1.4.1-canary.2",
+    "@vercel/node": "1.15.1-canary.2",
+    "@vercel/python": "2.3.1-canary.2",
+    "@vercel/ruby": "1.3.4-canary.2",
    "update-notifier": "4.1.0"
  },
  "devDependencies": {
+    "@alex_neo/jest-expect-message": "1.0.5",
    "@next/env": "11.1.2",
    "@sentry/node": "5.5.0",
    "@sindresorhus/slugify": "0.11.0",
@@ -68,7 +69,8 @@
    "@types/glob": "7.1.1",
    "@types/http-proxy": "1.16.2",
    "@types/inquirer": "7.3.1",
-    "@types/jest": "27.0.1",
+    "@types/jest": "27.4.1",
+    "@types/jest-expect-message": "1.0.3",
    "@types/load-json-file": "2.0.7",
    "@types/mime-types": "2.1.0",
    "@types/minimatch": "3.0.3",
@@ -88,11 +90,9 @@
    "@types/update-notifier": "5.1.0",
    "@types/which": "1.3.2",
    "@types/write-json-file": "2.2.1",
-    "@vercel/client": "10.4.1",
-    "@vercel/fetch-retry": "5.0.3",
-    "@vercel/frameworks": "0.7.1",
+    "@vercel/client": "11.0.1-canary.2",
+    "@vercel/frameworks": "0.8.1-canary.0",
    "@vercel/ncc": "0.24.0",
-    "@vercel/nft": "0.17.5",
    "@zeit/fun": "0.11.2",
    "@zeit/source-map-support": "0.6.2",
    "ajv": "6.12.2",
@@ -177,6 +177,9 @@
        "isolatedModules": true
      }
    },
+    "setupFilesAfterEnv": [
+      "@alex_neo/jest-expect-message"
+    ],
    "verbose": false,
    "testEnvironment": "node",
    "testMatch": [
--- a/packages/cli/src/commands/alias/set.ts
+++ b/packages/cli/src/commands/alias/set.ts
@@ -73,7 +73,7 @@ export default async function set(
  if (args.length === 0) {
    output.error(
      `To ship to production, optionally configure your domains (${link(
-        'https://vercel.com/docs/v2/custom-domains'
+        'https://vercel.link/domain-configuration'
      )}) and run ${getCommandName(`--prod`)}.`
    );
    return 1;
--- a/packages/cli/src/commands/deploy/index.ts
+++ b/packages/cli/src/commands/deploy/index.ts
@@ -61,6 +61,8 @@ import { getPreferredPreviewURL } from '../../util/deploy/get-preferred-preview-
 import { Output } from '../../util/output';
 import { help } from './args';
 import { getDeploymentChecks } from '../../util/deploy/get-deployment-checks';
+import parseTarget from '../../util/deploy/parse-target';
+import getPrebuiltJson from '../../util/deploy/get-prebuilt-json';

 export default async (client: Client) => {
  const { output } = client;
@@ -155,7 +157,7 @@ export default async (client: Client) => {
    }
  }

-  const { log, debug, error, warn, isTTY } = output;
+  const { log, debug, error, prettyError, isTTY } = output;

  const quiet = !isTTY;

@@ -181,6 +183,46 @@ export default async (client: Client) => {
    );
  }

+  // build `target`
+  const target = parseTarget(output, argv['--target'], argv['--prod']);
+  if (typeof target === 'number') {
+    return target;
+  }
+
+  // build `--prebuilt`
+  if (argv['--prebuilt']) {
+    const prebuiltExists = await fs.pathExists(join(path, '.vercel/output'));
+    if (!prebuiltExists) {
+      error(
+        `The ${param(
+          '--prebuilt'
+        )} option was used, but no prebuilt output found in ".vercel/output". Run ${getCommandName(
+          'build'
+        )} to generate a local build.`
+      );
+      return 1;
+    }
+
+    const prebuiltBuild = await getPrebuiltJson(path);
+    const assumedTarget = target || 'preview';
+    if (prebuiltBuild?.target && prebuiltBuild.target !== assumedTarget) {
+      let specifyTarget = '';
+      if (prebuiltBuild.target === 'production') {
+        specifyTarget = ` --prod`;
+      }
+
+      prettyError({
+        message: `The ${param(
+          '--prebuilt'
+        )} option was used with the target environment "${assumedTarget}", but the prebuilt output found in ".vercel/output" was built with target environment "${
+          prebuiltBuild.target
+        }". Please run ${getCommandName(`--prebuilt${specifyTarget}`)}.`,
+        link: 'https://vercel.link/prebuilt-environment-mismatch',
+      });
+      return 1;
+    }
+  }
+
  // retrieve `project` and `org` from .vercel
  const link = await getLinkedProject(client, path);

@@ -403,33 +445,6 @@ export default async (client: Client) => {
    .filter(Boolean);
  const regions = regionFlag.length > 0 ? regionFlag : localConfig.regions;

-  // build `target`
-  let target;
-  if (argv['--target']) {
-    const deprecatedTarget = argv['--target'];
-
-    if (!['staging', 'production'].includes(deprecatedTarget)) {
-      error(
-        `The specified ${param('--target')} ${code(
-          deprecatedTarget
-        )} is not valid`
-      );
-      return 1;
-    }
-
-    if (deprecatedTarget === 'production') {
-      warn(
-        'We recommend using the much shorter `--prod` option instead of `--target production` (deprecated)'
-      );
-    }
-
-    output.debug(`Setting target to ${deprecatedTarget}`);
-    target = deprecatedTarget;
-  } else if (argv['--prod']) {
-    output.debug('Setting target to production');
-    target = 'production';
-  }
-
  const currentTeam = org?.type === 'team' ? org.id : undefined;
  const now = new Now({
    client,
--- a/packages/cli/src/commands/dev/dev.ts
+++ b/packages/cli/src/commands/dev/dev.ts
@@ -10,6 +10,8 @@ import { ProjectSettings } from '../../types';
 import getDecryptedEnvRecords from '../../util/get-decrypted-env-records';
 import setupAndLink from '../../util/link/setup-and-link';
 import getSystemEnvValues from '../../util/env/get-system-env-values';
+import { getCommandName } from '../../util/pkg-name';
+import param from '../../util/output/param';

 type Options = {
  '--listen': string;
@@ -46,6 +48,13 @@ export default async function dev(
  }

  if (link.status === 'error') {
+    if (link.reason === 'HEADLESS') {
+      client.output.error(
+        `Command ${getCommandName(
+          'dev'
+        )} requires confirmation. Use option ${param('--confirm')} to confirm.`
+      );
+    }
    return link.exitCode;
  }

--- a/packages/cli/src/commands/env/index.ts
+++ b/packages/cli/src/commands/env/index.ts
@@ -115,9 +115,11 @@ export default async function main(client: Client) {
    return 2;
  }

-  const { subcommand, args } = getSubcommand(argv._.slice(1), COMMAND_CONFIG);
+  const cwd = argv['--cwd'] || process.cwd();
+  const subArgs = argv._.slice(1);
+  const { subcommand, args } = getSubcommand(subArgs, COMMAND_CONFIG);
  const { output, config } = client;
-  const link = await getLinkedProject(client);
+  const link = await getLinkedProject(client, cwd);
  if (link.status === 'error') {
    return link.exitCode;
  } else if (link.status === 'not_linked') {
@@ -144,7 +146,8 @@ export default async function main(client: Client) {
          ProjectEnvTarget.Development,
          argv,
          args,
-          output
+          output,
+          cwd
        );
      default:
        output.error(getInvalidSubcommand(COMMAND_CONFIG));
--- a/packages/cli/src/commands/env/pull.ts
+++ b/packages/cli/src/commands/env/pull.ts
@@ -1,5 +1,6 @@
 import chalk from 'chalk';
-import { closeSync, openSync, promises, readSync } from 'fs';
+import { outputFile } from 'fs-extra';
+import { closeSync, openSync, readSync } from 'fs';
 import { resolve } from 'path';
 import { Project, ProjectEnvTarget } from '../../types';
 import Client from '../../util/client';
@@ -12,7 +13,6 @@ import { Output } from '../../util/output';
 import param from '../../util/output/param';
 import stamp from '../../util/output/stamp';
 import { getCommandName } from '../../util/pkg-name';
-const { writeFile } = promises;

 const CONTENTS_PREFIX = '# Created by Vercel CLI\n';

@@ -49,7 +49,7 @@ export default async function pull(
  opts: Partial<Options>,
  args: string[],
  output: Output,
-  cwd: string = process.cwd()
+  cwd: string
 ) {
  if (args.length > 1) {
    output.error(
@@ -81,7 +81,7 @@ export default async function pull(
  }

  output.print(
-    `Downloading Development Environment Variables for Project ${chalk.bold(
+    `Downloading "${environment}" Environment Variables for Project ${chalk.bold(
      project.name
    )}\n`
  );
@@ -99,7 +99,9 @@ export default async function pull(
  const records = exposeSystemEnvs(
    projectEnvs,
    systemEnvValues,
-    project.autoExposeSystemEnvs
+    project.autoExposeSystemEnvs,
+    undefined,
+    environment
  );

  const contents =
@@ -109,7 +111,7 @@ export default async function pull(
      .join('\n') +
    '\n';

-  await writeFile(fullPath, contents, 'utf8');
+  await outputFile(fullPath, contents, 'utf8');

  output.print(
    `${prependEmoji(
--- a/packages/cli/src/commands/link/index.ts
+++ b/packages/cli/src/commands/link/index.ts
@@ -4,6 +4,8 @@ import getArgs from '../../util/get-args';
 import logo from '../../util/output/logo';
 import { getPkgName } from '../../util/pkg-name';
 import setupAndLink from '../../util/link/setup-and-link';
+import { getCommandName } from '../../util/pkg-name';
+import param from '../../util/output/param';

 const help = () => {
  console.log(`
@@ -67,6 +69,13 @@ export default async function main(client: Client) {
  });

  if (link.status === 'error') {
+    if (link.reason === 'HEADLESS') {
+      client.output.error(
+        `Command ${getCommandName(
+          'link'
+        )} requires confirmation. Use option ${param('--confirm')} to confirm.`
+      );
+    }
    return link.exitCode;
  } else if (link.status === 'not_linked') {
    // User aborted project linking questions
--- a/packages/cli/src/commands/pull.ts
+++ b/packages/cli/src/commands/pull.ts
@@ -4,7 +4,6 @@ import Client from '../util/client';
 import { ProjectEnvTarget } from '../types';
 import { emoji, prependEmoji } from '../util/emoji';
 import getArgs from '../util/get-args';
-import handleError from '../util/handle-error';
 import setupAndLink from '../util/link/setup-and-link';
 import logo from '../util/output/logo';
 import stamp from '../util/output/stamp';
@@ -16,7 +15,8 @@ import {
 } from '../util/projects/link';
 import { writeProjectSettings } from '../util/projects/project-settings';
 import envPull from './env/pull';
-
+import { getCommandName } from '../util/pkg-name';
+import param from '../util/output/param';
 import type { Project, Org } from '../types';
 import {
  isValidEnvTarget,
@@ -69,19 +69,14 @@ function processArgs(client: Client) {
 }

 function parseArgs(client: Client) {
-  try {
-    const argv = processArgs(client);
+  const argv = processArgs(client);

-    if (argv['--help']) {
-      help();
-      return 2;
-    }
-
-    return argv;
-  } catch (err) {
-    handleError(err);
-    return 1;
+  if (argv['--help']) {
+    help();
+    return 2;
  }
+
+  return argv;
 }

 type LinkResult = {
@@ -108,6 +103,13 @@ async function ensureLink(
  }

  if (link.status === 'error') {
+    if (link.reason === 'HEADLESS') {
+      client.output.error(
+        `Command ${getCommandName(
+          'pull'
+        )} requires confirmation. Use option ${param('--yes')} to confirm.`
+      );
+    }
    return link.exitCode;
  }

--- a/packages/cli/src/index.ts
+++ b/packages/cli/src/index.ts
@@ -82,7 +82,12 @@ let debug: (s: string) => void = () => {};
 let apiUrl = 'https://api.vercel.com';

 const main = async () => {
-  const { isTTY } = process.stdout;
+  let { isTTY } = process.stdout;
+  if (process.env.FORCE_TTY === '1') {
+    isTTY = true;
+    process.stdout.isTTY = true;
+    process.stdin.isTTY = true;
+  }

  let argv;

@@ -585,73 +590,73 @@ const main = async () => {
    let func: any;
    switch (targetCommand) {
      case 'alias':
-        func = await import('./commands/alias');
+        func = require('./commands/alias').default;
        break;
      case 'billing':
-        func = await import('./commands/billing');
+        func = require('./commands/billing').default;
        break;
      case 'bisect':
-        func = await import('./commands/bisect');
+        func = require('./commands/bisect').default;
        break;
      case 'certs':
-        func = await import('./commands/certs');
+        func = require('./commands/certs').default;
        break;
      case 'deploy':
-        func = await import('./commands/deploy');
+        func = require('./commands/deploy').default;
        break;
      case 'dev':
-        func = await import('./commands/dev');
+        func = require('./commands/dev').default;
        break;
      case 'dns':
-        func = await import('./commands/dns');
+        func = require('./commands/dns').default;
        break;
      case 'domains':
-        func = await import('./commands/domains');
+        func = require('./commands/domains').default;
        break;
      case 'env':
-        func = await import('./commands/env');
+        func = require('./commands/env').default;
        break;
      case 'init':
-        func = await import('./commands/init');
+        func = require('./commands/init').default;
        break;
      case 'inspect':
-        func = await import('./commands/inspect');
+        func = require('./commands/inspect').default;
        break;
      case 'link':
-        func = await import('./commands/link');
+        func = require('./commands/link').default;
        break;
      case 'list':
-        func = await import('./commands/list');
+        func = require('./commands/list').default;
        break;
      case 'logs':
-        func = await import('./commands/logs');
+        func = require('./commands/logs').default;
        break;
      case 'login':
-        func = await import('./commands/login');
+        func = require('./commands/login').default;
        break;
      case 'logout':
-        func = await import('./commands/logout');
+        func = require('./commands/logout').default;
        break;
      case 'projects':
-        func = await import('./commands/projects');
+        func = require('./commands/projects').default;
        break;
      case 'pull':
-        func = await import('./commands/pull');
+        func = require('./commands/pull').default;
        break;
      case 'remove':
-        func = await import('./commands/remove');
+        func = require('./commands/remove').default;
        break;
      case 'secrets':
-        func = await import('./commands/secrets');
+        func = require('./commands/secrets').default;
        break;
      case 'teams':
-        func = await import('./commands/teams');
+        func = require('./commands/teams').default;
        break;
      case 'update':
-        func = await import('./commands/update');
+        func = require('./commands/update').default;
        break;
      case 'whoami':
-        func = await import('./commands/whoami');
+        func = require('./commands/whoami').default;
        break;
      default:
        func = null;
--- a/packages/cli/src/types.ts
+++ b/packages/cli/src/types.ts
@@ -277,7 +277,17 @@ export interface PaginationOptions {
 export type ProjectLinkResult =
  | { status: 'linked'; org: Org; project: Project }
  | { status: 'not_linked'; org: null; project: null }
-  | { status: 'error'; exitCode: number };
+  | {
+      status: 'error';
+      exitCode: number;
+      reason?:
+        | 'HEADLESS'
+        | 'NOT_AUTHORIZED'
+        | 'TEAM_DELETED'
+        | 'PATH_IS_FILE'
+        | 'INVALID_ROOT_DIRECTORY'
+        | 'MISSING_PROJECT_SETTINGS';
+    };

 export interface Token {
  id: string;
--- a/packages/cli/src/util/deploy/get-prebuilt-json.ts
+++ b/packages/cli/src/util/deploy/get-prebuilt-json.ts
@@ -0,0 +1,12 @@
+import fs from 'fs-extra';
+import { join } from 'path';
+
+export default async function getPrebuiltJson(directory: string) {
+  try {
+    return await fs.readJSON(join(directory, '.vercel/output/builds.json'));
+  } catch (error) {
+    // ignoring error
+  }
+
+  return null;
+}
--- a/packages/cli/src/util/deploy/parse-target.ts
+++ b/packages/cli/src/util/deploy/parse-target.ts
@@ -0,0 +1,41 @@
+import { Output } from '../../util/output';
+import param from '../../util/output/param';
+import code from '../../util/output/code';
+
+/**
+ * Parses the environment target from the `--target` and `--prod` flags.
+ */
+export default function parseTarget(
+  output: Output,
+  targetArg?: string,
+  prodArg?: boolean
+): string | number | undefined {
+  if (targetArg) {
+    const deprecatedTarget = targetArg;
+
+    if (!['staging', 'production'].includes(deprecatedTarget)) {
+      output.error(
+        `The specified ${param('--target')} ${code(
+          deprecatedTarget
+        )} is not valid`
+      );
+      return 1;
+    }
+
+    if (deprecatedTarget === 'production') {
+      output.warn(
+        'We recommend using the much shorter `--prod` option instead of `--target production` (deprecated)'
+      );
+    }
+
+    output.debug(`Setting target to ${deprecatedTarget}`);
+    return deprecatedTarget;
+  }
+
+  if (prodArg) {
+    output.debug('Setting target to production');
+    return 'production';
+  }
+
+  return undefined;
+}
--- a/packages/cli/src/util/deploy/process-deployment.ts
+++ b/packages/cli/src/util/deploy/process-deployment.ts
@@ -9,7 +9,6 @@ import {
 import { Output } from '../output';
 // @ts-ignore
 import Now from '../../util';
-import { VercelConfig } from '../dev/types';
 import { Org } from '../../types';
 import ua from '../ua';
 import { linkFolderToProject } from '../projects/link';
@@ -43,7 +42,6 @@ export default async function processDeployment({
  uploadStamp: () => string;
  deployStamp: () => string;
  quiet: boolean;
-  nowConfig?: VercelConfig;
  force?: boolean;
  withCache?: boolean;
  org: Org;
@@ -62,7 +60,6 @@ export default async function processDeployment({
    deployStamp,
    force,
    withCache,
-    nowConfig,
    quiet,
    prebuilt,
    rootDirectory,
@@ -104,11 +101,7 @@ export default async function processDeployment({
  const indications = [];

  try {
-    for await (const event of createDeployment(
-      clientOptions,
-      requestBody,
-      nowConfig
-    )) {
+    for await (const event of createDeployment(clientOptions, requestBody)) {
      if (['tip', 'notice', 'warning'].includes(event.type)) {
        indications.push(event);
      }
--- a/packages/cli/src/util/index.ts
+++ b/packages/cli/src/util/index.ts
@@ -160,7 +160,6 @@ export default class Now extends EventEmitter {
      uploadStamp,
      deployStamp,
      quiet,
-      nowConfig,
      force: forceNew,
      withCache,
      org,
--- a/packages/cli/src/util/link/setup-and-link.ts
+++ b/packages/cli/src/util/link/setup-and-link.ts
@@ -6,6 +6,8 @@ import {
  getLinkedProject,
  linkFolderToProject,
  getVercelDirectory,
+  VERCEL_DIR_README,
+  VERCEL_DIR_PROJECT,
 } from '../projects/link';
 import createProject from '../projects/create-project';
 import updateProject from '../projects/update-project';
@@ -49,7 +51,7 @@ export default async function setupAndLink(
  const isFile = !isDirectory(path);
  if (isFile) {
    output.error(`Expected directory but found file: ${path}`);
-    return { status: 'error', exitCode: 1 };
+    return { status: 'error', exitCode: 1, reason: 'PATH_IS_FILE' };
  }
  const link = await getLinkedProject(client, path);
  const isTTY = process.stdout.isTTY;
@@ -65,7 +67,12 @@ export default async function setupAndLink(

  if (forceDelete) {
    const vercelDir = getVercelDirectory(path);
-    remove(vercelDir);
+    remove(join(vercelDir, VERCEL_DIR_README));
+    remove(join(vercelDir, VERCEL_DIR_PROJECT));
+  }
+
+  if (!isTTY && !autoConfirm) {
+    return { status: 'error', exitCode: 1, reason: 'HEADLESS' };
  }

  const shouldStartSetup =
@@ -87,9 +94,14 @@ export default async function setupAndLink(
      autoConfirm
    );
  } catch (err) {
-    if (err.code === 'NOT_AUTHORIZED' || err.code === 'TEAM_DELETED') {
+    if (err.code === 'NOT_AUTHORIZED') {
      output.prettyError(err);
-      return { status: 'error', exitCode: 1 };
+      return { status: 'error', exitCode: 1, reason: 'NOT_AUTHORIZED' };
+    }
+
+    if (err.code === 'TEAM_DELETED') {
+      output.prettyError(err);
+      return { status: 'error', exitCode: 1, reason: 'TEAM_DELETED' };
    }

    throw err;
@@ -135,7 +147,7 @@ export default async function setupAndLink(
    rootDirectory &&
    !(await validateRootDirectory(output, path, sourcePath, ''))
  ) {
-    return { status: 'error', exitCode: 1 };
+    return { status: 'error', exitCode: 1, reason: 'INVALID_ROOT_DIRECTORY' };
  }

  config.currentTeam = org.type === 'team' ? org.id : undefined;
@@ -191,7 +203,11 @@ export default async function setupAndLink(
        if (debug) {
          console.log(deployment);
        }
-        return { status: 'error', exitCode: 1 };
+        return {
+          status: 'error',
+          exitCode: 1,
+          reason: 'MISSING_PROJECT_SETTINGS',
+        };
      }

      const { projectSettings, framework } = deployment;
@@ -227,6 +243,7 @@ export default async function setupAndLink(
    return { status: 'linked', org, project };
  } catch (err) {
    handleError(err);
+
    return { status: 'error', exitCode: 1 };
  }
 }
--- a/packages/cli/src/util/projects/project-settings.ts
+++ b/packages/cli/src/util/projects/project-settings.ts
@@ -1,4 +1,4 @@
-import { writeFile } from 'fs-extra';
+import { outputJSON } from 'fs-extra';
 import { Org, Project, ProjectLink } from '../../types';
 import { getLinkFromDir, VERCEL_DIR, VERCEL_DIR_PROJECT } from './link';
 import { join } from 'path';
@@ -22,21 +22,22 @@ export async function writeProjectSettings(
  project: Project,
  org: Org
 ) {
-  return await writeFile(
-    join(cwd, VERCEL_DIR, VERCEL_DIR_PROJECT),
-    JSON.stringify({
-      projectId: project.id,
-      orgId: org.id,
-      settings: {
-        buildCommand: project.buildCommand,
-        devCommand: project.devCommand,
-        outputDirectory: project.outputDirectory,
-        directoryListing: project.directoryListing,
-        rootDirectory: project.rootDirectory,
-        framework: project.framework,
-      },
-    })
-  );
+  const data = {
+    projectId: project.id,
+    orgId: org.id,
+    settings: {
+      buildCommand: project.buildCommand,
+      devCommand: project.devCommand,
+      outputDirectory: project.outputDirectory,
+      directoryListing: project.directoryListing,
+      rootDirectory: project.rootDirectory,
+      framework: project.framework,
+    },
+  };
+  const path = join(cwd, VERCEL_DIR, VERCEL_DIR_PROJECT);
+  return await outputJSON(path, data, {
+    spaces: 2,
+  });
 }

 export async function readProjectSettings(cwd: string) {
--- a/packages/cli/test/commands/deploy.test.ts
+++ b/packages/cli/test/commands/deploy.test.ts
@@ -2,6 +2,10 @@ import { join } from 'path';
 import { fileNameSymbol } from '@vercel/client';
 import { client } from '../mocks/client';
 import deploy from '../../src/commands/deploy';
+import { setupFixture } from '../helpers/setup-fixture';
+import { defaultProject, useProject } from '../mocks/project';
+import { useTeams } from '../mocks/team';
+import { useUser } from '../mocks/user';

 describe('deploy', () => {
  it('should reject deploying a single file', async () => {
@@ -31,6 +35,59 @@ describe('deploy', () => {
    );
  });

+  it('should reject deploying a directory that does not contain ".vercel/output" when `--prebuilt` is used', async () => {
+    client.setArgv('deploy', __dirname, '--prebuilt');
+    const exitCode = await deploy(client);
+    expect(exitCode).toEqual(1);
+    expect(client.outputBuffer).toEqual(
+      'Error! The "--prebuilt" option was used, but no prebuilt output found in ".vercel/output". Run `vercel build` to generate a local build.\n'
+    );
+  });
+
+  it('should reject deploying a directory that was built with a different target environment when `--prebuilt --prod` is used on "preview" output', async () => {
+    const cwd = setupFixture('build-output-api-preview');
+
+    useUser();
+    useTeams('team_dummy');
+    useProject({
+      ...defaultProject,
+      id: 'build-output-api-preview',
+      name: 'build-output-api-preview',
+    });
+
+    client.setArgv('deploy', cwd, '--prebuilt', '--prod');
+    const exitCode = await deploy(client);
+    expect(exitCode).toEqual(1);
+    expect(client.outputBuffer).toEqual(
+      'Error! The "--prebuilt" option was used with the target environment "production",' +
+        ' but the prebuilt output found in ".vercel/output" was built with target environment "preview".' +
+        ' Please run `vercel --prebuilt`.\n' +
+        'Learn More: https://vercel.link/prebuilt-environment-mismatch\n'
+    );
+  });
+
+  it('should reject deploying a directory that was built with a different target environment when `--prebuilt` is used on "production" output', async () => {
+    const cwd = setupFixture('build-output-api-production');
+
+    useUser();
+    useTeams('team_dummy');
+    useProject({
+      ...defaultProject,
+      id: 'build-output-api-preview',
+      name: 'build-output-api-preview',
+    });
+
+    client.setArgv('deploy', cwd, '--prebuilt');
+    const exitCode = await deploy(client);
+    expect(exitCode).toEqual(1);
+    expect(client.outputBuffer).toEqual(
+      'Error! The "--prebuilt" option was used with the target environment "preview",' +
+        ' but the prebuilt output found in ".vercel/output" was built with target environment "production".' +
+        ' Please run `vercel --prebuilt --prod`.\n' +
+        'Learn More: https://vercel.link/prebuilt-environment-mismatch\n'
+    );
+  });
+
  it('should reject deploying "version: 1"', async () => {
    client.setArgv('deploy');
    client.localConfig = {
--- a/packages/cli/test/commands/env.test.ts
+++ b/packages/cli/test/commands/env.test.ts
@@ -0,0 +1,75 @@
+import fs from 'fs-extra';
+import path from 'path';
+import env from '../../src/commands/env';
+import { setupFixture } from '../helpers/setup-fixture';
+import { client } from '../mocks/client';
+import { defaultProject, useProject } from '../mocks/project';
+import { useTeams } from '../mocks/team';
+import { useUser } from '../mocks/user';
+
+describe('env', () => {
+  describe('pull', () => {
+    it('should handle pulling', async () => {
+      const cwd = setupFixture('vercel-env-pull');
+      useUser();
+      useTeams('team_dummy');
+      useProject({
+        ...defaultProject,
+        id: 'vercel-env-pull',
+        name: 'vercel-env-pull',
+      });
+      client.setArgv('env', 'pull', '--yes', '--cwd', cwd);
+      const exitCode = await env(client);
+      expect(exitCode, client.outputBuffer).toEqual(0);
+
+      const rawDevEnv = await fs.readFile(path.join(cwd, '.env'));
+
+      // check for development env value
+      const devFileHasDevEnv = rawDevEnv.toString().includes('SPECIAL_FLAG');
+      expect(devFileHasDevEnv).toBeTruthy();
+    });
+
+    it('should handle alternate filename', async () => {
+      const cwd = setupFixture('vercel-env-pull');
+      useUser();
+      useTeams('team_dummy');
+      useProject({
+        ...defaultProject,
+        id: 'vercel-env-pull',
+        name: 'vercel-env-pull',
+      });
+      client.setArgv('env', 'pull', 'other.env', '--yes', '--cwd', cwd);
+      const exitCode = await env(client);
+      expect(exitCode, client.outputBuffer).toEqual(0);
+
+      const rawDevEnv = await fs.readFile(path.join(cwd, 'other.env'));
+
+      // check for development env value
+      const devFileHasDevEnv = rawDevEnv.toString().includes('SPECIAL_FLAG');
+      expect(devFileHasDevEnv).toBeTruthy();
+    });
+
+    it('should expose production system env variables', async () => {
+      const cwd = setupFixture('vercel-env-pull');
+      useUser();
+      useTeams('team_dummy');
+      useProject({
+        ...defaultProject,
+        id: 'vercel-env-pull',
+        name: 'vercel-env-pull',
+        autoExposeSystemEnvs: true,
+      });
+
+      client.setArgv('env', 'pull', 'other.env', '--yes', '--cwd', cwd);
+      const exitCode = await env(client);
+      expect(exitCode, client.outputBuffer).toEqual(0);
+
+      const rawDevEnv = await fs.readFile(path.join(cwd, 'other.env'));
+
+      const productionFileHasVercelEnv = rawDevEnv
+        .toString()
+        .includes('VERCEL_ENV="development"');
+      expect(productionFileHasVercelEnv).toBeTruthy();
+    });
+  });
+});
--- a/packages/cli/test/commands/pull.test.ts
+++ b/packages/cli/test/commands/pull.test.ts
@@ -11,15 +11,15 @@ describe('pull', () => {
  it('should handle pulling', async () => {
    const cwd = setupFixture('vercel-pull-next');
    useUser();
-    useTeams();
+    useTeams('team_dummy');
    useProject({
      ...defaultProject,
      id: 'vercel-pull-next',
      name: 'vercel-pull-next',
    });
-    client.setArgv('pull', '--yes', cwd);
+    client.setArgv('pull', cwd);
    const exitCode = await pull(client);
-    expect(exitCode).toEqual(0);
+    expect(exitCode, client.outputBuffer).toEqual(0);

    const rawDevEnv = await fs.readFile(
      path.join(cwd, '.vercel', '.env.development.local')
@@ -28,16 +28,86 @@ describe('pull', () => {
    expect(devFileHasDevEnv).toBeTruthy();
  });

+  it('should fail with message to pull without a link and without --env', async () => {
+    try {
+      process.stdout.isTTY = undefined;
+
+      const cwd = setupFixture('vercel-pull-unlinked');
+      useUser();
+      useTeams('team_dummy');
+
+      client.setArgv('pull', cwd);
+      const exitCode = await pull(client);
+      expect(exitCode, client.outputBuffer).toEqual(1);
+
+      expect(client.outputBuffer).toMatch(
+        /Command `vercel pull` requires confirmation. Use option "--yes" to confirm./gm
+      );
+    } finally {
+      process.stdout.isTTY = true;
+    }
+  });
+
+  it('should fail without message to pull without a link and with --env', async () => {
+    const cwd = setupFixture('vercel-pull-next');
+    useUser();
+    useTeams('team_dummy');
+
+    client.setArgv('pull', cwd, '--yes');
+    const exitCode = await pull(client);
+    expect(exitCode, client.outputBuffer).toEqual(1);
+
+    expect(client.outputBuffer).not.toMatch(
+      /Command `vercel pull` requires confirmation. Use option "--yes" to confirm./gm
+    );
+  });
+
+  it('should handle pulling with env vars (headless mode)', async () => {
+    try {
+      process.env.VERCEL_PROJECT_ID = 'vercel-pull-next';
+      process.env.VERCEL_ORG_ID = 'team_dummy';
+
+      const cwd = setupFixture('vercel-pull-next');
+
+      // Remove the `.vercel` dir to ensure that the `pull`
+      // command creates a new one based on env vars
+      await fs.remove(path.join(cwd, '.vercel'));
+
+      useUser();
+      useTeams('team_dummy');
+      useProject({
+        ...defaultProject,
+        id: 'vercel-pull-next',
+        name: 'vercel-pull-next',
+      });
+      client.setArgv('pull', cwd);
+      const exitCode = await pull(client);
+      expect(exitCode, client.outputBuffer).toEqual(0);
+
+      const config = await fs.readJSON(path.join(cwd, '.vercel/project.json'));
+      expect(config).toMatchInlineSnapshot(`
+        Object {
+          "orgId": "team_dummy",
+          "projectId": "vercel-pull-next",
+          "settings": Object {},
+        }
+      `);
+    } finally {
+      delete process.env.VERCEL_PROJECT_ID;
+      delete process.env.VERCEL_ORG_ID;
+    }
+  });
+
  it('should handle --environment=preview flag', async () => {
    const cwd = setupFixture('vercel-pull-next');
    useUser();
-    useTeams();
+    useTeams('team_dummy');
    useProject({
      ...defaultProject,
      id: 'vercel-pull-next',
      name: 'vercel-pull-next',
    });
-    client.setArgv('pull', '--yes', '--environment=preview', cwd);
+    client.setArgv('pull', '--environment=preview', cwd);
    const exitCode = await pull(client);
    expect(exitCode).toEqual(0);

@@ -53,13 +123,13 @@ describe('pull', () => {
  it('should handle --environment=production flag', async () => {
    const cwd = setupFixture('vercel-pull-next');
    useUser();
-    useTeams();
+    useTeams('team_dummy');
    useProject({
      ...defaultProject,
      id: 'vercel-pull-next',
      name: 'vercel-pull-next',
    });
-    client.setArgv('pull', '--yes', '--environment=production', cwd);
+    client.setArgv('pull', '--environment=production', cwd);
    const exitCode = await pull(client);
    expect(exitCode).toEqual(0);

--- a/packages/cli/test/dev/fixtures/24-ember/.travis.yml
+++ b/packages/cli/test/dev/fixtures/24-ember/.travis.yml
@@ -15,7 +15,7 @@ cache:

 env:
  global:
-    # See https://git.io/vdao3 for details.
+    # See https://github.com/ember-cli/ember-cli/blob/master/docs/build-concurrency.md
    - JOBS=1

 script:
--- a/packages/cli/test/fixtures/unit/build-output-api-preview/.vercel/output/builds.json
+++ b/packages/cli/test/fixtures/unit/build-output-api-preview/.vercel/output/builds.json
@@ -0,0 +1,3 @@
+{
+  "target": "preview"
+}
--- a/packages/cli/test/fixtures/unit/build-output-api-production/.vercel/output/builds.json
+++ b/packages/cli/test/fixtures/unit/build-output-api-production/.vercel/output/builds.json
@@ -0,0 +1,3 @@
+{
+  "target": "production"
+}
--- a/packages/cli/test/fixtures/unit/vercel-env-pull/.gitignore
+++ b/packages/cli/test/fixtures/unit/vercel-env-pull/.gitignore
@@ -0,0 +1,2 @@
+.next
+yarn.lock
--- a/packages/cli/test/fixtures/unit/vercel-env-pull/.vercel/project.json
+++ b/packages/cli/test/fixtures/unit/vercel-env-pull/.vercel/project.json
@@ -0,0 +1,4 @@
+{
+  "orgId": "team_dummy",
+  "projectId": "vercel-env-pull"
+}
--- a/packages/cli/test/fixtures/unit/vercel-env-pull/package.json
+++ b/packages/cli/test/fixtures/unit/vercel-env-pull/package.json
@@ -0,0 +1,12 @@
+{
+  "scripts": {
+    "build": "next build",
+    "dev": "next",
+    "now-build": "next build"
+  },
+  "dependencies": {
+    "next": "^8.0.0",
+    "react": "^16.7.0",
+    "react-dom": "^16.7.0"
+  }
+}
--- a/packages/cli/test/fixtures/unit/vercel-env-pull/pages/index.js
+++ b/packages/cli/test/fixtures/unit/vercel-env-pull/pages/index.js
@@ -0,0 +1,11 @@
+import { withRouter } from 'next/router';
+
+function Index({ router }) {
+  const data = {
+    pathname: router.pathname,
+    query: router.query,
+  };
+  return <div>{JSON.stringify(data)}</div>;
+}
+
+export default withRouter(Index);
--- a/packages/cli/test/fixtures/unit/vercel-env-pull/vercel.json
+++ b/packages/cli/test/fixtures/unit/vercel-env-pull/vercel.json
@@ -0,0 +1,10 @@
+{
+  "version": 2,
+  "name": "vercel-env-pull",
+  "routes": [
+    {
+      "src": "/(.*)",
+      "dest": "/index?route-param=b"
+    }
+  ]
+}
--- a/packages/cli/test/fixtures/unit/vercel-pull-next/.gitignore
+++ b/packages/cli/test/fixtures/unit/vercel-pull-next/.gitignore
@@ -1,3 +1,2 @@
 .next
 yarn.lock
-.vercel
--- a/packages/cli/test/fixtures/unit/vercel-pull-next/.vercel/project.json
+++ b/packages/cli/test/fixtures/unit/vercel-pull-next/.vercel/project.json
@@ -0,0 +1,4 @@
+{
+  "orgId": "team_dummy",
+  "projectId": "vercel-pull-next"
+}
--- a/packages/cli/test/fixtures/unit/vercel-pull-next/vercel.json
+++ b/packages/cli/test/fixtures/unit/vercel-pull-next/vercel.json
@@ -1,7 +1,6 @@
 {
  "version": 2,
  "name": "vercel-pull-next",
-  "builds": [{ "src": "package.json", "use": "@vercel/next@canary" }],
  "routes": [
    {
      "src": "/(.*)",
--- a/packages/cli/test/fixtures/unit/vercel-pull-unlinked/.gitignore
+++ b/packages/cli/test/fixtures/unit/vercel-pull-unlinked/.gitignore
@@ -0,0 +1,2 @@
+.next
+yarn.lock
--- a/packages/cli/test/fixtures/unit/vercel-pull-unlinked/package.json
+++ b/packages/cli/test/fixtures/unit/vercel-pull-unlinked/package.json
@@ -0,0 +1,12 @@
+{
+  "scripts": {
+    "build": "next build",
+    "dev": "next",
+    "now-build": "next build"
+  },
+  "dependencies": {
+    "next": "^8.0.0",
+    "react": "^16.7.0",
+    "react-dom": "^16.7.0"
+  }
+}
--- a/packages/cli/test/fixtures/unit/vercel-pull-unlinked/pages/index.js
+++ b/packages/cli/test/fixtures/unit/vercel-pull-unlinked/pages/index.js
@@ -0,0 +1,11 @@
+import { withRouter } from 'next/router';
+
+function Index({ router }) {
+  const data = {
+    pathname: router.pathname,
+    query: router.query,
+  };
+  return <div>{JSON.stringify(data)}</div>;
+}
+
+export default withRouter(Index);
--- a/packages/cli/test/fixtures/unit/vercel-pull-unlinked/static/robots.txt
+++ b/packages/cli/test/fixtures/unit/vercel-pull-unlinked/static/robots.txt
@@ -0,0 +1 @@
+User-Agent: *
--- a/packages/cli/test/fixtures/unit/vercel-pull-unlinked/vercel.json
+++ b/packages/cli/test/fixtures/unit/vercel-pull-unlinked/vercel.json
@@ -0,0 +1,10 @@
+{
+  "version": 2,
+  "name": "vercel-pull-next",
+  "routes": [
+    {
+      "src": "/(.*)",
+      "dest": "/index?route-param=b"
+    }
+  ]
+}
--- a/packages/cli/test/helpers/prepare.js
+++ b/packages/cli/test/helpers/prepare.js
@@ -179,6 +179,19 @@ module.exports = async function prepare(session, binaryPath) {
      'list/README.md':
        'readme contents for deploy-default-with-conflicting-sub-directory',
    },
+    'deploy-default-with-prebuilt-preview': {
+      'vercel.json': JSON.stringify({ version: 2 }),
+      '.vercel/output/builds.json': JSON.stringify({ target: 'preview' }),
+      '.vercel/output/config.json': JSON.stringify({ version: 3 }),
+      '.vercel/output/static/README.md':
+        'readme contents for deploy-default-with-prebuilt-preview',
+    },
+    'build-output-api-raw': {
+      'vercel.json': JSON.stringify({ version: 2 }),
+      '.vercel/output/config.json': JSON.stringify({ version: 3 }),
+      '.vercel/output/static/README.md':
+        'readme contents for build-output-api-raw',
+    },
    'local-config-v2': {
      [`main-${session}.html`]: '<h1>hello main</h1>',
      [`test-${session}.html`]: '<h1>hello test</h1>',
--- a/packages/cli/test/integration.js
+++ b/packages/cli/test/integration.js
@@ -7,10 +7,9 @@ import { Readable } from 'stream';
 import { homedir } from 'os';
 import _execa from 'execa';
 import XDGAppPaths from 'xdg-app-paths';
-import nodeFetch from 'node-fetch';
+import fetch from 'node-fetch';
 import tmp from 'tmp-promise';
 import retry from 'async-retry';
-import createFetchRetry from '@vercel/fetch-retry';
 import fs, {
  writeFile,
  readFile,
@@ -25,8 +24,6 @@ import pkg from '../package';
 import prepareFixtures from './helpers/prepare';
 import { fetchTokenWithRetry } from '../../../test/lib/deployment/now-deploy';

-const fetch = createFetchRetry(nodeFetch);
-
 // log command when running `execa`
 function execa(file, args, options) {
  console.log(`$ vercel ${args.join(' ')}`);
@@ -497,6 +494,56 @@ test('default command should work with --cwd option', async t => {
  );
 });

+test('should allow deploying a directory that was built with a target environment of "preview" and `--prebuilt` is used without specifying a target', async t => {
+  const projectDir = fixture('deploy-default-with-prebuilt-preview');
+
+  await vcLink(t, projectDir);
+
+  const { exitCode, stderr, stdout } = await execa(
+    binaryPath,
+    [
+      // omit the default "deploy" command
+      '--prebuilt',
+      ...defaultArgs,
+    ],
+    {
+      cwd: projectDir,
+    }
+  );
+
+  t.is(exitCode, 0, formatOutput({ stderr, stdout }));
+
+  const url = stdout;
+  const deploymentResult = await fetch(`${url}/README.md`);
+  const body = await deploymentResult.text();
+  t.deepEqual(body, 'readme contents for deploy-default-with-prebuilt-preview');
+});
+
+test('should allow deploying a directory that was prebuilt, but has no builds.json', async t => {
+  const projectDir = fixture('build-output-api-raw');
+
+  await vcLink(t, projectDir);
+
+  const { exitCode, stderr, stdout } = await execa(
+    binaryPath,
+    [
+      // omit the default "deploy" command
+      '--prebuilt',
+      ...defaultArgs,
+    ],
+    {
+      cwd: projectDir,
+    }
+  );
+
+  t.is(exitCode, 0, formatOutput({ stderr, stdout }));
+
+  const url = stdout;
+  const deploymentResult = await fetch(`${url}/README.md`);
+  const body = await deploymentResult.text();
+  t.deepEqual(body, 'readme contents for build-output-api-raw');
+});
+
 test('deploy using only now.json with `redirects` defined', async t => {
  const target = fixture('redirects-v2');

@@ -796,13 +843,11 @@ test('Deploy `api-env` fixture and test `vercel env` command', async t => {
    t.regex(stderr, /Created .env file/gm);

    const contents = fs.readFileSync(path.join(target, '.env'), 'utf8');
-    t.true(contents.startsWith('# Created by Vercel CLI\n'));
-
-    const lines = new Set(contents.split('\n'));
-    t.true(lines.has('MY_NEW_ENV_VAR="my plaintext value"'));
-    t.true(lines.has('MY_STDIN_VAR="{"expect":"quotes"}"'));
-    t.true(lines.has('MY_DECRYPTABLE_SECRET_ENV="decryptable value"'));
-    t.false(lines.has('MY_PREVIEW'));
+    t.regex(contents, /^# Created by Vercel CLI\n/);
+    t.regex(contents, /MY_NEW_ENV_VAR="my plaintext value"/);
+    t.regex(contents, /MY_STDIN_VAR="{"expect":"quotes"}"/);
+    t.regex(contents, /MY_DECRYPTABLE_SECRET_ENV="decryptable value"/);
+    t.notRegex(contents, /MY_PREVIEW/);
  }

  async function vcEnvPullOverwrite() {
@@ -974,11 +1019,12 @@ test('Deploy `api-env` fixture and test `vercel env` command', async t => {
    const contents = fs.readFileSync(path.join(target, '.env'), 'utf8');

    const lines = new Set(contents.split('\n'));
-    t.true(lines.has('VERCEL="1"'));
-    t.true(lines.has('VERCEL_URL=""'));
-    t.true(lines.has('VERCEL_ENV="development"'));
-    t.true(lines.has('VERCEL_GIT_PROVIDER=""'));
-    t.true(lines.has('VERCEL_GIT_REPO_SLUG=""'));
+
+    t.true(lines.has('VERCEL="1"'), 'VERCEL');
+    t.true(lines.has('VERCEL_URL=""'), 'VERCEL_URL');
+    t.true(lines.has('VERCEL_ENV="development"'), 'VERCEL_ENV');
+    t.true(lines.has('VERCEL_GIT_PROVIDER=""'), 'VERCEL_GIT_PROVIDER');
+    t.true(lines.has('VERCEL_GIT_REPO_SLUG=""'), 'VERCEL_GIT_REPO_SLUG');
  }

  async function vcDevAndFetchSystemVars() {
@@ -1086,29 +1132,48 @@ test('Deploy `api-env` fixture and test `vercel env` command', async t => {
    t.is(exitCode, 0, formatOutput({ stderr, stdout }));
  }

-  await vcLink();
-  await vcEnvLsIsEmpty();
-  await vcEnvAddWithPrompts();
-  await vcEnvAddFromStdin();
-  await vcEnvAddFromStdinPreview();
-  await vcEnvAddFromStdinPreviewWithBranch();
-  await vcEnvLsIncludesVar();
-  await createEnvWithDecryptableSecret();
-  await vcEnvPull();
-  await vcEnvPullOverwrite();
-  await vcEnvPullConfirm();
-  await vcDeployWithVar();
-  await vcDevWithEnv();
-  fs.unlinkSync(path.join(target, '.env'));
-  await vcDevAndFetchCloudVars();
-  await enableAutoExposeSystemEnvs();
-  await vcEnvPullFetchSystemVars();
-  fs.unlinkSync(path.join(target, '.env'));
-  await vcDevAndFetchSystemVars();
-  await vcEnvRemove();
-  await vcEnvRemoveWithArgs();
-  await vcEnvRemoveWithNameOnly();
-  await vcEnvLsIsEmpty();
+  function vcEnvRemoveByName(name) {
+    return execa(binaryPath, ['env', 'rm', name, '-y', ...defaultArgs], {
+      reject: false,
+      cwd: target,
+    });
+  }
+
+  async function vcEnvRemoveAll() {
+    await vcEnvRemoveByName('MY_PREVIEW');
+    await vcEnvRemoveByName('MY_STDIN_VAR');
+    await vcEnvRemoveByName('MY_DECRYPTABLE_SECRET_ENV');
+    await vcEnvRemoveByName('MY_NEW_ENV_VAR');
+  }
+
+  try {
+    await vcEnvRemoveAll();
+    await vcLink();
+    await vcEnvLsIsEmpty();
+    await vcEnvAddWithPrompts();
+    await vcEnvAddFromStdin();
+    await vcEnvAddFromStdinPreview();
+    await vcEnvAddFromStdinPreviewWithBranch();
+    await vcEnvLsIncludesVar();
+    await createEnvWithDecryptableSecret();
+    await vcEnvPull();
+    await vcEnvPullOverwrite();
+    await vcEnvPullConfirm();
+    await vcDeployWithVar();
+    await vcDevWithEnv();
+    fs.unlinkSync(path.join(target, '.env'));
+    await vcDevAndFetchCloudVars();
+    await enableAutoExposeSystemEnvs();
+    await vcEnvPullFetchSystemVars();
+    fs.unlinkSync(path.join(target, '.env'));
+    await vcDevAndFetchSystemVars();
+    await vcEnvRemove();
+    await vcEnvRemoveWithArgs();
+    await vcEnvRemoveWithNameOnly();
+    await vcEnvLsIsEmpty();
+  } finally {
+    await vcEnvRemoveAll();
+  }
 });

 test('[vc projects] should create a project successfully', async t => {
@@ -1446,6 +1511,9 @@ test('try to purchase a domain', async t => {
    {
      reject: false,
      input: stream,
+      env: {
+        FORCE_TTY: '1',
+      },
    }
  );

@@ -2144,11 +2212,6 @@ const verifyExampleAngular = (cwd, dir) =>
  fs.existsSync(path.join(cwd, dir, 'tsconfig.json')) &&
  fs.existsSync(path.join(cwd, dir, 'angular.json'));

-const verifyExampleAmp = (cwd, dir) =>
-  fs.existsSync(path.join(cwd, dir, 'index.html')) &&
-  fs.existsSync(path.join(cwd, dir, 'logo.png')) &&
-  fs.existsSync(path.join(cwd, dir, 'favicon.png'));
-
 test('initialize example "angular"', async t => {
  tmpDir = tmp.dirSync({ unsafeCleanup: true });
  const cwd = tmpDir.name;
@@ -2183,21 +2246,6 @@ test('initialize example ("angular") to specified directory', async t => {
  t.true(verifyExampleAngular(cwd, 'ang'), formatOutput({ stdout, stderr }));
 });

-test('initialize selected example ("amp")', async t => {
-  tmpDir = tmp.dirSync({ unsafeCleanup: true });
-  const cwd = tmpDir.name;
-  const goal = '> Success! Initialized "amp" example in';
-
-  const { stdout, stderr, exitCode } = await execute(['init'], {
-    cwd,
-    input: '\n',
-  });
-
-  t.is(exitCode, 0, formatOutput({ stdout, stderr }));
-  t.true(stderr.includes(goal), formatOutput({ stdout, stderr }));
-  t.true(verifyExampleAmp(cwd, 'amp'), formatOutput({ stdout, stderr }));
-});
-
 test('initialize example to existing directory with "-f"', async t => {
  tmpDir = tmp.dirSync({ unsafeCleanup: true });
  const cwd = tmpDir.name;
@@ -2274,6 +2322,8 @@ test('try to revert a deployment and assign the automatic aliases', async t => {
  const { name } = JSON.parse(
    fs.readFileSync(path.join(firstDeployment, 'now.json'))
  );
+  t.true(!!name, 'name has a value');
+
  const url = `https://${name}.user.vercel.app`;

  {
@@ -2375,6 +2425,9 @@ test('[vercel dev] fails when development commad calls vercel dev recursively',
  const dev = execa(binaryPath, ['dev', ...defaultArgs], {
    cwd: dir,
    reject: false,
+    env: {
+      FORCE_TTY: '1',
+    },
  });

  await setupProject(dev, projectName, {
@@ -2780,6 +2833,9 @@ test('change user', async t => {

  await execute(['login', email, '--api', loginApiUrl, '--debug'], {
    stdio: 'inherit',
+    env: {
+      FORCE_TTY: '1',
+    },
  });

  const auth = await fs.readJSON(getConfigAuthPath());
@@ -2862,7 +2918,7 @@ test('should show prompts to set up project during first deploy', async t => {
  );

  // Send a test request to the deployment
-  const response = await fetch(new URL(output.stdout).href);
+  const response = await fetch(new URL(output.stdout));
  const text = await response.text();
  t.is(text.includes('<h1>custom hello</h1>'), true, text);

@@ -2909,7 +2965,11 @@ test('should prefill "project name" prompt with folder name', async t => {
  const directory = path.join(src, '../', projectName);
  await copy(src, directory);

-  const now = execa(binaryPath, [directory, ...defaultArgs]);
+  const now = execa(binaryPath, [directory, ...defaultArgs], {
+    env: {
+      FORCE_TTY: '1',
+    },
+  });

  await waitForPrompt(now, chunk => /Set up and deploy [^?]+\?/.test(chunk));
  now.stdin.write('yes\n');
@@ -2952,12 +3012,15 @@ test('should prefill "project name" prompt with --name', async t => {
  // remove previously linked project if it exists
  await remove(path.join(directory, '.vercel'));

-  const now = execa(binaryPath, [
-    directory,
-    '--name',
-    projectName,
-    ...defaultArgs,
-  ]);
+  const now = execa(
+    binaryPath,
+    [directory, '--name', projectName, ...defaultArgs],
+    {
+      env: {
+        FORCE_TTY: '1',
+      },
+    }
+  );

  let isDeprecated = false;

@@ -3016,7 +3079,11 @@ test('should prefill "project name" prompt with now.json `name`', async t => {
    })
  );

-  const now = execa(binaryPath, [directory, ...defaultArgs]);
+  const now = execa(binaryPath, [directory, ...defaultArgs], {
+    env: {
+      FORCE_TTY: '1',
+    },
+  });

  let isDeprecated = false;

@@ -3437,7 +3504,12 @@ test('[vc link] should show prompts to set up project', async t => {
  // remove previously linked project if it exists
  await remove(path.join(dir, '.vercel'));

-  const vc = execa(binaryPath, ['link', ...defaultArgs], { cwd: dir });
+  const vc = execa(binaryPath, ['link', ...defaultArgs], {
+    cwd: dir,
+    env: {
+      FORCE_TTY: '1',
+    },
+  });

  await setupProject(vc, projectName, {
    buildCommand: `mkdir -p o && echo '<h1>custom hello</h1>' > o/index.html`,
@@ -3510,7 +3582,13 @@ test('[vc link] should not duplicate paths in .gitignore', async t => {
  const { exitCode, stderr, stdout } = await execa(
    binaryPath,
    ['link', '--confirm', ...defaultArgs],
-    { cwd: dir, reject: false }
+    {
+      cwd: dir,
+      reject: false,
+      env: {
+        FORCE_TTY: '1',
+      },
+    }
  );

  // Ensure the exit code is right
@@ -3536,6 +3614,9 @@ test('[vc dev] should show prompts to set up project', async t => {

  const dev = execa(binaryPath, ['dev', '--listen', port, ...defaultArgs], {
    cwd: dir,
+    env: {
+      FORCE_TTY: '1',
+    },
  });

  await setupProject(dev, projectName, {
@@ -3580,7 +3661,12 @@ test('[vc link] should show project prompts but not framework when `builds` defi
  // remove previously linked project if it exists
  await remove(path.join(dir, '.vercel'));

-  const vc = execa(binaryPath, ['link', ...defaultArgs], { cwd: dir });
+  const vc = execa(binaryPath, ['link', ...defaultArgs], {
+    cwd: dir,
+    env: {
+      FORCE_TTY: '1',
+    },
+  });

  await waitForPrompt(vc, chunk => /Set up [^?]+\?/.test(chunk));
  vc.stdin.write('yes\n');
@@ -3639,6 +3725,9 @@ test('[vc dev] should send the platform proxy request headers to frontend dev se

  const dev = execa(binaryPath, ['dev', '--listen', port, ...defaultArgs], {
    cwd: dir,
+    env: {
+      FORCE_TTY: '1',
+    },
  });

  await setupProject(dev, projectName, {
--- a/packages/cli/test/mocks/client.ts
+++ b/packages/cli/test/mocks/client.ts
@@ -87,7 +87,20 @@ export class MockClient extends Client {
  }

  stopMockServer() {
-    this.mockServer?.close();
+    return new Promise<void>((resolve, reject) => {
+      if (!this.mockServer?.close) {
+        reject(new Error(`mockServer did not exist when closing`));
+        return;
+      }
+
+      this.mockServer.close(error => {
+        if (error) {
+          reject(error);
+          return;
+        }
+        resolve();
+      });
+    });
  }

  setArgv(...argv: string[]) {
@@ -109,6 +122,6 @@ beforeEach(() => {
  client.reset();
 });

-afterAll(() => {
-  client.stopMockServer();
+afterAll(async () => {
+  await client.stopMockServer();
 });
--- a/packages/cli/test/mocks/project.ts
+++ b/packages/cli/test/mocks/project.ts
@@ -1,4 +1,5 @@
 import { client } from './client';
+import { Project } from '../../src/types';

 const envs = [
  {
@@ -36,6 +37,42 @@ const envs = [
  },
 ];

+const systemEnvs = [
+  {
+    type: 'encrypted',
+    id: 'a235l6frtu25df32',
+    key: 'SYSTEM_ENV_FOR_DEV',
+    value: 'development',
+    target: ['development'],
+    gitBranch: null,
+    configurationId: null,
+    updatedAt: 1557241361445,
+    createdAt: 1557241361445,
+  },
+  {
+    type: 'encrypted',
+    id: 'a235l6frtu25df32',
+    key: 'SYSTEM_ENV_FOR_PREV',
+    value: 'preview',
+    target: ['preview'],
+    gitBranch: null,
+    configurationId: null,
+    updatedAt: 1557241361445,
+    createdAt: 1557241361445,
+  },
+  {
+    type: 'encrypted',
+    id: 'a235l6frtu25df32',
+    key: 'SYSTEM_ENV_FOR_PROD',
+    value: 'production',
+    target: ['production'],
+    gitBranch: null,
+    configurationId: null,
+    updatedAt: 1557241361445,
+    createdAt: 1557241361445,
+  },
+];
+
 export const defaultProject = {
  id: 'foo',
  name: 'cli',
@@ -80,25 +117,42 @@ export const defaultProject = {
      requestedAt: 1571239348998,
      target: 'production',
      teamId: null,
-      type: 'LAMBDAS',
+      type: undefined,
      url: 'a-project-name-rjtr4pz3f.vercel.app',
      userId: 'K4amb7K9dAt5R2vBJWF32bmY',
    },
  ],
 };

-export function useProject(project = defaultProject) {
+export function useProject(project: Partial<Project> = defaultProject) {
  client.scenario.get(`/v8/projects/${project.name}`, (_req, res) => {
    res.json(project);
  });
  client.scenario.get(`/v8/projects/${project.id}`, (_req, res) => {
    res.json(project);
  });
+  client.scenario.get(
+    `/v6/projects/${project.id}/system-env-values`,
+    (_req, res) => {
+      const target = _req.query.target || 'development';
+      if (typeof target !== 'string') {
+        throw new Error(
+          `/v6/projects/${project.id}/system-env-values was given a query param of "target=${target}", which is not a valid environment.`
+        );
+      }
+      const targetEnvs = systemEnvs.filter(env => env.target.includes(target));
+
+      res.json({
+        systemEnvValues: targetEnvs,
+      });
+    }
+  );
  client.scenario.get(`/v8/projects/${project.id}/env`, (_req, res) => {
    const target = _req.query.target;
    if (typeof target === 'string') {
      const targetEnvs = envs.filter(env => env.target.includes(target));
      res.json({ envs: targetEnvs });
+      return;
    }

    res.json({ envs });
--- a/packages/cli/test/mocks/team.ts
+++ b/packages/cli/test/mocks/team.ts
@@ -1,10 +1,11 @@
 import chance from 'chance';
 import { client } from './client';

-export function useTeams() {
+export function useTeams(teamId?: string) {
+  const id = teamId || chance().guid();
  const teams = [
    {
-      id: chance().guid(),
+      id,
      slug: chance().string({ length: 5, casing: 'lower' }),
      name: chance().company(),
      creatorId: chance().guid(),
@@ -14,7 +15,7 @@ export function useTeams() {
  ];

  for (let team of teams) {
-    client.scenario.get(`/v1/team/${team.id}`, (_req, res) => {
+    client.scenario.get(`/teams/${team.id}`, (_req, res) => {
      res.json(team);
    });
  }
--- a/packages/cli/test/util/deploy/parse-target.test.ts
+++ b/packages/cli/test/util/deploy/parse-target.test.ts
@@ -0,0 +1,55 @@
+import parseTarget from '../../../src/util/deploy/parse-target';
+import { Output } from '../../../src/util/output';
+
+describe('parseTarget', () => {
+  let output: Output;
+
+  beforeEach(() => {
+    output = new Output();
+    output.warn = jest.fn();
+    output.error = jest.fn();
+  });
+
+  it('defaults to `undefined`', () => {
+    let result = parseTarget(output);
+    expect(result).toEqual(undefined);
+  });
+
+  it('fails when given invalid target', () => {
+    const result = parseTarget(output, 'not-a-real-environment');
+    expect(result).toEqual(1);
+
+    const errorMock = (output.error as jest.Mock<any, any>).mock;
+    expect(errorMock.calls[0][0]).toMatch(
+      /not-a-real-environment.+is not valid/g
+    );
+  });
+
+  it('parses "production" target', () => {
+    let result = parseTarget(output, 'production');
+    expect(result).toEqual('production');
+    expect(output.warn).toHaveBeenCalledWith(
+      'We recommend using the much shorter `--prod` option instead of `--target production` (deprecated)'
+    );
+  });
+
+  it('parses "staging" target', () => {
+    let result = parseTarget(output, 'staging');
+    expect(result).toEqual('staging');
+  });
+
+  it('prefers target over production argument', () => {
+    let result = parseTarget(output, 'staging', true);
+    expect(result).toEqual('staging');
+  });
+
+  it('parses production argument when `true`', () => {
+    let result = parseTarget(output, undefined, true);
+    expect(result).toEqual('production');
+  });
+
+  it('parses production argument when `false`', () => {
+    let result = parseTarget(output, undefined, false);
+    expect(result).toEqual(undefined);
+  });
+});
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/client",
-  "version": "10.4.1",
+  "version": "11.0.1-canary.2",
  "main": "dist/index.js",
  "typings": "dist/index.d.ts",
  "homepage": "https://vercel.com",
@@ -24,7 +24,7 @@
  "devDependencies": {
    "@types/async-retry": "1.4.1",
    "@types/fs-extra": "7.0.0",
-    "@types/jest": "27.0.1",
+    "@types/jest": "27.4.1",
    "@types/minimatch": "3.0.5",
    "@types/ms": "0.7.30",
    "@types/node": "12.0.4",
@@ -41,7 +41,7 @@
    ]
  },
  "dependencies": {
-    "@vercel/build-utils": "2.15.1",
+    "@vercel/build-utils": "2.16.1-canary.2",
    "@zeit/fetch": "5.2.0",
    "async-retry": "1.2.3",
    "async-sema": "3.0.0",
--- a/packages/client/src/create-deployment.ts
+++ b/packages/client/src/create-deployment.ts
@@ -1,12 +1,10 @@
 import { lstatSync } from 'fs-extra';
-
-import { relative, isAbsolute } from 'path';
+import { isAbsolute } from 'path';
 import { hashes, mapToObject } from './utils/hashes';
 import { upload } from './upload';
-import { buildFileTree, createDebug, parseVercelConfig } from './utils';
+import { buildFileTree, createDebug } from './utils';
 import { DeploymentError } from './errors';
 import {
-  VercelConfig,
  VercelClientOptions,
  DeploymentOptions,
  DeploymentEventType,
@@ -15,13 +13,11 @@ import {
 export default function buildCreateDeployment() {
  return async function* createDeployment(
    clientOptions: VercelClientOptions,
-    deploymentOptions: DeploymentOptions = {},
-    nowConfig: VercelConfig = {}
+    deploymentOptions: DeploymentOptions = {}
  ): AsyncIterableIterator<{ type: DeploymentEventType; payload: any }> {
    const { path } = clientOptions;

    const debug = createDebug(clientOptions.debug);
-    const cwd = process.cwd();

    debug('Creating deployment...');

@@ -76,29 +72,6 @@ export default function buildCreateDeployment() {

    const { fileList } = await buildFileTree(path, clientOptions, debug);

-    let configPath: string | undefined;
-    if (!nowConfig) {
-      // If the user did not provide a config file, use the one in the root directory.
-      const relativePaths = fileList.map(f => relative(cwd, f));
-      const hasVercelConfig = relativePaths.includes('vercel.json');
-      const hasNowConfig = relativePaths.includes('now.json');
-
-      if (hasVercelConfig) {
-        if (hasNowConfig) {
-          throw new DeploymentError({
-            code: 'conflicting_config',
-            message:
-              'Cannot use both a `vercel.json` and `now.json` file. Please delete the `now.json` file.',
-          });
-        }
-        configPath = 'vercel.json';
-      } else if (hasNowConfig) {
-        configPath = 'now.json';
-      }
-
-      nowConfig = await parseVercelConfig(configPath);
-    }
-
    // This is a useful warning because it prevents people
    // from getting confused about a deployment that renders 404.
    if (fileList.length === 0) {
--- a/packages/client/src/deploy.ts
+++ b/packages/client/src/deploy.ts
@@ -126,27 +126,6 @@ export async function* deploy(
    }
  }

-  if (
-    files.size === 1 &&
-    deploymentOptions.builds === undefined &&
-    deploymentOptions.routes === undefined &&
-    deploymentOptions.cleanUrls === undefined &&
-    deploymentOptions.rewrites === undefined &&
-    deploymentOptions.redirects === undefined &&
-    deploymentOptions.headers === undefined &&
-    deploymentOptions.trailingSlash === undefined
-  ) {
-    debug(`Assigning '/' route for single file deployment`);
-    const filePath = Array.from(files.values())[0].names[0];
-
-    deploymentOptions.routes = [
-      {
-        src: '/',
-        dest: `/${filePath.split('/').pop()}`,
-      },
-    ];
-  }
-
  if (!deploymentOptions.name) {
    deploymentOptions.name =
      clientOptions.defaultName || getDefaultName(files, clientOptions);
--- a/packages/frameworks/logos/next-dark.svg
+++ b/packages/frameworks/logos/next-dark.svg
@@ -0,0 +1 @@
+<svg width="48" height="48" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M22.428.013c-.103.01-.431.042-.727.066C14.883.693 8.497 4.37 4.453 10.024A23.754 23.754 0 0 0 .216 20.51C.023 21.828 0 22.217 0 24.005c0 1.787.023 2.177.216 3.495 1.304 9.012 7.718 16.584 16.417 19.39 1.558.501 3.2.844 5.068 1.05.727.08 3.87.08 4.598 0 3.224-.356 5.954-1.154 8.648-2.529.412-.21.492-.267.436-.314-.038-.028-1.797-2.388-3.909-5.24l-3.838-5.184-4.809-7.117c-2.646-3.913-4.824-7.112-4.842-7.112-.019-.005-.038 3.157-.047 7.018-.014 6.76-.019 7.033-.103 7.192-.122.23-.216.324-.413.427-.15.075-.282.09-.99.09h-.812l-.216-.137a.878.878 0 0 1-.314-.342l-.099-.211.01-9.407.014-9.41.145-.184c.075-.098.235-.225.347-.286.193-.094.268-.103 1.08-.103.957 0 1.116.038 1.365.31.07.075 2.674 3.997 5.79 8.721s7.376 11.175 9.469 14.342l3.8 5.756.192-.127c1.704-1.107 3.505-2.683 4.932-4.325a23.888 23.888 0 0 0 5.65-12.268c.192-1.319.215-1.708.215-3.495 0-1.788-.023-2.177-.216-3.495-1.304-9.013-7.718-16.584-16.417-19.39C29.832.623 28.199.28 26.369.074c-.45-.047-3.551-.099-3.94-.061zm9.825 14.515a.947.947 0 0 1 .474.554c.038.122.047 2.73.038 8.608l-.014 8.436-1.488-2.28-1.492-2.28v-6.132c0-3.964.019-6.193.047-6.3a.957.957 0 0 1 .465-.592c.192-.098.262-.108 1-.108.694 0 .816.01.97.094z" fill="#fff"/></svg>
--- a/packages/frameworks/package.json
+++ b/packages/frameworks/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/frameworks",
-  "version": "0.7.1",
+  "version": "0.8.1-canary.0",
  "main": "./dist/frameworks.js",
  "types": "./dist/frameworks.d.ts",
  "files": [
@@ -16,11 +16,11 @@
    "js-yaml": "3.13.1"
  },
  "devDependencies": {
-    "@types/jest": "27.0.1",
+    "@types/jest": "27.4.1",
    "@types/js-yaml": "3.12.1",
    "@types/node": "12.0.4",
    "@types/node-fetch": "2.5.8",
-    "@vercel/routing-utils": "1.13.1",
+    "@vercel/routing-utils": "1.13.2",
    "ajv": "6.12.2",
    "typescript": "4.3.4"
  }
--- a/packages/frameworks/src/frameworks.ts
+++ b/packages/frameworks/src/frameworks.ts
@@ -60,6 +60,7 @@ export const frameworks = [
    slug: 'nextjs',
    demo: 'https://nextjs-template.vercel.app',
    logo: 'https://raw.githubusercontent.com/vercel/vercel/main/packages/frameworks/logos/next.svg',
+    darkModeLogo: 'https://raw.githubusercontent.com/vercel/vercel/main/packages/frameworks/logos/next-dark.svg',
    screenshot:
      'https://assets.vercel.com/image/upload/v1647366075/front/import/nextjs.png',
    tagline:
@@ -203,9 +204,7 @@ export const frameworks = [
    detectors: {
      every: [
        {
-          path: 'package.json',
-          matchContent:
-            '"(dev)?(d|D)ependencies":\\s*{[^}]*"remix":\\s*".+?"[^}]*}',
+          path: 'remix.config.js',
        },
      ],
    },
--- a/packages/frameworks/src/types.ts
+++ b/packages/frameworks/src/types.ts
@@ -60,6 +60,11 @@ export interface Framework {
   * @example "https://raw.githubusercontent.com/vercel/vercel/main/packages/frameworks/logos/next.svg"
   */
  logo: string;
+  /**
+   * An additional URL to the logo of the framework optimized for dark mode
+   * @example "https://raw.githubusercontent.com/vercel/vercel/main/packages/frameworks/logos/next-dark.svg"
+   */
+  darkModeLogo?: string;
  /**
   * A URL to a screenshot of the demo
   * @example "https://assets.vercel.com/image/upload/v1647366075/front/import/nextjs.png"
--- a/packages/go/go-helpers.ts
+++ b/packages/go/go-helpers.ts
@@ -6,6 +6,7 @@ import { join } from 'path';
 import stringArgv from 'string-argv';
 import { debug } from '@vercel/build-utils';
 const versionMap = new Map([
+  ['1.18', '1.18.1'],
  ['1.17', '1.17.3'],
  ['1.16', '1.16.10'],
  ['1.15', '1.15.8'],
--- a/packages/go/package.json
+++ b/packages/go/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/go",
-  "version": "1.3.2",
+  "version": "1.4.1-canary.2",
  "license": "MIT",
  "main": "./dist/index",
  "homepage": "https://vercel.com/docs/runtimes#official-runtimes/go",
@@ -24,7 +24,7 @@
    "@types/fs-extra": "^5.0.5",
    "@types/node-fetch": "^2.3.0",
    "@types/tar": "^4.0.0",
-    "@vercel/build-utils": "2.15.1",
+    "@vercel/build-utils": "2.16.1-canary.2",
    "@vercel/ncc": "0.24.0",
    "async-retry": "1.3.1",
    "execa": "^1.0.0",
--- a/packages/go/test/fixtures/01-cowsay/vercel.json
+++ b/packages/go/test/fixtures/01-cowsay/vercel.json
@@ -5,10 +5,10 @@
    { "src": "subdirectory/index.go", "use": "@vercel/go" }
  ],
  "probes": [
-    { "path": "/", "mustContain": "cow:go1.17.3:RANDOMNESS_PLACEHOLDER" },
+    { "path": "/", "mustContain": "cow:go1.18.1:RANDOMNESS_PLACEHOLDER" },
    {
      "path": "/subdirectory",
-      "mustContain": "subcow:go1.17.3:RANDOMNESS_PLACEHOLDER"
+      "mustContain": "subcow:go1.18.1:RANDOMNESS_PLACEHOLDER"
    }
  ]
 }
--- a/packages/node-bridge/bridge.js
+++ b/packages/node-bridge/bridge.js
@@ -186,9 +186,6 @@ class Bridge {
      'payloads' in normalizedEvent &&
      Array.isArray(normalizedEvent.payloads)
    ) {
-      // statusCode and headers are required to match when using
-      // multiple payloads in a single invocation so we can use
-      // the first
      let statusCode = 200;
      /**
       * @type {import('http').IncomingHttpHeaders}
@@ -200,6 +197,14 @@ class Bridge {
      let combinedBody = '';
      const multipartBoundary = 'payload-separator';
      const CLRF = '\r\n';
+      /**
+       * @type {Record<string, any>[]}
+       */
+      const separateHeaders = [];
+      /**
+       * @type {Set<string>}
+       */
+      const allHeaderKeys = new Set();

      // we execute the payloads one at a time to ensure
      // lambda semantics
@@ -209,20 +214,49 @@ class Bridge {
        // build a combined body using multipart
        // https://www.w3.org/Protocols/rfc1341/7_2_Multipart.html
        combinedBody += `--${multipartBoundary}${CLRF}`;
-        if (response.headers['content-type']) {
-          combinedBody += `content-type: ${response.headers['content-type']}${CLRF}${CLRF}`;
-        }
-        combinedBody += response.body;
+        combinedBody += `content-type: ${
+          response.headers['content-type'] || 'text/plain'
+        }${CLRF}${CLRF}`;
+        combinedBody += response.body || '';
        combinedBody += CLRF;

        if (i === normalizedEvent.payloads.length - 1) {
          combinedBody += `--${multipartBoundary}--${CLRF}`;
        }
-
-        statusCode = response.statusCode;
-        headers = response.headers;
+        // pass non-200 status code in header so it can be handled
+        // separately from other payloads e.g. HTML payload redirects
+        // (307) but data payload does not (200)
+        if (response.statusCode !== 200) {
+          headers[`x-vercel-payload-${i + 1}-status`] =
+            response.statusCode + '';
+        }
+        separateHeaders.push(response.headers);
+        Object.keys(response.headers).forEach(key => allHeaderKeys.add(key));
      }

+      allHeaderKeys.forEach(curKey => {
+        /**
+         * @type string | string[] | undefined
+         */
+        const curValue = separateHeaders[0] && separateHeaders[0][curKey];
+        const canDedupe = separateHeaders.every(
+          headers => headers[curKey] === curValue
+        );
+
+        if (canDedupe) {
+          headers[curKey] = curValue;
+        } else {
+          // if a header is unique per payload ensure it is prefixed
+          // so it can be parsed and provided separately
+          separateHeaders.forEach((curHeaders, idx) => {
+            if (curHeaders[curKey]) {
+              headers[`x-vercel-payload-${idx + 1}-${curKey}`] =
+                curHeaders[curKey];
+            }
+          });
+        }
+      });
+
      headers[
        'content-type'
      ] = `multipart/mixed; boundary="${multipartBoundary}"`;
--- a/packages/node-bridge/package.json
+++ b/packages/node-bridge/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/node-bridge",
-  "version": "2.2.0",
+  "version": "2.2.1",
  "license": "MIT",
  "main": "./index.js",
  "repository": {
--- a/packages/node-bridge/test/bridge.test.js
+++ b/packages/node-bridge/test/bridge.test.js
@@ -86,6 +86,12 @@ test('`NowProxyEvent` normalizing', async () => {

 test('multi-payload handling', async () => {
  const server = new Server((req, res) => {
+    if (req.url === '/redirect') {
+      res.setHeader('Location', '/somewhere');
+      res.statusCode = 307;
+      res.end('/somewhere');
+      return;
+    }
    res.setHeader(
      'content-type',
      req.url.includes('_next/data') ? 'application/json' : 'text/html'
@@ -117,6 +123,11 @@ test('multi-payload handling', async () => {
            headers: { foo: 'baz' },
            path: '/_next/data/build-id/nowproxy.json',
          },
+          {
+            method: 'GET',
+            headers: { foo: 'baz' },
+            path: '/redirect',
+          },
        ],
      }),
    },
@@ -137,20 +148,36 @@ test('multi-payload handling', async () => {
      !item.startsWith('content-type:') &&
      !item.startsWith('--payload')
    ) {
-      bodies.push(
-        JSON.parse(
-          Buffer.from(item.split('--payload-separator')[0], 'base64').toString()
-        )
-      );
+      const content = Buffer.from(
+        item.split('--payload-separator')[0],
+        'base64'
+      ).toString();
+      bodies.push(content.startsWith('{') ? JSON.parse(content) : content);
    }
  });

+  // ensure content-type is always specified as is required for
+  // proper parsing of the multipart body
+  assert(payloadParts.some(part => part.includes('content-type: text/plain')));
+
  assert.equal(bodies[0].method, 'GET');
  assert.equal(bodies[0].path, '/nowproxy');
  assert.equal(bodies[0].headers.foo, 'baz');
  assert.equal(bodies[1].method, 'GET');
  assert.equal(bodies[1].path, '/_next/data/build-id/nowproxy.json');
  assert.equal(bodies[1].headers.foo, 'baz');
+  assert.equal(bodies[2], '/somewhere');
+  assert.equal(result.headers['x-vercel-payload-3-status'], '307');
+  assert.equal(result.headers['x-vercel-payload-2-status'], undefined);
+  assert.equal(result.headers['x-vercel-payload-1-status'], undefined);
+  assert.equal(result.headers['x-vercel-payload-1-content-type'], 'text/html');
+  assert.equal(
+    result.headers['x-vercel-payload-2-content-type'],
+    'application/json'
+  );
+  assert.equal(result.headers['x-vercel-payload-3-content-type'], undefined);
+  assert.equal(result.headers['x-vercel-payload-3-location'], '/somewhere');
+  assert.equal(result.headers['x-vercel-payload-2-location'], undefined);
  assert.equal(context.callbackWaitsForEmptyEventLoop, false);

  server.close();
--- a/packages/node/.gitignore
+++ b/packages/node/.gitignore
@@ -1,3 +1,4 @@
 /dist
 /test/fixtures/**/types.d.ts
 /test/fixtures/11-symlinks/symlink
+!test/cache-fixtures/**
--- a/packages/node/package.json
+++ b/packages/node/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/node",
-  "version": "1.14.1",
+  "version": "1.15.1-canary.2",
  "license": "MIT",
  "main": "./dist/index",
  "homepage": "https://vercel.com/docs/runtimes#official-runtimes/node-js",
@@ -12,14 +12,26 @@
  "scripts": {
    "build": "node build",
    "test-integration-once": "jest --env node --verbose --runInBand --bail test/integration.test.js",
+    "test-unit": "jest --env node --verbose --bail test/prepare-cache.test.ts",
    "prepublishOnly": "node build"
  },
  "files": [
    "dist"
  ],
+  "jest": {
+    "preset": "ts-jest",
+    "testEnvironment": "node",
+    "globals": {
+      "ts-jest": {
+        "diagnostics": true,
+        "isolatedModules": true
+      }
+    }
+  },
  "dependencies": {
+    "@types/jest": "27.4.1",
    "@types/node": "*",
-    "@vercel/node-bridge": "2.2.0",
+    "@vercel/node-bridge": "2.2.1",
    "ts-node": "8.9.1",
    "typescript": "4.3.4"
  },
@@ -32,9 +44,9 @@
    "@types/cookie": "0.3.3",
    "@types/etag": "1.8.0",
    "@types/test-listen": "1.1.0",
-    "@vercel/build-utils": "2.15.1",
+    "@vercel/build-utils": "2.16.1-canary.2",
    "@vercel/ncc": "0.24.0",
-    "@vercel/nft": "0.17.5",
+    "@vercel/nft": "0.18.1",
    "content-type": "1.0.4",
    "cookie": "0.4.0",
    "etag": "1.8.1",
--- a/packages/node/src/index.ts
+++ b/packages/node/src/index.ts
@@ -86,7 +86,6 @@ async function downloadInstallAndBundle({
  meta,
 }: DownloadOptions) {
  const downloadedFiles = await download(files, workPath, meta);
-
  const entrypointFsDirname = join(workPath, dirname(entrypoint));
  const nodeVersion = await getNodeVersion(
    entrypointFsDirname,
@@ -95,16 +94,7 @@ async function downloadInstallAndBundle({
    meta
  );
  const spawnOpts = getSpawnOptions(meta, nodeVersion);
-
-  if (meta.isDev) {
-    debug('Skipping dependency installation because dev mode is enabled');
-  } else {
-    const installTime = Date.now();
-    console.log('Installing dependencies...');
-    await runNpmInstall(entrypointFsDirname, [], spawnOpts, meta, nodeVersion);
-    debug(`Install complete [${Date.now() - installTime}ms]`);
-  }
-
+  await runNpmInstall(entrypointFsDirname, [], spawnOpts, meta, nodeVersion);
  const entrypointPath = downloadedFiles[entrypoint].fsPath;
  return { entrypointPath, entrypointFsDirname, nodeVersion, spawnOpts };
 }
@@ -390,9 +380,8 @@ export const build: BuildV3 = async ({
  return { output: lambda };
 };

-export const prepareCache: PrepareCache = async ({ workPath }) => {
-  const cache = await glob('node_modules/**', workPath);
-  return cache;
+export const prepareCache: PrepareCache = ({ repoRootPath, workPath }) => {
+  return glob('**/node_modules/**', repoRootPath || workPath);
 };

 export const startDevServer: StartDevServer = async opts => {
--- a/packages/node/test/cache-fixtures/foo/node_modules/file
+++ b/packages/node/test/cache-fixtures/foo/node_modules/file
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Ethan Arrowood	d91bca7d6b	Publish Canary - @vercel/build-utils@2.16.1-canary.2 - vercel@24.2.1-canary.2 - @vercel/client@11.0.1-canary.2 - @vercel/frameworks@0.8.1-canary.0 - @vercel/go@1.4.1-canary.2 - @vercel/node@1.15.1-canary.2 - @vercel/python@2.3.1-canary.2 - @vercel/redwood@0.8.1-canary.2 - @vercel/ruby@1.3.4-canary.2 - @vercel/static-build@0.24.1-canary.2	2022-05-06 14:16:00 -06:00
Ethan Arrowood	be54fce67b	[build-utils] add pnpm7 to path when lockfile v5.4 is detected (#7758 ) ### Related Issues Adds support for `pnpm@7` using a similar lock file detection and path setting method that `npm@7` uses ### 📋 Checklist <!-- Please keep your PR as a Draft until the checklist is complete --> #### Tests - [x] The code changed/added as part of this PR has been covered with tests - [x] All tests pass locally with `yarn test-unit` #### Code Review - [x] This PR has a concise title and thorough description useful to a reviewer - [ ] Issue from task tracker has a link to this PR	2022-05-06 19:47:41 +00:00
Sean Massa	7753bb8d89	[cli] check prebuilt target env against deploy target env (#7748 ) This check prevents a user from creating a build output targeting one environment (like `preview`) and deploying targeting another environment (like `production`). It checks `.vercel/output/builds.json` for the `target` property to decide this. If that file is missing, the check is not run.	2022-05-06 07:06:07 +00:00
Logan McAnsh	ce17ac5c35	[frameworks] Update Remix detection to check for "remix.config.js" (#7761 ) The "remix" magic package is no longer preferred by Remix, so anyone who is using a modern template won't have it installed. Checking for `remix.config.js` is safer detection logic.	2022-05-05 19:13:44 -07:00
Sean Massa	8006fc32b8	[cli] require non-TTY uses of `pull` to also pass `--yes` (#7700 ) Checks for `TTY` input to decide to handle the command or not. If the input is not TTY and the user did not pass the `--yes` option, the CLi will exit with the message: > Command `vercel pull` requires confirmation. Use option "--yes" to confirm.	2022-05-05 22:40:26 +00:00
Nathan Rajlich	8038a90db1	[node] Use TypeScript for unit tests (#7756 ) Random change I had in my working directory.	2022-05-05 19:13:01 +00:00
agadzik	f88c862e9d	Publish Canary - @vercel/build-utils@2.16.1-canary.1 - vercel@24.2.1-canary.1 - @vercel/client@11.0.1-canary.1 - @vercel/go@1.4.1-canary.1 - @vercel/node@1.15.1-canary.1 - @vercel/python@2.3.1-canary.1 - @vercel/redwood@0.8.1-canary.1 - @vercel/ruby@1.3.4-canary.1 - @vercel/static-build@0.24.1-canary.1	2022-05-05 14:11:13 -04:00
Nathan Rajlich	9170820371	[build-utils] Add `ShouldServe` type (#7755 ) Version 3 Builders can define a `shouldServe()` function that is used in `vercel dev`, so add the proper type for that.	2022-05-05 17:06:20 +00:00
Andrew Gadzik	c881546e0e	[build-utils] Add supported list of workspace managers (#7737 ) In order to support monorepo detection, we need to build out the list of supported workspace managers so that our helper functions and API endpoints can utilize the same `detectFramework` function / logic to detect a workspace manager for a given git repository. ### Related Issues - Closes https://github.com/vercel/vercel/issues/7731 ### 📋 Checklist <!-- Please keep your PR as a Draft until the checklist is complete --> #### Tests - [x] The code changed/added as part of this PR has been covered with tests - [x] All tests pass locally with `yarn test-unit` #### Code Review - [x] This PR has a concise title and thorough description useful to a reviewer - [x] Issue from task tracker has a link to this PR	2022-05-05 14:44:34 +00:00
Nathan Rajlich	fa21db98e4	[cli] Revert "Use `@vercel/fetch-retry` in CLI integration tests" (#7738 ) This reverts commit `03a8fbd3a7` (#7360).	2022-05-04 17:15:54 +00:00
Ethan Arrowood	8eabbfc666	Publish Canary - @vercel/build-utils@2.16.1-canary.0 - vercel@24.2.1-canary.0 - @vercel/client@11.0.1-canary.0 - @vercel/go@1.4.1-canary.0 - @vercel/node@1.15.1-canary.0 - @vercel/python@2.3.1-canary.0 - @vercel/redwood@0.8.1-canary.0 - @vercel/ruby@1.3.4-canary.0 - @vercel/static-build@0.24.1-canary.0	2022-05-02 11:33:22 -06:00
Ethan Arrowood	6783f7afc9	[build-utils] Fix package manager auto detection precedence (#7733 ) ### Related Issues improves package manager auto detection so that when multiple lock files are found, the highest priority one is selected rather than defaulting to yarn. ### 📋 Checklist <!-- Please keep your PR as a Draft until the checklist is complete --> #### Tests - [x] The code changed/added as part of this PR has been covered with tests - [ ] All tests pass locally with `yarn test-unit` #### Code Review - [ ] This PR has a concise title and thorough description useful to a reviewer - [ ] Issue from task tracker has a link to this PR	2022-05-02 17:22:01 +00:00
Steven	a400b9b29d	Publish Stable - @vercel/build-utils@2.16.0 - vercel@24.2.0 - @vercel/client@11.0.0 - @vercel/frameworks@0.8.0 - @vercel/go@1.4.0 - @vercel/node-bridge@2.2.1 - @vercel/node@1.15.0 - @vercel/python@2.3.0 - @vercel/redwood@0.8.0 - @vercel/routing-utils@1.13.2 - @vercel/ruby@1.3.3 - @vercel/static-build@0.24.0 - @vercel/static-config@1.0.0	2022-04-29 14:11:32 -04:00
Steven	b549c37149	[build-utils][static-build] Replace 00a0 with space (#7732 )	2022-04-28 22:25:24 -04:00
Nathan Rajlich	30d5e64291	Publish Canary - @vercel/build-utils@2.15.2-canary.6 - vercel@24.1.1-canary.8 - @vercel/client@10.4.2-canary.7 - @vercel/go@1.3.3-canary.6 - @vercel/node@1.14.2-canary.7 - @vercel/python@2.2.3-canary.6 - @vercel/redwood@0.7.1-canary.6 - @vercel/ruby@1.3.3-canary.6 - @vercel/static-build@0.23.2-canary.6	2022-04-28 17:50:59 -07:00
Nathan Rajlich	47c2c361d2	[build-utils] Update "yazl" dependency (#7734 ) The older version of "yazl" was using `new Buffer()` which causes deprecation warnings to be printed. The latest version avoids that.	2022-04-28 17:47:10 -07:00
Nathan Rajlich	438576fc7c	Publish Canary - @vercel/build-utils@2.15.2-canary.5 - vercel@24.1.1-canary.7 - @vercel/client@10.4.2-canary.6 - @vercel/frameworks@0.7.2-canary.1 - @vercel/go@1.3.3-canary.5 - @vercel/node@1.14.2-canary.6 - @vercel/python@2.2.3-canary.5 - @vercel/redwood@0.7.1-canary.5 - @vercel/ruby@1.3.3-canary.5 - @vercel/static-build@0.23.2-canary.5 - @vercel/static-config@1.0.0-canary.1	2022-04-28 11:53:39 -07:00
Steven	b30343ef7b	[tests] Bump dependencies for jest/eslint/prettier/turbo/etc (#7727 )	2022-04-28 14:52:46 -04:00
Ethan Arrowood	2dc0dfa572	[node][static-build][redwood] Add root path pattern to `prepareCache()` (#7710 )	2022-04-27 21:17:44 -07:00
Steven	9ee54b3dd6	[static-build] Resolve git.io links (#7722 ) https://github.blog/changelog/2022-04-25-git-io-deprecation/	2022-04-26 21:57:12 -04:00
Steven	9d67e0bc06	[python] Add discontinue date for Python 3.6 (#7709 ) This PR does a few things: - Changes the existing warning message for Python 3.6 to print a discontinue date - Will automatically fail new Python 3.6 deployments created after that date - Consolidates logic to make Python version selection work in a similar manner to Node.js version selection - Changes tests from JS to TS	2022-04-26 15:49:19 -04:00
Steven	466135cf84	Publish Canary - @vercel/build-utils@2.15.2-canary.4 - vercel@24.1.1-canary.6 - @vercel/client@10.4.2-canary.5 - @vercel/go@1.3.3-canary.4 - @vercel/node@1.14.2-canary.5 - @vercel/python@2.2.3-canary.4 - @vercel/redwood@0.7.1-canary.4 - @vercel/ruby@1.3.3-canary.4 - @vercel/static-build@0.23.2-canary.4	2022-04-25 12:49:34 -04:00
Steven	eab2e229dc	[build-utils] Add warning for experimental Node.js (#7717 )	2022-04-25 12:49:04 -04:00
Steven	698b89a2ba	Publish Canary - @vercel/build-utils@2.15.2-canary.3 - vercel@24.1.1-canary.5 - @vercel/client@10.4.2-canary.4 - @vercel/frameworks@0.7.2-canary.0 - @vercel/go@1.3.3-canary.3 - @vercel/node@1.14.2-canary.4 - @vercel/python@2.2.3-canary.3 - @vercel/redwood@0.7.1-canary.3 - @vercel/ruby@1.3.3-canary.3 - @vercel/static-build@0.23.2-canary.3	2022-04-25 12:02:13 -04:00
Steven	bae2a2e4df	[python] Upgrade tests (#7711 ) * [python] Upgrade tests * Fix latest sanic asgi * Bump flask * Change requirements.txt to Pipfile * Fix dev test * Use verbose requirements.txt * Flip requirements	2022-04-25 12:01:49 -04:00
Steven	57916bb712	[build-utils] Add env var ENABLE_EXPERIMENTAL_NODE16 (#7489 ) This PR uses an environment variable since this feature is not available to all accounts yet.	2022-04-25 11:07:16 -04:00
Sean Massa	12bbd4e8eb	[cli] Update language of prebuilt error (#7702 )	2022-04-22 09:55:27 -07:00
Aaron Morris	4e4c7023dc	[frameworks] Add opt-in darkModeLogo to `Framework` in packages/frameworks (#7693 ) Supply light mode logos over the frameworks API to be consumed by front ### Related Issues ### 📋 Checklist <!-- Please keep your PR as a Draft until the checklist is complete --> #### Tests - [ ] The code changed/added as part of this PR has been covered with tests - [ ] All tests pass locally with `yarn test-unit` #### Code Review - [x] This PR has a concise title and thorough description useful to a reviewer - [ ] Issue from task tracker has a link to this PR	2022-04-22 16:49:39 +00:00
Nathan Rajlich	41805790e7	[static-build] Support Build Output API v3 `cache` property in `prepareCache()` (#7704 ) When a framework that outputs Build Output API v3 specifies the `cache` property in the `config.json` file then static-build will include those files in the `prepareCache()` function result.	2022-04-21 18:04:21 -07:00
Ethan Arrowood	6ad77ae8e1	Publish Canary - vercel@24.1.1-canary.4 - @vercel/client@10.4.2-canary.3	2022-04-21 16:01:41 -06:00
Ethan Arrowood	e8daf36cd7	only revert override feature (#7701 )	2022-04-21 15:59:55 -06:00
Nathan Rajlich	c319a2c499	[client] Remove single file deployment root path `/` route (#7699 ) This is strange behavior, and also inconsistent compared to how a Git deployment is created. Let's remove it.	2022-04-21 00:35:25 +00:00
Sean Massa	a410baa797	[cli] check for prebuilt directory (#7697 ) When using `vc deploy --prebuilt`, we need to check for an actual ".vercel/output" before attempting to deploy. This PR adds a a check for that. Now... In a directory without `.vercel/output`: ``` $ vc deploy --prebuilt Error! Option `--prebuilt` was used, but no prebuilt deploy found in ".vercel/output" ``` In a direcotry with `.vercel/output` (where I've not linked it yet): ``` $ vc deploy --prebuilt ? Set up and deploy “~/source/vercel/examples/build-output-api/serverless-function”? [Y/n] ```	2022-04-20 19:54:47 +00:00
Dominik Ferber	625568e659	fix ts-eager (#7677 ) Switches await import() to require().default so that ts-eager understands them. closes #7676	2022-04-20 10:30:48 -07:00
Nathan Rajlich	41868c1fe0	[cli] Ensure `.vercel` directory is created in `vc pull` (#7695 ) When the `.vercel` directory does not exist and the env vars (`VERCEL_PROJECT_ID`/`VERCEL_ORG_ID`) are used for project linking, the `vercel pull` command was throwing an error: ``` $ VERCEL_PROJECT_ID=xxxxxxxx VERCEL_ORG_ID=xxxxxxxxxx vercel pull Vercel CLI 24.1.1-canary.3 — https://vercel.com/feedback Downloading "development" Environment Variables for Project t Error! ENOENT: no such file or directory, open '/Code/t/.vercel/.env.development.local' ```	2022-04-19 20:49:44 -07:00
Steven	1b644f1218	[docs] Update available runtimes (#7692 )	2022-04-19 12:08:46 -04:00
Sean Massa	29ea0fb06b	[examples] Remove amp example (#7686 )	2022-04-17 19:29:56 -04:00
Ethan Arrowood	b61f049f11	Publish Canary - @vercel/build-utils@2.15.2-canary.2 - vercel@24.1.1-canary.3 - @vercel/client@10.4.2-canary.2 - @vercel/go@1.3.3-canary.2 - @vercel/node@1.14.2-canary.3 - @vercel/python@2.2.3-canary.2 - @vercel/redwood@0.7.1-canary.2 - @vercel/ruby@1.3.3-canary.2 - @vercel/static-build@0.23.2-canary.2	2022-04-15 15:26:55 -06:00
Ethan Arrowood	16e28f326b	[cli] Allow projectSettings override in vercel.json (#7619 ) This PR adds the required changes to the CLI to support overridable `vercel.json` `projectSettings` values. This PR is linked with changes on the API side too. - The core changes are in `packages/cli/src/commands/deploy/index.ts` - An unused code path was removed from `packages/client/src/create-deployment.ts`, `packages/cli/src/util/deploy/process-deployment.ts` and `packages/cli/src/util/index.ts`. This will only work for existing deployment (not new ones). This is implemented by checking the `status` of the deployment (is it linked or not). An error is thrown if the user attempts to send overrided settings to a new project. A warning is outputted when overrided settings are discovered and shares what settings are being overridden. ### 📋 Checklist <!-- Please keep your PR as a Draft until the checklist is complete --> #### Tests - [x] The code changed/added as part of this PR has been covered with tests - [x] All tests pass locally with `yarn test-unit` #### Code Review - [x] This PR has a concise title and thorough description useful to a reviewer - [ ] Issue from task tracker has a link to this PR	2022-04-15 21:20:00 +00:00
Sean Massa	276397c940	[examples] fixed vercel deploy link (#7684 )	2022-04-15 13:55:42 -05:00
Nathan Rajlich	85d7311199	[static-build] Misc TypeScript cleanup (#7682 ) This was just sitting on my local checkout so might as well push it.	2022-04-15 09:42:32 -07:00
Sean Massa	b8114b8b39	[cli] set environment properly in `vc pull` (#7656 ) This PR sets environment properly in `vc pull`. The system env vars were not respecting the target `--environment`. Adds tests for related `vc env` logic.	2022-04-15 04:41:29 +00:00
QianyuPan	d63e8d3187	[go] Add support for version 1.18 (#7590 ) Go 1.18 has been released, but I find that I can't deploy my project on Vercel when `go.mod` has `go 1.18` in it. 1.18 adds some very useful features. It would be very valuable for developers to have Vercel support 1.18.	2022-04-14 19:37:01 -04:00
JJ Kasper	11d3dd04aa	Publish Canary - vercel@24.1.1-canary.2 - @vercel/node-bridge@2.2.1-canary.0 - @vercel/node@1.14.2-canary.2	2022-04-14 17:04:05 -05:00
JJ Kasper	46bf95ee36	[node-bridge] Ensure content-type is always set with multi-payloads (#7681 ) ### Related Issues This ensures a content-type is always set inside of each part of the multi-part payload as it's needed for proper parsing. This also ensures non-200 status codes/headers are passed back separate when they differ so that they can be handled independently without assuming they all match. x-ref: https://vercel.slack.com/archives/C03AYHB6MA9 x-ref: https://github.com/vercel/vercel/pull/7507 ### 📋 Checklist <!-- Please keep your PR as a Draft until the checklist is complete --> #### Tests - [ ] The code changed/added as part of this PR has been covered with tests - [ ] All tests pass locally with `yarn test-unit` #### Code Review - [ ] This PR has a concise title and thorough description useful to a reviewer - [ ] Issue from task tracker has a link to this PR	2022-04-14 22:00:10 +00:00
Nathan Rajlich	92252468c2	[tests] Add `turbo.json` and bump to turbo 1.2.2 (#7620 ) * Add `turbo.json` Ran `npx @turbo/codemod create-turbo-config` like the warnings have been telling us to. * [tests] Bump `turbo` and allow `turbo.json` in `.vercelignore` (#7623) Co-authored-by: Jared Palmer <jared@jaredpalmer.com> Co-authored-by: Steven <steven@ceriously.com>	2022-04-13 11:09:47 -04:00
Nathan Rajlich	71b83d5587	Publish Canary - @vercel/build-utils@2.15.2-canary.1 - vercel@24.1.1-canary.1 - @vercel/client@10.4.2-canary.1 - @vercel/go@1.3.3-canary.1 - @vercel/node@1.14.2-canary.1 - @vercel/python@2.2.3-canary.1 - @vercel/redwood@0.7.1-canary.1 - @vercel/ruby@1.3.3-canary.1 - @vercel/static-build@0.23.2-canary.1	2022-04-12 15:57:36 -07:00
Nathan Rajlich	d9e5fdc5e4	[build-utils] Move "Installing dependencies..." log to `runNpmInstall()` (#7672 ) Follow-up to #7671. Since `runNpmInstall()` might now be de-duped, only print "Installing dependencies..." when the dependencies are actually being installed. This avoids printing the log message unnecessarily when the command won't actually be run, and also removes some duplication in the Builders' code.	2022-04-12 16:23:01 -04:00
Nathan Rajlich	58f479c603	[static-build] Add support for Build Output v3 detection (#7669 ) Adds detection logic for a framework / build script outputting Build Output v3 format to the filesystem. In this case, `static-build` will simply stop processing after the Build Command since deserialization happens in the build-container side of things (this is different compared to the v1 output which gets handled in this Builder. The reason for that is because the v3 output matches what `vc build` outputs vs. v1 which is a different format).	2022-04-12 09:09:50 -07:00
Nathan Rajlich	d62461d952	[build-utils] Only allow `runNpmInstall()` to run once per `package.json` (#7671 ) Adds a best-effort optimization to only run `npm install` once per `pacakge.json` file. This will save a lot of time in the single-sandbox build world (i.e. `vc build`).	2022-04-12 09:09:10 -07:00
Steven	e7f524defb	Publish Canary - @vercel/build-utils@2.15.2-canary.0 - vercel@24.1.1-canary.0 - @vercel/client@10.4.2-canary.0 - @vercel/go@1.3.3-canary.0 - @vercel/node@1.14.2-canary.0 - @vercel/python@2.2.3-canary.0 - @vercel/redwood@0.7.1-canary.0 - @vercel/ruby@1.3.3-canary.0 - @vercel/static-build@0.23.2-canary.0	2022-04-12 08:58:38 -04:00
Steven	bdefd0d05d	[docs] Fix links to docs (#7668 )	2022-04-12 07:52:12 -04:00
Ethan Arrowood	ca522fc9f1	[node][redwood] update `@vercel/nft` to 0.18.1 (#7670 ) ### Related Issues Updates the @vercel/nft dependency across the repo to v0.18.1. ### 📋 Checklist <!-- Please keep your PR as a Draft until the checklist is complete --> #### Tests - [ ] The code changed/added as part of this PR has been covered with tests - [ ] All tests pass locally with `yarn test-unit` #### Code Review - [ ] This PR has a concise title and thorough description useful to a reviewer - [ ] Issue from task tracker has a link to this PR	2022-04-11 22:07:45 +00:00
				`@@ -0,0 +1 @@`
				<svg width="48" height="48" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M22.428.013c-.103.01-.431.042-.727.066C14.883.693 8.497 4.37 4.453 10.024A23.754 23.754 0 0 0 .216 20.51C.023 21.828 0 22.217 0 24.005c0 1.787.023 2.177.216 3.495 1.304 9.012 7.718 16.584 16.417 19.39 1.558.501 3.2.844 5.068 1.05.727.08 3.87.08 4.598 0 3.224-.356 5.954-1.154 8.648-2.529.412-.21.492-.267.436-.314-.038-.028-1.797-2.388-3.909-5.24l-3.838-5.184-4.809-7.117c-2.646-3.913-4.824-7.112-4.842-7.112-.019-.005-.038 3.157-.047 7.018-.014 6.76-.019 7.033-.103 7.192-.122.23-.216.324-.413.427-.15.075-.282.09-.99.09h-.812l-.216-.137a.878.878 0 0 1-.314-.342l-.099-.211.01-9.407.014-9.41.145-.184c.075-.098.235-.225.347-.286.193-.094.268-.103 1.08-.103.957 0 1.116.038 1.365.31.07.075 2.674 3.997 5.79 8.721s7.376 11.175 9.469 14.342l3.8 5.756.192-.127c1.704-1.107 3.505-2.683 4.932-4.325a23.888 23.888 0 0 0 5.65-12.268c.192-1.319.215-1.708.215-3.495 0-1.788-.023-2.177-.216-3.495-1.304-9.013-7.718-16.584-16.417-19.39C29.832.623 28.199.28 26.369.074c-.45-.047-3.551-.099-3.94-.061zm9.825 14.515a.947.947 0 0 1 .474.554c.038.122.047 2.73.038 8.608l-.014 8.436-1.488-2.28-1.492-2.28v-6.132c0-3.964.019-6.193.047-6.3a.957.957 0 0 1 .465-.592c.192-.098.262-.108 1-.108.694 0 .816.01.97.094z" fill="#fff"/></svg>