Publish Canary

- @vercel/build-utils@3.1.1-canary.0
 - vercel@24.2.5-canary.0
 - @vercel/client@11.0.4-canary.0
 - @vercel/go@1.4.4-canary.0
 - @vercel/next@2.8.67-canary.0
 - @vercel/node@1.15.4-canary.0
 - @vercel/python@2.3.4-canary.0
 - @vercel/redwood@0.8.4-canary.0
 - @vercel/remix@0.0.2-canary.0
 - @vercel/ruby@1.3.7-canary.0
 - @vercel/static-build@0.25.3-canary.0

.eslintignore

@@ -19,6 +19,10 @@ packages/cli/src/util/dev/templates/*.ts
 packages/client/tests/fixtures
 packages/client/lib
 
+# next
+packages/next/test/integration/middleware
+packages/next/test/integration/middleware-eval
+
 # node-bridge
 packages/node-bridge/bridge.js
 packages/node-bridge/launcher.js

.github/CODEOWNERS

@@ -1,29 +1,26 @@
 # Documentation
 # https://help.github.com/en/articles/about-code-owners
 
-*                                        @TooTallNate
+*                                        @TooTallNate @EndangeredMassa @styfle
-/.github/workflows                       @AndyBitz @styfle
+/.github/workflows                       @TooTallNate @EndangeredMassa @styfle @ijjk
-/packages/frameworks                     @AndyBitz
+/packages/frameworks                     @TooTallNate @EndangeredMassa @styfle @AndyBitz
-/packages/cli/src/commands/build         @TooTallNate @styfle @AndyBitz @gdborton @jaredpalmer
-/packages/cli/src/commands/dev           @TooTallNate @styfle @AndyBitz
-/packages/cli/src/util/dev               @TooTallNate @styfle @AndyBitz
 /packages/cli/src/commands/domains       @javivelasco @mglagola @anatrajkovska
 /packages/cli/src/commands/certs         @javivelasco @mglagola @anatrajkovska
 /packages/cli/src/commands/env           @styfle @lucleray
-/packages/client                         @styfle @TooTallNate
+/packages/client                         @TooTallNate @EndangeredMassa @styfle
-/packages/build-utils                    @styfle @AndyBitz @TooTallNate
+/packages/build-utils                    @TooTallNate @EndangeredMassa @styfle @AndyBitz
 /packages/middleware                     @gdborton @javivelasco
-/packages/node                           @styfle @TooTallNate @lucleray
+/packages/node                           @TooTallNate @EndangeredMassa @styfle
-/packages/node-bridge                    @styfle @TooTallNate @lucleray
+/packages/node-bridge                    @TooTallNate @EndangeredMassa @styfle @ijjk
-/packages/next                           @Timer @ijjk
+/packages/next                           @TooTallNate @ijjk
-/packages/go                             @styfle @TooTallNate
+/packages/go                             @TooTallNate @EndangeredMassa @styfle
-/packages/python                         @styfle @TooTallNate
+/packages/python                         @TooTallNate @EndangeredMassa @styfle
-/packages/ruby                           @styfle @TooTallNate
+/packages/ruby                           @TooTallNate @EndangeredMassa @styfle
-/packages/static-build                   @styfle @AndyBitz
+/packages/static-build                   @TooTallNate @EndangeredMassa @styfle @AndyBitz
-/packages/routing-utils                  @styfle @dav-is @ijjk
+/packages/routing-utils                  @TooTallNate @EndangeredMassa @styfle @ijjk
-/examples                                @mcsdevv
+/examples                                @leerob
 /examples/create-react-app               @Timer
-/examples/nextjs                         @timneutkens @Timer
+/examples/nextjs                         @timneutkens @ijjk @styfle
-/examples/hugo                           @mcsdevv @styfle
+/examples/hugo                           @styfle
-/examples/jekyll                         @mcsdevv @styfle
+/examples/jekyll                         @styfle
-/examples/zola                           @mcsdevv @styfle
+/examples/zola                           @styfle

.github/workflows/cancel.yml

@@ -13,6 +13,5 @@ jobs:
     steps:
       - uses: styfle/cancel-workflow-action@0.9.1
         with:
-          workflow_id: 849295, 849296, 849297, 849298
+          workflow_id: test.yml, test-integration-cli.yml, test-unit.yml
           access_token: ${{ github.token }}
-

.github/workflows/test-integration-cli.yml

@@ -18,6 +18,10 @@ jobs:
         os: [ubuntu-latest]
         node: [12]
     runs-on: ${{ matrix.os }}
+    env:
+      TURBO_REMOTE_ONLY: true
+      TURBO_TEAM: vercel
+      TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
     steps:
       - uses: actions/setup-go@v2
         with:

.github/workflows/test-integration-dev.yml

@@ -1,43 +0,0 @@
-name: Dev
-
-on:
-  push:
-    branches:
-    - main
-    tags:
-    - '!*'
-  pull_request:
-
-jobs:
-  test:
-    name: Dev
-    timeout-minutes: 75
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest, macos-latest]
-        node: [12]
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/setup-go@v2
-        with:
-          go-version: '1.13.15'
-      - uses: actions/setup-node@v2
-        with:
-          node-version: ${{ matrix.node }}
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 100
-      - run: git --version
-      - run: git fetch origin main --depth=100
-      - run: git fetch origin ${{ github.ref }} --depth=100
-      - run: git diff origin/main...HEAD --name-only
-      - name: Install Hugo
-        if: matrix.os == 'macos-latest'
-        run: curl -L -O https://github.com/gohugoio/hugo/releases/download/v0.56.0/hugo_0.56.0_macOS-64bit.tar.gz && tar -xzf hugo_0.56.0_macOS-64bit.tar.gz && mv ./hugo packages/cli/test/dev/fixtures/08-hugo/
-      - run: yarn install --network-timeout 1000000
-      - run: yarn run build
-      - run: yarn test-integration-dev
-        env:
-          VERCEL_TEAM_TOKEN: ${{ secrets.VERCEL_TEAM_TOKEN }}
-          VERCEL_REGISTRATION_URL: ${{ secrets.VERCEL_REGISTRATION_URL }}

.github/workflows/test-integration-once.yml

@@ -1,35 +0,0 @@
-name: E2E
-
-on:
-  push:
-    branches:
-    - main
-    tags:
-    - '!*'
-  pull_request:
-
-jobs:
-  test:
-    name: E2E
-    timeout-minutes: 120
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/setup-go@v2
-        with:
-          go-version: '1.13.15'
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 12
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 100
-      - run: git --version
-      - run: git fetch origin main --depth=100
-      - run: git fetch origin ${{ github.ref }} --depth=100
-      - run: git diff origin/main...HEAD --name-only
-      - run: yarn install --network-timeout 1000000
-      - run: yarn run build
-      - run: yarn test-integration-once
-        env:
-          VERCEL_TEAM_TOKEN: ${{ secrets.VERCEL_TEAM_TOKEN }}
-          VERCEL_REGISTRATION_URL: ${{ secrets.VERCEL_REGISTRATION_URL }}

.github/workflows/test-unit.yml

@@ -16,8 +16,12 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        node: [12]
+        node: [14]
     runs-on: ${{ matrix.os }}
+    env:
+      TURBO_REMOTE_ONLY: true
+      TURBO_TEAM: vercel
+      TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
     steps:
       - uses: actions/setup-go@v2
         with:
@@ -35,9 +39,9 @@ jobs:
       - run: yarn install --network-timeout 1000000
       - run: yarn run build
       - run: yarn run lint
-        if: matrix.os == 'ubuntu-latest' && matrix.node == 12 # only run lint once
+        if: matrix.os == 'ubuntu-latest' && matrix.node == 14 # only run lint once
       - run: yarn run test-unit
       - run: yarn workspace vercel run coverage
-        if: matrix.os == 'ubuntu-latest' && matrix.node == 12 # only run coverage once
+        if: matrix.os == 'ubuntu-latest' && matrix.node == 14 # only run coverage once
         env:
-          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/test.yml

@@ -0,0 +1,88 @@
+name: Tests
+
+on:
+  push:
+    branches:
+    - main
+    tags:
+    - '!*'
+  pull_request:
+
+env:
+  NODE_VERSION: '14'
+
+jobs:
+  setup:
+    name: Find Changes
+    runs-on: ubuntu-latest
+    outputs:
+      tests: ${{ steps['set-tests'].outputs['tests'] }}
+    steps:
+      - uses: actions/checkout@v2
+      - run: git --version
+      - run: git fetch origin main
+      - uses: actions/setup-node@v2
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+          cache: 'yarn'
+      - run: yarn install --network-timeout 1000000
+      - id: set-tests
+        run: |
+          TESTS_ARRAY=$(node utils/chunk-tests.js $SCRIPT_NAME)
+          echo "Files to test:"
+          echo "$TESTS_ARRAY"
+          echo "::set-output name=tests::$TESTS_ARRAY"
+
+  test:
+    timeout-minutes: 120
+    runs-on: ${{ matrix.runner }}
+    name: ${{matrix.scriptName}} (${{matrix.packageName}}, ${{matrix.chunkNumber}}, ${{ matrix.runner }})
+    if: ${{ needs.setup.outputs['tests'] != '[]' }}
+    env:
+      TURBO_REMOTE_ONLY: true
+      TURBO_TEAM: vercel
+      TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
+    needs:
+      - setup
+    strategy:
+      fail-fast: false
+      matrix:
+        include: ${{ fromJson(needs.setup.outputs['tests']) }}
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 2
+      - uses: actions/setup-go@v2
+        with:
+          go-version: '1.13.15'
+      - uses: actions/setup-node@v2
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+          cache: 'yarn'
+          
+      - name: Install Hugo
+        if: matrix.runner == 'macos-latest'
+        run: curl -L -O https://github.com/gohugoio/hugo/releases/download/v0.56.0/hugo_0.56.0_macOS-64bit.tar.gz && tar -xzf hugo_0.56.0_macOS-64bit.tar.gz && mv ./hugo packages/cli/test/dev/fixtures/08-hugo/
+      
+      - run: yarn install --network-timeout 1000000
+
+      - name: Build ${{matrix.packageName}} and all its dependencies
+        run: yarn turbo run build --cache-dir=".turbo" --scope=${{matrix.packageName}} --include-dependencies --no-deps
+        env:
+          FORCE_COLOR: '1'
+      - name: Test ${{matrix.packageName}}
+        run: node_modules/.bin/turbo run test --cache-dir=".turbo" --scope=${{matrix.packageName}} --no-deps -- ${{ join(matrix.testPaths, ' ') }}
+        shell: bash
+        env:
+          VERCEL_TEAM_TOKEN: ${{ secrets.VERCEL_TEAM_TOKEN }}
+          VERCEL_REGISTRATION_URL: ${{ secrets.VERCEL_REGISTRATION_URL }}
+          FORCE_COLOR: '1'
+
+  conclusion:
+    needs:
+      - test
+    runs-on: ubuntu-latest
+    name: E2E
+    steps:
+      - name: Done
+        run: echo "Done."

examples/astro/.gitignore

@@ -0,0 +1,20 @@
+# build output
+dist/
+.output/
+
+# dependencies
+node_modules/
+
+# logs
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+
+
+# environment variables
+.env
+.env.production
+
+# macOS-specific files
+.DS_Store

examples/astro/.npmrc

@@ -0,0 +1,2 @@
+# Expose Astro dependencies for `pnpm` users
+shamefully-hoist=true

examples/astro/.vercelignore

@@ -0,0 +1 @@
+README.md

examples/astro/README.md

@@ -0,0 +1,42 @@
+# Welcome to [Astro](https://astro.build)
+
+[![Open in StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/withastro/astro/tree/latest/examples/starter)
+
+> 🧑‍🚀 **Seasoned astronaut?** Delete this file. Have fun!
+
+## 🚀 Project Structure
+
+Inside of your Astro project, you'll see the following folders and files:
+
+```
+/
+├── public/
+│   └── favicon.ico
+├── src/
+│   ├── components/
+│   │   └── Layout.astro
+│   └── pages/
+│       └── index.astro
+└── package.json
+```
+
+Astro looks for `.astro` or `.md` files in the `src/pages/` directory. Each page is exposed as a route based on its file name.
+
+There's nothing special about `src/components/`, but that's where we like to put any Astro/React/Vue/Svelte/Preact components or layouts.
+
+Any static assets, like images, can be placed in the `public/` directory.
+
+## 🧞 Commands
+
+All commands are run from the root of the project, from a terminal:
+
+| Command           | Action                                       |
+| :---------------- | :------------------------------------------- |
+| `npm install`     | Installs dependencies                        |
+| `npm run dev`     | Starts local dev server at `localhost:3000`  |
+| `npm run build`   | Build your production site to `./dist/`      |
+| `npm run preview` | Preview your build locally, before deploying |
+
+## 👀 Want to learn more?
+
+Feel free to check [our documentation](https://github.com/withastro/astro) or jump into our [Discord server](https://astro.build/chat).

examples/astro/astro.config.mjs

@@ -0,0 +1,4 @@
+import { defineConfig } from 'astro/config';
+
+// https://astro.build/config
+export default defineConfig({});

examples/astro/package.json

@@ -0,0 +1,14 @@
+{
+  "name": "@example/basics",
+  "version": "0.0.1",
+  "private": true,
+  "scripts": {
+    "dev": "astro dev",
+    "start": "astro dev",
+    "build": "astro build",
+    "preview": "astro preview"
+  },
+  "devDependencies": {
+    "astro": "^1.0.0-beta.20"
+  }
+}

examples/astro/src/components/Layout.astro

@@ -0,0 +1,55 @@
+---
+export interface Props {
+	title: string;
+}
+
+const { title } = Astro.props as Props;
+---
+
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="UTF-8">
+	<meta name="viewport" content="width=device-width">
+  <link rel="icon" type="image/x-icon" href="/favicon.ico" />
+	<title>{title}</title>
+</head>
+<body>
+	<slot />
+</body>
+</html>
+
+<style>
+  :root {
+    --font-size-base: clamp(1rem, 0.34vw + 0.91rem, 1.19rem);
+		--font-size-lg: clamp(1.2rem, 0.7vw + 1.2rem, 1.5rem); 
+    --font-size-xl: clamp(2.44rem, 2.38vw + 1.85rem, 3.75rem);
+
+    --color-text: hsl(12, 5%, 4%);
+    --color-bg: hsl(10, 21%, 95%);
+  }
+
+  html {
+    font-family: system-ui, sans-serif;
+    font-size: var(--font-size-base);
+    color: var(--color-text);
+    background-color: var(--color-bg);
+  }
+
+  body {
+    margin: 0;
+  }
+
+  :global(h1) {
+    font-size: var(--font-size-xl);
+  }
+
+  :global(h2) {
+    font-size: var(--font-size-lg);
+  }
+
+  :global(code) {
+    font-family: Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono,
+			Bitstream Vera Sans Mono, Courier New, monospace;
+  }
+</style>

examples/astro/src/pages/index.astro

@@ -0,0 +1,174 @@
+---
+import Layout from '../components/Layout.astro';
+---
+
+<Layout title="Welcome to Astro.">
+	<main>
+		<h1>Welcome to <span class="text-gradient">Astro</span></h1>
+		<p class="instructions"><strong>Your first mission:</strong> tweak this message to try our hot module reloading. Check the <code>src/pages</code> directory!</p>
+		<ul role="list" class="link-card-grid">
+			<li class="link-card">
+				<a href="https://astro.build/integrations/">
+					<h2>Integrations <span>&rarr;</span></h2>
+					<p>Add component frameworks, Tailwind, Partytown, and more!</p>
+				</a>
+			</li>
+			<li class="link-card">
+				<a href="https://astro.build/themes/">
+					<h2>Themes <span>&rarr;</span></h2>
+					<p>Explore a galaxy of community-built starters.</p>
+				</a>
+			</li>
+			<li class="link-card">
+				<a href="https://docs.astro.build/">
+					<h2>Docs <span>&rarr;</span></h2>
+					<p>Learn our complete feature set and explore the API.</p>
+				</a>
+			</li>
+			<li class="link-card">
+				<a href="https://astro.build/chat/">
+					<h2>Chat <span>&rarr;</span></h2>
+					<p>
+						Ask, contribute, and have fun on our community Discord
+						<svg
+							class="heart"
+							xmlns="http://www.w3.org/2000/svg"
+							viewBox="0 0 512 512"
+							width="16"
+							height="16"
+							fill="currentColor"
+						>
+							<title>heart</title>
+							<path d="M256 448l-30.164-27.211C118.718 322.442 48 258.61 48 179.095 48 114.221 97.918 64 162.4 64c36.399 0 70.717 16.742 93.6 43.947C278.882 80.742 313.199 64 349.6 64 414.082 64 464 114.221 464 179.095c0 79.516-70.719 143.348-177.836 241.694L256 448z" />
+						</svg>
+					</p>
+				</a>
+			</li>
+		</ul>
+	</main>
+</Layout>
+
+<style>
+	:root {
+		--color-border: hsl(17, 24%, 90%);
+		--astro-gradient: linear-gradient(0deg,#4F39FA, #DA62C4);
+		--link-gradient: linear-gradient(45deg, #4F39FA, #DA62C4 30%, var(--color-border) 60%);
+		--night-sky-gradient: linear-gradient(0deg, #392362 -33%, #431f69 10%, #30216b 50%, #1f1638 100%);
+	}
+
+	h2 {
+		margin: 0;
+		transition: color 0.6s cubic-bezier(0.22, 1, 0.36, 1);
+	}
+
+	h2 span {
+		display: inline-block;
+		transition: transform 0.3s cubic-bezier(0.22, 1, 0.36, 1);
+	}
+
+	code {
+		font-size: 0.875em;
+		border: 0.1em solid var(--color-border);
+		border-radius: 4px;
+		padding: 0.15em 0.25em;
+	}
+
+	main {
+		margin: auto;
+    padding: 1em;
+		max-width: 60ch;
+	}
+
+	.text-gradient {
+		font-weight: 900;
+		background-image: var(--astro-gradient);
+		-webkit-background-clip: text;
+  	-webkit-text-fill-color: transparent;
+		background-size: 100% 200%;
+		background-position-y: 100%;
+		border-radius: 0.4rem;
+		animation: pulse 4s ease-in-out infinite;
+	}
+
+	@keyframes pulse {
+		0%, 100% {
+			background-position-y: 0%;
+		}
+		50% {
+			background-position-y: 80%;
+		}
+	}
+
+	.instructions {
+		line-height: 1.8;
+		margin-bottom: 2rem;
+		background-image: var(--night-sky-gradient);
+		padding: 1.5rem;
+		border-radius: 0.4rem;
+		color: var(--color-bg);
+	}
+
+	.link-card-grid {
+		display: grid;
+		grid-template-columns: repeat(auto-fit, minmax(24ch, 1fr));
+		gap: 1rem;
+		padding: 0;
+	}
+
+	.link-card {
+		list-style: none;
+		display: flex;
+		padding: 0.15rem;
+		background-image: var(--link-gradient);
+		background-size: 400%;
+		border-radius: 0.5rem;
+		background-position: 100%;
+		transition: background-position 0.6s cubic-bezier(0.22, 1, 0.36, 1);
+	}
+
+	.link-card > a {
+		width: 100%;
+		text-decoration: none;
+		line-height: 1.4;
+		padding: 1em 1.3em;
+		border-radius: 0.35rem;
+		color: var(--text-color);
+		background-color: white;
+		opacity: 0.8;
+	}
+
+	.link-card:is(:hover, :focus-within) {
+		background-position: 0;
+	}
+
+	.link-card:is(:hover, :focus-within) h2 {
+		color: #4F39FA;
+	}
+
+	.link-card:is(:hover, :focus-within) h2 span {
+		transform: translateX(2px);
+	}
+
+	.heart {
+		display: inline-block;
+		color: #DA62C4;
+		animation: heartbeat 3s ease-in-out infinite;
+	}
+
+	@keyframes heartbeat {
+		0%,
+		50%,
+		100% {
+			transform: scale(1);
+		}
+		5% {
+			transform: scale(1.125);
+		}
+		10% {
+			transform: scale(1.05);
+		}
+		15% {
+			transform: scale(1.25);
+		}
+	}
+</style>

examples/astro/tsconfig.json

@@ -0,0 +1,15 @@
+{
+  "compilerOptions": {
+    // Enable top-level await, and other modern ESM features.
+    "target": "ESNext",
+    "module": "ESNext",
+    // Enable node-style module resolution, for things like npm package imports.
+    "moduleResolution": "node",
+    // Enable JSON imports.
+    "resolveJsonModule": true,
+    // Enable stricter transpilation for better output.
+    "isolatedModules": true,
+    // Add type definitions for our Vite runtime.
+    "types": ["vite/client"]
+  }
+}

examples/ember/package.json

@@ -48,6 +48,6 @@
     "qunit-dom": "^0.8.4"
   },
   "engines": {
-    "node": "8.* || >= 10.*"
+    "node": "14.x"
   }
 }

examples/nuxtjs/.vercelignore

@@ -2,3 +2,4 @@ README.md
 .nuxt
 node_modules
 *.log
+.output

examples/remix/package-lock.json

@@ -21,7 +21,7 @@
         "typescript": "^4.1.2"
       },
       "engines": {
-        "node": ">=14"
+        "node": "14.x"
       }
     },
     "node_modules/@babel/code-frame": {

examples/remix/package.json

@@ -23,7 +23,7 @@
     "typescript": "^4.1.2"
   },
   "engines": {
-    "node": ">=14"
+    "node": "14.x"
   },
   "sideEffects": false
-}
+}

examples/solidstart/README.md

@@ -1,6 +1,6 @@
 # SolidStart
 
-This directory is a brief example of a [SolidStart](https://github.com/ryansolid/solid-startp) site that can be deployed to Vercel with zero configuration.
+This directory is a brief example of a [SolidStart](https://github.com/ryansolid/solid-start) site that can be deployed to Vercel with zero configuration.
 
 ## Deploy Your Own
 

examples/solidstart/jsconfig.json

@@ -1,9 +0,0 @@
-{
-  "compilerOptions": {
-    "jsx": "preserve",
-    "jsxImportSource": "solid-js",
-    "paths": {
-      "~/*": ["./src/*"]
-    }
-  }
-}

examples/solidstart/package.json

@@ -7,14 +7,14 @@
   "type": "module",
   "private": true,
   "devDependencies": {
-    "solid-app-router": "^0.1.14",
+    "solid-app-router": "^0.3.2",
-    "solid-js": "^1.2.6",
+    "solid-js": "^1.3.15",
-    "solid-meta": "^0.27.2",
+    "solid-meta": "^0.27.3",
     "solid-start": "next",
     "solid-start-vercel": "next",
-    "vite": "^2.7.1"
+    "vite": "^2.9.9"
   },
   "engines": {
-    "node": ">=14"
+    "node": "16.x"
   }
 }

examples/solidstart/src/entry-client.tsx

@@ -0,0 +1,4 @@
+import { hydrate } from "solid-js/web";
+import { StartClient } from "solid-start/entry-client";
+
+hydrate(() => <StartClient />, document);

examples/solidstart/src/entry-server.tsx

@@ -0,0 +1,7 @@
+import { StartServer, createHandler, renderAsync } from "solid-start/entry-server";
+import { inlineServerModules } from "solid-start/server";
+
+export default createHandler(
+  inlineServerModules,
+  renderAsync((context) => <StartServer context={context} />)
+);

examples/solidstart/src/root.jsx

@@ -1,21 +0,0 @@
-// @refresh reload
-import { Links, Meta, Outlet, Scripts } from "solid-start/components";
-
-export default function Root({ Start }) {
-  return (
-    <Start>
-      <html lang="en">
-        <head>
-          <meta charset="utf-8" />
-          <meta name="viewport" content="width=device-width, initial-scale=1" />
-          <Meta />
-          <Links />
-        </head>
-        <body>
-          <Outlet />
-          <Scripts />
-        </body>
-      </html>
-    </Start>
-  );
-}

examples/solidstart/src/root.tsx

@@ -0,0 +1,25 @@
+// @refresh reload
+import { Links, Meta, Routes, Scripts } from "solid-start/root";
+import { ErrorBoundary } from "solid-start/error-boundary";
+import { Suspense } from "solid-js";
+
+export default function Root() {
+  return (
+    <html lang="en">
+      <head>
+        <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+        <Meta />
+        <Links />
+      </head>
+      <body>
+        <ErrorBoundary>
+          <Suspense>
+            <Routes />
+          </Suspense>
+        </ErrorBoundary>
+        <Scripts />
+      </body>
+    </html>
+  );
+}

examples/solidstart/tsconfig.json

@@ -0,0 +1,16 @@
+{
+  "compilerOptions": {
+    "allowSyntheticDefaultImports": true,
+    "esModuleInterop": true,
+    "target": "ESNext",
+    "module": "ESNext",
+    "moduleResolution": "node",
+    "jsxImportSource": "solid-js",
+    "jsx": "preserve",
+    "types": ["vite/client"],
+    "baseUrl": "./",
+    "paths": {
+      "~/*": ["./src/*"]
+    }
+  }
+}

examples/solidstart/vercel.json

@@ -0,0 +1,7 @@
+{
+  "build": {
+    "env": {
+      "ENABLE_VC_BUILD": "1"
+    }
+  }
+}

package.json

@@ -31,7 +31,7 @@
     "prettier": "2.6.2",
     "ts-eager": "2.0.2",
     "ts-jest": "28.0.0-next.1",
-    "turbo": "1.2.5"
+    "turbo": "1.2.9"
   },
   "scripts": {
     "lerna": "lerna",
@@ -44,10 +44,10 @@
     "vercel-build": "yarn build && cd api && node -r ts-eager/register ./_lib/script/build.ts",
     "pre-commit": "lint-staged",
     "test": "jest --rootDir=\"test\" --testPathPattern=\"\\.test.js\"",
-    "test-unit": "yarn test && node utils/run.js test-unit",
+    "test-unit": "yarn test && turbo run test-unit",
-    "test-integration-cli": "node utils/run.js test-integration-cli",
+    "test-integration-cli": "turbo run test-integration-cli",
-    "test-integration-once": "node utils/run.js test-integration-once",
+    "test-integration-once": "turbo run test-integration-once",
-    "test-integration-dev": "node utils/run.js test-integration-dev",
+    "test-integration-dev": "turbo run test-integration-dev",
     "lint": "eslint . --ext .ts,.js",
     "prepare": "husky install"
   },

packages/build-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "2.16.0",
+  "version": "3.1.1-canary.0",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",
@@ -12,8 +12,9 @@
   },
   "scripts": {
     "build": "node build",
-    "test-unit": "jest --env node --verbose --runInBand --bail test/unit.*test.*",
+    "test": "jest --env node --verbose --runInBand --bail",
-    "test-integration-once": "jest --env node --verbose --runInBand --bail test/integration.test.ts",
+    "test-unit": "yarn test test/unit.*test.*",
+    "test-integration-once": "yarn test test/integration.test.ts",
     "prepublishOnly": "node build"
   },
   "devDependencies": {
@@ -30,7 +31,7 @@
     "@types/node-fetch": "^2.1.6",
     "@types/semver": "6.0.0",
     "@types/yazl": "2.4.2",
-    "@vercel/frameworks": "0.8.0",
+    "@vercel/frameworks": "0.9.1",
     "@vercel/ncc": "0.24.0",
     "aggregate-error": "3.0.1",
     "async-retry": "1.2.3",

packages/build-utils/src/detectors/filesystem.ts

@@ -1,3 +1,8 @@
+export interface Stat {
+  name: string;
+  path: string;
+  type: 'file' | 'dir';
+}
 /**
  * `DetectorFilesystem` is an abstract class that represents a virtual filesystem
  * to perform read-only operations on in order to detect which framework is being
@@ -27,15 +32,19 @@ export abstract class DetectorFilesystem {
   protected abstract _hasPath(name: string): Promise<boolean>;
   protected abstract _readFile(name: string): Promise<Buffer>;
   protected abstract _isFile(name: string): Promise<boolean>;
+  protected abstract _readdir(name: string): Promise<Stat[]>;
+  protected abstract _chdir(name: string): DetectorFilesystem;
 
   private pathCache: Map<string, Promise<boolean>>;
   private fileCache: Map<string, Promise<boolean>>;
   private readFileCache: Map<string, Promise<Buffer>>;
+  private readdirCache: Map<string, Promise<Stat[]>>;
 
   constructor() {
     this.pathCache = new Map();
     this.fileCache = new Map();
     this.readFileCache = new Map();
+    this.readdirCache = new Map();
   }
 
   public hasPath = async (path: string): Promise<boolean> => {
@@ -64,4 +73,23 @@ export abstract class DetectorFilesystem {
     }
     return p;
   };
+
+  /**
+   * Returns a list of Stat objects from the current working directory.
+   */
+  public readdir = async (name: string): Promise<Stat[]> => {
+    let p = this.readdirCache.get(name);
+    if (!p) {
+      p = this._readdir(name);
+      this.readdirCache.set(name, p);
+    }
+    return p;
+  };
+
+  /**
+   * Changes the current directory to the specified path and returns a new instance of DetectorFilesystem.
+   */
+  public chdir = (name: string): DetectorFilesystem => {
+    return this._chdir(name);
+  };
 }

