Version Packages (#10213 )

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
[remix] Create ensured dependency symlink at the start directory, instead of root of repo (#10224 )
2025-12-11 12:57:46 +00:00 · 2023-07-18 14:02:19 -05:00 · 2023-07-18 18:27:19 +00:00 · 2023-07-17 19:48:45 +00:00 · 2023-07-17 16:45:05 +00:00 · 2023-07-17 14:33:25 +00:00
232 changed files with 7214 additions and 9539 deletions
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,12 +1,13 @@
 # Documentation
 # https://help.github.com/en/articles/about-code-owners

+# Restricted Paths
 *                                        @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood
 /.github/workflows                       @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood @ijjk
 /packages/fs-detectors                   @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood @agadzik @chloetedder
 /packages/next                           @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood @ijjk
 /packages/routing-utils                  @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood @ijjk
-/packages/edge                           @vercel/edge-compute
+/packages/edge                           @vercel/compute
 /examples                                @leerob
 /examples/create-react-app               @Timer
 /examples/nextjs                         @timneutkens @ijjk @styfle
@@ -14,3 +15,6 @@
 /examples/jekyll                         @styfle
 /examples/zola                           @styfle
 /packages/node                           @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood @Kikobeats
+
+# Unrestricted Paths
+.changeset/
--- a/.github/workflows/test-lint.yml
+++ b/.github/workflows/test-lint.yml
@@ -19,6 +19,22 @@ concurrency:
  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}

 jobs:
+  enforce-changeset:
+    name: Enforce Changeset
+    runs-on: ubuntu-latest
+    if: github.event_name == 'pull_request' && github.event.pull_request.title != 'Version Packages'
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+          ref: main
+      - run: git checkout ${{ github.event.pull_request.head.ref }}
+      - name: install pnpm@8.3.1
+        run: npm i -g pnpm@8.3.1
+      - run: pnpm install
+      # Enforce a changeset file to be present
+      - run: pnpm exec changeset status --since=main
+
  test:
    name: Lint
    timeout-minutes: 10
--- a/examples/nextjs/package-lock.json
+++ b/examples/nextjs/package-lock.json
--- a/examples/nextjs/package.json
+++ b/examples/nextjs/package.json
@@ -9,9 +9,9 @@
    "lint": "next lint"
  },
  "dependencies": {
-    "eslint": "8.41.0",
-    "eslint-config-next": "13.4.4",
-    "next": "13.4.4",
+    "eslint": "8.45.0",
+    "eslint-config-next": "13.4.10",
+    "next": "13.4.10",
    "react": "18.2.0",
    "react-dom": "18.2.0"
  }
--- a/examples/package.json
+++ b/examples/package.json
@@ -9,6 +9,6 @@
  },
  "devDependencies": {
    "@types/jest": "27.4.1",
-    "@vercel/frameworks": "1.4.2"
+    "@vercel/frameworks": "1.4.3"
  }
 }
--- a/examples/remix/.eslintrc.js
+++ b/examples/remix/.eslintrc.js
@@ -1,3 +1,4 @@
+/** @type {import('eslint').Linter.Config} */
 module.exports = {
  extends: ["@remix-run/eslint-config", "@remix-run/eslint-config/node"],
 };
--- a/examples/remix/.gitignore
+++ b/examples/remix/.gitignore
@@ -1,11 +1,12 @@
 node_modules

-.cache
+/.cache
+/build
+/public/build
 .env
+
 .vercel
 .output

-/build/
-/public/build
 /api/index.js
 /api/index.js.map