packages/build-utils/src/fs/node-version.ts

@@ -4,8 +4,14 @@ import { NowBuildError } from '../errors';
 import debug from '../debug';
 
 const allOptions = [
+  { major: 16, range: '16.x', runtime: 'nodejs16.x' },
   { major: 14, range: '14.x', runtime: 'nodejs14.x' },
-  { major: 12, range: '12.x', runtime: 'nodejs12.x' },
+  {
+    major: 12,
+    range: '12.x',
+    runtime: 'nodejs12.x',
+    discontinueDate: new Date('2022-08-09'),
+  },
   {
     major: 10,
     range: '10.x',

packages/build-utils/src/fs/run-user-scripts.ts

@@ -222,12 +222,6 @@ export async function getNodeVersion(
     const latest = getLatestNodeVersion();
     return { ...latest, runtime: 'nodejs' };
   }
-  if (process.env.ENABLE_EXPERIMENTAL_NODE16 === '1') {
-    console.warn(
-      'Warning: Using experimental Node.js 16.x due to ENABLE_EXPERIMENTAL_NODE16=1'
-    );
-    return { major: 16, range: '16.x', runtime: 'nodejs16.x' };
-  }
   const { packageJson } = await scanParentDirs(destPath, true);
   let { nodeVersion } = config;
   let isAuto = true;
@@ -285,15 +279,17 @@ export async function scanParentDirs(
         ),
       ]);
 
-      if (packageLockJson && !hasYarnLock && !pnpmLockYaml) {
+      // Priority order is Yarn > pnpm > npm
-        cliType = 'npm';
+      // - find highest priority lock file and use that
-        lockfileVersion = packageLockJson.lockfileVersion;
+      if (hasYarnLock) {
-      }
+        cliType = 'yarn';
-
+      } else if (pnpmLockYaml) {
-      if (!packageLockJson && !hasYarnLock && pnpmLockYaml) {
         cliType = 'pnpm';
         // just ensure that it is read as a number and not a string
         lockfileVersion = Number(pnpmLockYaml.lockfileVersion);
+      } else if (packageLockJson) {
+        cliType = 'npm';
+        lockfileVersion = packageLockJson.lockfileVersion;
       }
 
       // Only stop iterating if a lockfile was found, because it's possible
@@ -440,6 +436,12 @@ export function getEnvForPackageManager({
       newEnv.PATH = `/node16/bin-npm7:${env.PATH}`;
       console.log('Detected `package-lock.json` generated by npm 7...');
     }
+  } else if (cliType === 'pnpm') {
+    if (typeof lockfileVersion === 'number' && lockfileVersion === 5.4) {
+      // Ensure that pnpm 7 is at the beginning of the `$PATH`
+      newEnv.PATH = `/pnpm7/node_modules/.bin:${env.PATH}`;
+      console.log('Detected `pnpm-lock.yaml` generated by pnpm 7...');
+    }
   } else {
     // Yarn v2 PnP mode may be activated, so force "node-modules" linker style
     if (!env.YARN_NODE_LINKER) {

packages/build-utils/src/index.ts

@@ -33,7 +33,6 @@ import {
   getDiscontinuedNodeVersions,
 } from './fs/node-version';
 import streamToBuffer from './fs/stream-to-buffer';
-import shouldServe from './should-serve';
 import debug from './debug';
 import getIgnoreFilter from './get-ignore-filter';
 import { getPlatformEnv } from './get-platform-env';
@@ -73,7 +72,6 @@ export {
   getSpawnOptions,
   getPlatformEnv,
   streamToBuffer,
-  shouldServe,
   debug,
   isSymbolicLink,
   getLambdaOptionsFromFunction,
@@ -94,6 +92,7 @@ export { DetectorFilesystem } from './detectors/filesystem';
 export { readConfigFile } from './fs/read-config-file';
 export { normalizePath } from './fs/normalize-path';
 
+export * from './should-serve';
 export * from './schemas';
 export * from './types';
 export * from './errors';
@@ -116,3 +115,5 @@ export const isOfficialRuntime = (desired: string, name?: string): boolean => {
 export const isStaticRuntime = (name?: string): boolean => {
   return isOfficialRuntime('static', name);
 };
+
+export { workspaceManagers } from './workspaces/workspace-managers';

packages/build-utils/src/should-serve.ts

@@ -1,12 +1,12 @@
 import { parse } from 'path';
-import { ShouldServeOptions } from './types';
+import type FileFsRef from './file-fs-ref';
-import FileFsRef from './file-fs-ref';
+import type { ShouldServe } from './types';
 
-export default function shouldServe({
+export const shouldServe: ShouldServe = ({
   entrypoint,
   files,
   requestPath,
-}: ShouldServeOptions): boolean {
+}) => {
   requestPath = requestPath.replace(/\/$/, ''); // sanitize trailing '/'
   entrypoint = entrypoint.replace(/\\/, '/'); // windows compatibility
 
@@ -20,7 +20,7 @@ export default function shouldServe({
   }
 
   return false;
-}
+};
 
 function hasProp(obj: { [path: string]: FileFsRef }, key: string): boolean {
   return Object.hasOwnProperty.call(obj, key);

packages/build-utils/src/types.ts

@@ -327,6 +327,7 @@ export interface ProjectSettings {
   buildCommand?: string | null;
   outputDirectory?: string | null;
   rootDirectory?: string | null;
+  nodeVersion?: string;
   createdAt?: number;
   autoExposeSystemEnvs?: boolean;
   sourceFilesOutsideRootDirectory?: boolean;
@@ -345,6 +346,7 @@ export interface BuilderV3 {
   version: 3;
   build: BuildV3;
   prepareCache?: PrepareCache;
+  shouldServe?: ShouldServe;
   startDevServer?: StartDevServer;
 }
 
@@ -401,6 +403,9 @@ export interface BuildResultV3 {
 export type BuildV2 = (options: BuildOptions) => Promise<BuildResultV2>;
 export type BuildV3 = (options: BuildOptions) => Promise<BuildResultV3>;
 export type PrepareCache = (options: PrepareCacheOptions) => Promise<Files>;
+export type ShouldServe = (
+  options: ShouldServeOptions
+) => boolean | Promise<boolean>;
 export type StartDevServer = (
   options: StartDevServerOptions
 ) => Promise<StartDevServerResult>;

packages/build-utils/src/workspaces/workspace-managers.ts

@@ -0,0 +1,129 @@
+import type { Framework } from '@vercel/frameworks';
+
+/**
+ * The supported list of workspace managers.
+ *
+ * This list is designed to work with the @see {@link detectFramework} function.
+ *
+ * @example
+ *   import { workspaceManagers as frameworkList } from '@vercel/build-utils/workspaces'
+ *   import { detectFramework } from '@vercel/build-utils'
+ *
+ *   const fs = new GitDetectorFilesystem(...)
+ *   detectFramwork({ fs, frameworkList }) // returns the 'slug' field if detected, otherwise null
+ *
+ * @todo Will be used by the detect-eligible-projects API endpoint for a given git url.
+ */
+export const workspaceManagers: Array<Framework> = [
+  {
+    name: 'Yarn',
+    slug: 'yarn',
+    detectors: {
+      every: [
+        {
+          path: 'package.json',
+          matchContent:
+            '"workspaces":\\s*(?:\\[[^\\]]*]|{[^}]*"packages":[^}]*})',
+        },
+        {
+          path: 'yarn.lock',
+        },
+      ],
+    },
+    // unused props - needed for typescript
+    description: '',
+    logo: '',
+    settings: {
+      buildCommand: {
+        value: '',
+        placeholder: '',
+      },
+      devCommand: {
+        value: '',
+        placeholder: '',
+      },
+      installCommand: {
+        value: '',
+        placeholder: '',
+      },
+      outputDirectory: {
+        value: '',
+        placeholder: '',
+      },
+    },
+    getOutputDirName: () => Promise.resolve(''),
+  },
+  {
+    name: 'pnpm',
+    slug: 'pnpm',
+    detectors: {
+      every: [
+        {
+          path: 'pnpm-workspace.yaml',
+        },
+      ],
+    },
+    // unused props - needed for typescript
+    description: '',
+    logo: '',
+    settings: {
+      buildCommand: {
+        value: '',
+        placeholder: '',
+      },
+      devCommand: {
+        value: '',
+        placeholder: '',
+      },
+      installCommand: {
+        value: '',
+        placeholder: '',
+      },
+      outputDirectory: {
+        value: '',
+        placeholder: '',
+      },
+    },
+    getOutputDirName: () => Promise.resolve(''),
+  },
+  {
+    name: 'npm',
+    slug: 'npm',
+    detectors: {
+      every: [
+        {
+          path: 'package.json',
+          matchContent:
+            '"workspaces":\\s*(?:\\[[^\\]]*]|{[^}]*"packages":[^}]*})',
+        },
+        {
+          path: 'package-lock.json',
+        },
+      ],
+    },
+    // unused props - needed for typescript
+    description: '',
+    logo: '',
+    settings: {
+      buildCommand: {
+        value: '',
+        placeholder: '',
+      },
+      devCommand: {
+        value: '',
+        placeholder: '',
+      },
+      installCommand: {
+        value: '',
+        placeholder: '',
+      },
+      outputDirectory: {
+        value: '',
+        placeholder: '',
+      },
+    },
+    getOutputDirName: () => Promise.resolve(''),
+  },
+];
+
+export default workspaceManagers;

packages/build-utils/test/fixtures/25-multiple-lock-files-yarn/package.json

@@ -0,0 +1,14 @@
+{
+  "private": "true",
+  "name": "25-multiple-lock-files-yarn",
+  "workspaces": [
+    "a",
+    "b"
+  ],
+  "scripts": {
+    "build": "mkdir -p public && (printf \"yarn version: \" && yarn -v) > public/index.txt"
+  },
+  "dependencies": {
+    "once": "^1.4.0"
+  }
+}

packages/build-utils/test/fixtures/25-multiple-lock-files-yarn/pnpm-lock.yaml

@@ -0,0 +1,19 @@
+lockfileVersion: 5.3
+
+specifiers:
+  once: ^1.4.0
+
+dependencies:
+  once: 1.4.0
+
+packages:
+
+  /once/1.4.0:
+    resolution: {integrity: sha1-WDsap3WWHUsROsF9nFC6753Xa9E=}
+    dependencies:
+      wrappy: 1.0.2
+    dev: false
+
+  /wrappy/1.0.2:
+    resolution: {integrity: sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=}
+    dev: false

packages/build-utils/test/fixtures/25-multiple-lock-files-yarn/vercel.json

@@ -0,0 +1,11 @@
+{
+  "version": 2,
+  "builds": [{ "src": "package.json", "use": "@vercel/static-build" }],
+  "probes": [
+    {
+      "path": "/",
+      "mustContain": "yarn version: 1",
+      "logMustContain": "yarn run build"
+    }
+  ]
+}

packages/build-utils/test/fixtures/25-multiple-lock-files-yarn/yarn.lock

@@ -0,0 +1,15 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+once@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
+  dependencies:
+    wrappy "1"
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=

packages/build-utils/test/fixtures/26-multiple-lock-files-pnpm/package-lock.json

@@ -0,0 +1,44 @@
+{
+  "name": "26-multiple-lock-files-pnpm",
+  "version": "1.0.0",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "26-multiple-lock-files-pnpm",
+      "version": "1.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "once": "^1.4.0"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+    }
+  },
+  "dependencies": {
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+    }
+  }
+}

packages/build-utils/test/fixtures/26-multiple-lock-files-pnpm/package.json

@@ -0,0 +1,14 @@
+{
+  "private": "true",
+  "name": "26-multiple-lock-files-pnpm",
+  "workspaces": [
+    "a",
+    "b"
+  ],
+  "scripts": {
+    "build": "mkdir -p public && (printf \"pnpm version: \" && pnpm -v) > public/index.txt"
+  },
+  "dependencies": {
+    "once": "^1.4.0"
+  }
+}

packages/build-utils/test/fixtures/26-multiple-lock-files-pnpm/pnpm-lock.yaml

@@ -0,0 +1,19 @@
+lockfileVersion: 5.3
+
+specifiers:
+  once: ^1.4.0
+
+dependencies:
+  once: 1.4.0
+
+packages:
+
+  /once/1.4.0:
+    resolution: {integrity: sha1-WDsap3WWHUsROsF9nFC6753Xa9E=}
+    dependencies:
+      wrappy: 1.0.2
+    dev: false
+
+  /wrappy/1.0.2:
+    resolution: {integrity: sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=}
+    dev: false

packages/build-utils/test/fixtures/26-multiple-lock-files-pnpm/pnpm-workspace.yaml

@@ -0,0 +1,3 @@
+packages:
+  - 'a'
+  - 'b'

packages/build-utils/test/fixtures/26-multiple-lock-files-pnpm/vercel.json

@@ -0,0 +1,11 @@
+{
+  "version": 2,
+  "builds": [{ "src": "package.json", "use": "@vercel/static-build" }],
+  "probes": [
+    {
+      "path": "/",
+      "mustContain": "pnpm version: 6",
+      "logMustContain": "pnpm run build"
+    }
+  ]
+}

packages/build-utils/test/fixtures/27-yarn-workspaces/a/package.json

@@ -0,0 +1,15 @@
+{
+  "name": "a",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "debug": "^4.3.2"
+  }
+}

packages/build-utils/test/fixtures/27-yarn-workspaces/b/package.json

@@ -0,0 +1,15 @@
+{
+  "name": "b",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "cowsay": "^1.5.0"
+  }
+}

packages/build-utils/test/fixtures/27-yarn-workspaces/package.json

@@ -0,0 +1,9 @@
+{
+  "name": "21-npm-workspaces",
+  "version": "1.0.0",
+  "private": true,
+  "workspaces": [
+    "a",
+    "b"
+  ]
+}

packages/build-utils/test/fixtures/27-yarn-workspaces/yarn.lock

@@ -0,0 +1,232 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+ansi-regex@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.1.tgz#123d6479e92ad45ad897d4054e3c7ca7db4944e1"
+  integrity sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==
+
+ansi-regex@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
+  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
+
+ansi-styles@^4.0.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
+  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
+  dependencies:
+    color-convert "^2.0.1"
+
+camelcase@^5.0.0:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
+  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
+
+cliui@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1"
+  integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.0"
+    wrap-ansi "^6.2.0"
+
+color-convert@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
+  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
+  dependencies:
+    color-name "~1.1.4"
+
+color-name@~1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
+  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
+
+cowsay@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/cowsay/-/cowsay-1.5.0.tgz#4a2a453b8b59383c7d7a50e44d765c5de0bf615f"
+  integrity sha512-8Ipzr54Z8zROr/62C8f0PdhQcDusS05gKTS87xxdji8VbWefWly0k8BwGK7+VqamOrkv3eGsCkPtvlHzrhWsCA==
+  dependencies:
+    get-stdin "8.0.0"
+    string-width "~2.1.1"
+    strip-final-newline "2.0.0"
+    yargs "15.4.1"
+
+debug@^4.3.2:
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
+  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
+  dependencies:
+    ms "2.1.2"
+
+decamelize@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
+
+emoji-regex@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
+  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
+
+find-up@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
+  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
+  dependencies:
+    locate-path "^5.0.0"
+    path-exists "^4.0.0"
+
+get-caller-file@^2.0.1:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
+
+get-stdin@8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-8.0.0.tgz#cbad6a73feb75f6eeb22ba9e01f89aa28aa97a53"
+  integrity sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==
+
+is-fullwidth-code-point@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
+
+is-fullwidth-code-point@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
+  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
+
+locate-path@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
+  integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
+  dependencies:
+    p-locate "^4.1.0"
+
+ms@2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+
+p-limit@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
+  integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
+  dependencies:
+    p-try "^2.0.0"
+
+p-locate@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
+  integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
+  dependencies:
+    p-limit "^2.2.0"
+
+p-try@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
+  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
+
+path-exists@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
+  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
+
+require-directory@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
+
+require-main-filename@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
+  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
+
+set-blocking@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
+
+string-width@^4.1.0, string-width@^4.2.0:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+string-width@~2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
+  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
+  dependencies:
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^4.0.0"
+
+strip-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
+  dependencies:
+    ansi-regex "^3.0.0"
+
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+strip-final-newline@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
+  integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
+
+which-module@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
+  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
+
+wrap-ansi@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
+  integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
+y18n@^4.0.0:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
+  integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==
+
+yargs-parser@^18.1.2:
+  version "18.1.3"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
+  integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
+  dependencies:
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
+
+yargs@15.4.1:
+  version "15.4.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
+  integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==
+  dependencies:
+    cliui "^6.0.0"
+    decamelize "^1.2.0"
+    find-up "^4.1.0"
+    get-caller-file "^2.0.1"
+    require-directory "^2.1.1"
+    require-main-filename "^2.0.0"
+    set-blocking "^2.0.0"
+    string-width "^4.2.0"
+    which-module "^2.0.0"
+    y18n "^4.0.0"
+    yargs-parser "^18.1.2"

packages/build-utils/test/fixtures/28-pnpm-7/package.json

@@ -0,0 +1,9 @@
+{
+  "private": "true",
+  "scripts": {
+    "build": "mkdir -p public && (printf \"pnpm version: \" && pnpm -v) > public/index.txt"
+  },
+  "dependencies": {
+    "once": "^1.4.0"
+  }
+}

packages/build-utils/test/fixtures/28-pnpm-7/pnpm-lock.yaml

@@ -0,0 +1,19 @@
+lockfileVersion: 5.4
+
+specifiers:
+  once: ^1.4.0
+
+dependencies:
+  once: 1.4.0
+
+packages:
+
+  /once/1.4.0:
+    resolution: {integrity: sha1-WDsap3WWHUsROsF9nFC6753Xa9E=}
+    dependencies:
+      wrappy: 1.0.2
+    dev: false
+
+  /wrappy/1.0.2:
+    resolution: {integrity: sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=}
+    dev: false

packages/build-utils/test/fixtures/28-pnpm-7/vercel.json

@@ -0,0 +1,10 @@
+{
+  "version": 2,
+  "builds": [{ "src": "package.json", "use": "@vercel/static-build" }],
+  "probes": [
+    {
+      "path": "/",
+      "mustContain": "pnpm version: 7"
+    }
+  ]
+}

packages/build-utils/test/integration.test.ts

@@ -32,6 +32,7 @@ const skipFixtures: string[] = [
   '08-zero-config-middleman',
   '21-npm-workspaces',
   '23-pnpm-workspaces',
+  '27-yarn-workspaces',
 ];
 
 // eslint-disable-next-line no-restricted-syntax

packages/build-utils/test/unit.detect-workspace-managers.test.ts

@@ -0,0 +1,31 @@
+import path from 'path';
+import { detectFramework } from '../src/detect-framework';
+import workspaceManagers from '../src/workspaces/workspace-managers';
+import { FixtureFilesystem } from './utils/fixture-filesystem';
+
+describe('workspace-managers', () => {
+  describe.each([
+    ['npm', '21-npm-workspaces'],
+    ['pnpm', '23-pnpm-workspaces'],
+    ['yarn', '27-yarn-workspaces'],
+    ['yarn', '25-multiple-lock-files-yarn'],
+    ['pnpm', '26-multiple-lock-files-pnpm'],
+    [null, '22-pnpm'],
+  ])('with detectFramework', (frameworkSlug, fixturePath) => {
+    const testName = frameworkSlug
+      ? `should detect a ${frameworkSlug} workspace for ${fixturePath}`
+      : `should not detect framework for ${fixturePath}`;
+
+    it(testName, async () => {
+      const fixture = path.join(__dirname, 'fixtures', fixturePath);
+      const fs = new FixtureFilesystem(fixture);
+
+      const result = await detectFramework({
+        fs,
+        frameworkList: workspaceManagers,
+      });
+
+      expect(result).toBe(frameworkSlug);
+    });
+  });
+});

packages/build-utils/test/unit.framework-detector.test.ts

@@ -1,21 +1,32 @@
+import path from 'path';
 import frameworkList from '@vercel/frameworks';
 import { detectFramework, DetectorFilesystem } from '../src';
+import { Stat } from '../src/detectors/filesystem';
+
+const posixPath = path.posix;
 
 class VirtualFilesystem extends DetectorFilesystem {
   private files: Map<string, Buffer>;
+  private cwd: string;
 
-  constructor(files: { [key: string]: string | Buffer }) {
+  constructor(files: { [key: string]: string | Buffer }, cwd = '') {
     super();
     this.files = new Map();
+    this.cwd = cwd;
     Object.entries(files).map(([key, value]) => {
       const buffer = typeof value === 'string' ? Buffer.from(value) : value;
       this.files.set(key, buffer);
     });
   }
 
-  async _hasPath(path: string): Promise<boolean> {
+  private _normalizePath(rawPath: string): string {
+    return posixPath.normalize(rawPath);
+  }
+
+  async _hasPath(name: string): Promise<boolean> {
+    const basePath = this._normalizePath(posixPath.join(this.cwd, name));
     for (const file of this.files.keys()) {
-      if (file.startsWith(path)) {
+      if (file.startsWith(basePath)) {
         return true;
       }
     }
@@ -24,11 +35,13 @@ class VirtualFilesystem extends DetectorFilesystem {
   }
 
   async _isFile(name: string): Promise<boolean> {
-    return this.files.has(name);
+    const basePath = this._normalizePath(posixPath.join(this.cwd, name));
+    return this.files.has(basePath);
   }
 
   async _readFile(name: string): Promise<Buffer> {
-    const file = this.files.get(name);
+    const basePath = this._normalizePath(posixPath.join(this.cwd, name));
+    const file = this.files.get(basePath);
 
     if (file === undefined) {
       throw new Error('File does not exist');
@@ -40,115 +53,291 @@ class VirtualFilesystem extends DetectorFilesystem {
 
     return file;
   }
+
+  /**
+   * An example of how to implement readdir for a virtual filesystem.
+   */
+  async _readdir(name = '/'): Promise<Stat[]> {
+    return (
+      [...this.files.keys()]
+        .map(filepath => {
+          const basePath = this._normalizePath(
+            posixPath.join(this.cwd, name === '/' ? '' : name)
+          );
+          const fileDirectoryName = posixPath.dirname(filepath);
+
+          if (fileDirectoryName === basePath) {
+            return {
+              name: posixPath.basename(filepath),
+              path: filepath.replace(
+                this.cwd === '' ? this.cwd : `${this.cwd}/`,
+                ''
+              ),
+              type: 'file',
+            };
+          }
+
+          if (
+            (basePath === '.' && fileDirectoryName !== '.') ||
+            fileDirectoryName.startsWith(basePath)
+          ) {
+            let subDirectoryName = fileDirectoryName.replace(
+              basePath === '.' ? '' : `${basePath}/`,
+              ''
+            );
+
+            if (subDirectoryName.includes('/')) {
+              subDirectoryName = subDirectoryName.split('/')[0];
+            }
+
+            return {
+              name: subDirectoryName,
+              path:
+                name === '/'
+                  ? subDirectoryName
+                  : this._normalizePath(posixPath.join(name, subDirectoryName)),
+              type: 'dir',
+            };
+          }
+
+          return null;
+        })
+        // remove nulls
+        .filter((stat): stat is Stat => stat !== null)
+        // remove duplicates
+        .filter(
+          (stat, index, self) =>
+            index ===
+            self.findIndex(s => s.name === stat.name && s.path === stat.path)
+        )
+    );
+  }
+
+  /**
+   * An example of how to implement chdir for a virtual filesystem.
+   */
+  _chdir(name: string): DetectorFilesystem {
+    const basePath = this._normalizePath(posixPath.join(this.cwd, name));
+    const files = Object.fromEntries(
+      [...this.files.keys()].map(key => [key, this.files.get(key) ?? ''])
+    );
+
+    return new VirtualFilesystem(files, basePath);
+  }
 }
 
-describe('#detectFramework', () => {
+describe('DetectorFilesystem', () => {
-  it('Do not detect anything', async () => {
+  it('should return the directory contents relative to the cwd', async () => {
-    const fs = new VirtualFilesystem({
+    const files = {
-      'README.md': '# hi',
+      'package.json': '{}',
-      'api/cheese.js': 'export default (req, res) => res.end("cheese");',
+      'packages/app1/package.json': '{}',
-    });
+      'packages/app2/package.json': '{}',
+    };
 
-    expect(await detectFramework({ fs, frameworkList })).toBe(null);
+    const fs = new VirtualFilesystem(files);
+
+    expect(await fs.readdir('/')).toEqual([
+      { name: 'package.json', path: 'package.json', type: 'file' },
+      { name: 'packages', path: 'packages', type: 'dir' },
+    ]);
+
+    expect(await fs.readdir('packages')).toEqual([
+      { name: 'app1', path: 'packages/app1', type: 'dir' },
+      { name: 'app2', path: 'packages/app2', type: 'dir' },
+    ]);
+
+    expect(await fs.readdir('./packages')).toEqual([
+      { name: 'app1', path: 'packages/app1', type: 'dir' },
+      { name: 'app2', path: 'packages/app2', type: 'dir' },
+    ]);
+
+    expect(await fs.readdir('packages/app1')).toEqual([
+      {
+        name: 'package.json',
+        path: 'packages/app1/package.json',
+        type: 'file',
+      },
+    ]);
   });
 
-  it('Detect Next.js', async () => {
+  it('should be able to change directories', async () => {
-    const fs = new VirtualFilesystem({
+    const nextPackageJson = JSON.stringify({
-      'package.json': JSON.stringify({
+      dependencies: {
-        dependencies: {
+        next: '9.0.0',
-          next: '9.0.0',
+      },
-        },
+    });
-      }),
+    const gatsbyPackageJson = JSON.stringify({
+      dependencies: {
+        gatsby: '1.0.0',
+      },
     });
 
-    expect(await detectFramework({ fs, frameworkList })).toBe('nextjs');
+    const files = {
+      'package.json': '{}',
+      'packages/app1/package.json': nextPackageJson,
+      'packages/app2/package.json': gatsbyPackageJson,
+    };
+
+    const fs = new VirtualFilesystem(files);
+    const packagesFs = fs.chdir('packages');
+
+    expect(await packagesFs.readdir('/')).toEqual([
+      { name: 'app1', path: 'app1', type: 'dir' },
+      { name: 'app2', path: 'app2', type: 'dir' },
+    ]);
+
+    expect(await packagesFs.hasPath('app1')).toBe(true);
+    expect(await packagesFs.hasPath('app3')).toBe(false);
+    expect(await packagesFs.isFile('app1')).toBe(false);
+    expect(await packagesFs.isFile('app2')).toBe(false);
+    expect(await packagesFs.isFile('app1/package.json')).toBe(true);
+    expect(await packagesFs.isFile('app2/package.json')).toBe(true);
+    expect(
+      await (await packagesFs.readFile('app1/package.json')).toString()
+    ).toEqual(nextPackageJson);
+    expect(
+      await (await packagesFs.readFile('app2/package.json')).toString()
+    ).toEqual(gatsbyPackageJson);
+
+    expect(await detectFramework({ fs: packagesFs, frameworkList })).toBe(null);
+
+    const nextAppFs = packagesFs.chdir('app1');
+
+    expect(await nextAppFs.readdir('/')).toEqual([
+      { name: 'package.json', path: 'package.json', type: 'file' },
+    ]);
+
+    expect(await (await nextAppFs.readFile('package.json')).toString()).toEqual(
+      nextPackageJson
+    );
+
+    expect(await detectFramework({ fs: nextAppFs, frameworkList })).toBe(
+      'nextjs'
+    );
+
+    const gatsbyAppFs = packagesFs.chdir('./app2');
+
+    expect(await gatsbyAppFs.readdir('/')).toEqual([
+      { name: 'package.json', path: 'package.json', type: 'file' },
+    ]);
+
+    expect(
+      await (await gatsbyAppFs.readFile('package.json')).toString()
+    ).toEqual(gatsbyPackageJson);
+
+    expect(await detectFramework({ fs: gatsbyAppFs, frameworkList })).toBe(
+      'gatsby'
+    );
   });
 
-  it('Detect Nuxt.js', async () => {
+  describe('#detectFramework', () => {
-    const fs = new VirtualFilesystem({
+    it('Do not detect anything', async () => {
-      'package.json': JSON.stringify({
+      const fs = new VirtualFilesystem({
-        dependencies: {
+        'README.md': '# hi',
-          nuxt: '1.0.0',
+        'api/cheese.js': 'export default (req, res) => res.end("cheese");',
-        },
+      });
-      }),
+
+      expect(await detectFramework({ fs, frameworkList })).toBe(null);
     });
 
-    expect(await detectFramework({ fs, frameworkList })).toBe('nuxtjs');
+    it('Detect Next.js', async () => {
-  });
+      const fs = new VirtualFilesystem({
+        'package.json': JSON.stringify({
+          dependencies: {
+            next: '9.0.0',
+          },
+        }),
+      });
 
-  it('Detect Gatsby', async () => {
+      expect(await detectFramework({ fs, frameworkList })).toBe('nextjs');
-    const fs = new VirtualFilesystem({
-      'package.json': JSON.stringify({
-        dependencies: {
-          gatsby: '1.0.0',
-        },
-      }),
     });
 
-    expect(await detectFramework({ fs, frameworkList })).toBe('gatsby');
+    it('Detect Nuxt.js', async () => {
-  });
+      const fs = new VirtualFilesystem({
+        'package.json': JSON.stringify({
+          dependencies: {
+            nuxt: '1.0.0',
+          },
+        }),
+      });
 
-  it('Detect Hugo #1', async () => {
+      expect(await detectFramework({ fs, frameworkList })).toBe('nuxtjs');
-    const fs = new VirtualFilesystem({
-      'config.yaml': 'baseURL: http://example.org/',
-      'content/post.md': '# hello world',
     });
 
-    expect(await detectFramework({ fs, frameworkList })).toBe('hugo');
+    it('Detect Gatsby', async () => {
-  });
+      const fs = new VirtualFilesystem({
+        'package.json': JSON.stringify({
+          dependencies: {
+            gatsby: '1.0.0',
+          },
+        }),
+      });
 
-  it('Detect Hugo #2', async () => {
+      expect(await detectFramework({ fs, frameworkList })).toBe('gatsby');
-    const fs = new VirtualFilesystem({
-      'config.json': '{ "baseURL": "http://example.org/" }',
-      'content/post.md': '# hello world',
     });
 
-    expect(await detectFramework({ fs, frameworkList })).toBe('hugo');
+    it('Detect Hugo #1', async () => {
-  });
+      const fs = new VirtualFilesystem({
+        'config.yaml': 'baseURL: http://example.org/',
+        'content/post.md': '# hello world',
+      });
 
-  it('Detect Hugo #3', async () => {
+      expect(await detectFramework({ fs, frameworkList })).toBe('hugo');
-    const fs = new VirtualFilesystem({
-      'config.toml': 'baseURL = "http://example.org/"',
-      'content/post.md': '# hello world',
     });
 
-    expect(await detectFramework({ fs, frameworkList })).toBe('hugo');
+    it('Detect Hugo #2', async () => {
-  });
+      const fs = new VirtualFilesystem({
+        'config.json': '{ "baseURL": "http://example.org/" }',
+        'content/post.md': '# hello world',
+      });
 
-  it('Detect Jekyll', async () => {
+      expect(await detectFramework({ fs, frameworkList })).toBe('hugo');
-    const fs = new VirtualFilesystem({
-      '_config.yml': 'config',
     });
 
-    expect(await detectFramework({ fs, frameworkList })).toBe('jekyll');
+    it('Detect Hugo #3', async () => {
-  });
+      const fs = new VirtualFilesystem({
+        'config.toml': 'baseURL = "http://example.org/"',
+        'content/post.md': '# hello world',
+      });
 
-  it('Detect Middleman', async () => {
+      expect(await detectFramework({ fs, frameworkList })).toBe('hugo');
-    const fs = new VirtualFilesystem({
-      'config.rb': 'config',
     });
 
-    expect(await detectFramework({ fs, frameworkList })).toBe('middleman');
+    it('Detect Jekyll', async () => {
-  });
+      const fs = new VirtualFilesystem({
+        '_config.yml': 'config',
+      });
 
-  it('Detect Scully', async () => {
+      expect(await detectFramework({ fs, frameworkList })).toBe('jekyll');
-    const fs = new VirtualFilesystem({
-      'package.json': JSON.stringify({
-        dependencies: {
-          '@angular/cli': 'latest',
-          '@scullyio/init': 'latest',
-        },
-      }),
     });
 
-    expect(await detectFramework({ fs, frameworkList })).toBe('scully');
+    it('Detect Middleman', async () => {
-  });
+      const fs = new VirtualFilesystem({
+        'config.rb': 'config',
+      });
 
-  it('Detect Zola', async () => {
+      expect(await detectFramework({ fs, frameworkList })).toBe('middleman');
-    const fs = new VirtualFilesystem({
-      'config.toml': 'base_url = "/"',
     });
 
-    expect(await detectFramework({ fs, frameworkList })).toBe('zola');
+    it('Detect Scully', async () => {
+      const fs = new VirtualFilesystem({
+        'package.json': JSON.stringify({
+          dependencies: {
+            '@angular/cli': 'latest',
+            '@scullyio/init': 'latest',
+          },
+        }),
+      });
+
+      expect(await detectFramework({ fs, frameworkList })).toBe('scully');
+    });
+
+    it('Detect Zola', async () => {
+      const fs = new VirtualFilesystem({
+        'config.toml': 'base_url = "/"',
+      });
+
+      expect(await detectFramework({ fs, frameworkList })).toBe('zola');
+    });
   });
 });

packages/build-utils/test/unit.get-env-for-package-manager.test.ts

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

packages/build-utils/test/unit.test.ts

@@ -176,9 +176,13 @@ it('should only match supported node versions, otherwise throw an error', async
     'major',
     14
   );
+  expect(await getSupportedNodeVersion('16.x', false)).toHaveProperty(
+    'major',
+    16
+  );
 
   const autoMessage =
-    'Please set Node.js Version to 14.x in your Project Settings to use Node.js 14.';
+    'Please set Node.js Version to 16.x in your Project Settings to use Node.js 16.';
   await expectBuilderError(
     getSupportedNodeVersion('8.11.x', true),
     autoMessage
@@ -196,9 +200,13 @@ it('should only match supported node versions, otherwise throw an error', async
     'major',
     14
   );
+  expect(await getSupportedNodeVersion('16.x', true)).toHaveProperty(
+    'major',
+    16
+  );
 
   const foundMessage =
-    'Please set "engines": { "node": "14.x" } in your `package.json` file to use Node.js 14.';
+    'Please set "engines": { "node": "16.x" } in your `package.json` file to use Node.js 16.';
   await expectBuilderError(
     getSupportedNodeVersion('8.11.x', false),
     foundMessage
@@ -219,8 +227,8 @@ it('should match all semver ranges', async () => {
   // See https://docs.npmjs.com/files/package.json#engines
   expect(await getSupportedNodeVersion('12.0.0')).toHaveProperty('major', 12);
   expect(await getSupportedNodeVersion('12.x')).toHaveProperty('major', 12);
-  expect(await getSupportedNodeVersion('>=10')).toHaveProperty('major', 14);
+  expect(await getSupportedNodeVersion('>=10')).toHaveProperty('major', 16);
-  expect(await getSupportedNodeVersion('>=10.3.0')).toHaveProperty('major', 14);
+  expect(await getSupportedNodeVersion('>=10.3.0')).toHaveProperty('major', 16);
   expect(await getSupportedNodeVersion('11.5.0 - 12.5.0')).toHaveProperty(
     'major',
     12
@@ -231,6 +239,10 @@ it('should match all semver ranges', async () => {
   );
   expect(await getSupportedNodeVersion('~12.5.0')).toHaveProperty('major', 12);
   expect(await getSupportedNodeVersion('^12.5.0')).toHaveProperty('major', 12);
+  expect(await getSupportedNodeVersion('12.5.0 - 14.5.0')).toHaveProperty(
+    'major',
+    14
+  );
 });
 
 it('should ignore node version in vercel dev getNodeVersion()', async () => {
@@ -246,8 +258,8 @@ it('should ignore node version in vercel dev getNodeVersion()', async () => {
 
 it('should select project setting from config when no package.json is found', async () => {
   expect(
-    await getNodeVersion('/tmp', undefined, { nodeVersion: '14.x' }, {})
+    await getNodeVersion('/tmp', undefined, { nodeVersion: '16.x' }, {})
-  ).toHaveProperty('range', '14.x');
+  ).toHaveProperty('range', '16.x');
   expect(warningMessages).toStrictEqual([]);
 });
 
@@ -277,34 +289,27 @@ it('should not warn when package.json engines matches project setting from confi
   expect(warningMessages).toStrictEqual([]);
 });
 
-it('should select nodejs16.x with ENABLE_EXPERIMENTAL_NODE16', async () => {
-  process.env.ENABLE_EXPERIMENTAL_NODE16 = '1';
-  const result = await getNodeVersion('/tmp', undefined, {}, {});
-  delete process.env.ENABLE_EXPERIMENTAL_NODE16;
-  expect(result).toEqual({ major: 16, range: '16.x', runtime: 'nodejs16.x' });
-  expect(warningMessages).toStrictEqual([
-    'Warning: Using experimental Node.js 16.x due to ENABLE_EXPERIMENTAL_NODE16=1',
-  ]);
-});
-
 it('should get latest node version', async () => {
-  expect(getLatestNodeVersion()).toHaveProperty('major', 14);
+  expect(getLatestNodeVersion()).toHaveProperty('major', 16);
 });
 
 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('2021-05-01').getTime();
+  global.Date.now = () => new Date('2022-09-01').getTime();
 
   expect(getSupportedNodeVersion('8.10.x', false)).rejects.toThrow();
   expect(getSupportedNodeVersion('8.10.x', true)).rejects.toThrow();
   expect(getSupportedNodeVersion('10.x', false)).rejects.toThrow();
   expect(getSupportedNodeVersion('10.x', true)).rejects.toThrow();
+  expect(getSupportedNodeVersion('12.x', false)).rejects.toThrow();
+  expect(getSupportedNodeVersion('12.x', true)).rejects.toThrow();
 
   const discontinued = getDiscontinuedNodeVersions();
-  expect(discontinued.length).toBe(2);
+  expect(discontinued.length).toBe(3);
-  expect(discontinued[0]).toHaveProperty('range', '10.x');
+  expect(discontinued[0]).toHaveProperty('range', '12.x');
-  expect(discontinued[1]).toHaveProperty('range', '8.10.x');
+  expect(discontinued[1]).toHaveProperty('range', '10.x');
+  expect(discontinued[2]).toHaveProperty('range', '8.10.x');
 
   global.Date.now = realDateNow;
 });
@@ -322,9 +327,19 @@ it('should warn for deprecated versions, soon to be discontinued', async () => {
     'major',
     10
   );
+  expect(await getSupportedNodeVersion('12.x', false)).toHaveProperty(
+    'major',
+    12
+  );
+  expect(await getSupportedNodeVersion('12.x', true)).toHaveProperty(
+    'major',
+    12
+  );
   expect(warningMessages).toStrictEqual([
-    'Error: Node.js version 10.x is deprecated. Deployments created on or after 2021-04-20 will fail to build. Please set "engines": { "node": "14.x" } in your `package.json` file to use Node.js 14. This change is the result of a decision made by an upstream infrastructure provider (AWS).',
+    'Error: Node.js version 10.x is deprecated. Deployments created on or after 2021-04-20 will fail to build. Please set "engines": { "node": "16.x" } in your `package.json` file to use Node.js 16. This change is the result of a decision made by an upstream infrastructure provider (AWS).',
-    'Error: Node.js version 10.x is deprecated. Deployments created on or after 2021-04-20 will fail to build. Please set Node.js Version to 14.x in your Project Settings to use Node.js 14. This change is the result of a decision made by an upstream infrastructure provider (AWS).',
+    'Error: Node.js version 10.x is deprecated. Deployments created on or after 2021-04-20 will fail to build. Please set Node.js Version to 16.x in your Project Settings to use Node.js 16. This change is the result of a decision made by an upstream infrastructure provider (AWS).',
+    'Error: Node.js version 12.x is deprecated. Deployments created on or after 2022-08-09 will fail to build. Please set "engines": { "node": "16.x" } in your `package.json` file to use Node.js 16. This change is the result of a decision made by an upstream infrastructure provider (AWS).',
+    'Error: Node.js version 12.x is deprecated. Deployments created on or after 2022-08-09 will fail to build. Please set Node.js Version to 16.x in your Project Settings to use Node.js 16. This change is the result of a decision made by an upstream infrastructure provider (AWS).',
   ]);
 
   global.Date.now = realDateNow;

packages/build-utils/test/utils/fixture-filesystem.ts

@@ -0,0 +1,51 @@
+import { promises } from 'fs';
+import path from 'path';
+
+import { DetectorFilesystem } from '../../src';
+import { Stat } from '../../src/detectors/filesystem';
+
+const { stat, readFile, readdir } = promises;
+
+export class FixtureFilesystem extends DetectorFilesystem {
+  private rootPath: string;
+
+  constructor(fixturePath: string) {
+    super();
+
+    this.rootPath = fixturePath;
+  }
+
+  async _hasPath(name: string): Promise<boolean> {
+    try {
+      const filePath = path.join(this.rootPath, name);
+      await stat(filePath);
+
+      return true;
+    } catch {
+      return false;
+    }
+  }
+  async _readFile(name: string): Promise<Buffer> {
+    const filePath = path.join(this.rootPath, name);
+    return readFile(filePath);
+  }
+  async _isFile(name: string): Promise<boolean> {
+    const filePath = path.join(this.rootPath, name);
+    return (await stat(filePath)).isFile();
+  }
+
+  async _readdir(name: string): Promise<Stat[]> {
+    const dirPath = path.join(this.rootPath, name);
+    const files = await readdir(dirPath, { withFileTypes: true });
+
+    return files.map(file => ({
+      name: file.name,
+      type: file.isFile() ? 'file' : 'dir',
+      path: path.join(name, file.name),
+    }));
+  }
+
+  _chdir(name: string): DetectorFilesystem {
+    return new FixtureFilesystem(path.join(this.rootPath, name));
+  }
+}

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vercel",
-  "version": "24.2.0",
+  "version": "24.2.5-canary.0",
   "preferGlobal": true,
   "license": "Apache-2.0",
   "description": "The command-line interface for Vercel",
@@ -12,10 +12,10 @@
   },
   "scripts": {
     "preinstall": "node ./scripts/preinstall.js",
-    "test": "jest",
+    "test": "jest --env node --verbose --runInBand --bail --forceExit",
-    "test-unit": "jest --coverage --verbose",
+    "test-unit": "yarn test test/unit/",
     "test-integration-cli": "rimraf test/fixtures/integration && ava test/integration.js --serial --fail-fast --verbose",
-    "test-integration-dev": "ava test/dev/integration.js --serial --fail-fast --verbose",
+    "test-integration-dev": "yarn test test/dev/",
     "prepublishOnly": "yarn build",
     "coverage": "codecov",
     "build": "node -r ts-eager/register ./scripts/build.ts",
@@ -43,11 +43,15 @@
     "node": ">= 12"
   },
   "dependencies": {
-    "@vercel/build-utils": "2.16.0",
+    "@vercel/build-utils": "3.1.1-canary.0",
-    "@vercel/go": "1.4.0",
+    "@vercel/go": "1.4.4-canary.0",
-    "@vercel/node": "1.15.0",
+    "@vercel/next": "2.8.67-canary.0",
-    "@vercel/python": "2.3.0",
+    "@vercel/node": "1.15.4-canary.0",
-    "@vercel/ruby": "1.3.3",
+    "@vercel/python": "2.3.4-canary.0",
+    "@vercel/redwood": "0.8.4-canary.0",
+    "@vercel/remix": "0.0.2-canary.0",
+    "@vercel/ruby": "1.3.7-canary.0",
+    "@vercel/static-build": "0.25.3-canary.0",
     "update-notifier": "4.1.0"
   },
   "devDependencies": {
@@ -90,9 +94,9 @@
     "@types/update-notifier": "5.1.0",
     "@types/which": "1.3.2",
     "@types/write-json-file": "2.2.1",
-    "@vercel/client": "11.0.0",
+    "@types/yauzl-promise": "2.1.0",
-    "@vercel/fetch-retry": "5.0.3",
+    "@vercel/client": "11.0.4-canary.0",
-    "@vercel/frameworks": "0.8.0",
+    "@vercel/frameworks": "0.9.1",
     "@vercel/ncc": "0.24.0",
     "@zeit/fun": "0.11.2",
     "@zeit/source-map-support": "0.6.2",
@@ -168,7 +172,8 @@
     "utility-types": "2.1.0",
     "which": "2.0.2",
     "write-json-file": "2.2.0",
-    "xdg-app-paths": "5.1.0"
+    "xdg-app-paths": "5.1.0",
+    "yauzl-promise": "2.1.3"
   },
   "jest": {
     "preset": "ts-jest",

packages/cli/scripts/build.ts

@@ -13,7 +13,7 @@ async function createConstants() {
 export const GA_TRACKING_ID: string | undefined = ${envToString(
     'GA_TRACKING_ID'
   )};
-export const SENTRY_DSN: string | undefined =  ${envToString('SENTRY_DSN')};
+export const SENTRY_DSN: string | undefined = ${envToString('SENTRY_DSN')};
 `;
   await writeFile(filename, contents, 'utf8');
 }

packages/cli/src/commands/build.ts

@@ -0,0 +1,502 @@
+import fs from 'fs-extra';
+import chalk from 'chalk';
+import dotenv from 'dotenv';
+import { join, relative } from 'path';
+import {
+  detectBuilders,
+  Files,
+  FileFsRef,
+  PackageJson,
+  BuildOptions,
+  Config,
+  Meta,
+  Builder,
+  BuildResultV2,
+  BuildResultV2Typical,
+  BuildResultV3,
+} from '@vercel/build-utils';
+import minimatch from 'minimatch';
+import {
+  appendRoutesToPhase,
+  getTransformedRoutes,
+  mergeRoutes,
+  MergeRoutesProps,
+  Route,
+} from '@vercel/routing-utils';
+import { VercelConfig } from '@vercel/client';
+
+import pull from './pull';
+import { staticFiles as getFiles } from '../util/get-files';
+import Client from '../util/client';
+import getArgs from '../util/get-args';
+import cmd from '../util/output/cmd';
+import * as cli from '../util/pkg-name';
+import cliPkg from '../util/pkg';
+import readJSONFile from '../util/read-json-file';
+import { CantParseJSONFile } from '../util/errors-ts';
+import { readProjectSettings } from '../util/projects/project-settings';
+import { VERCEL_DIR } from '../util/projects/link';
+import confirm from '../util/input/confirm';
+import { emoji, prependEmoji } from '../util/emoji';
+import stamp from '../util/output/stamp';
+import {
+  OUTPUT_DIR,
+  PathOverride,
+  writeBuildResult,
+} from '../util/build/write-build-result';
+import { importBuilders } from '../util/build/import-builders';
+
+type BuildResult = BuildResultV2 | BuildResultV3;
+
+const help = () => {
+  return console.log(`
+   ${chalk.bold(`${cli.logo} ${cli.name} build`)}
+
+   ${chalk.dim('Options:')}
+
+      -h, --help                     Output usage information
+      -A ${chalk.bold.underline('FILE')}, --local-config=${chalk.bold.underline(
+    'FILE'
+  )}   Path to the local ${'`vercel.json`'} file
+      -Q ${chalk.bold.underline('DIR')}, --global-config=${chalk.bold.underline(
+    'DIR'
+  )}    Path to the global ${'`.vercel`'} directory
+      --cwd [path]                   The current working directory
+      --prod                         Build a production deployment
+      -d, --debug                    Debug mode [off]
+      -y, --yes                      Skip the confirmation prompt
+
+    ${chalk.dim('Examples:')}
+
+    ${chalk.gray('–')} Build the project
+
+      ${chalk.cyan(`$ ${cli.name} build`)}
+      ${chalk.cyan(`$ ${cli.name} build --cwd ./path-to-project`)}
+`);
+};
+
+export default async function main(client: Client): Promise<number> {
+  const { output } = client;
+
+  // Ensure that `vc build` is not being invoked recursively
+  if (process.env.__VERCEL_BUILD_RUNNING) {
+    output.error(
+      `${cmd(
+        `${cli.name} build`
+      )} must not recursively invoke itself. Check the Build Command in the Project Settings or the ${cmd(
+        'build'
+      )} script in ${cmd('package.json')}`
+    );
+    output.error(
+      `Learn More: https://vercel.link/recursive-invocation-of-commands`
+    );
+    return 1;
+  } else {
+    process.env.__VERCEL_BUILD_RUNNING = '1';
+  }
+
+  // Parse CLI args
+  const argv = getArgs(client.argv.slice(2), {
+    '--cwd': String,
+    '--prod': Boolean,
+  });
+
+  if (argv['--help']) {
+    help();
+    return 2;
+  }
+
+  // Set the working directory if necessary
+  if (argv['--cwd']) {
+    process.chdir(argv['--cwd']);
+  }
+  const cwd = process.cwd();
+
+  // 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 isTTY = process.stdin.isTTY;
+  while (!project?.settings) {
+    if (!isTTY) {
+      client.output.print(
+        `No Project Settings found locally. Run ${cli.getCommandName(
+          'pull --yes'
+        )} to retreive them.`
+      );
+      return 1;
+    }
+
+    const confirmed = await confirm(
+      `No Project Settings found locally. Run ${cli.getCommandName(
+        'pull'
+      )} for retrieving them?`,
+      true
+    );
+    if (!confirmed) {
+      client.output.print(`Aborted. No Project Settings retrieved.\n`);
+      return 0;
+    }
+    client.argv = [];
+    const result = await pull(client);
+    if (result !== 0) {
+      return result;
+    }
+    project = await readProjectSettings(join(cwd, VERCEL_DIR));
+  }
+
+  // Build `target` influences which environment variables will be used
+  const target = argv['--prod'] ? 'production' : 'preview';
+
+  // TODO: load env vars from the API, fall back to local files if that fails
+
+  const envPath = await checkExists([
+    join(cwd, VERCEL_DIR, `.env.${target}.local`),
+    join(cwd, `.env`),
+  ]);
+  if (envPath) {
+    dotenv.config({ path: envPath, debug: client.output.isDebugEnabled() });
+    output.log(`Loaded env from "${relative(cwd, envPath)}"`);
+  }
+
+  // Some build processes use this env var to platform detect Vercel
+  process.env.NOW_BUILDER = '1';
+
+  const workPath = join(cwd, project.settings.rootDirectory || '.');
+
+  // Load `package.json` and `vercel.json` files
+  const [pkg, vercelConfig] = await Promise.all([
+    readJSONFile<PackageJson>(join(workPath, 'package.json')),
+    readJSONFile<VercelConfig>(join(workPath, 'vercel.json')).then(
+      config => config || readJSONFile<VercelConfig>(join(workPath, 'now.json'))
+    ),
+  ]);
+  if (pkg instanceof CantParseJSONFile) throw pkg;
+  if (vercelConfig instanceof CantParseJSONFile) throw vercelConfig;
+
+  // Get a list of source files
+  const files = (await getFiles(workPath, client)).map(f =>
+    relative(workPath, f)
+  );
+
+  const routesResult = getTransformedRoutes({ nowConfig: vercelConfig || {} });
+  if (routesResult.error) {
+    output.prettyError(routesResult.error);
+    return 1;
+  }
+
+  if (vercelConfig?.builds && vercelConfig.functions) {
+    output.prettyError({
+      message:
+        'The `functions` property cannot be used in conjunction with the `builds` property. Please remove one of them.',
+      link: 'https://vercel.link/functions-and-builds',
+    });
+    return 1;
+  }
+
+  let builds = vercelConfig?.builds || [];
+  let zeroConfigRoutes: Route[] = [];
+
+  if (builds.length > 0) {
+    output.warn(
+      'Due to `builds` existing in your configuration file, the Build and Development Settings defined in your Project Settings will not apply. Learn More: https://vercel.link/unused-build-settings'
+    );
+    builds = builds.map(b => expandBuild(files, b)).flat();
+  } else {
+    // Zero config
+
+    // Detect the Vercel Builders that will need to be invoked
+    const detectedBuilders = await detectBuilders(files, pkg, {
+      ...vercelConfig,
+      projectSettings: project.settings,
+      featHandleMiss: true,
+    });
+
+    if (detectedBuilders.errors && detectedBuilders.errors.length > 0) {
+      output.prettyError(detectedBuilders.errors[0]);
+      return 1;
+    }
+
+    for (const w of detectedBuilders.warnings) {
+      console.log(
+        `Warning: ${w.message} ${w.action || 'Learn More'}: ${w.link}`
+      );
+    }
+
+    if (detectedBuilders.builders) {
+      builds = detectedBuilders.builders;
+    } else {
+      builds = [{ src: '**', use: '@vercel/static' }];
+    }
+
+    zeroConfigRoutes.push(...(detectedBuilders.redirectRoutes || []));
+    zeroConfigRoutes.push(
+      ...appendRoutesToPhase({
+        routes: [],
+        newRoutes: detectedBuilders.rewriteRoutes,
+        phase: 'filesystem',
+      })
+    );
+    zeroConfigRoutes = appendRoutesToPhase({
+      routes: zeroConfigRoutes,
+      newRoutes: detectedBuilders.errorRoutes,
+      phase: 'error',
+    });
+    zeroConfigRoutes.push(...(detectedBuilders.defaultRoutes || []));
+  }
+
+  const builderSpecs = new Set(builds.map(b => b.use));
+  const buildersWithPkgs = await importBuilders(builderSpecs, cwd, output);
+
+  // Populate Files -> FileFsRef mapping
+  const filesMap: Files = {};
+  for (const path of files) {
+    const fsPath = join(workPath, path);
+    const { mode } = await fs.stat(fsPath);
+    filesMap[path] = new FileFsRef({ mode, fsPath });
+  }
+
+  // Delete output directory from potential previous build
+  await fs.remove(OUTPUT_DIR);
+
+  const buildStamp = stamp();
+
+  // Create fresh new output directory
+  await fs.mkdirp(OUTPUT_DIR);
+
+  const ops: Promise<Error | void>[] = [];
+
+  // Write the `detectedBuilders` result to output dir
+  ops.push(
+    fs.writeJSON(
+      join(OUTPUT_DIR, 'builds.json'),
+      {
+        '//': 'This file was generated by the `vercel build` command. It is not part of the Build Output API.',
+        target,
+        builds: builds.map(build => {
+          const builderWithPkg = buildersWithPkgs.get(build.use);
+          if (!builderWithPkg) {
+            throw new Error(`Failed to load Builder "${build.use}"`);
+          }
+          const { builder, pkg: builderPkg } = builderWithPkg;
+          return {
+            require: builderPkg.name,
+            apiVersion: builder.version,
+            ...build,
+          };
+        }),
+      },
+      {
+        spaces: 2,
+      }
+    )
+  );
+
+  // The `meta` config property is re-used for each Builder
+  // invocation so that Builders can share state between
+  // subsequent entrypoint builds.
+  const meta: Meta = {
+    skipDownload: true,
+    cliVersion: cliPkg.version,
+  };
+
+  // Execute Builders for detected entrypoints
+  // TODO: parallelize builds
+  const buildResults: Map<Builder, BuildResult> = new Map();
+  const overrides: PathOverride[] = [];
+  for (const build of builds) {
+    if (typeof build.src !== 'string') continue;
+
+    const builderWithPkg = buildersWithPkgs.get(build.use);
+    if (!builderWithPkg) {
+      throw new Error(`Failed to load Builder "${build.use}"`);
+    }
+    const { builder, pkg: builderPkg } = builderWithPkg;
+
+    const buildConfig: Config = {
+      outputDirectory: project.settings.outputDirectory ?? undefined,
+      ...build.config,
+      projectSettings: project.settings,
+      installCommand: project.settings.installCommand ?? undefined,
+      devCommand: project.settings.devCommand ?? undefined,
+      buildCommand: project.settings.buildCommand ?? undefined,
+      framework: project.settings.framework,
+      nodeVersion: project.settings.nodeVersion,
+    };
+    const repoRootPath = cwd === workPath ? undefined : cwd;
+    const buildOptions: BuildOptions = {
+      files: filesMap,
+      entrypoint: build.src,
+      workPath,
+      repoRootPath,
+      config: buildConfig,
+      meta,
+    };
+    output.debug(
+      `Building entrypoint "${build.src}" with "${builderPkg.name}"`
+    );
+    const buildResult = await builder.build(buildOptions);
+
+    // Store the build result to generate the final `config.json` after
+    // all builds have completed
+    buildResults.set(build, buildResult);
+
+    // Start flushing the file outputs to the filesystem asynchronously
+    ops.push(
+      writeBuildResult(
+        buildResult,
+        build,
+        builder,
+        builderPkg,
+        vercelConfig?.cleanUrls
+      ).then(
+        override => {
+          if (override) overrides.push(override);
+        },
+        err => err
+      )
+    );
+  }
+
+  // Wait for filesystem operations to complete
+  // TODO render progress bar?
+  let hadError = false;
+  const errors = await Promise.all(ops);
+  for (const error of errors) {
+    if (error) {
+      hadError = true;
+      output.prettyError(error);
+    }
+  }
+  if (hadError) return 1;
+
+  // Merge existing `config.json` file into the one that will be produced
+  const configPath = join(OUTPUT_DIR, 'config.json');
+  // TODO: properly type
+  const existingConfig = await readJSONFile<any>(configPath);
+  if (existingConfig instanceof CantParseJSONFile) {
+    throw existingConfig;
+  }
+  if (existingConfig) {
+    if (existingConfig.overrides) {
+      overrides.push(existingConfig.overrides);
+    }
+    // Find the `Build` entry for this config file and update the build result
+    for (const [build, buildResult] of buildResults.entries()) {
+      if ('buildOutputPath' in buildResult) {
+        output.debug(`Using "config.json" for "${build.use}`);
+        buildResults.set(build, existingConfig);
+        break;
+      }
+    }
+  }
+
+  const builderRoutes: MergeRoutesProps['builds'] = Array.from(
+    buildResults.entries()
+  )
+    .filter(b => 'routes' in b[1] && Array.isArray(b[1].routes))
+    .map(b => {
+      return {
+        use: b[0].use,
+        entrypoint: b[0].src!,
+        routes: (b[1] as BuildResultV2Typical).routes,
+      };
+    });
+  if (zeroConfigRoutes.length) {
+    builderRoutes.unshift({
+      use: '@vercel/zero-config-routes',
+      entrypoint: '/',
+      routes: zeroConfigRoutes,
+    });
+  }
+  const mergedRoutes = mergeRoutes({
+    userRoutes: routesResult.routes,
+    builds: builderRoutes,
+  });
+
+  const mergedImages = mergeImages(buildResults.values());
+  const mergedWildcard = mergeWildcard(buildResults.values());
+  const mergedOverrides: Record<string, PathOverride> =
+    overrides.length > 0 ? Object.assign({}, ...overrides) : undefined;
+
+  // Write out the final `config.json` file based on the
+  // user configuration and Builder build results
+  // TODO: properly type
+  const config = {
+    version: 3,
+    routes: mergedRoutes,
+    images: mergedImages,
+    wildcard: mergedWildcard,
+    overrides: mergedOverrides,
+  };
+  await fs.writeJSON(join(OUTPUT_DIR, 'config.json'), config, { spaces: 2 });
+
+  output.print(
+    `${prependEmoji(
+      `Build Completed in ${chalk.bold(OUTPUT_DIR)} ${chalk.gray(
+        buildStamp()
+      )}`,
+      emoji('success')
+    )}\n`
+  );
+
+  return 0;
+}
+
+function expandBuild(files: string[], build: Builder): Builder[] {
+  if (!build.src) return [];
+
+  let pattern = build.src;
+  if (pattern[0] === '/') {
+    // Remove a leading slash so that the globbing is relative
+    // to `cwd` instead of the root of the filesystem.
+    pattern = pattern.substring(1);
+  }
+
+  const matches = files.filter(
+    name => name === pattern || minimatch(name, pattern, { dot: true })
+  );
+
+  return matches.map(m => {
+    return {
+      ...build,
+      src: m,
+    };
+  });
+}
+
+function mergeImages(
+  buildResults: Iterable<BuildResult>
+): BuildResultV2Typical['images'] {
+  let images: BuildResultV2Typical['images'] = undefined;
+  for (const result of buildResults) {
+    if ('images' in result && result.images) {
+      images = Object.assign({} || images, result.images);
+    }
+  }
+  return images;
+}
+
+function mergeWildcard(
+  buildResults: Iterable<BuildResult>
+): BuildResultV2Typical['wildcard'] {
+  let wildcard: BuildResultV2Typical['wildcard'] = undefined;
+  for (const result of buildResults) {
+    if ('wildcard' in result && result.wildcard) {
+      if (!wildcard) wildcard = [];
+      wildcard.push(...result.wildcard);
+    }
+  }
+  return wildcard;
+}
+
+async function checkExists(paths: Iterable<string>) {
+  for (const path of paths) {
+    try {
+      await fs.stat(path);
+      return path;
+    } catch (err: any) {
+      if (err.code !== 'ENOENT') throw err;
+    }
+  }
+}

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

@@ -61,6 +61,8 @@ import { getPreferredPreviewURL } from '../../util/deploy/get-preferred-preview-
 import { Output } from '../../util/output';
 import { help } from './args';
 import { getDeploymentChecks } from '../../util/deploy/get-deployment-checks';
+import parseTarget from '../../util/deploy/parse-target';
+import getPrebuiltJson from '../../util/deploy/get-prebuilt-json';
 
 export default async (client: Client) => {
   const { output } = client;
@@ -155,7 +157,7 @@ export default async (client: Client) => {
     }
   }
 
-  const { log, debug, error, warn, isTTY } = output;
+  const { log, debug, error, prettyError, isTTY } = output;
 
   const quiet = !isTTY;
 
@@ -181,6 +183,12 @@ export default async (client: Client) => {
     );
   }
 
+  // build `target`
+  const target = parseTarget(output, argv['--target'], argv['--prod']);
+  if (typeof target === 'number') {
+    return target;
+  }
+
   // build `--prebuilt`
   if (argv['--prebuilt']) {
     const prebuiltExists = await fs.pathExists(join(path, '.vercel/output'));
@@ -194,6 +202,25 @@ export default async (client: Client) => {
       );
       return 1;
     }
+
+    const prebuiltBuild = await getPrebuiltJson(path);
+    const assumedTarget = target || 'preview';
+    if (prebuiltBuild?.target && prebuiltBuild.target !== assumedTarget) {
+      let specifyTarget = '';
+      if (prebuiltBuild.target === 'production') {
+        specifyTarget = ` --prod`;
+      }
+
+      prettyError({
+        message: `The ${param(
+          '--prebuilt'
+        )} option was used with the target environment "${assumedTarget}", but the prebuilt output found in ".vercel/output" was built with target environment "${
+          prebuiltBuild.target
+        }". Please run ${getCommandName(`--prebuilt${specifyTarget}`)}.`,
+        link: 'https://vercel.link/prebuilt-environment-mismatch',
+      });
+      return 1;
+    }
   }
 
   // retrieve `project` and `org` from .vercel
@@ -418,33 +445,6 @@ export default async (client: Client) => {
     .filter(Boolean);
   const regions = regionFlag.length > 0 ? regionFlag : localConfig.regions;
 
-  // build `target`
-  let target;
-  if (argv['--target']) {
-    const deprecatedTarget = argv['--target'];
-
-    if (!['staging', 'production'].includes(deprecatedTarget)) {
-      error(
-        `The specified ${param('--target')} ${code(
-          deprecatedTarget
-        )} is not valid`
-      );
-      return 1;
-    }
-
-    if (deprecatedTarget === 'production') {
-      warn(
-        'We recommend using the much shorter `--prod` option instead of `--target production` (deprecated)'
-      );
-    }
-
-    output.debug(`Setting target to ${deprecatedTarget}`);
-    target = deprecatedTarget;
-  } else if (argv['--prod']) {
-    output.debug('Setting target to production');
-    target = 'production';
-  }
-
   const currentTeam = org?.type === 'team' ? org.id : undefined;
   const now = new Now({
     client,

packages/cli/src/commands/dev/dev.ts

@@ -10,6 +10,8 @@ import { ProjectSettings } from '../../types';
 import getDecryptedEnvRecords from '../../util/get-decrypted-env-records';
 import setupAndLink from '../../util/link/setup-and-link';
 import getSystemEnvValues from '../../util/env/get-system-env-values';
+import { getCommandName } from '../../util/pkg-name';
+import param from '../../util/output/param';
 
 type Options = {
   '--listen': string;
@@ -46,6 +48,13 @@ export default async function dev(
   }
 
   if (link.status === 'error') {
+    if (link.reason === 'HEADLESS') {
+      client.output.error(
+        `Command ${getCommandName(
+          'dev'
+        )} requires confirmation. Use option ${param('--confirm')} to confirm.`
+      );
+    }
     return link.exitCode;
   }
 
@@ -82,7 +91,7 @@ export default async function dev(
     }
 
     [{ envs: projectEnvs }, { systemEnvValues }] = await Promise.all([
-      getDecryptedEnvRecords(output, client, project.id),
+      getDecryptedEnvRecords(output, client, project.id, 'vercel-cli:dev'),
       project.autoExposeSystemEnvs
         ? getSystemEnvValues(output, client, project.id)
         : { systemEnvValues: [] },

packages/cli/src/commands/env/add.ts

@@ -79,7 +79,12 @@ export default async function add(
     }
   }
 
-  const { envs } = await getEnvRecords(output, client, project.id);
+  const { envs } = await getEnvRecords(
+    output,
+    client,
+    project.id,
+    'vercel-cli:env:add'
+  );
   const existing = new Set(
     envs.filter(r => r.key === envName).map(r => r.target)
   );

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

@@ -147,7 +147,8 @@ export default async function main(client: Client) {
           argv,
           args,
           output,
-          cwd
+          cwd,
+          'vercel-cli:env:pull'
         );
       default:
         output.error(getInvalidSubcommand(COMMAND_CONFIG));

packages/cli/src/commands/env/ls.ts

@@ -48,10 +48,16 @@ export default async function ls(
 
   const lsStamp = stamp();
 
-  const { envs } = await getEnvRecords(output, client, project.id, {
+  const { envs } = await getEnvRecords(
-    target: envTarget,
+    output,
-    gitBranch: envGitBranch,
+    client,
-  });
+    project.id,
+    'vercel-cli:env:ls',
+    {
+      target: envTarget,
+      gitBranch: envGitBranch,
+    }
+  );
 
   if (envs.length === 0) {
     output.log(

packages/cli/src/commands/env/pull.ts

@@ -13,6 +13,7 @@ import { Output } from '../../util/output';
 import param from '../../util/output/param';
 import stamp from '../../util/output/stamp';
 import { getCommandName } from '../../util/pkg-name';
+import { EnvRecordsSource } from '../../util/env/get-env-records';
 
 const CONTENTS_PREFIX = '# Created by Vercel CLI\n';
 
@@ -49,7 +50,8 @@ export default async function pull(
   opts: Partial<Options>,
   args: string[],
   output: Output,
-  cwd: string
+  cwd: string,
+  source: Extract<EnvRecordsSource, 'vercel-cli:env:pull' | 'vercel-cli:pull'>
 ) {
   if (args.length > 1) {
     output.error(
@@ -90,7 +92,7 @@ export default async function pull(
   output.spinner('Downloading');
 
   const [{ envs: projectEnvs }, { systemEnvValues }] = await Promise.all([
-    getDecryptedEnvRecords(output, client, project.id, environment),
+    getDecryptedEnvRecords(output, client, project.id, source, environment),
     project.autoExposeSystemEnvs
       ? getSystemEnvValues(output, client, project.id)
       : { systemEnvValues: [] },

packages/cli/src/commands/env/rm.ts

@@ -67,10 +67,16 @@ export default async function rm(
     return 1;
   }
 
-  const result = await getEnvRecords(output, client, project.id, {
+  const result = await getEnvRecords(
-    target: envTarget,
+    output,
-    gitBranch: envGitBranch,
+    client,
-  });
+    project.id,
+    'vercel-cli:env:rm',
+    {
+      target: envTarget,
+      gitBranch: envGitBranch,
+    }
+  );
 
   let envs = result.envs.filter(env => env.key === envName);
 

packages/cli/src/commands/index.ts

@@ -3,6 +3,7 @@ export default new Map([
   ['aliases', 'alias'],
   ['billing', 'billing'],
   ['bisect', 'bisect'],
+  ['build', 'build'],
   ['cc', 'billing'],
   ['cert', 'certs'],
   ['certs', 'certs'],

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

@@ -4,6 +4,8 @@ import getArgs from '../../util/get-args';
 import logo from '../../util/output/logo';
 import { getPkgName } from '../../util/pkg-name';
 import setupAndLink from '../../util/link/setup-and-link';
+import { getCommandName } from '../../util/pkg-name';
+import param from '../../util/output/param';
 
 const help = () => {
   console.log(`
@@ -67,6 +69,13 @@ export default async function main(client: Client) {
   });
 
   if (link.status === 'error') {
+    if (link.reason === 'HEADLESS') {
+      client.output.error(
+        `Command ${getCommandName(
+          'link'
+        )} requires confirmation. Use option ${param('--confirm')} to confirm.`
+      );
+    }
     return link.exitCode;
   } else if (link.status === 'not_linked') {
     // User aborted project linking questions

packages/cli/src/commands/pull.ts

@@ -15,7 +15,8 @@ import {
 } from '../util/projects/link';
 import { writeProjectSettings } from '../util/projects/project-settings';
 import envPull from './env/pull';
-
+import { getCommandName } from '../util/pkg-name';
+import param from '../util/output/param';
 import type { Project, Org } from '../types';
 import {
   isValidEnvTarget,
@@ -102,6 +103,13 @@ async function ensureLink(
   }
 
   if (link.status === 'error') {
+    if (link.reason === 'HEADLESS') {
+      client.output.error(
+        `Command ${getCommandName(
+          'pull'
+        )} requires confirmation. Use option ${param('--yes')} to confirm.`
+      );
+    }
     return link.exitCode;
   }
 
@@ -123,7 +131,8 @@ async function pullAllEnvFiles(
     argv,
     [join('.vercel', environmentFile)],
     client.output,
-    cwd
+    cwd,
+    'vercel-cli:pull'
   );
 }
 

packages/cli/src/index.ts

@@ -82,7 +82,12 @@ let debug: (s: string) => void = () => {};
 let apiUrl = 'https://api.vercel.com';
 
 const main = async () => {
-  const { isTTY } = process.stdout;
+  let { isTTY } = process.stdout;
+  if (process.env.FORCE_TTY === '1') {
+    isTTY = true;
+    process.stdout.isTTY = true;
+    process.stdin.isTTY = true;
+  }
 
   let argv;
 
@@ -166,7 +171,7 @@ const main = async () => {
   //  * a subcommand (as in: `vercel ls`)
   const targetOrSubcommand = argv._[2];
 
-  const betaCommands: string[] = [];
+  const betaCommands: string[] = ['build'];
   if (betaCommands.includes(targetOrSubcommand)) {
     console.log(
       `${chalk.grey(
@@ -298,7 +303,14 @@ const main = async () => {
 
   let authConfig = null;
 
-  const subcommandsWithoutToken = ['login', 'logout', 'help', 'init', 'update'];
+  const subcommandsWithoutToken = [
+    'login',
+    'logout',
+    'help',
+    'init',
+    'update',
+    'build',
+  ];
 
   if (authConfigExists) {
     try {
@@ -519,6 +531,7 @@ const main = async () => {
     typeof scope === 'string' &&
     targetCommand !== 'login' &&
     targetCommand !== 'dev' &&
+    targetCommand !== 'build' &&
     !(targetCommand === 'teams' && argv._[3] !== 'invite')
   ) {
     let user = null;
@@ -593,6 +606,9 @@ const main = async () => {
       case 'bisect':
         func = require('./commands/bisect').default;
         break;
+      case 'build':
+        func = require('./commands/build').default;
+        break;
       case 'certs':
         func = require('./commands/certs').default;
         break;

packages/cli/src/types.ts

@@ -251,9 +251,6 @@ export interface Project extends ProjectSettings {
   updatedAt: number;
   createdAt: number;
   alias?: ProjectAliasTarget[];
-  devCommand?: string | null;
-  framework?: string | null;
-  rootDirectory?: string | null;
   latestDeployments?: Partial<Deployment>[];
 }
 
@@ -277,7 +274,17 @@ export interface PaginationOptions {
 export type ProjectLinkResult =
   | { status: 'linked'; org: Org; project: Project }
   | { status: 'not_linked'; org: null; project: null }
-  | { status: 'error'; exitCode: number };
+  | {
+      status: 'error';
+      exitCode: number;
+      reason?:
+        | 'HEADLESS'
+        | 'NOT_AUTHORIZED'
+        | 'TEAM_DELETED'
+        | 'PATH_IS_FILE'
+        | 'INVALID_ROOT_DIRECTORY'
+        | 'MISSING_PROJECT_SETTINGS';
+    };
 
 export interface Token {
   id: string;

packages/cli/src/util/build/import-builders.ts

@@ -0,0 +1,197 @@
+import npa from 'npm-package-arg';
+import { satisfies } from 'semver';
+import { dirname, join } from 'path';
+import { outputJSON, readJSON } from 'fs-extra';
+import {
+  BuilderV2,
+  BuilderV3,
+  PackageJson,
+  spawnAsync,
+} from '@vercel/build-utils';
+import * as staticBuilder from './static-builder';
+import { VERCEL_DIR } from '../projects/link';
+import { Output } from '../output';
+import readJSONFile from '../read-json-file';
+import { CantParseJSONFile } from '../errors-ts';
+
+interface BuilderWithPkg {
+  path: string;
+  pkgPath: string;
+  builder: BuilderV2 | BuilderV3;
+  pkg: PackageJson;
+}
+
+/**
+ * Imports the specified Vercel Builders, installing any missing ones
+ * into `.vercel/builders` if necessary.
+ */
+export async function importBuilders(
+  builderSpecs: Set<string>,
+  cwd: string,
+  output: Output
+): Promise<Map<string, BuilderWithPkg>> {
+  const results = new Map<string, BuilderWithPkg>();
+  const resolvedSpecs = new Map<string, string>();
+
+  const buildersDir = join(cwd, VERCEL_DIR, 'builders');
+  const buildersPkgPath = join(buildersDir, 'package.json');
+
+  do {
+    const buildersToAdd = new Set<string>();
+
+    for (const spec of builderSpecs) {
+      const resolvedSpec = resolvedSpecs.get(spec) || spec;
+      const parsed = npa(resolvedSpec);
+
+      let { name } = parsed;
+      if (!name) {
+        // A URL was specified - will need to install it and resolve the
+        // proper package name from the written `package.json` file
+        buildersToAdd.add(spec);
+        continue;
+      }
+
+      if (name === '@vercel/static') {
+        // `@vercel/static` is a special-case built-in builder
+        results.set(name, {
+          builder: staticBuilder,
+          pkg: { name },
+          path: '',
+          pkgPath: '',
+        });
+        continue;
+      }
+
+      try {
+        let pkgPath: string | undefined;
+        let builderPkg: PackageJson | undefined;
+
+        try {
+          // First try `.vercel/builders`. The package name should always be available
+          // at the top-level of `node_modules` since CLI is installing those directly.
+          pkgPath = join(buildersDir, 'node_modules', name, 'package.json');
+          builderPkg = await readJSON(pkgPath);
+        } catch (err: any) {
+          if (err?.code !== 'ENOENT') throw err;
+          // If `pkgPath` wasn't found in `.vercel/builders` then try as a CLI local
+          // dependency. `require.resolve()` will throw if the Builder is not a CLI
+          // dep, in which case we'll install it into `.vercel/builders`.
+          pkgPath = require.resolve(`${name}/package.json`, {
+            paths: [__dirname],
+          });
+          builderPkg = await readJSON(pkgPath);
+        }
+
+        if (!builderPkg || !pkgPath) {
+          throw new Error(`Failed to load \`package.json\` for "${name}"`);
+        }
+
+        if (typeof builderPkg.version !== 'string') {
+          throw new Error(
+            `\`package.json\` for "${name}" does not contain a "version" field`
+          );
+        }
+
+        if (
+          parsed.type === 'version' &&
+          parsed.rawSpec !== builderPkg.version
+        ) {
+          // An explicit Builder version was specified but it does
+          // not match the version that is currently installed
+          output.debug(
+            `Installed version "${name}@${builderPkg.version}" does not match "${parsed.rawSpec}"`
+          );
+          buildersToAdd.add(spec);
+          continue;
+        }
+
+        if (
+          parsed.type === 'range' &&
+          !satisfies(builderPkg.version, parsed.rawSpec)
+        ) {
+          // An explicit Builder range was specified but it is not
+          // compatible with the version that is currently installed
+          output.debug(
+            `Installed version "${name}@${builderPkg.version}" is not compatible with "${parsed.rawSpec}"`
+          );
+          buildersToAdd.add(spec);
+          continue;
+        }
+
+        // TODO: handle `parsed.type === 'tag'` ("latest" vs. anything else?)
+
+        const path = join(dirname(pkgPath), builderPkg.main || 'index.js');
+        const builder = require(path);
+
+        results.set(spec, {
+          builder,
+          pkg: builderPkg,
+          path,
+          pkgPath,
+        });
+        output.debug(`Imported Builder "${name}" from "${dirname(pkgPath)}"`);
+      } catch (err: any) {
+        if (err.code === 'MODULE_NOT_FOUND') {
+          output.debug(`Failed to import "${name}": ${err}`);
+          buildersToAdd.add(spec);
+
+          if (err.message.includes('@now/build-utils')) {
+            const upgradeMessage =
+              parsed.scope === '@now'
+                ? ` Please update from "@now" to "@vercel".`
+                : '';
+            throw new Error(
+              `The legacy "${name}" Builder is not supported.${upgradeMessage}`
+            );
+          }
+        } else {
+          throw err;
+        }
+      }
+    }
+
+    // Add any Builders that are not yet present into `.vercel/builders`
+    if (buildersToAdd.size > 0) {
+      try {
+        const emptyPkgJson = {
+          private: true,
+          license: 'UNLICENSED',
+        };
+        await outputJSON(buildersPkgPath, emptyPkgJson, {
+          flag: 'wx',
+        });
+      } catch (err: any) {
+        if (err.code !== 'EEXIST') throw err;
+      }
+
+      output.debug(
+        `Installing Builders: ${Array.from(buildersToAdd).join(', ')}`
+      );
+      await spawnAsync(
+        'yarn',
+        ['add', '@vercel/build-utils', ...buildersToAdd],
+        { cwd: buildersDir }
+      );
+
+      // Cross-reference any builderSpecs from the saved `package.json` file,
+      // in case they were installed from a URL
+      const buildersPkg = await readJSONFile<PackageJson>(buildersPkgPath);
+      if (buildersPkg instanceof CantParseJSONFile) throw buildersPkg;
+      if (!buildersPkg) {
+        throw new Error(`Failed to load "${buildersPkgPath}"`);
+      }
+      for (const spec of buildersToAdd) {
+        for (const [name, version] of Object.entries(
+          buildersPkg.dependencies || {}
+        )) {
+          if (version === spec) {
+            output.debug(`Resolved Builder spec "${spec}" to name "${name}"`);
+            resolvedSpecs.set(spec, name);
+          }
+        }
+      }
+    }
+  } while (results.size !== builderSpecs.size);
+
+  return results;
+}

packages/cli/src/util/build/static-builder.ts

@@ -0,0 +1,41 @@
+import minimatch from 'minimatch';
+import { BuildV2, Files } from '@vercel/build-utils';
+
+export const version = 2;
+
+export const build: BuildV2 = async ({ entrypoint, files, config }) => {
+  const output: Files = {};
+  const outputDirectory = config.zeroConfig ? config.outputDirectory : '';
+
+  for (let [filename, fileFsRef] of Object.entries(files)) {
+    if (
+      filename.startsWith('.git/') ||
+      filename === 'vercel.json' ||
+      filename === 'now.json'
+    ) {
+      continue;
+    }
+
+    if (
+      entrypoint &&
+      !(
+        entrypoint === filename ||
+        minimatch(filename, entrypoint, { dot: true })
+      )
+    ) {
+      continue;
+    }
+
+    if (outputDirectory) {
+      const outputMatch = outputDirectory + '/';
+      if (filename.startsWith(outputMatch)) {
+        // static output files are moved to the root directory
+        filename = filename.slice(outputMatch.length);
+      }
+    }
+
+    output[filename] = fileFsRef;
+  }
+
+  return { output };
+};

packages/cli/src/util/build/unzip.ts

@@ -0,0 +1,108 @@
+/**
+ * Code modified from `extract-zip` to accept Buffer.
+ * https://github.com/maxogden/extract-zip/blob/master/index.js
+ * BSD-2 Copyright (c) 2014 Max Ogden and other contributors
+ */
+
+import path from 'path';
+import pipe from 'promisepipe';
+import * as fs from 'fs-extra';
+import { streamToBuffer } from '@vercel/build-utils';
+import { Entry, ZipFile, fromBuffer as zipFromBuffer } from 'yauzl-promise';
+
+async function* createZipIterator(zipFile: ZipFile) {
+  let entry: Entry;
+  while ((entry = await zipFile.readEntry()) !== null) {
+    yield entry;
+  }
+}
+
+export async function unzip(buffer: Buffer, dir: string): Promise<void> {
+  const zipFile = await zipFromBuffer(buffer);
+  for await (const entry of createZipIterator(zipFile)) {
+    if (entry.fileName.startsWith('__MACOSX/')) continue;
+
+    try {
+      const destDir = path.dirname(path.join(dir, entry.fileName));
+      await fs.mkdirp(destDir);
+
+      const canonicalDestDir = await fs.realpath(destDir);
+      const relativeDestDir = path.relative(dir, canonicalDestDir);
+
+      if (relativeDestDir.split(path.sep).includes('..')) {
+        throw new Error(
+          `Out of bound path "${canonicalDestDir}" found while processing file ${entry.fileName}`
+        );
+      }
+
+      await extractEntry(zipFile, entry, dir);
+    } catch (err) {
+      await zipFile.close();
+      throw err;
+    }
+  }
+}
+
+async function extractEntry(
+  zipFile: ZipFile,
+  entry: Entry,
+  dir: string
+): Promise<void> {
+  const dest = path.join(dir, entry.fileName);
+
+  // convert external file attr int into a fs stat mode int
+  const mode = (entry.externalFileAttributes >> 16) & 0xffff;
+  // check if it's a symlink or dir (using stat mode constants)
+  const IFMT = 61440;
+  const IFDIR = 16384;
+  const IFLNK = 40960;
+  const symlink = (mode & IFMT) === IFLNK;
+  let isDir = (mode & IFMT) === IFDIR;
+
+  // Failsafe, borrowed from jsZip
+  if (!isDir && entry.fileName.endsWith('/')) {
+    isDir = true;
+  }
+
+  // check for windows weird way of specifying a directory
+  // https://github.com/maxogden/extract-zip/issues/13#issuecomment-154494566
+  const madeBy = entry.versionMadeBy >> 8;
+  if (!isDir) isDir = madeBy === 0 && entry.externalFileAttributes === 16;
+
+  const procMode = getExtractedMode(mode, isDir) & 0o777;
+
+  // always ensure folders are created
+  const destDir = isDir ? dest : path.dirname(dest);
+
+  const mkdirOptions = { recursive: true };
+  if (isDir) {
+    // @ts-ignore
+    mkdirOptions.mode = procMode;
+  }
+  await fs.mkdir(destDir, mkdirOptions);
+  if (isDir) return;
+
+  const readStream = await zipFile.openReadStream(entry);
+
+  if (symlink) {
+    const link = await streamToBuffer(readStream);
+    await fs.symlink(link.toString('utf8'), dest);
+  } else {
+    await pipe(readStream, fs.createWriteStream(dest, { mode: procMode }));
+  }
+}
+
+function getExtractedMode(entryMode: number, isDir: boolean): number {
+  let mode = entryMode;
+
+  // Set defaults, if necessary
+  if (mode === 0) {
+    if (isDir) {
+      mode = 0o755;
+    } else {
+      mode = 0o644;
+    }
+  }
+
+  return mode;
+}

packages/cli/src/util/build/write-build-result.ts

@@ -0,0 +1,373 @@
+import fs from 'fs-extra';
+import mimeTypes from 'mime-types';
+import { basename, dirname, extname, join, relative, resolve } from 'path';
+import {
+  Builder,
+  BuildResultV2,
+  BuildResultV3,
+  File,
+  FileFsRef,
+  BuilderV2,
+  BuilderV3,
+  Lambda,
+  PackageJson,
+  Prerender,
+  download,
+  EdgeFunction,
+  BuildResultBuildOutput,
+} from '@vercel/build-utils';
+import pipe from 'promisepipe';
+import { unzip } from './unzip';
+import { VERCEL_DIR } from '../projects/link';
+
+export const OUTPUT_DIR = join(VERCEL_DIR, 'output');
+
+export async function writeBuildResult(
+  buildResult: BuildResultV2 | BuildResultV3,
+  build: Builder,
+  builder: BuilderV2 | BuilderV3,
+  builderPkg: PackageJson,
+  cleanUrls?: boolean
+) {
+  const { version } = builder;
+  if (version === 2) {
+    return writeBuildResultV2(buildResult as BuildResultV2, cleanUrls);
+  } else if (version === 3) {
+    return writeBuildResultV3(buildResult as BuildResultV3, build);
+  }
+  throw new Error(
+    `Unsupported Builder version \`${version}\` from "${builderPkg.name}"`
+  );
+}
+
+function isEdgeFunction(v: any): v is EdgeFunction {
+  return v?.type === 'EdgeFunction';
+}
+
+function isLambda(v: any): v is Lambda {
+  return v?.type === 'Lambda';
+}
+
+function isPrerender(v: any): v is Prerender {
+  return v?.type === 'Prerender';
+}
+
+function isFile(v: any): v is File {
+  const type = v?.type;
+  return type === 'FileRef' || type === 'FileFsRef' || type === 'FileBlob';
+}
+
+export interface PathOverride {
+  contentType?: string;
+  path?: string;
+}
+
+/**
+ * Writes the output from the `build()` return value of a v2 Builder to
+ * the filesystem.
+ */
+async function writeBuildResultV2(
+  buildResult: BuildResultV2,
+  cleanUrls?: boolean
+) {
+  if ('buildOutputPath' in buildResult) {
+    await mergeBuilderOutput(buildResult);
+    return;
+  }
+
+  const lambdas = new Map<Lambda, string>();
+  const overrides: Record<string, PathOverride> = {};
+  for (const [path, output] of Object.entries(buildResult.output)) {
+    if (isLambda(output)) {
+      await writeLambda(output, path, lambdas);
+    } else if (isPrerender(output)) {
+      await writeLambda(output.lambda, path, lambdas);
+
+      // Write the fallback file alongside the Lambda directory
+      let fallback = output.fallback;
+      if (fallback) {
+        const ext = getFileExtension(fallback);
+        const fallbackName = `${path}.prerender-fallback${ext}`;
+        const fallbackPath = join(OUTPUT_DIR, 'functions', fallbackName);
+        const stream = fallback.toStream();
+        await pipe(
+          stream,
+          fs.createWriteStream(fallbackPath, { mode: fallback.mode })
+        );
+        fallback = new FileFsRef({
+          ...output.fallback,
+          fsPath: basename(fallbackName),
+        });
+      }
+
+      const prerenderConfigPath = join(
+        OUTPUT_DIR,
+        'functions',
+        `${path}.prerender-config.json`
+      );
+      const prerenderConfig = {
+        ...output,
+        lambda: undefined,
+        fallback,
+      };
+      await fs.writeJSON(prerenderConfigPath, prerenderConfig, { spaces: 2 });
+    } else if (isFile(output)) {
+      await writeStaticFile(output, path, overrides, cleanUrls);
+    } else if (isEdgeFunction(output)) {
+      await writeEdgeFunction(output, path);
+    } else {
+      throw new Error(
+        `Unsupported output type: "${(output as any).type}" for ${path}`
+      );
+    }
+  }
+  return Object.keys(overrides).length > 0 ? overrides : undefined;
+}
+
+/**
+ * Writes the output from the `build()` return value of a v3 Builder to
+ * the filesystem.
+ */
+async function writeBuildResultV3(buildResult: BuildResultV3, build: Builder) {
+  const { output } = buildResult;
+  if (isLambda(output)) {
+    const src = build.src!;
+    const ext = extname(src);
+    const path = build.config?.zeroConfig
+      ? src.substring(0, src.length - ext.length)
+      : src;
+    await writeLambda(output, path);
+  } else {
+    throw new Error(
+      `Unsupported output type: "${(output as any).type}" for ${build.src}`
+    );
+  }
+}
+
+/**
+ * Writes a static `File` instance to the file system in the "static" directory.
+ * If the filename does not have a file extension then one attempts to be inferred
+ * from the extension of the `fsPath`.
+ *
+ * @param file The `File` instance to write
+ * @param path The URL path where the `File` can be accessed from
+ * @param overrides Record of override configuration when a File is renamed or has other metadata
+ */
+async function writeStaticFile(
+  file: File,
+  path: string,
+  overrides: Record<string, PathOverride>,
+  cleanUrls = false
+) {
+  let fsPath = path;
+  let override: PathOverride | null = null;
+
+  // If the output path doesn't match the determined file extension of
+  // the File then add the extension. This is to help avoid conflicts
+  // where an output path matches a directory name of another output path
+  // (i.e. `blog` -> `blog.html` and `blog/hello` -> `blog/hello.html`)
+  const ext = getFileExtension(file);
+  if (ext && extname(path) !== ext) {
+    fsPath += ext;
+    if (!override) override = {};
+    override.path = path;
+  }
+
+  // If `cleanUrls` is true then remove the `.html` file extension
+  // for HTML files.
+  if (cleanUrls && path.endsWith('.html')) {
+    if (!override) override = {};
+    override.path = path.slice(0, -5);
+  }
+
+  // Ensure an explicit "content-type" on the `File` is returned in
+  // the final output asset.
+  if (file.contentType) {
+    if (!override) override = {};
+    override.contentType = file.contentType;
+  }
+
+  if (override) {
+    overrides[fsPath] = override;
+  }
+
+  const dest = join(OUTPUT_DIR, 'static', fsPath);
+  await fs.mkdirp(dirname(dest));
+
+  // TODO: handle (or skip) symlinks?
+  const stream = file.toStream();
+  await pipe(stream, fs.createWriteStream(dest, { mode: file.mode }));
+}
+
+/**
+ * Serializes the `EdgeFunction` instance to the file system.
+ *
+ * @param edgeFunction The `EdgeFunction` instance
+ * @param path The URL path where the `EdgeFunction` can be accessed from
+ */
+async function writeEdgeFunction(edgeFunction: EdgeFunction, path: string) {
+  const dest = join(OUTPUT_DIR, 'functions', `${path}.func`);
+
+  await fs.mkdirp(dest);
+  const ops: Promise<any>[] = [];
+  ops.push(download(edgeFunction.files, dest));
+
+  const config = {
+    runtime: 'edge',
+    ...edgeFunction,
+    files: undefined,
+    type: undefined,
+  };
+  const configPath = join(dest, '.vc-config.json');
+  ops.push(
+    fs.writeJSON(configPath, config, {
+      spaces: 2,
+    })
+  );
+  await Promise.all(ops);
+}
+
+/**
+ * Writes the file references from the `Lambda` instance to the file system.
+ *
+ * @param lambda The `Lambda` instance
+ * @param path The URL path where the `Lambda` can be accessed from
+ * @param lambdas (optional) Map of `Lambda` instances that have previously been written
+ */
+async function writeLambda(
+  lambda: Lambda,
+  path: string,
+  lambdas?: Map<Lambda, string>
+) {
+  const dest = join(OUTPUT_DIR, 'functions', `${path}.func`);
+
+  // If the `lambda` has already been written to the filesystem at a different
+  // location then create a symlink to the previous location instead of copying
+  // the files again.
+  const existingLambdaPath = lambdas?.get(lambda);
+  if (existingLambdaPath) {
+    const destDir = dirname(dest);
+    const targetDest = join(
+      OUTPUT_DIR,
+      'functions',
+      `${existingLambdaPath}.func`
+    );
+    const target = relative(destDir, targetDest);
+    await fs.mkdirp(destDir);
+    await fs.symlink(target, dest);
+    return;
+  }
+  lambdas?.set(lambda, path);
+
+  await fs.mkdirp(dest);
+  const ops: Promise<any>[] = [];
+  if (lambda.files) {
+    // `files` is defined
+    ops.push(download(lambda.files, dest));
+  } else if (lambda.zipBuffer) {
+    // Builders that use the deprecated `createLambda()` might only have `zipBuffer`
+    ops.push(unzip(lambda.zipBuffer, dest));
+  } else {
+    throw new Error('Malformed `Lambda` - no "files" present');
+  }
+
+  const config = {
+    ...lambda,
+    type: undefined,
+    files: undefined,
+    zipBuffer: undefined,
+  };
+  const configPath = join(dest, '.vc-config.json');
+  ops.push(
+    fs.writeJSON(configPath, config, {
+      spaces: 2,
+    })
+  );
+  await Promise.all(ops);
+
+  // XXX: remove any `.vercel/builders` directories that were
+  // extracted into the `dest` dir. This is a temporary band-aid
+  // to make `vercel-php` work since it is inadvertently including
+  // `.vercel/builders` into the Lambda files due to glob syntax.
+  // See: https://github.com/juicyfx/vercel-php/pull/232
+  for await (const dir of findDirs('.vercel', dest)) {
+    const absDir = join(dest, dir);
+    const entries = await fs.readdir(absDir);
+    if (entries.includes('cache')) {
+      // Delete everything except for "cache"
+      await Promise.all(
+        entries
+          .filter(e => e !== 'cache')
+          .map(entry => fs.remove(join(absDir, entry)))
+      );
+    } else {
+      // Delete the entire `.vercel` directory
+      await fs.remove(absDir);
+    }
+  }
+}
+
+/**
+ * When the Root Directory setting is utilized, merge the contents of the
+ * `.vercel/output` directory that was specified by the Builder into the
+ * `vc build` output directory.
+ */
+async function mergeBuilderOutput(buildResult: BuildResultBuildOutput) {
+  const absOutputDir = resolve(OUTPUT_DIR);
+  if (absOutputDir === buildResult.buildOutputPath) {
+    // `.vercel/output` dir is already in the correct location,
+    // so no need to do anything
+    return;
+  }
+  await fs.copy(buildResult.buildOutputPath, OUTPUT_DIR);
+}
+
+/**
+ * Attempts to return the file extension (i.e. `.html`) from the given
+ * `File` instance, based on its actual filesystem path and/or the
+ * "content-type" of the File.
+ */
+function getFileExtension(file: File): string {
+  let ext = '';
+  if (file.type === 'FileFsRef') {
+    ext = extname(file.fsPath);
+  }
+  if (!ext && file.contentType) {
+    const e = mimeTypes.extension(file.contentType);
+    if (e) {
+      ext = `.${e}`;
+    }
+  }
+  return ext;
+}
+
+/**
+ * Creates an async iterator that scans a directory
+ * for sub-directories with the matching `name`.
+ */
+export async function* findDirs(
+  name: string,
+  dir: string,
+  root = dir
+): AsyncIterable<string> {
+  let paths: string[];
+  try {
+    paths = await fs.readdir(dir);
+  } catch (err: any) {
+    if (err.code !== 'ENOENT') {
+      throw err;
+    }
+    paths = [];
+  }
+  for (const path of paths) {
+    const abs = join(dir, path);
+    const s = await fs.stat(abs);
+    if (s.isDirectory()) {
+      if (path === name) {
+        yield relative(root, abs);
+      } else {
+        yield* findDirs(name, abs, root);
+      }
+    }
+  }
+}

packages/cli/src/util/deploy/get-prebuilt-json.ts

@@ -0,0 +1,12 @@
+import fs from 'fs-extra';
+import { join } from 'path';
+
+export default async function getPrebuiltJson(directory: string) {
+  try {
+    return await fs.readJSON(join(directory, '.vercel/output/builds.json'));
+  } catch (error) {
+    // ignoring error
+  }
+
+  return null;
+}

packages/cli/src/util/deploy/parse-target.ts

@@ -0,0 +1,41 @@
+import { Output } from '../../util/output';
+import param from '../../util/output/param';
+import code from '../../util/output/code';
+
+/**
+ * Parses the environment target from the `--target` and `--prod` flags.
+ */
+export default function parseTarget(
+  output: Output,
+  targetArg?: string,
+  prodArg?: boolean
+): string | number | undefined {
+  if (targetArg) {
+    const deprecatedTarget = targetArg;
+
+    if (!['staging', 'production'].includes(deprecatedTarget)) {
+      output.error(
+        `The specified ${param('--target')} ${code(
+          deprecatedTarget
+        )} is not valid`
+      );
+      return 1;
+    }
+
+    if (deprecatedTarget === 'production') {
+      output.warn(
+        'We recommend using the much shorter `--prod` option instead of `--target production` (deprecated)'
+      );
+    }
+
+    output.debug(`Setting target to ${deprecatedTarget}`);
+    return deprecatedTarget;
+  }
+
+  if (prodArg) {
+    output.debug('Setting target to production');
+    return 'production';
+  }
+
+  return undefined;
+}

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

@@ -89,6 +89,7 @@ import {
 } from './types';
 import { ProjectEnvVariable, ProjectSettings } from '../../types';
 import exposeSystemEnvs from './expose-system-envs';
+import { treeKill } from '../tree-kill';
 
 const frontendRuntimeSet = new Set(
   frameworkList.map(f => f.useRuntime?.use || '@vercel/static-build')
@@ -998,20 +999,7 @@ export default class DevServer {
     }
 
     if (devProcess) {
-      ops.push(
+      ops.push(treeKill(devProcess.pid));
-        new Promise<void>((resolve, reject) => {
-          devProcess.once('exit', () => resolve());
-          try {
-            process.kill(devProcess.pid);
-          } catch (err) {
-            if (err.code === 'ESRCH') {
-              // Process already exited
-              return resolve();
-            }
-            reject(err);
-          }
-        })
-      );
     }
 
     ops.push(close(this.server));
@@ -1052,12 +1040,7 @@ export default class DevServer {
     const { debug } = this.output;
     debug(`Killing builder dev server with PID ${pid}`);
     this.devServerPids.delete(pid);
-    try {
+    await treeKill(pid);
-      process.kill(pid, 'SIGTERM');
-      debug(`Killed builder dev server with PID ${pid}`);
-    } catch (err) {
-      debug(`Failed to kill builder dev server with PID ${pid}: ${err}`);
-    }
   }
 
   async send404(
@@ -2120,7 +2103,7 @@ export default class DevServer {
       .replace(/%PORT%/g, `${port}`);
 
     this.output.debug(
-      `Starting dev command with parameters : ${JSON.stringify({
+      `Starting dev command with parameters: ${JSON.stringify({
         cwd,
         command,
         port,
@@ -2152,6 +2135,7 @@ export default class DevServer {
       cwd,
       env,
     });
+    this.devProcess = p;
 
     if (!p.stdout || !p.stderr) {
       throw new Error('Expected child process to have stdout and stderr');
@@ -2164,17 +2148,14 @@ export default class DevServer {
       process.stdout.write(data.replace(proxyPort, devPort));
     });
 
-    p.on('exit', (code: number) => {
+    p.on('exit', (code, signal) => {
-      if (code > 0) {
+      this.output.debug(`Dev command exited with "${signal || code}"`);
-        process.exit(code);
-      }
       this.devProcessPort = undefined;
     });
 
     await checkForPort(port, 1000 * 60 * 5);
 
     this.devProcessPort = port;
-    this.devProcess = p;
   }
 }
 

packages/cli/src/util/env/get-env-records.ts

@@ -3,10 +3,20 @@ import Client from '../client';
 import { ProjectEnvVariable, ProjectEnvTarget } from '../../types';
 import { URLSearchParams } from 'url';
 
+/** The CLI command that was used that needs the environment variables. */
+export type EnvRecordsSource =
+  | 'vercel-cli:env:ls'
+  | 'vercel-cli:env:add'
+  | 'vercel-cli:env:rm'
+  | 'vercel-cli:env:pull'
+  | 'vercel-cli:dev'
+  | 'vercel-cli:pull';
+
 export default async function getEnvRecords(
   output: Output,
   client: Client,
   projectId: string,
+  source: EnvRecordsSource,
   {
     target,
     gitBranch,
@@ -31,6 +41,9 @@ export default async function getEnvRecords(
   if (decrypt) {
     query.set('decrypt', decrypt.toString());
   }
+  if (source) {
+    query.set('source', source);
+  }
 
   const url = `/v8/projects/${projectId}/env?${query}`;
 

packages/cli/src/util/get-decrypted-env-records.ts

@@ -6,15 +6,16 @@ import {
   ProjectEnvVariable,
   Secret,
 } from '../types';
-import getEnvRecords from './env/get-env-records';
+import getEnvRecords, { EnvRecordsSource } from './env/get-env-records';
 
 export default async function getDecryptedEnvRecords(
   output: Output,
   client: Client,
   projectId: string,
+  source: EnvRecordsSource,
   target?: ProjectEnvTarget
 ): Promise<{ envs: ProjectEnvVariable[] }> {
-  const { envs } = await getEnvRecords(output, client, projectId, {
+  const { envs } = await getEnvRecords(output, client, projectId, source, {
     target: target || ProjectEnvTarget.Development,
     decrypt: true,
   });

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

@@ -6,6 +6,8 @@ import {
   getLinkedProject,
   linkFolderToProject,
   getVercelDirectory,
+  VERCEL_DIR_README,
+  VERCEL_DIR_PROJECT,
 } from '../projects/link';
 import createProject from '../projects/create-project';
 import updateProject from '../projects/update-project';
@@ -49,7 +51,7 @@ export default async function setupAndLink(
   const isFile = !isDirectory(path);
   if (isFile) {
     output.error(`Expected directory but found file: ${path}`);
-    return { status: 'error', exitCode: 1 };
+    return { status: 'error', exitCode: 1, reason: 'PATH_IS_FILE' };
   }
   const link = await getLinkedProject(client, path);
   const isTTY = process.stdout.isTTY;
@@ -65,7 +67,12 @@ export default async function setupAndLink(
 
   if (forceDelete) {
     const vercelDir = getVercelDirectory(path);
-    remove(vercelDir);
+    remove(join(vercelDir, VERCEL_DIR_README));
+    remove(join(vercelDir, VERCEL_DIR_PROJECT));
+  }
+
+  if (!isTTY && !autoConfirm) {
+    return { status: 'error', exitCode: 1, reason: 'HEADLESS' };
   }
 
   const shouldStartSetup =
@@ -87,9 +94,14 @@ export default async function setupAndLink(
       autoConfirm
     );
   } catch (err) {
-    if (err.code === 'NOT_AUTHORIZED' || err.code === 'TEAM_DELETED') {
+    if (err.code === 'NOT_AUTHORIZED') {
       output.prettyError(err);
-      return { status: 'error', exitCode: 1 };
+      return { status: 'error', exitCode: 1, reason: 'NOT_AUTHORIZED' };
+    }
+
+    if (err.code === 'TEAM_DELETED') {
+      output.prettyError(err);
+      return { status: 'error', exitCode: 1, reason: 'TEAM_DELETED' };
     }
 
     throw err;
@@ -135,7 +147,7 @@ export default async function setupAndLink(
     rootDirectory &&
     !(await validateRootDirectory(output, path, sourcePath, ''))
   ) {
-    return { status: 'error', exitCode: 1 };
+    return { status: 'error', exitCode: 1, reason: 'INVALID_ROOT_DIRECTORY' };
   }
 
   config.currentTeam = org.type === 'team' ? org.id : undefined;
@@ -191,7 +203,11 @@ export default async function setupAndLink(
         if (debug) {
           console.log(deployment);
         }
-        return { status: 'error', exitCode: 1 };
+        return {
+          status: 'error',
+          exitCode: 1,
+          reason: 'MISSING_PROJECT_SETTINGS',
+        };
       }
 
       const { projectSettings, framework } = deployment;

packages/cli/src/util/pkg-name.ts

@@ -2,6 +2,16 @@ import title from 'title';
 import pkg from './pkg';
 import cmd from './output/cmd';
 
+/**
+ * The package name defined in the CLI's `package.json` file (`vercel`).
+ */
+export const name = pkg.name;
+
+/**
+ * Unicode symbol used to represent the CLI.
+ */
+export const logo = '▲';
+
 /**
  * Returns the package name such as `vercel` or `now`.
  */

packages/cli/src/util/projects/link.ts

@@ -8,7 +8,7 @@ import { promisify } from 'util';
 
 import getProjectByIdOrName from '../projects/get-project-by-id-or-name';
 import Client from '../client';
-import { ProjectNotFound } from '../errors-ts';
+import { InvalidToken, ProjectNotFound } from '../errors-ts';
 import getUser from '../get-user';
 import getTeamById from '../teams/get-team-by-id';
 import { Output } from '../output';
@@ -150,15 +150,20 @@ export async function getLinkedProject(
       getProjectByIdOrName(client, link.projectId, link.orgId),
     ]);
   } catch (err) {
-    if (err?.status === 403) {
+    if (err && err.status === 403) {
       output.stopSpinner();
-      throw new NowBuildError({
+
-        message: `Could not retrieve Project Settings. To link your Project, remove the ${outputCode(
+      if (err.missingToken) {
-          VERCEL_DIR
+        throw new InvalidToken();
-        )} directory and deploy again.`,
+      } else {
-        code: 'PROJECT_UNAUTHORIZED',
+        throw new NowBuildError({
-        link: 'https://vercel.link/cannot-load-project-settings',
+          message: `Could not retrieve Project Settings. To link your Project, remove the ${outputCode(
-      });
+            VERCEL_DIR
+          )} directory and deploy again.`,
+          code: 'PROJECT_UNAUTHORIZED',
+          link: 'https://vercel.link/cannot-load-project-settings',
+        });
+      }
     }
 
     // Not a special case 403, we should still throw it

packages/cli/src/util/projects/project-settings.ts

@@ -5,12 +5,14 @@ import { join } from 'path';
 
 export type ProjectLinkAndSettings = ProjectLink & {
   settings: {
+    installCommand: Project['installCommand'];
     buildCommand: Project['buildCommand'];
     devCommand: Project['devCommand'];
     outputDirectory: Project['outputDirectory'];
     directoryListing: Project['directoryListing'];
     rootDirectory: Project['rootDirectory'];
     framework: Project['framework'];
+    nodeVersion: Project['nodeVersion'];
   };
 };
 
@@ -22,20 +24,22 @@ export async function writeProjectSettings(
   project: Project,
   org: Org
 ) {
-  const data = {
+  const projectLinkAndSettings: ProjectLinkAndSettings = {
     projectId: project.id,
     orgId: org.id,
     settings: {
-      buildCommand: project.buildCommand,
-      devCommand: project.devCommand,
-      outputDirectory: project.outputDirectory,
-      directoryListing: project.directoryListing,
-      rootDirectory: project.rootDirectory,
       framework: project.framework,
+      devCommand: project.devCommand,
+      installCommand: project.installCommand,
+      buildCommand: project.buildCommand,
+      outputDirectory: project.outputDirectory,
+      rootDirectory: project.rootDirectory,
+      directoryListing: project.directoryListing,
+      nodeVersion: project.nodeVersion,
     },
   };
   const path = join(cwd, VERCEL_DIR, VERCEL_DIR_PROJECT);
-  return await outputJSON(path, data, {
+  return await outputJSON(path, projectLinkAndSettings, {
     spaces: 2,
   });
 }

packages/cli/test/dev/fixtures/26-nextjs-secrets/.env

@@ -1 +0,0 @@
-ANOTHER_SECRET=runtime

packages/cli/test/dev/fixtures/26-nextjs-secrets/.env.build

@@ -1 +0,0 @@
-SECRET=buildtime

packages/cli/test/dev/fixtures/26-nextjs-secrets/.gitignore

@@ -1,7 +0,0 @@
-.now
-.vercel
-.next
-.idea
-node_modules
-!.env
-!.env.build

packages/cli/test/dev/fixtures/26-nextjs-secrets/next.config.js

@@ -1,10 +0,0 @@
-console.log({
-  SECRET: process.env.SECRET,
-  ANOTHER_SECRET: process.env.ANOTHER_SECRET,
-});
-
-module.exports = {
-  env: {
-    SECRET: process.env.SECRET,
-  },
-};