--- a/examples/remix/app/root.tsx
+++ b/examples/remix/app/root.tsx
@@ -1,4 +1,4 @@
-import type { MetaFunction } from "@vercel/remix";
+import { cssBundleHref } from "@remix-run/css-bundle";
 import {
  Links,
  LiveReload,
@@ -8,17 +8,18 @@ import {
  ScrollRestoration,
 } from "@remix-run/react";
 import { Analytics } from "@vercel/analytics/react";
+import type { LinksFunction } from "@vercel/remix";

-export const meta: MetaFunction = () => ({
-  charset: "utf-8",
-  title: "New Remix App",
-  viewport: "width=device-width,initial-scale=1",
-});
+export const links: LinksFunction = () => [
+  ...(cssBundleHref ? [{ rel: "stylesheet", href: cssBundleHref }] : []),
+];

 export default function App() {
  return (
    <html lang="en">
      <head>
+        <meta charSet="utf-8" />
+        <meta name="viewport" content="width=device-width,initial-scale=1" />
        <Meta />
        <Links />
      </head>
--- a/examples/remix/app/routes/_index.tsx
+++ b/examples/remix/app/routes/_index.tsx
@@ -1,3 +1,7 @@
+import type { V2_MetaFunction } from "@vercel/remix";
+
+export const meta: V2_MetaFunction = () => [{ title: "New Remix App" }];
+
 export default function Index() {
  return (
    <div style={{ fontFamily: "system-ui, sans-serif", lineHeight: "1.4" }}>
--- a/examples/remix/app/routes/edge.tsx
+++ b/examples/remix/app/routes/edge.tsx
@@ -1,5 +1,9 @@
+import type { V2_MetaFunction } from "@vercel/remix";
+
 export const config = { runtime: "edge" };

+export const meta: V2_MetaFunction = () => [{ title: "Remix@Edge | New Remix App" }];
+
 export default function Edge() {
  return (
    <div style={{ fontFamily: "system-ui, sans-serif", lineHeight: "1.4" }}>
--- a/examples/remix/package.json
+++ b/examples/remix/package.json
@@ -3,24 +3,28 @@
  "sideEffects": false,
  "scripts": {
    "build": "remix build",
-    "dev": "remix dev"
+    "dev": "remix dev",
+    "start": "remix-serve build",
+    "typecheck": "tsc"
  },
  "dependencies": {
-    "@remix-run/node": "^1.15.0",
-    "@remix-run/react": "^1.15.0",
-    "@remix-run/serve": "^1.15.0",
+    "@remix-run/css-bundle": "^1.18.0",
+    "@remix-run/node": "^1.18.0",
+    "@remix-run/react": "^1.18.0",
+    "@remix-run/serve": "^1.18.0",
    "@vercel/analytics": "^0.1.11",
-    "@vercel/remix": "^1.15.0",
+    "@vercel/remix": "^1.18.0",
+    "isbot": "^3.6.8",
    "react": "^18.2.0",
    "react-dom": "^18.2.0"
  },
  "devDependencies": {
-    "@remix-run/dev": "^1.15.0",
-    "@remix-run/eslint-config": "^1.15.0",
+    "@remix-run/dev": "^1.18.0",
+    "@remix-run/eslint-config": "^1.18.0",
    "@types/react": "^18.0.25",
    "@types/react-dom": "^18.0.11",
    "eslint": "^8.28.0",
-    "typescript": "^4.9.3"
+    "typescript": "^5.1.3"
  },
  "engines": {
    "node": ">=14"
--- a/examples/remix/pnpm-lock.yaml
+++ b/examples/remix/pnpm-lock.yaml
--- a/examples/remix/remix.config.js
+++ b/examples/remix/remix.config.js
@@ -1,8 +1,15 @@
-/**
- * @type {import('@remix-run/dev').AppConfig}
- */
+/** @type {import('@remix-run/dev').AppConfig} */
 module.exports = {
-  ignoredRouteFiles: ['**/.*'],
+  future: {
+    v2_dev: true,
+    v2_errorBoundary: true,
+    v2_headers: true,
+    v2_meta: true,
+    v2_normalizeFormMethod: true,
+    v2_routeConvention: true,
+  },
+  ignoredRouteFiles: ["**/.*"],
+  serverModuleFormat: "cjs",
  // appDirectory: "app",
  // assetsBuildDirectory: "public/build",
  // serverBuildPath: "build/index.js",
--- a/examples/saber/README.md
+++ b/examples/saber/README.md
@@ -2,7 +2,7 @@

 # Saber Example

-This directory is a brief example of a [Saber](https://saber.land) site that can be deployed to Vercel with zero configuration.
+This directory is a brief example of a [Saber](https://saber.egoist.dev) site that can be deployed to Vercel with zero configuration.

 ## Deploy Your Own

--- a/examples/saber/pages/about.md
+++ b/examples/saber/pages/about.md
@@ -5,4 +5,4 @@ layout: page

 This is the Saber port of the base Jekyll theme. Check out the [GitHub project](https://github.com/egoist/saber-theme-minima) for detailed usages.

-You can find out more info about customizing your theme, as well as basic Saber usage documentation at https://saber.land
+You can find out more info about customizing your theme, as well as basic Saber usage documentation at https://saber.egoist.dev
--- a/examples/storybook/vercel.json
+++ b/examples/storybook/vercel.json
@@ -0,0 +1,4 @@
+{
+  "framework": "storybook",
+  "buildCommand": "storybook build"
+}
--- a/internals/constants/CHANGELOG.md
+++ b/internals/constants/CHANGELOG.md
@@ -1,5 +1,25 @@
 # @vercel-internals/constants

+## 1.0.4
+
+### Patch Changes
+
+- Create new help output and arg parsing for deploy command ([#10090](https://github.com/vercel/vercel/pull/10090))
+
+## 1.0.3
+
+### Patch Changes
+
+- Updated dependencies [[`346892210`](https://github.com/vercel/vercel/commit/3468922108f411482a72acd0331f0f2ee52a6d4c)]:
+  - @vercel/build-utils@6.8.0
+
+## 1.0.2
+
+### Patch Changes
+
+- Updated dependencies [[`cd35071f6`](https://github.com/vercel/vercel/commit/cd35071f609d615d47bc04634c123b33768436cb)]:
+  - @vercel/build-utils@6.7.5
+
 ## 1.0.1

 ### Patch Changes
--- a/internals/constants/package.json
+++ b/internals/constants/package.json
@@ -1,16 +1,13 @@
 {
  "private": true,
  "name": "@vercel-internals/constants",
-  "version": "1.0.1",
+  "version": "1.0.4",
  "types": "dist/index.d.ts",
  "main": "dist/index.js",
  "scripts": {
    "build": "tsc -p tsconfig.json"
  },
-  "dependencies": {
-    "@vercel/build-utils": "6.7.4",
-    "@vercel/routing-utils": "2.2.1"
-  },
+  "dependencies": {},
  "devDependencies": {
    "@vercel-internals/tsconfig": "1.0.0",
    "@vercel/style-guide": "4.0.2",
--- a/internals/constants/src/index.ts
+++ b/internals/constants/src/index.ts
@@ -3,3 +3,7 @@ export const PROJECT_ENV_TARGET = [
  'preview',
  'development',
 ] as const;
+
+export const LOGO = '▲' as const;
+export const NAME = 'vercel' as const;
+export const TITLE = 'Vercel' as const;
--- a/internals/types/CHANGELOG.md
+++ b/internals/types/CHANGELOG.md
@@ -1,5 +1,36 @@
 # @vercel-internals/types

+## 1.0.5
+
+### Patch Changes
+
+- Updated dependencies [[`0750517af`](https://github.com/vercel/vercel/commit/0750517af99aea41410d4f1f772ce427699554e7)]:
+  - @vercel/build-utils@6.8.2
+
+## 1.0.4
+
+### Patch Changes
+
+- Updated dependencies [[`7021279b2`](https://github.com/vercel/vercel/commit/7021279b284f314a4d1bdbb4306b4c22291efa08), [`718bbd365`](https://github.com/vercel/vercel/commit/718bbd365a50271a980bdca231ca801a0eead32b)]:
+  - @vercel/build-utils@6.8.1
+  - @vercel-internals/constants@1.0.4
+
+## 1.0.3
+
+### Patch Changes
+
+- Updated dependencies [[`346892210`](https://github.com/vercel/vercel/commit/3468922108f411482a72acd0331f0f2ee52a6d4c)]:
+  - @vercel/build-utils@6.8.0
+  - @vercel-internals/constants@1.0.3
+
+## 1.0.2
+
+### Patch Changes
+
+- Updated dependencies [[`cd35071f6`](https://github.com/vercel/vercel/commit/cd35071f609d615d47bc04634c123b33768436cb)]:
+  - @vercel/build-utils@6.7.5
+  - @vercel-internals/constants@1.0.2
+
 ## 1.0.1

 ### Patch Changes
--- a/internals/types/index.d.ts
+++ b/internals/types/index.d.ts
@@ -1,5 +1,6 @@
 import type { BuilderFunctions } from '@vercel/build-utils';
 import type { Readable, Writable } from 'stream';
+import type * as tty from 'tty';
 import type { Route } from '@vercel/routing-utils';
 import { PROJECT_ENV_TARGET } from '@vercel-internals/constants';

@@ -378,28 +379,60 @@ export interface ProjectLink {
   * to the root directory of the repository.
   */
  repoRoot?: string;
+  /**
+   * When linked as a repository, contains the relative path
+   * to the selected project root directory.
+   */
+  projectRootDirectory?: string;
 }

 export interface PaginationOptions {
-  prev: number;
+  /**
+   * Amount of items in the current page.
+   * @example 20
+   */
  count: number;
-  next?: number;
+  /**
+   * Timestamp that must be used to request the next page.
+   * @example 1540095775951
+   */
+  next: number | null;
+  /**
+   * Timestamp that must be used to request the previous page.
+   * @example 1540095775951
+   */
+  prev: number | null;
 }

+export type ProjectLinked = {
+  status: 'linked';
+  org: Org;
+  project: Project;
+  repoRoot?: string;
+};
+
+export type ProjectNotLinked = {
+  status: 'not_linked';
+  org: null;
+  project: null;
+};
+
+export type ProjectLinkedError = {
+  status: 'error';
+  exitCode: number;
+  reason?:
+    | 'HEADLESS'
+    | 'NOT_AUTHORIZED'
+    | 'TEAM_DELETED'
+    | 'PATH_IS_FILE'
+    | 'INVALID_ROOT_DIRECTORY'
+    | 'MISSING_PROJECT_SETTINGS';
+};
+
 export type ProjectLinkResult =
-  | { status: 'linked'; org: Org; project: Project; repoRoot?: string }
-  | { status: 'not_linked'; org: null; project: null }
-  | {
-      status: 'error';
-      exitCode: number;
-      reason?:
-        | 'HEADLESS'
-        | 'NOT_AUTHORIZED'
-        | 'TEAM_DELETED'
-        | 'PATH_IS_FILE'
-        | 'INVALID_ROOT_DIRECTORY'
-        | 'MISSING_PROJECT_SETTINGS';
-    };
+  | ProjectLinked
+  | ProjectNotLinked
+  | ProjectLinkedError;

 /**
 * @deprecated - `RollbackJobStatus` has been replace by `LastAliasRequest['jobStatus']`.
@@ -599,6 +632,6 @@ export interface WritableTTY extends Writable {

 export interface Stdio {
  stdin: ReadableTTY;
-  stdout: WritableTTY;
-  stderr: WritableTTY;
+  stdout: tty.WriteStream;
+  stderr: tty.WriteStream;
 }
--- a/internals/types/package.json
+++ b/internals/types/package.json
@@ -1,13 +1,13 @@
 {
  "private": true,
  "name": "@vercel-internals/types",
-  "version": "1.0.1",
+  "version": "1.0.5",
  "types": "index.d.ts",
  "main": "index.d.ts",
  "dependencies": {
    "@types/node": "14.14.31",
-    "@vercel-internals/constants": "1.0.1",
-    "@vercel/build-utils": "6.7.4",
+    "@vercel-internals/constants": "1.0.4",
+    "@vercel/build-utils": "6.8.2",
    "@vercel/routing-utils": "2.2.1"
  },
  "devDependencies": {
--- a/lerna.json
+++ b/lerna.json
@@ -1,13 +0,0 @@
-{
-  "npmClient": "pnpm",
-  "useWorkspaces": true,
-  "packages": ["packages/*"],
-  "command": {
-    "publish": {
-      "npmClient": "npm",
-      "allowBranch": ["main"],
-      "registry": "https://registry.npmjs.org/"
-    }
-  },
-  "version": "independent"
-}
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
    "source-map-support": "0.5.12",
    "ts-eager": "2.0.2",
    "ts-jest": "29.1.0",
-    "turbo": "1.9.9",
+    "turbo": "1.10.7",
    "typescript": "4.9.5"
  },
  "scripts": {
--- a/packages/build-utils/CHANGELOG.md
+++ b/packages/build-utils/CHANGELOG.md
@@ -1,5 +1,29 @@
 # @vercel/build-utils

+## 6.8.2
+
+### Patch Changes
+
+- Push back `nodejs16.x` discontinue date to `2024-02-06` ([#10209](https://github.com/vercel/vercel/pull/10209))
+
+## 6.8.1
+
+### Patch Changes
+
+- Revert "[build-utils] Allow file-ref sema to be controlled through env flag" ([#10167](https://github.com/vercel/vercel/pull/10167))
+
+## 6.8.0
+
+### Minor Changes
+
+- Add `getNodeBinPaths()` and `traverseUpDirectories()` functions ([#10150](https://github.com/vercel/vercel/pull/10150))
+
+## 6.7.5
+
+### Patch Changes
+
+- Publish missing build-utils ([`cd35071f6`](https://github.com/vercel/vercel/commit/cd35071f609d615d47bc04634c123b33768436cb))
+
 ## 6.7.4

 ### Patch Changes
--- a/packages/build-utils/package.json
+++ b/packages/build-utils/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/build-utils",
-  "version": "6.7.4",
+  "version": "6.8.2",
  "license": "Apache-2.0",
  "main": "./dist/index.js",
  "types": "./dist/index.d.js",
--- a/packages/build-utils/src/file-fs-ref.ts
+++ b/packages/build-utils/src/file-fs-ref.ts
@@ -5,13 +5,7 @@ import path from 'path';
 import Sema from 'async-sema';
 import { FileBase } from './types';

-const DEFAULT_SEMA = 20;
-const semaToPreventEMFILE = new Sema(
-  parseInt(
-    process.env.VERCEL_INTERNAL_FILE_FS_REF_SEMA || String(DEFAULT_SEMA),
-    10
-  ) || DEFAULT_SEMA
-);
+const semaToPreventEMFILE = new Sema(20);

 interface FileFsRefOptions {
  mode?: number;
--- a/packages/build-utils/src/file-ref.ts
+++ b/packages/build-utils/src/file-ref.ts
@@ -12,13 +12,7 @@ interface FileRefOptions {
  mutable?: boolean;
 }

-const DEFAULT_SEMA = 5;
-const semaToDownloadFromS3 = new Sema(
-  parseInt(
-    process.env.VERCEL_INTERNAL_FILE_REF_SEMA || String(DEFAULT_SEMA),
-    10
-  ) || DEFAULT_SEMA
-);
+const semaToDownloadFromS3 = new Sema(5);

 class BailableError extends Error {
  public bail: boolean;
--- a/packages/build-utils/src/fs/node-version.ts
+++ b/packages/build-utils/src/fs/node-version.ts
@@ -10,7 +10,7 @@ function getOptions() {
      major: 16,
      range: '16.x',
      runtime: 'nodejs16.x',
-      discontinueDate: new Date('2023-08-15'),
+      discontinueDate: new Date('2024-02-06'),
    },
    {
      major: 14,
--- a/packages/build-utils/src/fs/run-user-scripts.ts
+++ b/packages/build-utils/src/fs/run-user-scripts.ts
@@ -44,23 +44,33 @@ export interface ScanParentDirsResult {
  lockfileVersion?: number;
 }

-export interface WalkParentDirsProps {
+export interface TraverseUpDirectoriesProps {
  /**
-   * The highest directory, typically the workPath root of the project.
-   * If this directory is reached and it doesn't contain the file, null is returned.
-   */
-  base: string;
-  /**
-   * The directory to start searching, typically the same directory of the entrypoint.
-   * If this directory doesn't contain the file, the parent is checked, etc.
+   * The directory to start iterating from, typically the same directory of the entrypoint.
   */
  start: string;
+  /**
+   * The highest directory, typically the workPath root of the project.
+   */
+  base?: string;
+}
+
+export interface WalkParentDirsProps
+  extends Required<TraverseUpDirectoriesProps> {
  /**
   * The name of the file to search for, typically `package.json` or `Gemfile`.
   */
  filename: string;
 }

+export interface WalkParentDirsMultiProps
+  extends Required<TraverseUpDirectoriesProps> {
+  /**
+   * The name of the file to search for, typically `package.json` or `Gemfile`.
+   */
+  filenames: string[];
+}
+
 export interface SpawnOptionsExtended extends SpawnOptions {
  /**
   * Pretty formatted command that is being spawned for logging purposes.
@@ -131,6 +141,24 @@ export async function execCommand(command: string, options: SpawnOptions = {}) {
  return true;
 }

+export function* traverseUpDirectories({
+  start,
+  base,
+}: TraverseUpDirectoriesProps) {
+  let current: string | undefined = path.normalize(start);
+  const normalizedRoot = base ? path.normalize(base) : undefined;
+  while (current) {
+    yield current;
+    if (current === normalizedRoot) break;
+    // Go up one directory
+    const next = path.join(current, '..');
+    current = next === current ? undefined : next;
+  }
+}
+
+/**
+ * @deprecated Use `getNodeBinPaths()` instead.
+ */
 export async function getNodeBinPath({
  cwd,
 }: {
@@ -141,6 +169,15 @@ export async function getNodeBinPath({
  return path.join(dir, 'node_modules', '.bin');
 }

+export function getNodeBinPaths({
+  start,
+  base,
+}: TraverseUpDirectoriesProps): string[] {
+  return Array.from(traverseUpDirectories({ start, base })).map(dir =>
+    path.join(dir, 'node_modules/.bin')
+  );
+}
+
 async function chmodPlusX(fsPath: string) {
  const s = await fs.stat(fsPath);
  const newMode = s.mode | 64 | 8 | 1; // eslint-disable-line no-bitwise
@@ -297,22 +334,14 @@ export async function walkParentDirs({
 }: WalkParentDirsProps): Promise<string | null> {
  assert(path.isAbsolute(base), 'Expected "base" to be absolute path');
  assert(path.isAbsolute(start), 'Expected "start" to be absolute path');
-  let parent = '';

-  for (let current = start; base.length <= current.length; current = parent) {
-    const fullPath = path.join(current, filename);
+  for (const dir of traverseUpDirectories({ start, base })) {
+    const fullPath = path.join(dir, filename);

    // eslint-disable-next-line no-await-in-loop
    if (await fs.pathExists(fullPath)) {
      return fullPath;
    }
-
-    parent = path.dirname(current);
-
-    if (parent === current) {
-      // Reached root directory of the filesystem
-      break;
-    }
  }

  return null;
@@ -322,14 +351,9 @@ async function walkParentDirsMulti({
  base,
  start,
  filenames,
-}: {
-  base: string;
-  start: string;
-  filenames: string[];
-}): Promise<(string | undefined)[]> {
-  let parent = '';
-  for (let current = start; base.length <= current.length; current = parent) {
-    const fullPaths = filenames.map(f => path.join(current, f));
+}: WalkParentDirsMultiProps): Promise<(string | undefined)[]> {
+  for (const dir of traverseUpDirectories({ start, base })) {
+    const fullPaths = filenames.map(f => path.join(dir, f));
    const existResults = await Promise.all(
      fullPaths.map(f => fs.pathExists(f))
    );
@@ -338,13 +362,6 @@ async function walkParentDirsMulti({
    if (foundOneOrMore) {
      return fullPaths.map((f, i) => (existResults[i] ? f : undefined));
    }
-
-    parent = path.dirname(current);
-
-    if (parent === current) {
-      // Reached root directory of the filesystem
-      break;
-    }
  }

  return [];
--- a/packages/build-utils/src/index.ts
+++ b/packages/build-utils/src/index.ts
@@ -30,7 +30,9 @@ import {
  getNodeVersion,
  getSpawnOptions,
  getNodeBinPath,
+  getNodeBinPaths,
  scanParentDirs,
+  traverseUpDirectories,
 } from './fs/run-user-scripts';
 import {
  getLatestNodeVersion,
@@ -43,6 +45,7 @@ import { getPlatformEnv } from './get-platform-env';
 import { getPrefixedEnvVars } from './get-prefixed-env-vars';
 import { cloneEnv } from './clone-env';
 import { hardLinkDir } from './hard-link-dir';
+import { validateNpmrc } from './validate-npmrc';

 export {
  FileBlob,
@@ -67,6 +70,7 @@ export {
  spawnCommand,
  walkParentDirs,
  getNodeBinPath,
+  getNodeBinPaths,
  runNpmInstall,
  runBundleInstall,
  runPipInstall,
@@ -88,6 +92,8 @@ export {
  getIgnoreFilter,
  cloneEnv,
  hardLinkDir,
+  traverseUpDirectories,
+  validateNpmrc,
 };

 export { EdgeFunction } from './edge-function';
--- a/packages/build-utils/src/validate-npmrc.ts
+++ b/packages/build-utils/src/validate-npmrc.ts
@@ -0,0 +1,26 @@
+import { join } from 'path';
+import { readFile } from 'fs/promises';
+
+/**
+ * Checks if there is a `.npmrc` in the cwd (project root) and makes sure it
+ * doesn't contain a `use-node-version`. This config setting is not supported
+ * since it causes the package manager to install the Node.js version which in
+ * the case of newer Node.js versions is not compatible with AWS due to
+ * outdated GLIBC binaries.
+ *
+ * @see https://pnpm.io/npmrc#use-node-version
+ *
+ * @param cwd The current working directory (e.g. project root);
+ */
+export async function validateNpmrc(cwd: string): Promise<void> {
+  const npmrc = await readFile(join(cwd, '.npmrc'), 'utf-8').catch(err => {
+    if (err.code !== 'ENOENT') throw err;
+  });
+
+  const nodeRegExp = /(?<!#.*)use-node-version/;
+  if (npmrc?.match(nodeRegExp)) {
+    throw new Error(
+      'Detected unsupported "use-node-version" in your ".npmrc". Please use "engines" in your "package.json" instead.'
+    );
+  }
+}
--- a/packages/build-utils/test/fixtures/29-npmrc/comment-use-node-version/.npmrc
+++ b/packages/build-utils/test/fixtures/29-npmrc/comment-use-node-version/.npmrc
@@ -0,0 +1,2 @@
+foo=bar
+# use-node-version=16.16.0
--- a/packages/build-utils/test/fixtures/29-npmrc/good/.npmrc
+++ b/packages/build-utils/test/fixtures/29-npmrc/good/.npmrc
@@ -0,0 +1 @@
+foo=bar
--- a/packages/build-utils/test/fixtures/29-npmrc/has-use-node-version/.npmrc
+++ b/packages/build-utils/test/fixtures/29-npmrc/has-use-node-version/.npmrc
@@ -0,0 +1,3 @@
+foo=bar
+# the next line is not supported
+use-node-version=16.16.0
--- a/packages/build-utils/test/unit.get-node-bin-path.test.ts
+++ b/packages/build-utils/test/unit.get-node-bin-path.test.ts
--- a/packages/build-utils/test/unit.get-node-bin-paths.test.ts
+++ b/packages/build-utils/test/unit.get-node-bin-paths.test.ts
@@ -0,0 +1,17 @@
+import { join } from 'path';
+import { getNodeBinPaths } from '../src/fs/run-user-scripts';
+
+describe('getNodeBinPaths()', () => {
+  const cwd = process.cwd();
+
+  it('should return array of `node_modules/.bin` paths', () => {
+    const start = join(cwd, 'foo/bar/baz');
+    const paths = getNodeBinPaths({ start, base: cwd });
+    expect(paths).toEqual([
+      join(cwd, 'foo/bar/baz/node_modules/.bin'),
+      join(cwd, 'foo/bar/node_modules/.bin'),
+      join(cwd, 'foo/node_modules/.bin'),
+      join(cwd, 'node_modules/.bin'),
+    ]);
+  });
+});
--- a/packages/build-utils/test/unit.test.ts
+++ b/packages/build-utils/test/unit.test.ts
@@ -238,7 +238,7 @@ it('should get latest node version', async () => {
 it('should throw for discontinued versions', async () => {
  // Mock a future date so that Node 8 and 10 become discontinued
  const realDateNow = Date.now.bind(global.Date);
-  global.Date.now = () => new Date('2023-10-01').getTime();
+  global.Date.now = () => new Date('2024-02-13').getTime();

  expect(getSupportedNodeVersion('8.10.x', false)).rejects.toThrow();
  expect(getSupportedNodeVersion('8.10.x', true)).rejects.toThrow();
@@ -306,8 +306,8 @@ it('should warn for deprecated versions, soon to be discontinued', async () => {
    'Error: Node.js version 12.x has reached End-of-Life. Deployments created on or after 2022-10-03 will fail to build. Please set Node.js Version to 18.x in your Project Settings to use Node.js 18.',
    'Error: Node.js version 14.x has reached End-of-Life. Deployments created on or after 2023-08-15 will fail to build. Please set "engines": { "node": "18.x" } in your `package.json` file to use Node.js 18.',
    'Error: Node.js version 14.x has reached End-of-Life. Deployments created on or after 2023-08-15 will fail to build. Please set Node.js Version to 18.x in your Project Settings to use Node.js 18.',
-    'Error: Node.js version 16.x has reached End-of-Life. Deployments created on or after 2023-08-15 will fail to build. Please set "engines": { "node": "18.x" } in your `package.json` file to use Node.js 18.',
-    'Error: Node.js version 16.x has reached End-of-Life. Deployments created on or after 2023-08-15 will fail to build. Please set Node.js Version to 18.x in your Project Settings to use Node.js 18.',
+    'Error: Node.js version 16.x has reached End-of-Life. Deployments created on or after 2024-02-06 will fail to build. Please set "engines": { "node": "18.x" } in your `package.json` file to use Node.js 18.',
+    'Error: Node.js version 16.x has reached End-of-Life. Deployments created on or after 2024-02-06 will fail to build. Please set Node.js Version to 18.x in your Project Settings to use Node.js 18.',
  ]);

  global.Date.now = realDateNow;
--- a/packages/build-utils/test/unit.traverse-up-directories.test.ts
+++ b/packages/build-utils/test/unit.traverse-up-directories.test.ts
@@ -0,0 +1,50 @@
+import { traverseUpDirectories } from '../src/fs/run-user-scripts';
+
+const isWindows = process.platform === 'win32';
+
+describe('traverseUpDirectories()', () => {
+  test.each(
+    isWindows
+      ? [
+          {
+            start: 'C:\\foo\\bar\\baz',
+            expected: ['C:\\foo\\bar\\baz', 'C:\\foo\\bar', 'C:\\foo', 'C:\\'],
+          },
+          {
+            start: 'C:\\foo\\..\\bar\\.\\baz',
+            expected: ['C:\\bar\\baz', 'C:\\bar', 'C:\\'],
+          },
+          {
+            start: 'C:\\foo\\bar\\baz\\another',
+            base: 'C:\\foo\\bar',
+            expected: [
+              'C:\\foo\\bar\\baz\\another',
+              'C:\\foo\\bar\\baz',
+              'C:\\foo\\bar',
+            ],
+          },
+        ]
+      : [
+          {
+            start: '/foo/bar/baz',
+            expected: ['/foo/bar/baz', '/foo/bar', '/foo', '/'],
+          },
+          {
+            start: '/foo/../bar/./baz',
+            expected: ['/bar/baz', '/bar', '/'],
+          },
+          {
+            start: '/foo/bar/baz/another',
+            base: '/foo/bar',
+            expected: ['/foo/bar/baz/another', '/foo/bar/baz', '/foo/bar'],
+          },
+        ]
+  )(
+    'should traverse start="$start", base="$base"',
+    ({ start, base, expected }) => {
+      expect(Array.from(traverseUpDirectories({ start, base }))).toEqual(
+        expected
+      );
+    }
+  );
+});
--- a/packages/build-utils/test/unit.validate-npmrc.test.ts
+++ b/packages/build-utils/test/unit.validate-npmrc.test.ts
@@ -0,0 +1,22 @@
+import { join } from 'path';
+import { validateNpmrc } from '../src/validate-npmrc';
+
+const fixture = (name: string) => join(__dirname, 'fixtures', '29-npmrc', name);
+
+describe('validateNpmrc', () => {
+  it('should not error with no use-node-version', async () => {
+    await expect(validateNpmrc(fixture('good'))).resolves.toBe(undefined);
+  });
+
+  it('should throw when use-node-version is found', async () => {
+    await expect(
+      validateNpmrc(fixture('has-use-node-version'))
+    ).rejects.toThrow('Detected unsupported');
+  });
+
+  it('should not error when use-node-version is commented out', async () => {
+    await expect(
+      validateNpmrc(fixture('comment-use-node-version'))
+    ).resolves.toBe(undefined);
+  });
+});
--- a/packages/cli/CHANGELOG.md
+++ b/packages/cli/CHANGELOG.md
@@ -1,5 +1,158 @@
 # vercel

+## 31.0.4
+
+### Patch Changes
+
+- Detect multiple frameworks within the same root directory during `vc link --repo` ([#10203](https://github.com/vercel/vercel/pull/10203))
+
+- Updated dependencies [[`b56639b62`](https://github.com/vercel/vercel/commit/b56639b624e9ad1df048a4c85083e26888696060), [`cae60155f`](https://github.com/vercel/vercel/commit/cae60155f34883f08a5e4f51b547e2a1a5fee694), [`c670e5171`](https://github.com/vercel/vercel/commit/c670e51712022193e078bd68b055f7e61013015d), [`5439d7c0c`](https://github.com/vercel/vercel/commit/5439d7c0c9b79e7161bf4fa84ffdb357365f9e7e)]:
+  - @vercel/node@2.15.6
+  - @vercel/next@3.9.0
+  - @vercel/remix-builder@1.8.18
+  - @vercel/static-build@1.3.41
+
+## 31.0.3
+
+### Patch Changes
+
+- Fix redeploy target to be undefined when null ([#10201](https://github.com/vercel/vercel/pull/10201))
+
+- Respect forbidden API responses ([#10178](https://github.com/vercel/vercel/pull/10178))
+
+- Update `supports-hyperlinks` to v3 ([#10208](https://github.com/vercel/vercel/pull/10208))
+
+- Updated dependencies [[`0750517af`](https://github.com/vercel/vercel/commit/0750517af99aea41410d4f1f772ce427699554e7)]:
+  - @vercel/build-utils@6.8.2
+  - @vercel/static-build@1.3.40
+  - @vercel/node@2.15.5
+  - @vercel/remix-builder@1.8.17
+
+## 31.0.2
+
+### Patch Changes
+
+- Allow additional project settings in `createProject()` ([#10172](https://github.com/vercel/vercel/pull/10172))
+
+- Run local Project detection during `vc link --repo`. ([#10094](https://github.com/vercel/vercel/pull/10094))
+  This allows for creation of new Projects that do not yet exist under the selected scope.
+
+- Redeploy command no longer redeploys preview deployments to production ([#10186](https://github.com/vercel/vercel/pull/10186))
+
+- Added trailing new line at end of help output ([#10170](https://github.com/vercel/vercel/pull/10170))
+
+- Create new help output and arg parsing for deploy command ([#10090](https://github.com/vercel/vercel/pull/10090))
+
+- [cli] Remove `preinstall` script ([#10157](https://github.com/vercel/vercel/pull/10157))
+
+- Updated dependencies [[`7021279b2`](https://github.com/vercel/vercel/commit/7021279b284f314a4d1bdbb4306b4c22291efa08), [`5e5332fbc`](https://github.com/vercel/vercel/commit/5e5332fbc9317a8f3cc4ed0b72ec1a2c76020891), [`027bce00b`](https://github.com/vercel/vercel/commit/027bce00b3821d9b4a8f7ec320cd1c43ab9f4215)]:
+  - @vercel/build-utils@6.8.1
+  - @vercel/node@2.15.4
+  - @vercel/remix-builder@1.8.16
+  - @vercel/static-build@1.3.39
+
+## 31.0.1
+
+### Patch Changes
+
+- Updated dependencies [[`aa734efc6`](https://github.com/vercel/vercel/commit/aa734efc6c42badd4aa9bf64487904aa64e9bd49)]:
+  - @vercel/next@3.8.8
+
+## 31.0.0
+
+### Major Changes
+
+- Update `vc dev` redirect response to match production behavior ([#10143](https://github.com/vercel/vercel/pull/10143))
+
+### Patch Changes
+
+- require `--yes` to promote preview deployment ([#10135](https://github.com/vercel/vercel/pull/10135))
+
+- [cli] Optimize write build result for vc build ([#10154](https://github.com/vercel/vercel/pull/10154))
+
+- Only show relevant Project matches in Project selector ([#10114](https://github.com/vercel/vercel/pull/10114))
+
+- [cli] Fix error message when token is invalid ([#10131](https://github.com/vercel/vercel/pull/10131))
+
+- Updated dependencies [[`e4895d979`](https://github.com/vercel/vercel/commit/e4895d979b57e369e0618481c5974243887d72cc), [`346892210`](https://github.com/vercel/vercel/commit/3468922108f411482a72acd0331f0f2ee52a6d4c), [`346892210`](https://github.com/vercel/vercel/commit/3468922108f411482a72acd0331f0f2ee52a6d4c), [`a6de052ed`](https://github.com/vercel/vercel/commit/a6de052ed2f09cc80bf4c2d0f06bedd267a63cdc)]:
+  - @vercel/next@3.8.7
+  - @vercel/static-build@1.3.38
+  - @vercel/build-utils@6.8.0
+  - @vercel/remix-builder@1.8.15
+  - @vercel/node@2.15.3
+
+## 30.2.3
+
+### Patch Changes
+
+- [cli] do not force auto-assign value on deployments ([#10110](https://github.com/vercel/vercel/pull/10110))
+
+- Updated dependencies [[`91406abdb`](https://github.com/vercel/vercel/commit/91406abdb0c332152fc6c7c1e4bd3a872b084434), [`2230ea6cc`](https://github.com/vercel/vercel/commit/2230ea6cc1b84c1f03227a4e197b7684635b5955), [`8b3a4146a`](https://github.com/vercel/vercel/commit/8b3a4146af68d2b7288c80a5b919d832dba929b5)]:
+  - @vercel/node@2.15.2
+  - @vercel/remix-builder@1.8.14
+  - @vercel/static-build@1.3.37
+
+## 30.2.2
+
+### Patch Changes
+
+- [cli] vc env pull should add `.env*.local` to `.gitignore` ([#10085](https://github.com/vercel/vercel/pull/10085))
+
+- [cli] Fix team validation bug where you are apart of a team ([#10092](https://github.com/vercel/vercel/pull/10092))
+
+- Add support for `vc dev` command with repo link ([#10082](https://github.com/vercel/vercel/pull/10082))
+
+- Add support for `vc deploy --prebuilt` command with repo link ([#10083](https://github.com/vercel/vercel/pull/10083))
+
+- Move readme copy logic to a helper function for `vc link` ([#10084](https://github.com/vercel/vercel/pull/10084))
+
+- Add support for `vc pull` command with repo link ([#10078](https://github.com/vercel/vercel/pull/10078))
+
+- Add support for `vc build` command with repo link ([#10075](https://github.com/vercel/vercel/pull/10075))
+
+## 30.2.1
+
+### Patch Changes
+
+- Updated dependencies [[`a04bf557f`](https://github.com/vercel/vercel/commit/a04bf557fc6e1080a117428977d0993dec78b004)]:
+  - @vercel/node@2.15.1
+  - @vercel/static-build@1.3.36
+
+## 30.2.0
+
+### Minor Changes
+
+- [node] Add isomorphic functions ([#9947](https://github.com/vercel/vercel/pull/9947))
+
+### Patch Changes
+
+- Add `client.fetchPaginated()` helper function ([#10054](https://github.com/vercel/vercel/pull/10054))
+
+- Updated dependencies [[`bc5afe24c`](https://github.com/vercel/vercel/commit/bc5afe24c4547dbf798b939199e8212c4b34038e), [`49c717856`](https://github.com/vercel/vercel/commit/49c7178567ec5bcebe633b598c8c9c0e1aa40fbb), [`0039c8b5c`](https://github.com/vercel/vercel/commit/0039c8b5cea975316a62c4f6aaca5d66d731cc0d)]:
+  - @vercel/node@2.15.0
+  - @vercel/remix-builder@1.8.13
+  - @vercel/static-build@1.3.35
+
+## 30.1.2
+
+### Patch Changes
+
+- Publish missing build-utils ([`cd35071f6`](https://github.com/vercel/vercel/commit/cd35071f609d615d47bc04634c123b33768436cb))
+
+- Updated dependencies [[`cd35071f6`](https://github.com/vercel/vercel/commit/cd35071f609d615d47bc04634c123b33768436cb)]:
+  - @vercel/build-utils@6.7.5
+  - @vercel/node@2.14.5
+  - @vercel/remix-builder@1.8.12
+  - @vercel/static-build@1.3.34
+
+## 30.1.1
+
+### Patch Changes
+
+- [cli] vc build ignore '.env\*' & ignore files for '@vercel/static' ([#10056](https://github.com/vercel/vercel/pull/10056))
+
+- [cli] Ensure .npmrc does not contain use-node-version ([#10049](https://github.com/vercel/vercel/pull/10049))
+
 ## 30.1.0

 ### Minor Changes
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
  "name": "vercel",
-  "version": "30.1.0",
+  "version": "31.0.4",
  "preferGlobal": true,
  "license": "Apache-2.0",
  "description": "The command-line interface for Vercel",
@@ -11,7 +11,6 @@
    "directory": "packages/cli"
  },
  "scripts": {
-    "preinstall": "node ./scripts/preinstall.js",
    "test": "jest --env node --verbose --bail",
    "test-unit": "pnpm test test/unit/",
    "test-e2e": "rimraf test/fixtures/integration && pnpm test test/integration-1.test.ts test/integration-2.test.ts test/integration-3.test.ts",
@@ -32,20 +31,20 @@
    "node": ">= 14"
  },
  "dependencies": {
-    "@vercel/build-utils": "6.7.4",
+    "@vercel/build-utils": "6.8.2",
    "@vercel/go": "2.5.1",
    "@vercel/hydrogen": "0.0.64",
-    "@vercel/next": "3.8.6",
-    "@vercel/node": "2.14.4",
+    "@vercel/next": "3.9.0",
+    "@vercel/node": "2.15.6",
    "@vercel/python": "3.1.60",
    "@vercel/redwood": "1.1.15",
-    "@vercel/remix-builder": "1.8.11",
+    "@vercel/remix-builder": "1.8.18",
    "@vercel/ruby": "1.3.76",
-    "@vercel/static-build": "1.3.33"
+    "@vercel/static-build": "1.3.41"
  },
  "devDependencies": {
    "@alex_neo/jest-expect-message": "1.0.5",
-    "@edge-runtime/node-utils": "2.0.3",
+    "@edge-runtime/node-utils": "2.1.0",
    "@next/env": "11.1.2",
    "@sentry/node": "5.5.0",
    "@sindresorhus/slugify": "0.11.0",
@@ -85,13 +84,13 @@
    "@types/which": "3.0.0",
    "@types/write-json-file": "2.2.1",
    "@types/yauzl-promise": "2.1.0",
-    "@vercel-internals/constants": "1.0.1",
+    "@vercel-internals/constants": "1.0.4",
    "@vercel-internals/get-package-json": "1.0.0",
-    "@vercel-internals/types": "1.0.1",
-    "@vercel/client": "12.6.1",
+    "@vercel-internals/types": "1.0.5",
+    "@vercel/client": "12.6.5",
    "@vercel/error-utils": "1.0.10",
-    "@vercel/frameworks": "1.4.2",
-    "@vercel/fs-detectors": "3.9.3",
+    "@vercel/frameworks": "1.4.3",
+    "@vercel/fs-detectors": "4.1.0",
    "@vercel/fun": "1.0.4",
    "@vercel/ncc": "0.24.0",
    "@vercel/routing-utils": "2.2.1",
@@ -159,7 +158,7 @@
    "serve-handler": "6.1.1",
    "strip-ansi": "6.0.1",
    "stripe": "5.1.0",
-    "supports-hyperlinks": "2.2.0",
+    "supports-hyperlinks": "3.0.0",
    "tar-fs": "1.16.3",
    "test-listen": "1.1.0",
    "text-table": "0.2.0",
--- a/packages/cli/scripts/preinstall.js
+++ b/packages/cli/scripts/preinstall.js
@@ -1,101 +0,0 @@
-#!/usr/bin/env node
-const { join } = require('path');
-const { statSync } = require('fs');
-const pkg = require('../package');
-
-function error(command) {
-  console.error('> Error:', command);
-}
-
-function debug(str) {
-  if (
-    process.argv.find(str => str === '--debug') ||
-    process.env.PREINSTALL_DEBUG
-  ) {
-    console.log(`[debug] [${new Date().toISOString()}]`, str);
-  }
-}
-
-function isYarn() {
-  return process.env.npm_config_heading !== 'npm';
-}
-
-function isGlobal() {
-  const cmd = JSON.parse(process.env.npm_config_argv || '{ "original": [] }');
-
-  return isYarn()
-    ? cmd.original.includes('global')
-    : Boolean(process.env.npm_config_global);
-}
-
-function isVercel() {
-  return pkg.name === 'vercel';
-}
-
-function validateNodeVersion() {
-  let semver = '>= 0';
-  let major = '1';
-
-  try {
-    major = process.versions.node.split('.')[0];
-    const pkg = require('../package.json');
-    semver = pkg.engines.node;
-  } catch (e) {
-    debug('Failed to read package.json engines');
-  }
-
-  const isValid = eval(`${major} ${semver}`);
-  return { isValid, expected: semver, actual: process.versions.node };
-}
-
-function isInNodeModules(name) {
-  try {
-    const nodeModules = join(__dirname, '..', '..');
-    const stat = statSync(join(nodeModules, name));
-    return stat.isDirectory();
-  } catch (err) {
-    return false;
-  }
-}
-
-async function main() {
-  if (!isGlobal()) {
-    debug('Skipping preinstall since Vercel CLI is being installed locally');
-    return;
-  }
-
-  const ver = validateNodeVersion();
-
-  if (!ver.isValid) {
-    error(
-      `Detected unsupported Node.js version.\n` +
-        `Expected "${ver.expected}" but found "${ver.actual}".\n` +
-        `Please update to the latest Node.js LTS version to install Vercel CLI.`
-    );
-    process.exit(1);
-  }
-
-  if (isVercel() && isInNodeModules('now')) {
-    const uninstall = isYarn()
-      ? 'yarn global remove now'
-      : 'npm uninstall -g now';
-    console.error(`NOTE: Run \`${uninstall}\` to uninstall \`now\`\n`);
-  }
-}
-
-process.on('unhandledRejection', err => {
-  console.error('Unhandled Rejection:');
-  console.error(err);
-  process.exit(1);
-});
-
-process.on('uncaughtException', err => {
-  console.error('Uncaught Exception:');
-  console.error(err);
-  process.exit(1);
-});
-
-main().catch(err => {
-  console.error(err);
-  process.exit(1);
-});
--- a/packages/cli/src/commands/bisect/index.ts
+++ b/packages/cli/src/commands/bisect/index.ts
@@ -6,21 +6,19 @@ import chalk, { Chalk } from 'chalk';
 import { URLSearchParams, parse } from 'url';

 import box from '../../util/output/box';
-import sleep from '../../util/sleep';
 import formatDate from '../../util/format-date';
 import link from '../../util/output/link';
 import logo from '../../util/output/logo';
 import getArgs from '../../util/get-args';
 import Client from '../../util/client';
 import { getPkgName } from '../../util/pkg-name';
-import { Deployment, PaginationOptions } from '@vercel-internals/types';
+import { Deployment } from '@vercel-internals/types';
 import { normalizeURL } from '../../util/bisect/normalize-url';
 import getScope from '../../util/get-scope';
 import getDeployment from '../../util/get-deployment';

 interface Deployments {
  deployments: Deployment[];
-  pagination: PaginationOptions;
 }

 const pkgName = getPkgName();
@@ -206,44 +204,34 @@ export default async function main(client: Client): Promise<number> {

  // Fetch all the project's "READY" deployments with the pagination API
  let deployments: Deployment[] = [];
-  let next: number | undefined = badDeployment.createdAt + 1;
-  do {
-    const query = new URLSearchParams();
-    query.set('projectId', projectId);
-    if (badDeployment.target) {
-      query.set('target', badDeployment.target);
-    }
-    query.set('limit', '100');
-    query.set('state', 'READY');
-    if (next) {
-      query.set('until', String(next));
-    }

-    const res = await client.fetch<Deployments>(`/v6/deployments?${query}`, {
+  const query = new URLSearchParams();
+  query.set('projectId', projectId);
+  if (badDeployment.target) {
+    query.set('target', badDeployment.target);
+  }
+  query.set('state', 'READY');
+  query.set('until', String(badDeployment.createdAt + 1));
+
+  for await (const chunk of client.fetchPaginated<Deployments>(
+    `/v6/deployments?${query}`,
+    {
      accountId: badDeployment.ownerId,
-    });
-
-    next = res.pagination.next;
-
-    let newDeployments = res.deployments;
+    }
+  )) {
+    let newDeployments = chunk.deployments;

    // If we have the "good" deployment in this chunk, then we're done
    for (let i = 0; i < newDeployments.length; i++) {
      if (newDeployments[i].url === good) {
        // grab all deployments up until the good one
        newDeployments = newDeployments.slice(0, i);
-        next = undefined;
        break;
      }
    }

    deployments = deployments.concat(newDeployments);
-
-    if (next) {
-      // Small sleep to avoid rate limiting
-      await sleep(100);
-    }
-  } while (next);
+  }

  if (!deployments.length) {
    output.error(
--- a/packages/cli/src/commands/build.ts
+++ b/packages/cli/src/commands/build.ts
@@ -1,7 +1,10 @@
 import fs from 'fs-extra';
 import chalk from 'chalk';
 import dotenv from 'dotenv';
+import semver from 'semver';
+import minimatch from 'minimatch';
 import { join, normalize, relative, resolve, sep } from 'path';
+import frameworks from '@vercel/frameworks';
 import {
  getDiscontinuedNodeVersions,
  normalizePath,
@@ -17,13 +20,14 @@ import {
  BuildResultV3,
  NowBuildError,
  Cron,
+  validateNpmrc,
 } from '@vercel/build-utils';
 import {
  detectBuilders,
  detectFrameworkRecord,
+  detectFrameworkVersion,
  LocalFileSystemDetector,
 } from '@vercel/fs-detectors';
-import minimatch from 'minimatch';
 import {
  appendRoutesToPhase,
  getTransformedRoutes,
@@ -48,7 +52,7 @@ import {
  ProjectLinkAndSettings,
  readProjectSettings,
 } from '../util/projects/project-settings';
-import { VERCEL_DIR } from '../util/projects/link';
+import { getProjectLink, VERCEL_DIR } from '../util/projects/link';
 import confirm from '../util/input/confirm';
 import { emoji, prependEmoji } from '../util/emoji';
 import stamp from '../util/output/stamp';
@@ -62,11 +66,7 @@ import { initCorepack, cleanupCorepack } from '../util/build/corepack';
 import { sortBuilders } from '../util/build/sort-builders';
 import { toEnumerableError } from '../util/error';
 import { validateConfig } from '../util/validate-config';
-
 import { setMonorepoDefaultSettings } from '../util/build/monorepo';
-import frameworks from '@vercel/frameworks';
-import { detectFrameworkVersion } from '@vercel/fs-detectors';
-import semver from 'semver';

 type BuildResult = BuildResultV2 | BuildResultV3;

@@ -133,7 +133,8 @@ const help = () => {
 };

 export default async function main(client: Client): Promise<number> {
-  const { cwd, output } = client;
+  let { cwd } = client;
+  const { output } = client;

  // Ensure that `vc build` is not being invoked recursively
  if (process.env.__VERCEL_BUILD_RUNNING) {
@@ -169,10 +170,25 @@ export default async function main(client: Client): Promise<number> {
  const target = argv['--prod'] ? 'production' : 'preview';
  const yes = Boolean(argv['--yes']);

+  try {
+    await validateNpmrc(cwd);
+  } catch (err) {
+    output.prettyError(err);
+    return 1;
+  }
+
+  // If repo linked, update `cwd` to the repo root
+  const link = await getProjectLink(client, cwd);
+  const projectRootDirectory = link?.projectRootDirectory ?? '';
+  if (link?.repoRoot) {
+    cwd = client.cwd = link.repoRoot;
+  }
+
  // TODO: read project settings from the API, fall back to local `project.json` if that fails

  // Read project settings, and pull them from Vercel if necessary
-  let project = await readProjectSettings(join(cwd, VERCEL_DIR));
+  const vercelDir = join(cwd, projectRootDirectory, VERCEL_DIR);
+  let project = await readProjectSettings(vercelDir);
  const isTTY = process.stdin.isTTY;
  while (!project?.settings) {
    let confirmed = yes;
@@ -199,6 +215,7 @@ export default async function main(client: Client): Promise<number> {
      return 0;
    }
    const { argv: originalArgv } = client;
+    client.cwd = join(cwd, projectRootDirectory);
    client.argv = [
      ...originalArgv.slice(0, 2),
      'pull',
@@ -209,12 +226,13 @@ export default async function main(client: Client): Promise<number> {
    if (result !== 0) {
      return result;
    }
+    client.cwd = cwd;
    client.argv = originalArgv;
-    project = await readProjectSettings(join(cwd, VERCEL_DIR));
+    project = await readProjectSettings(vercelDir);
  }

  // Delete output directory from potential previous build
-  const defaultOutputDir = join(cwd, OUTPUT_DIR);
+  const defaultOutputDir = join(cwd, projectRootDirectory, OUTPUT_DIR);
  const outputDir = argv['--output']
    ? resolve(argv['--output'])
    : defaultOutputDir;
@@ -233,7 +251,12 @@ export default async function main(client: Client): Promise<number> {
  const envToUnset = new Set<string>(['VERCEL', 'NOW_BUILDER']);

  try {
-    const envPath = join(cwd, VERCEL_DIR, `.env.${target}.local`);
+    const envPath = join(
+      cwd,
+      projectRootDirectory,
+      VERCEL_DIR,
+      `.env.${target}.local`
+    );
    // TODO (maybe?): load env vars from the API, fall back to the local file if that fails
    const dotenvResult = dotenv.config({
      path: envPath,
--- a/packages/cli/src/commands/deploy/args.ts
+++ b/packages/cli/src/commands/deploy/args.ts
@@ -1,50 +0,0 @@
-import chalk from 'chalk';
-import logo from '../../util/output/logo';
-import { getPkgName } from '../../util/pkg-name';
-
-export const help = () => {
-  return `
-  ${chalk.bold(`${logo} ${getPkgName()} [deploy]`)} [path-to-project] [options]
-
-  --prod                         Create a production deployment
-  -p, --public                   Deployment is public (${chalk.dim(
-    '`/_src`'
-  )} is exposed)
-  -e, --env                      Include an env var during run time (e.g.: ${chalk.dim(
-    '`-e KEY=value`'
-  )}). Can appear many times.
-  -b, --build-env                Similar to ${chalk.dim(
-    '`--env`'
-  )} but for build time only.
-  -m, --meta                     Add metadata for the deployment (e.g.: ${chalk.dim(
-    '`-m KEY=value`'
-  )}). Can appear many times.
-  --no-wait                      Don't wait for the deployment to finish
-  -f, --force                    Force a new deployment even if nothing has changed
-  --with-cache                   Retain build cache when using "--force"
-  --regions                      Set default regions to enable the deployment on
-
-  ${chalk.dim('Examples:')}
-
-  ${chalk.gray('–')} Deploy the current directory
-
-    ${chalk.cyan(`$ ${getPkgName()}`)}
-
-  ${chalk.gray('–')} Deploy a custom path
-
-    ${chalk.cyan(`$ ${getPkgName()} /usr/src/project`)}
-
-  ${chalk.gray('–')} Deploy with Environment Variables
-
-    ${chalk.cyan(`$ ${getPkgName()} -e NODE_ENV=production`)}
-
-  ${chalk.gray('–')} Deploy with prebuilt outputs
-
-    ${chalk.cyan(`$ ${getPkgName()} build`)}
-    ${chalk.cyan(`$ ${getPkgName()} deploy --prebuilt`)}
-
-  ${chalk.gray('–')} Write Deployment URL to a file
-
-    ${chalk.cyan(`$ ${getPkgName()} > deployment-url.txt`)}
-`;
-};
--- a/packages/cli/src/commands/deploy/command.ts
+++ b/packages/cli/src/commands/deploy/command.ts
@@ -0,0 +1,181 @@
+import { Command } from '../help';
+
+export const deployCommand: Command = {
+  name: 'deploy',
+  description:
+    'Deploy your project to Vercel. The `deploy` command is the default command for the Vercel CLI, and can be omitted (`vc deploy my-app` equals `vc my-app`).',
+  arguments: [
+    {
+      name: 'project-path',
+      required: false,
+    },
+  ],
+  options: [
+    {
+      name: 'force',
+      shorthand: 'f',
+      type: 'boolean',
+      deprecated: false,
+      description: 'Force a new deployment even if nothing has changed',
+      multi: false,
+    },
+    {
+      name: 'with-cache',
+      shorthand: null,
+      type: 'boolean',
+      deprecated: false,
+      description: 'Retain build cache when using "--force"',
+      multi: false,
+    },
+    {
+      name: 'public',
+      shorthand: 'p',
+      type: 'boolean',
+      deprecated: false,
+      description: 'Deployment is public (`/_src`) is exposed)',
+      multi: false,
+    },
+    {
+      name: 'env',
+      shorthand: 'e',
+      type: 'string',
+      argument: 'key=value',
+      deprecated: false,
+      multi: true,
+      description:
+        'Specify environment variables during run-time (e.g. `-e KEY1=value1 -e KEY2=value2`)',
+    },
+    {
+      name: 'build-env',
+      shorthand: 'b',
+      type: 'string',
+      argument: 'key=value',
+      deprecated: false,
+      multi: true,
+      description:
+        'Specify environment variables during build-time (e.g. `-b KEY1=value1 -b KEY2=value2`)',
+    },
+    {
+      name: 'meta',
+      shorthand: 'm',
+      type: 'string',
+      argument: 'key=value',
+      deprecated: false,
+      multi: true,
+      description:
+        'Specify metadata for the deployment (e.g. `-m KEY1=value1 -m KEY2=value2`)',
+    },
+    {
+      name: 'regions',
+      shorthand: null,
+      type: 'string',
+      deprecated: false,
+      description: 'Set default regions to enable the deployment on',
+      multi: false,
+    },
+    {
+      name: 'prebuilt',
+      shorthand: null,
+      type: 'boolean',
+      deprecated: false,
+      description:
+        'Use in combination with `vc build`. Deploy an existing build',
+      multi: false,
+    },
+    {
+      name: 'prod',
+      shorthand: null,
+      type: 'boolean',
+      deprecated: false,
+      description: 'Create a production deployment',
+      multi: false,
+    },
+    {
+      name: 'archive',
+      shorthand: null,
+      type: 'string',
+      deprecated: false,
+      description:
+        'Compress the deployment code into a file before uploading it',
+      multi: false,
+    },
+    {
+      name: 'no-wait',
+      shorthand: null,
+      type: 'boolean',
+      deprecated: false,
+      description: "Don't wait for the deployment to finish",
+      multi: false,
+    },
+    {
+      name: 'skip-domain',
+      shorthand: null,
+      type: 'boolean',
+      deprecated: false,
+      description: undefined,
+      multi: false,
+    },
+    {
+      name: 'yes',
+      shorthand: 'y',
+      type: 'boolean',
+      deprecated: false,
+      description: 'Use default options to skip all prompts',
+      multi: false,
+    },
+    {
+      name: 'name',
+      shorthand: 'n',
+      type: 'string',
+      deprecated: true,
+      description: 'Provide a Vercel Project name',
+      multi: false,
+    },
+    {
+      name: 'no-clipboard',
+      shorthand: null,
+      type: 'boolean',
+      deprecated: true,
+      description: 'Do not copy deployment URL to clipboard',
+      multi: false,
+    },
+    {
+      name: 'target',
+      shorthand: null,
+      type: 'string',
+      deprecated: true,
+      description: 'Specify the target deployment environment',
+      multi: false,
+    },
+    {
+      name: 'confirm',
+      shorthand: 'c',
+      type: 'boolean',
+      deprecated: true,
+      description: 'Use default options to skip all prompts',
+      multi: false,
+    },
+  ],
+  examples: [
+    {
+      name: 'Deploy the current directory',
+      value: 'vercel',
+    },
+    {
+      name: 'Deploy a custom path',
+      value: 'vercel /usr/src/project',
+    },
+    {
+      name: 'Deploy with run-time Environment Variables',
+      value: 'vercel -e NODE_ENV=production',
+    },
+    {
+      name: 'Deploy with prebuilt outputs',
+      value: ['vercel build', 'vercel deploy --prebuilt'],
+    },
+    {
+      name: 'Write Deployment URL to a file',
+      value: 'vercel > deployment-url.txt',
+    },
+  ],
+};
--- a/packages/cli/src/commands/deploy/index.ts
+++ b/packages/cli/src/commands/deploy/index.ts
@@ -59,7 +59,6 @@ import validatePaths, {
 } from '../../util/validate-paths';
 import { getCommandName } from '../../util/pkg-name';
 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';
@@ -69,44 +68,38 @@ import { parseEnv } from '../../util/parse-env';
 import { errorToString, isErrnoException, isError } from '@vercel/error-utils';
 import { pickOverrides } from '../../util/projects/project-settings';
 import { printDeploymentStatus } from '../../util/deploy/print-deployment-status';
+import { help } from '../help';
+import { deployCommand } from './command';

 export default async (client: Client): Promise<number> => {
  const { output } = client;

  let argv = null;

-  try {
-    argv = getArgs(client.argv.slice(2), {
-      '--force': Boolean,
-      '--with-cache': Boolean,
-      '--public': Boolean,
-      '--env': [String],
-      '--build-env': [String],
-      '--meta': [String],
-      // This is not an array in favor of matching
-      // the config property name.
-      '--regions': String,
-      '--prebuilt': Boolean,
-      '--prod': Boolean,
-      '--archive': String,
-      '--no-wait': Boolean,
-      '--skip-domain': Boolean,
-      '--yes': Boolean,
-      '-f': '--force',
-      '-p': '--public',
-      '-e': '--env',
-      '-b': '--build-env',
-      '-m': '--meta',
-      '-y': '--yes',
+  const argOptions: {
+    [k: string]:
+      | BooleanConstructor
+      | StringConstructor
+      | string
+      | [StringConstructor];
+  } = {};
+  for (const option of deployCommand.options) {
+    argOptions[`--${option.name}`] =
+      option.type === 'boolean' ? Boolean : String;
+    if (option.shorthand) {
+      argOptions[`-${option.shorthand}`] = `--${option.name}`;
+    }
+    if (
+      option.name === 'env' ||
+      option.name === 'build-env' ||
+      option.name === 'meta'
+    ) {
+      argOptions[`--${option.name}`] = [String];
+    }
+  }

-      // deprecated
-      '--name': String,
-      '-n': '--name',
-      '--no-clipboard': Boolean,
-      '--target': String,
-      '--confirm': Boolean,
-      '-c': '--confirm',
-    });
+  try {
+    argv = getArgs(client.argv.slice(2), argOptions);

    if ('--confirm' in argv) {
      output.warn('`--confirm` is deprecated, please use `--yes` instead');
@@ -118,7 +111,7 @@ export default async (client: Client): Promise<number> => {
  }

  if (argv['--help']) {
-    output.print(help());
+    output.print(help(deployCommand, { columns: client.stderr.columns }));
    return 2;
  }

@@ -203,56 +196,6 @@ export default async (client: Client): Promise<number> => {
    return target;
  }

-  // build `--prebuilt`
-  if (argv['--prebuilt']) {
-    const prebuiltExists = await fs.pathExists(join(cwd, '.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(cwd);
-
-    // Ensure that there was not a build error
-    const prebuiltError =
-      prebuiltBuild?.error ||
-      prebuiltBuild?.builds?.find(build => 'error' in build)?.error;
-    if (prebuiltError) {
-      output.log(
-        `Prebuilt deployment cannot be created because ${getCommandName(
-          'build'
-        )} failed with error:\n`
-      );
-      prettyError(prebuiltError);
-      return 1;
-    }
-
-    // Ensure that the deploy target matches the build target
-    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;
-    }
-  }
-
  const archive = argv['--archive'];
  if (typeof archive === 'string' && !isValidArchive(archive)) {
    output.error(`Format must be one of: ${VALID_ARCHIVE_FORMATS.join(', ')}`);
@@ -355,6 +298,66 @@ export default async (client: Client): Promise<number> => {
    throw new Error(`"org" is not defined`);
  }

+  // build `--prebuilt`
+  if (argv['--prebuilt']) {
+    // For repo-style linking, update `cwd` to be the Project
+    // subdirectory when `rootDirectory` setting is defined
+    if (
+      link.status === 'linked' &&
+      link.repoRoot &&
+      link.project.rootDirectory
+    ) {
+      cwd = join(cwd, link.project.rootDirectory);
+    }
+
+    const prebuiltExists = await fs.pathExists(join(cwd, '.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(cwd);
+
+    // Ensure that there was not a build error
+    const prebuiltError =
+      prebuiltBuild?.error ||
+      prebuiltBuild?.builds?.find(build => 'error' in build)?.error;
+    if (prebuiltError) {
+      output.log(
+        `Prebuilt deployment cannot be created because ${getCommandName(
+          'build'
+        )} failed with error:\n`
+      );
+      prettyError(prebuiltError);
+      return 1;
+    }
+
+    // Ensure that the deploy target matches the build target
+    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;
+    }
+  }
+
  // Set the `contextName` and `currentTeam` as specified by the
  // Project Settings, so that API calls happen with the proper scope
  const contextName = org.slug;
@@ -511,7 +514,8 @@ export default async (client: Client): Promise<number> => {
  }

  try {
-    const autoAssignCustomDomains = !argv['--skip-domain'];
+    // if this flag is not set, use `undefined` to allow the project setting to be used
+    const autoAssignCustomDomains = argv['--skip-domain'] ? false : undefined;

    const createArgs: CreateOptions = {
      name,
--- a/packages/cli/src/commands/dev/dev.ts
+++ b/packages/cli/src/commands/dev/dev.ts
@@ -58,7 +58,13 @@ export default async function dev(
  let projectSettings: ProjectSettings | undefined;
  let envValues: Record<string, string> = {};
  if (link.status === 'linked') {
-    const { project, org } = link;
+    const { project, org, repoRoot } = link;
+
+    // If repo linked, update `cwd` to the repo root
+    if (repoRoot) {
+      cwd = repoRoot;
+    }
+
    client.config.currentTeam = org.type === 'team' ? org.id : undefined;

    projectSettings = project;
--- a/packages/cli/src/commands/env/index.ts
+++ b/packages/cli/src/commands/env/index.ts
@@ -167,6 +167,7 @@ export default async function main(client: Client) {
      case 'pull':
        return pull(
          client,
+          link,
          project,
          target,
          argv,
--- a/packages/cli/src/commands/env/pull.ts
+++ b/packages/cli/src/commands/env/pull.ts
@@ -2,7 +2,11 @@ import chalk from 'chalk';
 import { outputFile } from 'fs-extra';
 import { closeSync, openSync, readSync } from 'fs';
 import { resolve } from 'path';
-import type { Project, ProjectEnvTarget } from '@vercel-internals/types';
+import type {
+  Project,
+  ProjectEnvTarget,
+  ProjectLinked,
+} from '@vercel-internals/types';
 import Client from '../../util/client';
 import { emoji, prependEmoji } from '../../util/emoji';
 import confirm from '../../util/input/confirm';
@@ -19,6 +23,7 @@ import {
  createEnvObject,
 } from '../../util/env/diff-env-files';
 import { isErrnoException } from '@vercel/error-utils';
+import { addToGitIgnore } from '../../util/link/add-to-gitignore';

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

@@ -51,6 +56,7 @@ function tryReadHeadSync(path: string, length: number) {

 export default async function pull(
  client: Client,
+  link: ProjectLinked,
  project: Project,
  environment: ProjectEnvTarget,
  opts: Partial<Options>,
@@ -136,11 +142,22 @@ export default async function pull(
    output.log('No changes found.');
  }

+  let isGitIgnoreUpdated = false;
+  if (filename === '.env.local') {
+    // When the file is `.env.local`, we also add it to `.gitignore`
+    // to avoid accidentally committing it to git.
+    // We use '.env*.local' to match the default .gitignore from
+    // create-next-app template. See:
+    // https://github.com/vercel/next.js/blob/06abd634899095b6cc28e6e8315b1e8b9c8df939/packages/create-next-app/templates/app/js/gitignore#L28
+    const rootPath = link.repoRoot ?? cwd;
+    isGitIgnoreUpdated = await addToGitIgnore(rootPath, '.env*.local');
+  }
+
  output.print(
    `${prependEmoji(
-      `${exists ? 'Updated' : 'Created'} ${chalk.bold(
-        filename
-      )} file ${chalk.gray(pullStamp())}`,
+      `${exists ? 'Updated' : 'Created'} ${chalk.bold(filename)} file ${
+        isGitIgnoreUpdated ? 'and added it to .gitignore' : ''
+      } ${chalk.gray(pullStamp())}`,
      emoji('success')
    )}\n`
  );
--- a/packages/cli/src/commands/help.ts
+++ b/packages/cli/src/commands/help.ts
@@ -0,0 +1,229 @@
+import chalk from 'chalk';
+import stripAnsi from 'strip-ansi';
+import { LOGO, NAME } from '@vercel-internals/constants';
+
+const INDENT = ' '.repeat(2);
+const NEWLINE = '\n';
+
+export interface CommandOption {
+  name: string;
+  shorthand: string | null;
+  type: 'boolean' | 'string';
+  argument?: string;
+  deprecated: boolean;
+  description?: string;
+  multi: boolean;
+}
+export interface CommandArgument {
+  name: string;
+  required: boolean;
+}
+export interface CommandExample {
+  name: string;
+  value: string | string[];
+}
+export interface Command {
+  name: string;
+  description: string;
+  arguments: CommandArgument[];
+  options: CommandOption[];
+  examples: CommandExample[];
+}
+
+export function calcLineLength(line: string[]) {
+  return stripAnsi(lineToString(line)).length;
+}
+
+// Insert spaces in between non-whitespace items only
+export function lineToString(line: string[]) {
+  let string = '';
+  for (let i = 0; i < line.length; i++) {
+    if (i === line.length - 1) {
+      string += line[i];
+    } else {
+      const curr = line[i];
+      const next = line[i + 1];
+      string += curr;
+      if (curr.trim() !== '' && next.trim() !== '') {
+        string += ' ';
+      }
+    }
+  }
+  return string;
+}
+
+export function outputArrayToString(outputArray: string[]) {
+  return outputArray.join(NEWLINE);
+}
+
+/**
+ * Example: `▲ vercel deploy [path] [options]`
+ * @param command
+ * @returns
+ */
+export function buildCommandSynopsisLine(command: Command) {
+  const line: string[] = [LOGO, chalk.bold(NAME), chalk.bold(command.name)];
+  if (command.arguments.length > 0) {
+    for (const argument of command.arguments) {
+      line.push(argument.required ? argument.name : `[${argument.name}]`);
+    }
+  }
+  if (command.options.length > 0) {
+    line.push('[options]');
+  }
+  return lineToString(line);
+}
+
+export function buildCommandOptionLines(
+  command: Command,
+  options: BuildHelpOutputOptions
+) {
+  // Filter out deprecated and intentionally undocumented options
+  command.options = command.options.filter(
+    option => !option.deprecated && option.description !== undefined
+  );
+
+  // Initialize output array with header and empty line
+  const outputArray: string[] = [chalk.dim(`Options:`), ''];
+
+  // Start building option lines
+  const optionLines: string[][] = [];
+  // Sort command options alphabetically
+  command.options.sort((a, b) =>
+    a.name < b.name ? -1 : a.name > b.name ? 1 : 0
+  );
+  // Keep track of longest "start" of an option line to determine description spacing
+  let maxLineStartLength = 0;
+  // Iterate over options and create the "start" of each option (e.g. `  -b, --build-env <key=value>`)
+  for (const option of command.options) {
+    const startLine: string[] = [INDENT];
+    if (option.shorthand) {
+      startLine.push(`-${option.shorthand},`);
+    }
+    startLine.push(`--${option.name}`);
+    if (option.argument) {
+      startLine.push(`<${option.argument}>`);
+    }
+    // the length includes the INDENT
+    const lineLength = calcLineLength(startLine);
+    maxLineStartLength = Math.max(lineLength, maxLineStartLength);
+    optionLines.push(startLine);
+  }
+  /*
+   * Iterate over in-progress option lines to add space-filler and description
+   * For Example:
+   * |  --archive                    My description starts here.
+   * |
+   * |  -b, --build-env <key=value>  Start of description here then
+   * |                               it wraps here.
+   * |
+   * |  -e, --env <key=value>        My description is short.
+   *
+   * Breaking down option lines:
+   * |  -b, --build-env <key=value>  Start of description here then
+   * |[][                         ][][                             ]
+   * |↑ ↑                          ↑ ↑
+   * |1 2                          3 4
+   * |                               it wraps here.
+   * |[][                           ][                            ]
+   * |↑ ↑                            ↑
+   * |5 6                            7
+   * | 1, 5 = indent
+   * | 2 = start
+   * | 3, 6 = space-filler
+   * | 4, 7 = description
+   */
+  for (let i = 0; i < optionLines.length; i++) {
+    const optionLine = optionLines[i];
+    const option = command.options[i];
+    // Add only 2 spaces to the longest line, and then make all shorter lines the same length.
+    optionLine.push(
+      ' '.repeat(2 + (maxLineStartLength - calcLineLength(optionLine)))
+    );
+
+    // Descriptions may be longer than max line length. Wrap them to the same column as the first description line
+    const lines: string[][] = [optionLine];
+    if (option.description) {
+      for (const descriptionWord of option.description.split(' ')) {
+        // insert a new line when the next word would match or exceed the maximum line length
+        if (
+          calcLineLength(lines[lines.length - 1]) +
+            stripAnsi(descriptionWord).length >=
+          options.columns
+        ) {
+          // initialize the new line with the necessary whitespace. The INDENT is apart of `maxLineStartLength`
+          lines.push([' '.repeat(maxLineStartLength + 2)]);
+        }
+        // insert the word to the current last line
+        lines[lines.length - 1].push(descriptionWord);
+      }
+    }
+    // for every line, transform into a string and push it to the output
+    for (const line of lines) {
+      outputArray.push(lineToString(line));
+    }
+    // add an empty line in between in each option block for readability (skip the last block)
+    if (i !== optionLines.length - 1) outputArray.push('');
+  }
+
+  // return the entire list of options as a single string after delete the last '\n' added to the option list
+  return outputArrayToString(outputArray);
+}
+
+export function buildCommandExampleLines(command: Command) {
+  const outputArray: string[] = [chalk.dim(`Examples:`), ''];
+  for (const example of command.examples) {
+    const nameLine: string[] = [INDENT];
+    nameLine.push(chalk.gray('-'));
+    nameLine.push(example.name);
+    outputArray.push(lineToString(nameLine));
+    outputArray.push('');
+    const buildValueLine = (value: string) => {
+      return lineToString([INDENT, INDENT, chalk.cyan(`$ ${value}`)]);
+    };
+    if (Array.isArray(example.value)) {
+      for (const line of example.value) {
+        outputArray.push(buildValueLine(line));
+      }
+    } else {
+      outputArray.push(buildValueLine(example.value));
+    }
+    outputArray.push('');
+  }
+  // delete the last newline added after examples iteration
+  outputArray.splice(-1);
+
+  return outputArrayToString(outputArray);
+}
+
+interface BuildHelpOutputOptions {
+  columns: number;
+}
+
+export function buildHelpOutput(
+  command: Command,
+  options: BuildHelpOutputOptions
+) {
+  const outputArray: string[] = [
+    buildCommandSynopsisLine(command),
+    '',
+    command.description,
+    '',
+    buildCommandOptionLines(command, options),
+    '',
+    buildCommandExampleLines(command),
+    '',
+  ];
+
+  return outputArrayToString(outputArray);
+}
+
+export interface HelpOptions {
+  columns?: number;
+}
+
+export function help(command: Command, options: HelpOptions) {
+  return buildHelpOutput(command, {
+    columns: options.columns ?? 80,
+  });
+}
--- a/packages/cli/src/commands/link/index.ts
+++ b/packages/cli/src/commands/link/index.ts
@@ -97,7 +97,7 @@ export default async function main(client: Client) {
    client.output.warn(
      `The ${cmd('--repo')} flag is in alpha, please report issues`
    );
-    await ensureRepoLink(client, cwd, yes);
+    await ensureRepoLink(client, cwd, { yes, overwrite: true });
  } else {
    const link = await ensureLink('link', client, cwd, {
      autoConfirm: yes,
--- a/packages/cli/src/commands/project/rm.ts
+++ b/packages/cli/src/commands/project/rm.ts
@@ -38,6 +38,10 @@ export default async function rm(client: Client, args: string[]) {
      client.output.error('No such project exists');
      return 1;
    }
+    if (isAPIError(err) && err.status === 403) {
+      client.output.error(err.message);
+      return 1;
+    }
  }
  const elapsed = ms(Date.now() - start);
  client.output.log(
--- a/packages/cli/src/commands/promote/index.ts
+++ b/packages/cli/src/commands/promote/index.ts
@@ -73,6 +73,8 @@ export default async (client: Client): Promise<number> => {
    return 2;
  }

+  const yes = argv['--yes'] ?? false;
+
  // validate the timeout
  let timeout = argv['--timeout'];
  if (timeout && ms(timeout) === undefined) {
@@ -103,6 +105,7 @@ export default async (client: Client): Promise<number> => {
      client,
      deployId: actionOrDeployId,
      timeout,
+      yes,
    });
  } catch (err) {
    if (isErrnoException(err)) {
--- a/packages/cli/src/commands/promote/request-promote.ts
+++ b/packages/cli/src/commands/promote/request-promote.ts
@@ -4,6 +4,7 @@ import { getCommandName } from '../../util/pkg-name';
 import getProjectByDeployment from '../../util/projects/get-project-by-deployment';
 import ms from 'ms';
 import promoteStatus from './status';
+import confirm from '../../util/input/confirm';

 /**
 * Requests a promotion and waits for it complete.
@@ -16,10 +17,12 @@ export default async function requestPromote({
  client,
  deployId,
  timeout,
+  yes,
 }: {
  client: Client;
  deployId: string;
  timeout?: string;
+  yes: boolean;
 }): Promise<number> {
  const { output } = client;

@@ -29,6 +32,16 @@ export default async function requestPromote({
    output: client.output,
  });

+  if (deployment.target !== 'production' && !yes) {
+    const question =
+      'This deployment does not target production, therefore promotion will not apply production environment variables. Are you sure you want to continue?';
+    const answer = await confirm(client, question, false);
+    if (!answer) {
+      output.error('Canceled');
+      return 0;
+    }
+  }
+
  // request the promotion
  await client.fetch(`/v9/projects/${project.id}/promote/${deployment.id}`, {
    body: {}, // required
--- a/packages/cli/src/commands/pull.ts
+++ b/packages/cli/src/commands/pull.ts
@@ -1,7 +1,11 @@
 import chalk from 'chalk';
 import { join } from 'path';
 import Client from '../util/client';
-import type { Project, ProjectEnvTarget } from '@vercel-internals/types';
+import type {
+  Project,
+  ProjectEnvTarget,
+  ProjectLinked,
+} from '@vercel-internals/types';
 import { emoji, prependEmoji } from '../util/emoji';
 import getArgs from '../util/get-args';
 import logo from '../util/output/logo';
@@ -15,6 +19,7 @@ import {
  getEnvTargetPlaceholder,
 } from '../util/env/env-target';
 import { ensureLink } from '../util/link/ensure-link';
+import humanizePath from '../util/humanize-path';

 const help = () => {
  return console.log(`
@@ -81,6 +86,7 @@ function parseArgs(client: Client) {
 async function pullAllEnvFiles(
  environment: ProjectEnvTarget,
  client: Client,
+  link: ProjectLinked,
  project: Project,
  argv: ReturnType<typeof processArgs>,
  cwd: string
@@ -88,6 +94,7 @@ async function pullAllEnvFiles(
  const environmentFile = `.env.${environment}.local`;
  return envPull(
    client,
+    link,
    project,
    environment,
    argv,
@@ -115,7 +122,7 @@ export default async function main(client: Client) {
    return argv;
  }

-  const cwd = argv._[1] || process.cwd();
+  let cwd = argv._[1] || client.cwd;
  const autoConfirm = Boolean(argv['--yes']);
  const environment = parseEnvironment(argv['--environment'] || undefined);

@@ -124,13 +131,18 @@ export default async function main(client: Client) {
    return link;
  }

-  const { project, org } = link;
+  const { project, org, repoRoot } = link;
+
+  if (repoRoot) {
+    cwd = join(repoRoot, project.rootDirectory || '');
+  }

  client.config.currentTeam = org.type === 'team' ? org.id : undefined;

  const pullResultCode = await pullAllEnvFiles(
    environment,
    client,
+    link,
    project,
    argv,
    cwd
@@ -141,13 +153,14 @@ export default async function main(client: Client) {

  client.output.print('\n');
  client.output.log('Downloading project settings');
-  await writeProjectSettings(cwd, project, org);
+  const isRepoLinked = typeof repoRoot === 'string';
+  await writeProjectSettings(cwd, project, org, isRepoLinked);

  const settingsStamp = stamp();
  client.output.print(
    `${prependEmoji(
      `Downloaded project settings to ${chalk.bold(
-        join(VERCEL_DIR, VERCEL_DIR_PROJECT)
+        humanizePath(join(cwd, VERCEL_DIR, VERCEL_DIR_PROJECT))
      )} ${chalk.gray(settingsStamp())}`,
      emoji('success')
    )}\n`
--- a/packages/cli/src/commands/redeploy.ts
+++ b/packages/cli/src/commands/redeploy.ts
@@ -108,7 +108,7 @@ export default async (client: Client): Promise<number> => {
          action: 'redeploy',
        },
        name: fromDeployment.name,
-        target: fromDeployment.target || 'production',
+        target: fromDeployment.target ?? undefined,
      },
      method: 'POST',
    });
--- a/packages/cli/src/util/build/static-builder.ts
+++ b/packages/cli/src/util/build/static-builder.ts
@@ -12,7 +12,10 @@ export const build: BuildV2 = async ({ entrypoint, files, config }) => {
    if (
      filename.startsWith('.git/') ||
      filename === 'vercel.json' ||
-      filename === 'now.json'
+      filename === '.vercelignore' ||
+      filename === 'now.json' ||
+      filename === '.nowignore' ||
+      filename.startsWith('.env')
    ) {
      continue;
    }
--- a/packages/cli/src/util/build/write-build-result.ts
+++ b/packages/cli/src/util/build/write-build-result.ts
@@ -131,6 +131,7 @@ async function writeBuildResultV2(

  const lambdas = new Map<Lambda, string>();
  const overrides: Record<string, PathOverride> = {};
+
  for (const [path, output] of Object.entries(buildResult.output)) {
    const normalizedPath = stripDuplicateSlashes(path);
    if (isLambda(output)) {
@@ -156,11 +157,26 @@ async function writeBuildResultV2(
        const ext = getFileExtension(fallback);
        const fallbackName = `${normalizedPath}.prerender-fallback${ext}`;
        const fallbackPath = join(outputDir, 'functions', fallbackName);
-        const stream = fallback.toStream();
-        await pipe(
-          stream,
-          fs.createWriteStream(fallbackPath, { mode: fallback.mode })
-        );
+
+        // if file is already on the disk we can hard link
+        // instead of creating a new copy
+        let usedHardLink = false;
+        if ('fsPath' in fallback) {
+          try {
+            await fs.link(fallback.fsPath, fallbackPath);
+            usedHardLink = true;
+          } catch (_) {
+            // if link fails we continue attempting to copy
+          }
+        }
+
+        if (!usedHardLink) {
+          const stream = fallback.toStream();
+          await pipe(
+            stream,
+            fs.createWriteStream(fallbackPath, { mode: fallback.mode })
+          );
+        }
        fallback = new FileFsRef({
          ...output.fallback,
          fsPath: basename(fallbackName),
@@ -288,6 +304,14 @@ async function writeStaticFile(
  const dest = join(outputDir, 'static', fsPath);
  await fs.mkdirp(dirname(dest));

+  // if already on disk hard link instead of copying
+  if ('fsPath' in file) {
+    try {
+      return await fs.link(file.fsPath, dest);
+    } catch (_) {
+      // if link fails we continue attempting to copy
+    }
+  }
  await downloadFile(file, dest);
 }

--- a/packages/cli/src/util/client.ts
+++ b/packages/cli/src/util/client.ts
@@ -18,12 +18,14 @@ import type {
  JSONObject,
  Stdio,
  ReadableTTY,
-  WritableTTY,
+  PaginationOptions,
 } from '@vercel-internals/types';
 import { sharedPromise } from './promise';
 import { APIError } from './errors-ts';
 import { normalizeError } from '@vercel/error-utils';
 import type { Agent } from 'http';
+import sleep from './sleep';
+import type * as tty from 'tty';

 const isSAMLError = (v: any): v is SAMLError => {
  return v && v.saml;
@@ -57,8 +59,8 @@ export default class Client extends EventEmitter implements Stdio {
  apiUrl: string;
  authConfig: AuthConfig;
  stdin: ReadableTTY;
-  stdout: WritableTTY;
-  stderr: WritableTTY;
+  stdout: tty.WriteStream;
+  stderr: tty.WriteStream;
  output: Output;
  config: GlobalConfig;
  agent?: Agent;
@@ -144,7 +146,8 @@ export default class Client extends EventEmitter implements Stdio {
      if (!res.ok) {
        const error = await responseError(res);

-        if (isSAMLError(error)) {
+        // we should force reauth only if error has a teamId
+        if (isSAMLError(error) && error.teamId) {
          try {
            // A SAML error means the token is expired, or is not
            // designated for the requested team, so the user needs
@@ -176,6 +179,31 @@ export default class Client extends EventEmitter implements Stdio {
    }, opts.retry);
  }

+  async *fetchPaginated<T>(
+    url: string | URL,
+    opts?: FetchOptions
+  ): AsyncGenerator<T & { pagination: PaginationOptions }> {
+    const endpoint =
+      typeof url === 'string' ? new URL(url, this.apiUrl) : new URL(url.href);
+    if (!endpoint.searchParams.has('limit')) {
+      endpoint.searchParams.set('limit', '100');
+    }
+    let next: number | null | undefined;
+    do {
+      if (next) {
+        // Small sleep to avoid rate limiting
+        await sleep(100);
+        endpoint.searchParams.set('until', String(next));
+      }
+      const res = await this.fetch<T & { pagination: PaginationOptions }>(
+        endpoint.href,
+        opts
+      );
+      yield res;
+      next = res.pagination?.next;
+    } while (next);
+  }
+
  reauthenticate = sharedPromise(async function (
    this: Client,
    error: SAMLError
--- a/packages/cli/src/util/deploy/process-deployment.ts
+++ b/packages/cli/src/util/deploy/process-deployment.ts
@@ -234,6 +234,10 @@ export default async function processDeployment({
          return error;
        }

+        if (error.code === 'forbidden') {
+          return error;
+        }
+
        throw error;
      }

--- a/packages/cli/src/util/dev/server.ts
+++ b/packages/cli/src/util/dev/server.ts
@@ -1131,7 +1131,7 @@ export default class DevServer {
      body = redirectTemplate({ location, statusCode });
    } else {
      res.setHeader('content-type', 'text/plain; charset=utf-8');
-      body = `Redirecting to ${location} (${statusCode})\n`;
+      body = `Redirecting...\n`;
    }
    res.end(body);
  }
--- a/packages/cli/src/util/extension/proxy.ts
+++ b/packages/cli/src/util/extension/proxy.ts
@@ -8,10 +8,7 @@ import {
 import type { Server } from 'http';
 import type Client from '../client';

-const toHeaders = buildToHeaders({
-  // @ts-expect-error - `node-fetch` Headers is missing `getAll()`
-  Headers,
-});
+const toHeaders = buildToHeaders({ Headers });

 export function createProxy(client: Client): Server {
  return createServer(async (req, res) => {
--- a/packages/cli/src/util/get-project-name.ts
+++ b/packages/cli/src/util/get-project-name.ts
@@ -2,7 +2,7 @@ import { basename } from 'path';
 import { VercelConfig } from '@vercel/client';

 export interface GetProjectNameOptions {
-  argv: { '--name'?: string };
+  argv: { [k: string]: string | undefined };
  nowConfig?: VercelConfig;
  paths?: string[];
 }
--- a/packages/cli/src/util/git/repo-info-to-url.ts
+++ b/packages/cli/src/util/git/repo-info-to-url.ts
@@ -0,0 +1,5 @@
+import type { RepoInfo } from './connect-git-provider';
+
+export function repoInfoToUrl(info: RepoInfo): string {
+  return `https://${info.provider}.com/${info.org}/${info.repo}`;
+}
--- a/packages/cli/src/util/index.ts
+++ b/packages/cli/src/util/index.ts
@@ -50,7 +50,7 @@ export interface CreateOptions {
  projectSettings?: any;
  skipAutoDetectionConfirmation?: boolean;
  noWait?: boolean;
-  autoAssignCustomDomains: boolean;
+  autoAssignCustomDomains?: boolean;
 }

 export interface RemoveOptions {
--- a/packages/cli/src/util/link/ensure-link.ts
+++ b/packages/cli/src/util/link/ensure-link.ts
@@ -1,15 +1,10 @@
-import { Org, Project } from '@vercel-internals/types';
 import Client from '../client';
 import setupAndLink from '../link/setup-and-link';
 import param from '../output/param';
 import { getCommandName } from '../pkg-name';
 import { getLinkedProject } from '../projects/link';
 import type { SetupAndLinkOptions } from '../link/setup-and-link';
-
-type LinkResult = {
-  org: Org;
-  project: Project;
-};
+import type { ProjectLinked } from '@vercel-internals/types';

 /**
 * Checks if a project is already linked and if not, links the project and
@@ -23,15 +18,15 @@ type LinkResult = {
 * directory
 * @param opts.projectName - The project name to use when linking, otherwise
 * the current directory
- * @returns {Promise<LinkResult|number>} Returns a numeric exit code when aborted or
+ * @returns {Promise<ProjectLinked|number>} Returns a numeric exit code when aborted or
 * error, otherwise an object containing the org an project
 */
 export async function ensureLink(
  commandName: string,
  client: Client,
  cwd: string,
-  opts: SetupAndLinkOptions
-): Promise<LinkResult | number> {
+  opts: SetupAndLinkOptions = {}
+): Promise<ProjectLinked | number> {
  let { link } = opts;
  if (!link) {
    link = await getLinkedProject(client, cwd);
@@ -61,5 +56,5 @@ export async function ensureLink(
    return link.exitCode;
  }

-  return { org: link.org, project: link.project };
+  return link;
 }
--- a/packages/cli/src/util/link/repo.ts
+++ b/packages/cli/src/util/link/repo.ts
@@ -1,23 +1,26 @@
 import chalk from 'chalk';
+import inquirer from 'inquirer';
 import pluralize from 'pluralize';
 import { homedir } from 'os';
-import { join, normalize } from 'path';
-import { normalizePath } from '@vercel/build-utils';
-import { lstat, readJSON, outputJSON, writeFile, readFile } from 'fs-extra';
+import slugify from '@sindresorhus/slugify';
+import { basename, join, normalize } from 'path';
+import { normalizePath, traverseUpDirectories } from '@vercel/build-utils';
+import { lstat, readJSON, outputJSON } from 'fs-extra';
 import confirm from '../input/confirm';
 import toHumanPath from '../humanize-path';
-import {
-  VERCEL_DIR,
-  VERCEL_DIR_README,
-  VERCEL_DIR_REPO,
-} from '../projects/link';
+import { VERCEL_DIR, VERCEL_DIR_REPO, writeReadme } from '../projects/link';
 import { getRemoteUrls } from '../create-git-meta';
 import link from '../output/link';
 import { emoji, prependEmoji } from '../emoji';
 import selectOrg from '../input/select-org';
 import { addToGitIgnore } from './add-to-gitignore';
 import type Client from '../client';
+import type { Framework } from '@vercel/frameworks';
 import type { Project } from '@vercel-internals/types';
+import createProject from '../projects/create-project';
+import { detectProjects } from '../projects/detect-projects';
+import { repoInfoToUrl } from '../git/repo-info-to-url';
+import { connectGitProvider, parseRepoUrl } from '../git/connect-git-provider';

 const home = homedir();

@@ -39,14 +42,22 @@ export interface RepoLink {
  repoConfig?: RepoProjectsConfig;
 }

+export interface EnsureRepoLinkOptions {
+  yes: boolean;
+  overwrite: boolean;
+}
+
 /**
 * Given a directory path `cwd`, finds the root of the Git repository
 * and returns the parsed `.vercel/repo.json` file if the repository
 * has already been linked.
 */
-export async function getRepoLink(cwd: string): Promise<RepoLink | undefined> {
+export async function getRepoLink(
+  client: Client,
+  cwd: string
+): Promise<RepoLink | undefined> {
  // Determine where the root of the repo is
-  const rootPath = await findRepoRoot(cwd);
+  const rootPath = await findRepoRoot(client, cwd);
  if (!rootPath) return undefined;

  // Read the `repo.json`, if this repo has already been linked
@@ -63,11 +74,11 @@ export async function getRepoLink(cwd: string): Promise<RepoLink | undefined> {
 export async function ensureRepoLink(
  client: Client,
  cwd: string,
-  yes = false
+  { yes, overwrite }: EnsureRepoLinkOptions
 ): Promise<RepoLink | undefined> {
  const { output } = client;

-  const repoLink = await getRepoLink(cwd);
+  const repoLink = await getRepoLink(client, cwd);
  if (repoLink) {
    output.debug(`Found Git repository root directory: ${repoLink.rootPath}`);
  } else {
@@ -75,7 +86,14 @@ export async function ensureRepoLink(
  }
  let { rootPath, repoConfig, repoConfigPath } = repoLink;

-  if (!repoConfig) {
+  if (overwrite || !repoConfig) {
+    // Detect the projects on the filesystem out of band, so that
+    // they will be ready by the time the projects are listed
+    const detectedProjectsPromise = detectProjects(rootPath).catch(err => {
+      output.debug(`Failed to detect local projects: ${err}`);
+      return new Map<string, Framework[]>();
+    });
+
    // Not yet linked, so prompt user to begin linking
    let shouldLink =
      yes ||
@@ -112,64 +130,163 @@ export async function ensureRepoLink(
      remoteName = remoteNames[0];
    } else {
      // Prompt user to select which remote to use
-      const originIndex = remoteNames.indexOf('origin');
      const answer = await client.prompt({
        type: 'list',
        name: 'value',
        message: 'Which Git remote should be used?',
-        choices: remoteNames.map(name => {
+        choices: remoteNames.sort().map(name => {
          return { name: name, value: name };
        }),
-        default: originIndex === -1 ? 0 : originIndex,
+        default: remoteNames.includes('origin') ? 'origin' : undefined,
      });
      remoteName = answer.value;
    }
    const repoUrl = remoteUrls[remoteName];
+    const parsedRepoUrl = parseRepoUrl(repoUrl);
+    if (!parsedRepoUrl) {
+      throw new Error(`Failed to parse Git URL: ${repoUrl}`);
+    }
+    const repoUrlLink = output.link(repoUrl, repoInfoToUrl(parsedRepoUrl), {
+      fallback: () => link(repoUrl),
+    });
    output.spinner(
-      `Fetching Projects for ${link(repoUrl)} under ${chalk.bold(org.slug)}…`
+      `Fetching Projects for ${repoUrlLink} under ${chalk.bold(org.slug)}…`
    );
-    // TODO: Add pagination to fetch all Projects
-    const query = new URLSearchParams({ repoUrl, limit: '100' });
-    const projects: Project[] = await client.fetch(`/v2/projects?${query}`);
+    let projects: Project[] = [];
+    const query = new URLSearchParams({ repoUrl });
+    const projectsIterator = client.fetchPaginated<{
+      projects: Project[];
+    }>(`/v9/projects?${query}`);
+    const detectedProjects = await detectedProjectsPromise;
+    for await (const chunk of projectsIterator) {
+      projects = projects.concat(chunk.projects);
+      if (chunk.pagination.next) {
+        output.spinner(`Found ${chalk.bold(projects.length)} Projects…`, 0);
+      }
+    }
+
    if (projects.length === 0) {
      output.log(
-        `No Projects are linked to ${link(repoUrl)} under ${chalk.bold(
+        `No Projects are linked to ${repoUrlLink} under ${chalk.bold(
          org.slug
        )}.`
      );
-      // TODO: run detection logic to find potential projects.
-      // then prompt user to select valid projects.
-      // then create new Projects
    } else {
      output.log(
-        `Found ${chalk.bold(projects.length)} ${pluralize(
+        `Found ${pluralize(
          'Project',
-          projects.length
-        )} linked to ${link(repoUrl)} under ${chalk.bold(org.slug)}:`
+          projects.length,
+          true
+        )} linked to ${repoUrlLink} under ${chalk.bold(org.slug)}`
      );
    }

+    // For any projects that already exists on Vercel, remove them from the
+    // locally detected directories. Any remaining ones will be prompted to
+    // create new Projects for.
    for (const project of projects) {
-      output.print(`  * ${chalk.cyan(`${org.slug}/${project.name}\n`)}`);
+      detectedProjects.delete(project.rootDirectory ?? '');
    }

-    shouldLink =
-      yes ||
-      (await confirm(
-        client,
-        `Link to ${projects.length === 1 ? 'it' : 'them'}?`,
-        true
-      ));
+    const detectedProjectsCount = Array.from(detectedProjects.values()).reduce(
+      (o, f) => o + f.length,
+      0
+    );
+    if (detectedProjectsCount > 0) {
+      output.log(
+        `Detected ${pluralize(
+          'new Project',
+          detectedProjectsCount,
+          true
+        )} that may be created.`
+      );
+    }

-    if (!shouldLink) {
-      output.print(`Canceled. Repository not linked.\n`);
+    const addSeparators = projects.length > 0 && detectedProjectsCount > 0;
+    const { selected } = await client.prompt({
+      type: 'checkbox',
+      name: 'selected',
+      message: `Which Projects should be ${
+        projects.length ? 'linked to' : 'created'
+      }?`,
+      choices: [
+        ...(addSeparators
+          ? [new inquirer.Separator('----- Existing Projects -----')]
+          : []),
+        ...projects.map(project => {
+          return {
+            name: `${org.slug}/${project.name}`,
+            value: project,
+            checked: true,
+          };
+        }),
+        ...(addSeparators
+          ? [new inquirer.Separator('----- New Projects to be created -----')]
+          : []),
+        ...Array.from(detectedProjects.entries()).flatMap(
+          ([rootDirectory, frameworks]) =>
+            frameworks.map((framework, i) => {
+              const name = slugify(
+                [
+                  basename(rootPath),
+                  basename(rootDirectory),
+                  i > 0 ? framework.slug : '',
+                ]
+                  .filter(Boolean)
+                  .join('-')
+              );
+              return {
+                name: `${org.slug}/${name} (${framework.name})`,
+                value: {
+                  newProject: true,
+                  rootDirectory,
+                  name,
+                  framework,
+                },
+                // Checked by default when there are no other existing Projects
+                checked: projects.length === 0,
+              };
+            })
+        ),
+      ],
+    });
+
+    if (selected.length === 0) {
+      output.print(`No Projects were selected. Repository not linked.\n`);
      return;
    }

+    for (let i = 0; i < selected.length; i++) {
+      const selection = selected[i];
+      if (!selection.newProject) continue;
+      const orgAndName = `${org.slug}/${selection.name}`;
+      output.spinner(`Creating new Project: ${orgAndName}`);
+      delete selection.newProject;
+      if (!selection.rootDirectory) delete selection.rootDirectory;
+      selected[i] = await createProject(client, {
+        ...selection,
+        framework: selection.framework.slug,
+      });
+      await connectGitProvider(
+        client,
+        org,
+        selected[i].id,
+        parsedRepoUrl.provider,
+        `${parsedRepoUrl.org}/${parsedRepoUrl.repo}`
+      );
+      output.log(
+        `Created new Project: ${output.link(
+          orgAndName,
+          `https://vercel.com/${orgAndName}`,
+          { fallback: false }
+        )}`
+      );
+    }
+
    repoConfig = {
      orgId: org.id,
      remoteName,
-      projects: projects.map(project => {
+      projects: selected.map((project: Project) => {
        return {
          id: project.id,
          name: project.name,
@@ -179,19 +296,18 @@ export async function ensureRepoLink(
    };
    await outputJSON(repoConfigPath, repoConfig, { spaces: 2 });

-    await writeFile(
-      join(rootPath, VERCEL_DIR, VERCEL_DIR_README),
-      await readFile(join(__dirname, 'VERCEL_DIR_README.txt'), 'utf8')
-    );
+    await writeReadme(rootPath);

    // update .gitignore
    const isGitIgnoreUpdated = await addToGitIgnore(rootPath);

    output.print(
      prependEmoji(
-        `Linked to ${link(repoUrl)} under ${chalk.bold(
-          org.slug
-        )} (created ${VERCEL_DIR}${
+        `Linked to ${pluralize(
+          'Project',
+          selected.length,
+          true
+        )} under ${chalk.bold(org.slug)} (created ${VERCEL_DIR}${
          isGitIgnoreUpdated ? ' and added it to .gitignore' : ''
        })`,
        emoji('link')
@@ -211,45 +327,47 @@ export async function ensureRepoLink(
 * the nearest `.git/config` file is found. Returns the directory where
 * the Git config was found, or `undefined` when no Git repo was found.
 */
-export async function findRepoRoot(start: string): Promise<string | undefined> {
-  for (const current of traverseUpDirectories(start)) {
+export async function findRepoRoot(
+  client: Client,
+  start: string
+): Promise<string | undefined> {
+  const { debug } = client.output;
+  const REPO_JSON_PATH = join(VERCEL_DIR, VERCEL_DIR_REPO);
+  const GIT_CONFIG_PATH = normalize('.git/config');
+
+  for (const current of traverseUpDirectories({ start })) {
    if (current === home) {
      // Sometimes the $HOME directory is set up as a Git repo
      // (for dotfiles, etc.). In this case it's safe to say that
      // this isn't the repo we're looking for. Bail.
+      debug('Arrived at home directory');
      break;
    }

    // if `.vercel/repo.json` exists (already linked),
    // then consider this the repo root
-    const repoConfigPath = join(current, VERCEL_DIR, VERCEL_DIR_REPO);
+    const repoConfigPath = join(current, REPO_JSON_PATH);
    let stat = await lstat(repoConfigPath).catch(err => {
      if (err.code !== 'ENOENT') throw err;
    });
    if (stat) {
+      debug(`Found "${REPO_JSON_PATH}" - detected "${current}" as repo root`);
      return current;
    }

    // if `.git/config` exists (unlinked),
    // then consider this the repo root
-    const gitConfigPath = join(current, '.git/config');
+    const gitConfigPath = join(current, GIT_CONFIG_PATH);
    stat = await lstat(gitConfigPath).catch(err => {
      if (err.code !== 'ENOENT') throw err;
    });
    if (stat) {
+      debug(`Found "${GIT_CONFIG_PATH}" - detected "${current}" as repo root`);
      return current;
    }
  }
-}

-export function* traverseUpDirectories(start: string) {
-  let current: string | undefined = normalize(start);
-  while (current) {
-    yield current;
-    // Go up one directory
-    const next = join(current, '..');
-    current = next === current ? undefined : next;
-  }
+  debug('Aborting search for repo root');
 }

 function sortByDirectory(a: RepoProjectConfig, b: RepoProjectConfig): number {
@@ -268,7 +386,7 @@ export function findProjectsFromPath(
  path: string
 ): RepoProjectConfig[] {
  const normalizedPath = normalizePath(path);
-  return projects
+  const matches = projects
    .slice()
    .sort(sortByDirectory)
    .filter(project => {
@@ -281,14 +399,9 @@ export function findProjectsFromPath(
        normalizedPath.startsWith(`${project.directory}/`)
      );
    });
-}
-
-/**
- * TODO: remove
- */
-export function findProjectFromPath(
-  projects: RepoProjectConfig[],
-  path: string
-): RepoProjectConfig | undefined {
-  return findProjectsFromPath(projects, path)[0];
+  // If there are multiple matches, we only want the most relevant
+  // selections (with the deepest directory depth), so pick the first
+  // one and filter on those matches.
+  const firstMatch = matches[0];
+  return matches.filter(match => match.directory === firstMatch.directory);
 }
--- a/packages/cli/src/util/link/setup-and-link.ts
+++ b/packages/cli/src/util/link/setup-and-link.ts
@@ -10,7 +10,6 @@ import {
  VERCEL_DIR_PROJECT,
 } from '../projects/link';
 import createProject from '../projects/create-project';
-import updateProject from '../projects/update-project';
 import Client from '../client';
 import handleError from '../handle-error';
 import confirm from '../input/confirm';
@@ -245,10 +244,10 @@ export default async function setupAndLink(
      settings.rootDirectory = rootDirectory;
    }

-    const project = await createProject(client, newProjectName);
-
-    await updateProject(client, project.id, settings);
-    Object.assign(project, settings);
+    const project = await createProject(client, {
+      ...settings,
+      name: newProjectName,
+    });

    await linkFolderToProject(
      client,
--- a/packages/cli/src/util/output/create-output.ts
+++ b/packages/cli/src/util/output/create-output.ts
@@ -3,9 +3,9 @@ import * as ansiEscapes from 'ansi-escapes';
 import { supportsHyperlink as detectSupportsHyperlink } from 'supports-hyperlinks';
 import renderLink from './link';
 import wait, { StopSpinner } from './wait';
-import type { WritableTTY } from '@vercel-internals/types';
 import { errorToString } from '@vercel/error-utils';
 import { removeEmoji } from '../emoji';
+import type * as tty from 'tty';

 const IS_TEST = process.env.NODE_ENV === 'test';

@@ -24,7 +24,7 @@ interface LinkOptions {
 }

 export class Output {
-  stream: WritableTTY;
+  stream: tty.WriteStream;
  debugEnabled: boolean;
  supportsHyperlink: boolean;
  colorDisabled: boolean;
@@ -32,7 +32,7 @@ export class Output {
  private _spinner: StopSpinner | null;

  constructor(
-    stream: WritableTTY,
+    stream: tty.WriteStream,
    {
      debug: debugEnabled = false,
      supportsHyperlink = detectSupportsHyperlink(stream),
--- a/packages/cli/src/util/projects/create-project.ts
+++ b/packages/cli/src/util/projects/create-project.ts
@@ -1,13 +1,13 @@
 import Client from '../client';
-import type { Project } from '@vercel-internals/types';
+import type { Project, ProjectSettings } from '@vercel-internals/types';

 export default async function createProject(
  client: Client,
-  projectName: string
+  settings: ProjectSettings & { name: string }
 ) {
  const project = await client.fetch<Project>('/v1/projects', {
    method: 'POST',
-    body: { name: projectName },
+    body: { ...settings },
  });
  return project;
 }
--- a/packages/cli/src/util/projects/detect-projects.ts
+++ b/packages/cli/src/util/projects/detect-projects.ts
@@ -0,0 +1,38 @@
+import { join } from 'path';
+import frameworkList, { Framework } from '@vercel/frameworks';
+import {
+  detectFrameworks,
+  getWorkspacePackagePaths,
+  getWorkspaces,
+  LocalFileSystemDetector,
+} from '@vercel/fs-detectors';
+
+export async function detectProjects(cwd: string) {
+  const fs = new LocalFileSystemDetector(cwd);
+  const workspaces = await getWorkspaces({ fs });
+  const detectedProjects = new Map<string, Framework[]>();
+  const packagePaths = (
+    await Promise.all(
+      workspaces.map(workspace =>
+        getWorkspacePackagePaths({
+          fs,
+          workspace,
+        })
+      )
+    )
+  ).flat();
+  if (packagePaths.length === 0) {
+    packagePaths.push('/');
+  }
+  await Promise.all(
+    packagePaths.map(async p => {
+      const frameworks = await detectFrameworks({
+        fs: fs.chdir(join('.', p)),
+        frameworkList,
+      });
+      if (frameworks.length === 0) return;
+      detectedProjects.set(p.slice(1), frameworks);
+    })
+  );
+  return detectedProjects;
+}
--- a/packages/cli/src/util/projects/get-project-by-deployment.ts
+++ b/packages/cli/src/util/projects/get-project-by-deployment.ts
@@ -74,9 +74,7 @@ export default async function getProjectByDeployment({
        err.code = 'ERR_INVALID_TEAM';
        throw err;
      }
-    }
-
-    if (team) {
+    } else if (team) {
      const err: NodeJS.ErrnoException = new Error(
        `Deployment doesn't belong to current team ${chalk.bold(contextName)}`
      );
--- a/packages/cli/src/util/projects/link.ts
+++ b/packages/cli/src/util/projects/link.ts
@@ -69,7 +69,7 @@ export function getVercelDirectory(cwd: string): string {
  return existingDirs[0] || possibleDirs[0];
 }

-async function getProjectLink(
+export async function getProjectLink(
  client: Client,
  path: string
 ): Promise<ProjectLink | null> {
@@ -83,7 +83,7 @@ async function getProjectLinkFromRepoLink(
  client: Client,
  path: string
 ): Promise<ProjectLink | null> {
-  const repoLink = await getRepoLink(path);
+  const repoLink = await getRepoLink(client, path);
  if (!repoLink?.repoConfig) {
    return null;
  }
@@ -95,11 +95,13 @@ async function getProjectLinkFromRepoLink(
  if (projects.length === 1) {
    project = projects[0];
  } else {
+    const selectableProjects =
+      projects.length > 0 ? projects : repoLink.repoConfig.projects;
    const { p } = await client.prompt({
      name: 'p',
      type: 'list',
      message: `Please select a Project:`,
-      choices: repoLink.repoConfig.projects.map(p => ({
+      choices: selectableProjects.map(p => ({
        value: p,
        name: p.name,
      })),
@@ -108,9 +110,10 @@ async function getProjectLinkFromRepoLink(
  }
  if (project) {
    return {
+      repoRoot: repoLink.rootPath,
      orgId: repoLink.repoConfig.orgId,
      projectId: project.id,
-      repoRoot: repoLink.rootPath,
+      projectRootDirectory: project.directory,
    };
  }
  return null;
@@ -166,6 +169,7 @@ async function getOrgById(client: Client, orgId: string): Promise<Org | null> {
 }

 async function hasProjectLink(
+  client: Client,
  projectLink: ProjectLink,
  path: string
 ): Promise<boolean> {
@@ -180,7 +184,7 @@ async function hasProjectLink(
  }

  // linked via `repo.json`?
-  const repoLink = await getRepoLink(path);
+  const repoLink = await getRepoLink(client, path);
  if (
    repoLink?.repoConfig?.orgId === projectLink.orgId &&
    repoLink.repoConfig.projects.find(p => p.id === projectLink.projectId)
@@ -242,7 +246,7 @@ export async function getLinkedProject(
    if (isAPIError(err) && err.status === 403) {
      output.stopSpinner();

-      if (err.missingToken) {
+      if (err.missingToken || err.invalidToken) {
        throw new InvalidToken();
      } else {
        throw new NowBuildError({
@@ -284,6 +288,13 @@ export async function getLinkedProject(
  return { status: 'linked', org, project, repoRoot: link.repoRoot };
 }

+export async function writeReadme(path: string) {
+  await writeFile(
+    join(path, VERCEL_DIR, VERCEL_DIR_README),
+    await readFile(join(__dirname, 'VERCEL_DIR_README.txt'), 'utf8')
+  );
+}
+
 export async function linkFolderToProject(
  client: Client,
  path: string,
@@ -293,7 +304,7 @@ export async function linkFolderToProject(
  successEmoji: EmojiLabel = 'link'
 ) {
  // if the project is already linked, we skip linking
-  if (await hasProjectLink(projectLink, path)) {
+  if (await hasProjectLink(client, projectLink, path)) {
    return;
  }

@@ -313,10 +324,7 @@ export async function linkFolderToProject(
    JSON.stringify(projectLink)
  );

-  await writeFile(
-    join(path, VERCEL_DIR, VERCEL_DIR_README),
-    await readFile(join(__dirname, 'VERCEL_DIR_README.txt'), 'utf8')
-  );
+  await writeReadme(path);

  // update .gitignore
  const isGitIgnoreUpdated = await addToGitIgnore(path);
--- a/packages/cli/src/util/projects/project-settings.ts
+++ b/packages/cli/src/util/projects/project-settings.ts
@@ -1,11 +1,12 @@
-import { outputJSON } from 'fs-extra';
-import { Org, Project, ProjectLink } from '@vercel-internals/types';
-import { getLinkFromDir, VERCEL_DIR, VERCEL_DIR_PROJECT } from './link';
 import { join } from 'path';
+import { outputJSON, readFile } from 'fs-extra';
 import { VercelConfig } from '@vercel/client';
+import { VERCEL_DIR, VERCEL_DIR_PROJECT } from './link';
 import { PartialProjectSettings } from '../input/edit-project-settings';
+import type { Org, Project, ProjectLink } from '@vercel-internals/types';
+import { isErrnoException, isError } from '@vercel/error-utils';

-export type ProjectLinkAndSettings = ProjectLink & {
+export type ProjectLinkAndSettings = Partial<ProjectLink> & {
  settings: {
    createdAt: Project['createdAt'];
    installCommand: Project['installCommand'];
@@ -26,7 +27,8 @@ export type ProjectLinkAndSettings = ProjectLink & {
 export async function writeProjectSettings(
  cwd: string,
  project: Project,
-  org: Org
+  org: Org,
+  isRepoLinked: boolean
 ) {
  let analyticsId: string | undefined;
  if (
@@ -39,8 +41,8 @@ export async function writeProjectSettings(
  }

  const projectLinkAndSettings: ProjectLinkAndSettings = {
-    projectId: project.id,
-    orgId: org.id,
+    projectId: isRepoLinked ? undefined : project.id,
+    orgId: isRepoLinked ? undefined : org.id,
    settings: {
      createdAt: project.createdAt,
      framework: project.framework,
@@ -60,8 +62,28 @@ export async function writeProjectSettings(
  });
 }

-export async function readProjectSettings(cwd: string) {
-  return await getLinkFromDir<ProjectLinkAndSettings>(cwd);
+export async function readProjectSettings(vercelDir: string) {
+  try {
+    return JSON.parse(
+      await readFile(join(vercelDir, VERCEL_DIR_PROJECT), 'utf8')
+    );
+  } catch (err: unknown) {
+    // `project.json` file does not exists, so project settings have not been pulled
+    if (
+      isErrnoException(err) &&
+      err.code &&
+      ['ENOENT', 'ENOTDIR'].includes(err.code)
+    ) {
+      return null;
+    }
+
+    // failed to parse JSON, treat the same as if project settings have not been pulled
+    if (isError(err) && err.name === 'SyntaxError') {
+      return null;
+    }
+
+    throw err;
+  }
 }

 export function pickOverrides(
--- a/packages/cli/src/util/projects/update-project.ts
+++ b/packages/cli/src/util/projects/update-project.ts
@@ -1,26 +1,16 @@
 import Client from '../client';
-import type { JSONObject, ProjectSettings } from '@vercel-internals/types';
-
-interface ProjectSettingsResponse extends ProjectSettings {
-  id: string;
-  name: string;
-  updatedAt: number;
-  createdAt: number;
-}
+import type { Project, ProjectSettings } from '@vercel-internals/types';

 export default async function updateProject(
  client: Client,
  prjNameOrId: string,
  settings: ProjectSettings
 ) {
-  // `ProjectSettings` is technically compatible with JSONObject
-  const body = settings as JSONObject;
-
-  const res = await client.fetch<ProjectSettingsResponse>(
+  const res = await client.fetch<Project>(
    `/v2/projects/${encodeURIComponent(prjNameOrId)}`,
    {
      method: 'PATCH',
-      body,
+      body: { ...settings },
    }
  );
  return res;
--- a/packages/cli/test/dev/integration-1.test.ts
+++ b/packages/cli/test/dev/integration-1.test.ts
@@ -322,14 +322,17 @@ test('[vercel dev] should handle missing handler errors thrown in edge functions
    );
    validateResponseHeaders(res);

-    const { stderr } = await dev.kill();
+    const { stdout } = await dev.kill();

    expect(await res.text()).toMatch(
      /<strong>500<\/strong>: INTERNAL_SERVER_ERROR/g
    );
-    expect(stderr).toMatch(
-      /No default export was found. Add a default export to handle requests./g
-    );
+    const url = `http://localhost:${port}/api/edge-error-no-handler`;
+    expect(stdout).toMatchInlineSnapshot(`
+      "Error from API Route /api/edge-error-no-handler: No default or HTTP-named export was found at ${url}. Add one to handle requests. Learn more: https://vercel.link/creating-edge-middleware
+          at (api/edge-error-no-handler.js)
+      "
+    `);
  } finally {
    await dev.kill();
  }
--- a/packages/cli/test/dev/integration-2.test.ts
+++ b/packages/cli/test/dev/integration-2.test.ts
@@ -88,10 +88,10 @@ test(
    async (testPath: any) => {
      const vcRobots = `https://vercel.com/robots.txt`;
      await testPath(200, '/rewrite', /User-Agent: \*/m);
-      await testPath(308, '/redirect', `Redirecting to ${vcRobots} (308)`, {
+      await testPath(308, '/redirect', `Redirecting...`, {
        Location: vcRobots,
      });
-      await testPath(307, '/tempRedirect', `Redirecting to ${vcRobots} (307)`, {
+      await testPath(307, '/tempRedirect', `Redirecting...`, {
        Location: vcRobots,
      });
    }
@@ -103,10 +103,10 @@ test(
  testFixtureStdio('test-routing-case-sensitive', async (testPath: any) => {
    await testPath(200, '/Path', 'UPPERCASE');
    await testPath(200, '/path', 'lowercase');
-    await testPath(308, '/GoTo', 'Redirecting to /upper.html (308)', {
+    await testPath(308, '/GoTo', 'Redirecting...', {
      Location: '/upper.html',
    });
-    await testPath(308, '/goto', 'Redirecting to /lower.html (308)', {
+    await testPath(308, '/goto', 'Redirecting...', {
      Location: '/lower.html',
    });
  })
--- a/packages/cli/test/dev/integration-3.test.ts
+++ b/packages/cli/test/dev/integration-3.test.ts
@@ -233,7 +233,7 @@ test(
        expect(res.headers.get('location')).toBe(
          `http://localhost:${port}/?foo=bar`
        );
-        expect(body).toBe('Redirecting to /?foo=bar (301)\n');
+        expect(body).toBe('Redirecting...\n');
      }

      {
--- a/packages/cli/test/dev/integration-5.test.ts
+++ b/packages/cli/test/dev/integration-5.test.ts
@@ -197,21 +197,18 @@ test(
    await testPath(200, '/sub', 'Sub Index Page');
    await testPath(200, '/sub/another', 'Sub Another Page');
    await testPath(200, '/style.css', 'body { color: green }');
-    await testPath(308, '/index.html', 'Redirecting to / (308)', {
+    await testPath(308, '/index.html', 'Redirecting...', {
      Location: '/',
    });
-    await testPath(308, '/about.html', 'Redirecting to /about (308)', {
+    await testPath(308, '/about.html', 'Redirecting...', {
      Location: '/about',
    });
-    await testPath(308, '/sub/index.html', 'Redirecting to /sub (308)', {
+    await testPath(308, '/sub/index.html', 'Redirecting...', {
      Location: '/sub',
    });
-    await testPath(
-      308,
-      '/sub/another.html',
-      'Redirecting to /sub/another (308)',
-      { Location: '/sub/another' }
-    );
+    await testPath(308, '/sub/another.html', 'Redirecting...', {
+      Location: '/sub/another',
+    });
  })
 );

@@ -225,21 +222,18 @@ test(
      await testPath(200, '/sub', 'Sub Index Page');
      await testPath(200, '/sub/another', 'Sub Another Page');
      await testPath(200, '/style.css', 'body { color: green }');
-      await testPath(308, '/index.html', 'Redirecting to / (308)', {
+      await testPath(308, '/index.html', 'Redirecting...', {
        Location: '/',
      });
-      await testPath(308, '/about.html', 'Redirecting to /about (308)', {
+      await testPath(308, '/about.html', 'Redirecting...', {
        Location: '/about',
      });
-      await testPath(308, '/sub/index.html', 'Redirecting to /sub (308)', {
+      await testPath(308, '/sub/index.html', 'Redirecting...', {
        Location: '/sub',
      });
-      await testPath(
-        308,
-        '/sub/another.html',
-        'Redirecting to /sub/another (308)',
-        { Location: '/sub/another' }
-      );
+      await testPath(308, '/sub/another.html', 'Redirecting...', {
+        Location: '/sub/another',
+      });
    }
  )
 );
@@ -264,21 +258,16 @@ test(
    await testPath(200, '/sub/another/', 'Sub Another Page');
    await testPath(200, '/style.css', 'body { color: green }');
    //TODO: fix this test so that location is `/` instead of `//`
-    //await testPath(308, '/index.html', 'Redirecting to / (308)', { Location: '/' });
-    await testPath(308, '/about.html', 'Redirecting to /about/ (308)', {
+    //await testPath(308, '/index.html', 'Redirecting...', { Location: '/' });
+    await testPath(308, '/about.html', 'Redirecting...', {
      Location: '/about/',
    });
-    await testPath(308, '/sub/index.html', 'Redirecting to /sub/ (308)', {
+    await testPath(308, '/sub/index.html', 'Redirecting...', {
      Location: '/sub/',
    });
-    await testPath(
-      308,
-      '/sub/another.html',
-      'Redirecting to /sub/another/ (308)',
-      {
-        Location: '/sub/another/',
-      }
-    );
+    await testPath(308, '/sub/another.html', 'Redirecting...', {
+      Location: '/sub/another/',
+    });
  })
 );

@@ -315,13 +304,13 @@ test(
    await testPath(200, '/sub/index.html', 'Sub Index Page');
    await testPath(200, '/sub/another.html', 'Sub Another Page');
    await testPath(200, '/style.css', 'body { color: green }');
-    await testPath(308, '/about.html/', 'Redirecting to /about.html (308)', {
+    await testPath(308, '/about.html/', 'Redirecting...', {
      Location: '/about.html',
    });
-    await testPath(308, '/style.css/', 'Redirecting to /style.css (308)', {
+    await testPath(308, '/style.css/', 'Redirecting...', {
      Location: '/style.css',
    });
-    await testPath(308, '/sub', 'Redirecting to /sub/ (308)', {
+    await testPath(308, '/sub', 'Redirecting...', {
      Location: '/sub/',
    });
  })
@@ -347,20 +336,15 @@ test(
    await testPath(200, '/sub/index.html', 'Sub Index Page');
    await testPath(200, '/sub/another.html', 'Sub Another Page');
    await testPath(200, '/style.css', 'body { color: green }');
-    await testPath(308, '/about.html/', 'Redirecting to /about.html (308)', {
+    await testPath(308, '/about.html/', 'Redirecting...', {
      Location: '/about.html',
    });
-    await testPath(308, '/sub/', 'Redirecting to /sub (308)', {
+    await testPath(308, '/sub/', 'Redirecting...', {
      Location: '/sub',
    });
-    await testPath(
-      308,
-      '/sub/another.html/',
-      'Redirecting to /sub/another.html (308)',
-      {
-        Location: '/sub/another.html',
-      }
-    );
+    await testPath(308, '/sub/another.html/', 'Redirecting...', {
+      Location: '/sub/another.html',
+    });
  })
 );

--- a/packages/cli/test/dev/utils.js
+++ b/packages/cli/test/dev/utils.js
@@ -44,7 +44,9 @@ function fetchWithRetry(url, opts = {}) {
      if (res.status !== opts.status) {
        const text = await res.text();
        throw new Error(
-          `Failed to fetch ${url} with status ${res.status} (expected ${opts.status}):\n\n${text}\n\n`
+          `Failed to fetch "${url}", received ${res.status}, expected ${
+            opts.status
+          }, id: ${res.headers.get('x-vercel-id')}:\n\n${text}\n\n`
        );
      }

--- a/packages/cli/test/fixtures/unit/build-output-api-failed-before-builds/.vercel/project.json
+++ b/packages/cli/test/fixtures/unit/build-output-api-failed-before-builds/.vercel/project.json
@@ -0,0 +1,4 @@
+{
+    "orgId": "team_dummy",
+    "projectId": "build-output-api-failed-before-builds"
+}
--- a/packages/cli/test/fixtures/unit/build-output-api-failed-within-build/.vercel/project.json
+++ b/packages/cli/test/fixtures/unit/build-output-api-failed-within-build/.vercel/project.json
@@ -0,0 +1,4 @@
+{
+    "orgId": "team_dummy",
+    "projectId": "build-output-api-failed-within-build"
+}
--- a/packages/cli/test/fixtures/unit/build-output-api-preview/.vercel/project.json
+++ b/packages/cli/test/fixtures/unit/build-output-api-preview/.vercel/project.json
@@ -0,0 +1,4 @@
+{
+    "orgId": "team_dummy",
+    "projectId": "build-output-api-preview"
+}
--- a/packages/cli/test/fixtures/unit/build-output-api-production/.vercel/project.json
+++ b/packages/cli/test/fixtures/unit/build-output-api-production/.vercel/project.json
@@ -0,0 +1,4 @@
+{
+    "orgId": "team_dummy",
+    "projectId": "build-output-api-production"
+}
--- a/packages/cli/test/fixtures/unit/commands/build/npmrc-use-node-version/.npmrc
+++ b/packages/cli/test/fixtures/unit/commands/build/npmrc-use-node-version/.npmrc
@@ -0,0 +1,3 @@
+foo=bar
+# the next line is not supported
+use-node-version=16.16.0
--- a/packages/cli/test/fixtures/unit/commands/build/static-env/.env
+++ b/packages/cli/test/fixtures/unit/commands/build/static-env/.env
@@ -0,0 +1 @@
+FOO=bar
--- a/packages/cli/test/fixtures/unit/commands/build/static-env/.vercel/project.json
+++ b/packages/cli/test/fixtures/unit/commands/build/static-env/.vercel/project.json
@@ -0,0 +1,7 @@
+{
+  "orgId": ".",
+  "projectId": ".",
+  "settings": {
+    "framework": null
+  }
+}
--- a/packages/cli/test/fixtures/unit/commands/build/static-env/index.html
+++ b/packages/cli/test/fixtures/unit/commands/build/static-env/index.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+Hello world!
+</body>
+</html>
--- a/packages/cli/test/fixtures/unit/monorepo-link/.gitignore
+++ b/packages/cli/test/fixtures/unit/monorepo-link/.gitignore
@@ -1 +1,3 @@
-!.vercel
+dist
+!/.vercel
+.vercel/output
--- a/packages/cli/test/fixtures/unit/monorepo-link/blog/package.json
+++ b/packages/cli/test/fixtures/unit/monorepo-link/blog/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "blog",
+  "scripts": {
+    "build": "mkdir -p dist && echo blog > dist/index.txt"
+  }
+}
--- a/packages/cli/test/fixtures/unit/monorepo-link/dashboard/package.json
+++ b/packages/cli/test/fixtures/unit/monorepo-link/dashboard/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "dashboard",
+  "scripts": {
+    "build": "mkdir -p dist && echo dashboard > dist/index.txt"
+  }
+}
--- a/packages/cli/test/fixtures/unit/monorepo-link/marketing/package.json
+++ b/packages/cli/test/fixtures/unit/monorepo-link/marketing/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "marketing",
+  "scripts": {
+    "build": "mkdir -p dist && echo marketing > dist/index.txt"
+  }
+}
--- a/packages/cli/test/fixtures/unit/vercel-env-pull-with-gitignore/.gitignore
+++ b/packages/cli/test/fixtures/unit/vercel-env-pull-with-gitignore/.gitignore
@@ -0,0 +1,4 @@
+.next
+yarn.lock
+!.vercel
+.env*.local
--- a/packages/cli/test/fixtures/unit/vercel-env-pull-with-gitignore/.vercel/project.json
+++ b/packages/cli/test/fixtures/unit/vercel-env-pull-with-gitignore/.vercel/project.json
@@ -0,0 +1,4 @@
+{
+  "orgId": "team_dummy",
+  "projectId": "vercel-env-pull-with-gitignore"
+}
--- a/packages/cli/test/helpers/setup-unit-fixture.ts
+++ b/packages/cli/test/helpers/setup-unit-fixture.ts
@@ -47,7 +47,7 @@ export function setupTmpDir(fixtureName?: string) {

  const cwd = path.join(tempRoot.name, String(tempNumber++), fixtureName ?? '');
  fs.mkdirpSync(cwd);
-  return cwd;
+  return fs.realpathSync(cwd);
 }

 export function cleanupFixtures() {
--- a/packages/cli/test/integration-1.test.ts
+++ b/packages/cli/test/integration-1.test.ts
@@ -32,7 +32,9 @@ function fetchTokenInformation(token: string, retries = 3) {

      if (!res.ok) {
        throw new Error(
-          `Failed to fetch ${url}, received status ${res.status}`
+          `Failed to fetch "${url}", status: ${
+            res.status
+          }, id: ${res.headers.get('x-vercel-id')}`
        );
      }

--- a/packages/cli/test/integration-2.test.ts
+++ b/packages/cli/test/integration-2.test.ts
@@ -43,7 +43,9 @@ function fetchTokenInformation(token: string, retries = 3) {

      if (!res.ok) {
        throw new Error(
-          `Failed to fetch ${url}, received status ${res.status}`
+          `Failed to fetch "${url}", status: ${
+            res.status
+          }, id: ${res.headers.get('x-vercel-id')}`
        );
      }

--- a/packages/cli/test/integration-3.test.ts
+++ b/packages/cli/test/integration-3.test.ts
@@ -47,7 +47,9 @@ function fetchTokenInformation(token: string, retries = 3) {

      if (!res.ok) {
        throw new Error(
-          `Failed to fetch ${url}, received status ${res.status}`
+          `Failed to fetch "${url}", status: ${
+            res.status
+          }, id: ${res.headers.get('x-vercel-id')}`
        );
      }

--- a/Show More
+++ b/Show More