Publish Stable

- @vercel/build-utils@5.0.0 - vercel@26.0.0 - @vercel/client@12.0.4 - @vercel/fs-detectors@1.0.0 - @vercel/go@2.0.4 - @vercel/next@3.1.3 - @vercel/node@2.4.0 - @vercel/python@3.0.4 - @vercel/redwood@1.0.5 - @vercel/remix@1.0.5 - @vercel/ruby@1.3.12 - @vercel/static-build@1.0.4
Update trailing slash handling for _next/data resolving (#8080 )
2025-12-11 21:07:47 +00:00 · 2022-07-05 08:47:49 -04:00 · 2022-07-04 09:52:08 -05:00 · 2022-07-04 13:22:35 +00:00 · 2022-07-01 22:47:36 +00:00 · 2022-07-01 20:38:02 +00:00
559 changed files with 29596 additions and 12218 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -8,3 +8,7 @@ packages/*/test/* linguist-vendored
 # Go build fails with Windows line endings.
 *.go text eol=lf
 go.mod text eol=lf
+
+# Mark certain files as "binary" -- hide diffs
+**/test/fixtures/**/git/**/* binary
+**/test/fixtures/**/git/**/* linguist-generated
--- a/.prettierignore
+++ b/.prettierignore
@@ -0,0 +1,4 @@
+# https://prettier.io/docs/en/ignore.html
+
+# ignore this file with an intentional syntax error
+packages/cli/test/dev/fixtures/edge-function-error/api/edge-error-syntax.js
--- a/.vercelignore
+++ b/.vercelignore
@@ -1,18 +1 @@
-*
-
-# general
-!utils/
-!utils/run.js
-!.yarnrc
-!yarn.lock
-!package.json
-!turbo.json
-
-# api
-!api/
-!api/**
-
-# packages
-!packages/
-!packages/frameworks
-!packages/frameworks/**
+packages/*/test/**
--- a/api/_lib/script/build.ts
+++ b/api/_lib/script/build.ts
@@ -1,5 +1,6 @@
 import fs from 'fs/promises';
-import { join } from 'path';
+import { join, dirname } from 'path';
+import execa from 'execa';
 import { getExampleList } from '../examples/example-list';
 import { mapOldToNew } from '../examples/map-old-to-new';

@@ -40,7 +41,32 @@ async function main() {
    JSON.stringify([...existingExamples, ...oldExamples])
  );

+  const { stdout: sha } = await execa('git', ['rev-parse', '--short', 'HEAD'], {
+    cwd: repoRoot,
+  });
+
+  const tarballsDir = join(pubDir, 'tarballs');
+  const packagesDir = join(repoRoot, 'packages');
+  const packages = await fs.readdir(packagesDir);
+  for (const pkg of packages) {
+    const fullDir = join(packagesDir, pkg);
+    const packageJsonRaw = await fs.readFile(
+      join(fullDir, 'package.json'),
+      'utf-8'
+    );
+    const packageJson = JSON.parse(packageJsonRaw);
+    const tarballName = `${packageJson.name
+      .replace('@', '')
+      .replace('/', '-')}-v${packageJson.version}-${sha.trim()}.tgz`;
+    const destTarballPath = join(tarballsDir, `${packageJson.name}.tgz`);
+    await fs.mkdir(dirname(destTarballPath), { recursive: true });
+    await fs.copyFile(join(fullDir, tarballName), destTarballPath);
+  }
+
  console.log('Completed building static frontend.');
 }

-main().catch(console.error);
+main().catch(err => {
+  console.log('error running build:', err);
+  process.exit(1);
+});
--- a/examples/create-react-app/.env.production
+++ b/examples/create-react-app/.env.production
@@ -0,0 +1,2 @@
+# `REACT_APP` prefix is required to expose to client-side
+REACT_APP_VERCEL_ANALYTICS_ID=$VERCEL_ANALYTICS_ID
--- a/examples/create-react-app/package.json
+++ b/examples/create-react-app/package.json
@@ -1,13 +1,13 @@
 {
  "private": true,
  "dependencies": {
-    "@testing-library/jest-dom": "^5.16.1",
-    "@testing-library/react": "^12.1.2",
-    "@testing-library/user-event": "^13.5.0",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
-    "react-scripts": "5.0.0",
-    "web-vitals": "^2.1.3"
+    "@testing-library/jest-dom": "^5.16.4",
+    "@testing-library/react": "^13.3.0",
+    "@testing-library/user-event": "^14.2.0",
+    "react": "^18.1.0",
+    "react-dom": "^18.1.0",
+    "react-scripts": "5.0.1",
+    "web-vitals": "^2.1.4"
  },
  "scripts": {
    "start": "react-scripts start",
--- a/examples/create-react-app/src/index.js
+++ b/examples/create-react-app/src/index.js
@@ -3,6 +3,7 @@ import ReactDOM from 'react-dom';
 import './index.css';
 import App from './App';
 import reportWebVitals from './reportWebVitals';
+import { sendToVercelAnalytics } from './vitals';

 ReactDOM.render(
  <React.StrictMode>
@@ -11,7 +12,4 @@ ReactDOM.render(
  document.getElementById('root')
 );

-// If you want to start measuring performance in your app, pass a function
-// to log results (for example: reportWebVitals(console.log))
-// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
-reportWebVitals();
+reportWebVitals(sendToVercelAnalytics);
--- a/examples/create-react-app/src/vitals.js
+++ b/examples/create-react-app/src/vitals.js
@@ -0,0 +1,40 @@
+const vitalsUrl = 'https://vitals.vercel-analytics.com/v1/vitals';
+
+function getConnectionSpeed() {
+  return 'connection' in navigator &&
+    navigator['connection'] &&
+    'effectiveType' in navigator['connection']
+    ? navigator['connection']['effectiveType']
+    : '';
+}
+
+export function sendToVercelAnalytics(metric) {
+  const analyticsId = process.env.REACT_APP_VERCEL_ANALYTICS_ID;
+  if (!analyticsId) {
+    return;
+  }
+
+  const body = {
+    dsn: analyticsId,
+    id: metric.id,
+    page: window.location.pathname,
+    href: window.location.href,
+    event_name: metric.name,
+    value: metric.value.toString(),
+    speed: getConnectionSpeed(),
+  };
+
+  const blob = new Blob([new URLSearchParams(body).toString()], {
+    // This content type is necessary for `sendBeacon`
+    type: 'application/x-www-form-urlencoded',
+  });
+  if (navigator.sendBeacon) {
+    navigator.sendBeacon(vitalsUrl, blob);
+  } else
+    fetch(vitalsUrl, {
+      body: blob,
+      method: 'POST',
+      credentials: 'omit',
+      keepalive: true,
+    });
+}
--- a/examples/create-react-app/yarn.lock
+++ b/examples/create-react-app/yarn.lock
@@ -1484,10 +1484,10 @@
    "@svgr/plugin-svgo" "^5.5.0"
    loader-utils "^2.0.0"

-"@testing-library/dom@^8.0.0":
-  version "8.11.2"
-  resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-8.11.2.tgz#fc110c665a066c2287be765e4a35ba8dad737015"
-  integrity sha512-idsS/cqbYudXcVWngc1PuWNmXs416oBy2g/7Q8QAUREt5Z3MUkAL2XJD7xazLJ6esDfqRDi/ZBxk+OPPXitHRw==
+"@testing-library/dom@^8.5.0":
+  version "8.13.0"
+  resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-8.13.0.tgz#bc00bdd64c7d8b40841e27a70211399ad3af46f5"
+  integrity sha512-9VHgfIatKNXQNaZTtLnalIy0jNZzY35a4S3oi08YAt9Hv1VsfZ/DfA45lM8D/UhtHBGJ4/lGwp0PZkVndRkoOQ==
  dependencies:
    "@babel/code-frame" "^7.10.4"
    "@babel/runtime" "^7.12.5"
@@ -1498,10 +1498,10 @@
    lz-string "^1.4.4"
    pretty-format "^27.0.2"

-"@testing-library/jest-dom@^5.16.1":
-  version "5.16.1"
-  resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.16.1.tgz#3db7df5ae97596264a7da9696fe14695ba02e51f"
-  integrity sha512-ajUJdfDIuTCadB79ukO+0l8O+QwN0LiSxDaYUTI4LndbbUsGi6rWU1SCexXzBA2NSjlVB9/vbkasQIL3tmPBjw==
+"@testing-library/jest-dom@^5.16.4":
+  version "5.16.4"
+  resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.16.4.tgz#938302d7b8b483963a3ae821f1c0808f872245cd"
+  integrity sha512-Gy+IoFutbMQcky0k+bqqumXZ1cTGswLsFqmNLzNdSKkU9KGV2u9oXhukCbbJ9/LRPKiqwxEE8VpV/+YZlfkPUA==
  dependencies:
    "@babel/runtime" "^7.9.2"
    "@types/testing-library__jest-dom" "^5.9.1"
@@ -1513,20 +1513,19 @@
    lodash "^4.17.15"
    redent "^3.0.0"

-"@testing-library/react@^12.1.2":
-  version "12.1.2"
-  resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-12.1.2.tgz#f1bc9a45943461fa2a598bb4597df1ae044cfc76"
-  integrity sha512-ihQiEOklNyHIpo2Y8FREkyD1QAea054U0MVbwH1m8N9TxeFz+KoJ9LkqoKqJlzx2JDm56DVwaJ1r36JYxZM05g==
+"@testing-library/react@^13.3.0":
+  version "13.3.0"
+  resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-13.3.0.tgz#bf298bfbc5589326bbcc8052b211f3bb097a97c5"
+  integrity sha512-DB79aA426+deFgGSjnf5grczDPiL4taK3hFaa+M5q7q20Kcve9eQottOG5kZ74KEr55v0tU2CQormSSDK87zYQ==
  dependencies:
    "@babel/runtime" "^7.12.5"
-    "@testing-library/dom" "^8.0.0"
+    "@testing-library/dom" "^8.5.0"
+    "@types/react-dom" "^18.0.0"

-"@testing-library/user-event@^13.5.0":
-  version "13.5.0"
-  resolved "https://registry.yarnpkg.com/@testing-library/user-event/-/user-event-13.5.0.tgz#69d77007f1e124d55314a2b73fd204b333b13295"
-  integrity sha512-5Kwtbo3Y/NowpkbRuSepbyMFkZmHgD+vPzYB/RJ4oxt5Gj/avFFBYjhw27cqSVPVw/3a67NK1PbiIr9k4Gwmdg==
-  dependencies:
-    "@babel/runtime" "^7.12.5"
+"@testing-library/user-event@^14.2.0":
+  version "14.2.0"
+  resolved "https://registry.yarnpkg.com/@testing-library/user-event/-/user-event-14.2.0.tgz#8293560f8f80a00383d6c755ec3e0b918acb1683"
+  integrity sha512-+hIlG4nJS6ivZrKnOP7OGsDu9Fxmryj9vCl8x0ZINtTJcCHs2zLsYif5GzuRiBF2ck5GZG2aQr7Msg+EHlnYVQ==

 "@tootallnate/once@1":
  version "1.1.2"
@@ -1735,6 +1734,11 @@
  resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.4.3.tgz#a3c65525b91fca7da00ab1a3ac2b5a2a4afbffbf"
  integrity sha512-QzSuZMBuG5u8HqYz01qtMdg/Jfctlnvj1z/lYnIDXs/golxw0fxtRAHd9KrzjR7Yxz1qVeI00o0kiO3PmVdJ9w==

+"@types/prop-types@*":
+  version "15.7.5"
+  resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.5.tgz#5f19d2b85a98e9558036f6a3cacc8819420f05cf"
+  integrity sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==
+
 "@types/q@^1.5.1":
  version "1.5.5"
  resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.5.tgz#75a2a8e7d8ab4b230414505d92335d1dcb53a6df"
@@ -1750,6 +1754,22 @@
  resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc"
  integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==

+"@types/react-dom@^18.0.0":
+  version "18.0.5"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.0.5.tgz#330b2d472c22f796e5531446939eacef8378444a"
+  integrity sha512-OWPWTUrY/NIrjsAPkAk1wW9LZeIjSvkXRhclsFO8CZcZGCOg2G0YZy4ft+rOyYxy8B7ui5iZzi9OkDebZ7/QSA==
+  dependencies:
+    "@types/react" "*"
+
+"@types/react@*":
+  version "18.0.9"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.9.tgz#d6712a38bd6cd83469603e7359511126f122e878"
+  integrity sha512-9bjbg1hJHUm4De19L1cHiW0Jvx3geel6Qczhjd0qY5VKVE2X5+x77YxAepuCwVh4vrgZJdgEJw48zrhRIeF4Nw==
+  dependencies:
+    "@types/prop-types" "*"
+    "@types/scheduler" "*"
+    csstype "^3.0.2"
+
 "@types/resolve@1.17.1":
  version "1.17.1"
  resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.17.1.tgz#3afd6ad8967c77e4376c598a82ddd58f46ec45d6"
@@ -1762,6 +1782,11 @@
  resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.1.tgz#d8f1c0d0dc23afad6dc16a9e993a0865774b4065"
  integrity sha512-xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g==

+"@types/scheduler@*":
+  version "0.16.2"
+  resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39"
+  integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==
+
 "@types/serve-index@^1.9.1":
  version "1.9.1"
  resolved "https://registry.yarnpkg.com/@types/serve-index/-/serve-index-1.9.1.tgz#1b5e85370a192c01ec6cec4735cf2917337a6278"
@@ -3175,6 +3200,11 @@ cssstyle@^2.3.0:
  dependencies:
    cssom "~0.3.6"

+csstype@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.0.tgz#4ddcac3718d787cf9df0d1b7d15033925c8f29f2"
+  integrity sha512-uX1KG+x9h5hIJsaKR9xHUeUraxf8IODOwq9JLNPq6BwB04a/xgpq3rcx47l5BZu5zBPlgD342tdke3Hom/nJRA==
+
 damerau-levenshtein@^1.0.7:
  version "1.0.8"
  resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz#b43d286ccbd36bc5b2f7ed41caf2d0aba1f8a6e7"
@@ -3622,10 +3652,10 @@ escodegen@^2.0.0:
  optionalDependencies:
    source-map "~0.6.1"

-eslint-config-react-app@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-react-app/-/eslint-config-react-app-7.0.0.tgz#0fa96d5ec1dfb99c029b1554362ab3fa1c3757df"
-  integrity sha512-xyymoxtIt1EOsSaGag+/jmcywRuieQoA2JbPCjnw9HukFj9/97aGPoZVFioaotzk1K5Qt9sHO5EutZbkrAXS0g==
+eslint-config-react-app@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/eslint-config-react-app/-/eslint-config-react-app-7.0.1.tgz#73ba3929978001c5c86274c017ea57eb5fa644b4"
+  integrity sha512-K6rNzvkIeHaTd8m/QEh1Zko0KI7BACWkkneSs6s9cKZC/J27X3eZR6Upt1jkmZ/4FK+XUOPPxMEN7+lbUXfSlA==
  dependencies:
    "@babel/core" "^7.16.0"
    "@babel/eslint-parser" "^7.16.3"
@@ -6841,10 +6871,10 @@ react-app-polyfill@^3.0.0:
    regenerator-runtime "^0.13.9"
    whatwg-fetch "^3.6.2"

-react-dev-utils@^12.0.0:
-  version "12.0.0"
-  resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-12.0.0.tgz#4eab12cdb95692a077616770b5988f0adf806526"
-  integrity sha512-xBQkitdxozPxt1YZ9O1097EJiVpwHr9FoAuEVURCKV0Av8NBERovJauzP7bo1ThvuhZ4shsQ1AJiu4vQpoT1AQ==
+react-dev-utils@^12.0.1:
+  version "12.0.1"
+  resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-12.0.1.tgz#ba92edb4a1f379bd46ccd6bcd4e7bc398df33e73"
+  integrity sha512-84Ivxmr17KjUupyqzFode6xKhjwuEJDROWKJy/BthkL7Wn6NJ8h4WE6k/exAv6ImS+0oZLRRW5j/aINMHyeGeQ==
  dependencies:
    "@babel/code-frame" "^7.16.0"
    address "^1.1.2"
@@ -6865,25 +6895,24 @@ react-dev-utils@^12.0.0:
    open "^8.4.0"
    pkg-up "^3.1.0"
    prompts "^2.4.2"
-    react-error-overlay "^6.0.10"
+    react-error-overlay "^6.0.11"
    recursive-readdir "^2.2.2"
    shell-quote "^1.7.3"
    strip-ansi "^6.0.1"
    text-table "^0.2.0"

-react-dom@^17.0.2:
-  version "17.0.2"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23"
-  integrity sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==
+react-dom@^18.1.0:
+  version "18.1.0"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.1.0.tgz#7f6dd84b706408adde05e1df575b3a024d7e8a2f"
+  integrity sha512-fU1Txz7Budmvamp7bshe4Zi32d0ll7ect+ccxNu9FlObT605GOEB8BfO4tmRJ39R5Zj831VCpvQ05QPBW5yb+w==
  dependencies:
    loose-envify "^1.1.0"
-    object-assign "^4.1.1"
-    scheduler "^0.20.2"
+    scheduler "^0.22.0"

-react-error-overlay@^6.0.10:
-  version "6.0.10"
-  resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.10.tgz#0fe26db4fa85d9dbb8624729580e90e7159a59a6"
-  integrity sha512-mKR90fX7Pm5seCOfz8q9F+66VCc1PGsWSBxKbITjfKVQHMNF2zudxHnMdJiB1fRCb+XsbQV9sO9DCkgsMQgBIA==
+react-error-overlay@^6.0.11:
+  version "6.0.11"
+  resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.11.tgz#92835de5841c5cf08ba00ddd2d677b6d17ff9adb"
+  integrity sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg==

 react-is@^16.13.1:
  version "16.13.1"
@@ -6900,10 +6929,10 @@ react-refresh@^0.11.0:
  resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.11.0.tgz#77198b944733f0f1f1a90e791de4541f9f074046"
  integrity sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A==

-react-scripts@5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/react-scripts/-/react-scripts-5.0.0.tgz#6547a6d7f8b64364ef95273767466cc577cb4b60"
-  integrity sha512-3i0L2CyIlROz7mxETEdfif6Sfhh9Lfpzi10CtcGs1emDQStmZfWjJbAIMtRD0opVUjQuFWqHZyRZ9PPzKCFxWg==
+react-scripts@5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/react-scripts/-/react-scripts-5.0.1.tgz#6285dbd65a8ba6e49ca8d651ce30645a6d980003"
+  integrity sha512-8VAmEm/ZAwQzJ+GOMLbBsTdDKOpuZh7RPs0UymvBR2vRk4iZWCskjbFnxqjrzoIvlNNRZ3QJFx6/qDSi6zSnaQ==
  dependencies:
    "@babel/core" "^7.16.0"
    "@pmmmwh/react-refresh-webpack-plugin" "^0.5.3"
@@ -6921,7 +6950,7 @@ react-scripts@5.0.0:
    dotenv "^10.0.0"
    dotenv-expand "^5.1.0"
    eslint "^8.3.0"
-    eslint-config-react-app "^7.0.0"
+    eslint-config-react-app "^7.0.1"
    eslint-webpack-plugin "^3.1.1"
    file-loader "^6.2.0"
    fs-extra "^10.0.0"
@@ -6938,7 +6967,7 @@ react-scripts@5.0.0:
    postcss-preset-env "^7.0.1"
    prompts "^2.4.2"
    react-app-polyfill "^3.0.0"
-    react-dev-utils "^12.0.0"
+    react-dev-utils "^12.0.1"
    react-refresh "^0.11.0"
    resolve "^1.20.0"
    resolve-url-loader "^4.0.0"
@@ -6955,13 +6984,12 @@ react-scripts@5.0.0:
  optionalDependencies:
    fsevents "^2.3.2"

-react@^17.0.2:
-  version "17.0.2"
-  resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037"
-  integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==
+react@^18.1.0:
+  version "18.1.0"
+  resolved "https://registry.yarnpkg.com/react/-/react-18.1.0.tgz#6f8620382decb17fdc5cc223a115e2adbf104890"
+  integrity sha512-4oL8ivCz5ZEPyclFQXaNksK3adutVS8l2xzZU0cqEFrE9Sb7fC0EFK5uEk74wIreL1DERyjvsU915j1pcT2uEQ==
  dependencies:
    loose-envify "^1.1.0"
-    object-assign "^4.1.1"

 readable-stream@^2.0.1:
  version "2.3.7"
@@ -7235,13 +7263,12 @@ saxes@^5.0.1:
  dependencies:
    xmlchars "^2.2.0"

-scheduler@^0.20.2:
-  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91"
-  integrity sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==
+scheduler@^0.22.0:
+  version "0.22.0"
+  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.22.0.tgz#83a5d63594edf074add9a7198b1bae76c3db01b8"
+  integrity sha512-6QAm1BgQI88NPYymgGQLCZgvep4FyePDWFpXVK+zNSUgHwlqpJy8VEh8Et0KxTACS4VWwMousBElAZOH9nkkoQ==
  dependencies:
    loose-envify "^1.1.0"
-    object-assign "^4.1.1"

 schema-utils@2.7.0:
  version "2.7.0"
@@ -8156,10 +8183,10 @@ wbuf@^1.1.0, wbuf@^1.7.3:
  dependencies:
    minimalistic-assert "^1.0.0"

-web-vitals@^2.1.3:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/web-vitals/-/web-vitals-2.1.3.tgz#6dca59f41dbc3fcccdb889da06191b437b18f534"
-  integrity sha512-+ijpniAzcnQicXaXIN0/eHQAiV/jMt1oHGHTmz7VdAJPPkzzDhmoYPSpLgJTuFtUh+jCjxCoeTZPg7Ic+g8o7w==
+web-vitals@^2.1.4:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/web-vitals/-/web-vitals-2.1.4.tgz#76563175a475a5e835264d373704f9dde718290c"
+  integrity sha512-sVWcwhU5mX6crfI5Vd2dC4qchyTqxV8URinzt25XqVh+bHEPGH4C3NPrNionCP7Obx59wrYEbNlw4Z8sjALzZg==

 webidl-conversions@^4.0.2:
  version "4.0.2"
--- a/examples/remix/.eslintrc.js
+++ b/examples/remix/.eslintrc.js
@@ -0,0 +1,3 @@
+module.exports = {
+  extends: ["@remix-run/eslint-config", "@remix-run/eslint-config/node"],
+};
--- a/examples/remix/.gitignore
+++ b/examples/remix/.gitignore
@@ -1,7 +1,11 @@
 node_modules

 .cache
+.env
 .vercel
+.output

-public/build
-api/_build
+/build/
+/public/build
+/api/index.js
+/api/index.js.map
--- a/examples/remix/api/index.js
+++ b/examples/remix/api/index.js
@@ -1,5 +0,0 @@
-const { createRequestHandler } = require("@remix-run/vercel");
-
-module.exports = createRequestHandler({
-  build: require("./_build")
-});
--- a/examples/remix/app/entry.client.tsx
+++ b/examples/remix/app/entry.client.tsx
@@ -1,4 +1,4 @@
+import { RemixBrowser } from "@remix-run/react";
 import { hydrate } from "react-dom";
-import { RemixBrowser } from "remix";

 hydrate(<RemixBrowser />, document);
--- a/examples/remix/app/entry.server.tsx
+++ b/examples/remix/app/entry.server.tsx
@@ -1,6 +1,6 @@
+import type { EntryContext } from "@remix-run/node";
+import { RemixServer } from "@remix-run/react";
 import { renderToString } from "react-dom/server";
-import { RemixServer } from "remix";
-import type { EntryContext } from "remix";

 export default function handleRequest(
  request: Request,
@@ -16,6 +16,6 @@ export default function handleRequest(

  return new Response("<!DOCTYPE html>" + markup, {
    status: responseStatusCode,
-    headers: responseHeaders
+    headers: responseHeaders,
  });
 }
--- a/examples/remix/app/root.tsx
+++ b/examples/remix/app/root.tsx
@@ -1,3 +1,4 @@
+import type { LinksFunction, MetaFunction } from "@remix-run/node";
 import {
  Link,
  Links,
@@ -6,14 +7,13 @@ import {
  Outlet,
  Scripts,
  ScrollRestoration,
-  useCatch
-} from "remix";
-import type { LinksFunction } from "remix";
+  useCatch,
+} from "@remix-run/react";

-import globalStylesUrl from "~/styles/global.css";
 import darkStylesUrl from "~/styles/dark.css";
+import globalStylesUrl from "~/styles/global.css";

-// https://remix.run/api/app#links
+// https://remix.run/api/conventions#links
 export let links: LinksFunction = () => {
  return [
    { rel: "stylesheet", href: globalStylesUrl },
@@ -25,6 +25,12 @@ export let links: LinksFunction = () => {
  ];
 };

+// https://remix.run/api/conventions#meta
+export let meta: MetaFunction = () => ({
+  charset: "utf-8",
+  viewport: "width=device-width,initial-scale=1",
+});
+
 // https://remix.run/api/conventions#default-export
 // https://remix.run/api/conventions#route-filenames
 export default function App() {
@@ -37,7 +43,7 @@ export default function App() {
  );
 }

-// https://remix.run/docs/en/v1/api/conventions#errorboundary
+// https://remix.run/api/conventions#errorboundary
 export function ErrorBoundary({ error }: { error: Error }) {
  console.error(error);
  return (
@@ -57,7 +63,7 @@ export function ErrorBoundary({ error }: { error: Error }) {
  );
 }

-// https://remix.run/docs/en/v1/api/conventions#catchboundary
+// https://remix.run/api/conventions#catchboundary
 export function CatchBoundary() {
  let caught = useCatch();

@@ -103,8 +109,6 @@ function Document({
  return (
    <html lang="en">
      <head>
-        <meta charSet="utf-8" />
-        <meta name="viewport" content="width=device-width,initial-scale=1" />
        {title ? <title>{title}</title> : null}
        <Meta />
        <Links />
@@ -113,7 +117,7 @@ function Document({
        {children}
        <ScrollRestoration />
        <Scripts />
-        {process.env.NODE_ENV === "development" && <LiveReload />}
+        <LiveReload />
      </body>
    </html>
  );
--- a/examples/remix/app/routes/demos/about.tsx
+++ b/examples/remix/app/routes/demos/about.tsx
@@ -1,5 +1,5 @@
-import { Outlet } from "remix";
-import type { MetaFunction, LinksFunction } from "remix";
+import type { MetaFunction, LinksFunction } from "@remix-run/node";
+import { Outlet } from "@remix-run/react";

 import stylesUrl from "~/styles/demos/about.css";

--- a/examples/remix/app/routes/demos/about/index.tsx
+++ b/examples/remix/app/routes/demos/about/index.tsx
@@ -1,4 +1,4 @@
-import { Link } from "remix";
+import { Link } from "@remix-run/react";

 export default function AboutIndex() {
  return (
--- a/examples/remix/app/routes/demos/about/whoa.tsx
+++ b/examples/remix/app/routes/demos/about/whoa.tsx
@@ -1,4 +1,4 @@
-import { Link } from "remix";
+import { Link } from "@remix-run/react";

 export default function AboutIndex() {
  return (
--- a/examples/remix/app/routes/demos/actions.tsx
+++ b/examples/remix/app/routes/demos/actions.tsx
@@ -1,6 +1,7 @@
+import type { ActionFunction } from "@remix-run/node";
+import { json, redirect } from "@remix-run/node";
+import { Form, useActionData } from "@remix-run/react";
 import { useEffect, useRef } from "react";
-import type { ActionFunction } from "remix";
-import { Form, json, useActionData, redirect } from "remix";

 export function meta() {
  return { title: "Actions Demo" };
--- a/examples/remix/app/routes/demos/params.tsx
+++ b/examples/remix/app/routes/demos/params.tsx
@@ -1,8 +1,8 @@
-import { useCatch, Link, json, useLoaderData, Outlet } from "remix";
+import type { MetaFunction } from "@remix-run/node";
+import { json } from "@remix-run/node";
+import { Link, Outlet, useCatch, useLoaderData } from "@remix-run/react";

-export function meta() {
-  return { title: "Boundaries Demo" };
-}
+export let meta: MetaFunction = () => ({ title: "Boundaries Demo" });

 export default function Boundaries() {
  return (
--- a/examples/remix/app/routes/demos/params/$id.tsx
+++ b/examples/remix/app/routes/demos/params/$id.tsx
@@ -1,5 +1,6 @@
-import { useCatch, Link, json, useLoaderData } from "remix";
-import type { LoaderFunction, MetaFunction } from "remix";
+import type { LoaderFunction, MetaFunction } from "@remix-run/node";
+import { json } from "@remix-run/node";
+import { Link, useCatch, useLoaderData } from "@remix-run/react";

 // The `$` in route filenames becomes a pattern that's parsed from the URL and
 // passed to your loaders so you can look up data.
--- a/examples/remix/app/routes/demos/params/index.tsx
+++ b/examples/remix/app/routes/demos/params/index.tsx
@@ -1,5 +1,6 @@
-import { useCatch, Link, json, useLoaderData, Outlet } from "remix";
-import type { LoaderFunction } from "remix";
+import type { LoaderFunction } from "@remix-run/node";
+import { json } from "@remix-run/node";
+import { Link, Outlet, useCatch, useLoaderData } from "@remix-run/react";

 export default function Boundaries() {
  return (
--- a/examples/remix/app/routes/index.tsx
+++ b/examples/remix/app/routes/index.tsx
@@ -1,5 +1,6 @@
-import type { MetaFunction, LoaderFunction } from "remix";
-import { useLoaderData, json, Link } from "remix";
+import type { MetaFunction, LoaderFunction } from "@remix-run/node";
+import { json } from "@remix-run/node";
+import { Link, useLoaderData } from "@remix-run/react";

 type IndexData = {
  resources: Array<{ name: string; url: string }>;
--- a/examples/remix/package-lock.json
+++ b/examples/remix/package-lock.json
--- a/examples/remix/package.json
+++ b/examples/remix/package.json
@@ -1,26 +1,28 @@
 {
  "private": true,
-  "name": "remix-app-template",
-  "description": "",
-  "license": "",
+  "sideEffects": false,
  "scripts": {
    "build": "remix build",
-    "dev": "remix dev",
-    "postinstall": "remix setup node"
+    "dev": "remix dev"
  },
  "dependencies": {
-    "@remix-run/react": "^1.0.6",
+    "@remix-run/node": "^1.5.1",
+    "@remix-run/react": "^1.5.1",
+    "@remix-run/vercel": "^1.5.1",
+    "@vercel/node": "^2.0.0",
    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
-    "remix": "^1.0.6",
-    "@remix-run/serve": "^1.0.6",
-    "@remix-run/vercel": "^1.0.6"
+    "react-dom": "^17.0.2"
  },
  "devDependencies": {
-    "@remix-run/dev": "^1.0.6",
-    "@types/react": "^17.0.24",
-    "@types/react-dom": "^17.0.9",
-    "typescript": "^4.1.2"
+    "@remix-run/dev": "^1.5.1",
+    "@remix-run/eslint-config": "^1.5.1",
+    "@remix-run/serve": "^1.5.1",
+    "@types/react": "^17.0.45",
+    "@types/react-dom": "^17.0.17",
+    "eslint": "^8.15.0",
+    "typescript": "^4.6.4"
  },
-  "sideEffects": false
+  "engines": {
+    "node": ">=14"
+  }
 }
--- a/examples/remix/remix.config.js
+++ b/examples/remix/remix.config.js
@@ -1,9 +1,15 @@
 /**
- * @type {import('@remix-run/dev/config').AppConfig}
+ * @type {import('@remix-run/dev').AppConfig}
 */
 module.exports = {
-  appDirectory: "app",
-  browserBuildDirectory: "public/build",
-  publicPath: "/build/",
-  serverBuildDirectory: "api/_build"
+  serverBuildTarget: "vercel",
+  // When running locally in development mode, we use the built in remix
+  // server. This does not understand the vercel lambda module format,
+  // so we default back to the standard build output.
+  server: process.env.NODE_ENV === "development" ? undefined : "./server.js",
+  ignoredRouteFiles: ["**/.*"],
+  // appDirectory: "app",
+  // assetsBuildDirectory: "public/build",
+  // serverBuildPath: "api/index.js",
+  // publicPath: "/build/",
 };
--- a/examples/remix/server.js
+++ b/examples/remix/server.js
@@ -0,0 +1,4 @@
+import * as build from "@remix-run/dev/server-build";
+import { createRequestHandler } from "@remix-run/vercel";
+
+export default createRequestHandler({ build, mode: process.env.NODE_ENV });
--- a/examples/sveltekit/package.json
+++ b/examples/sveltekit/package.json
@@ -12,8 +12,8 @@
    "format": "prettier --write --plugin-search-dir=. ."
  },
  "devDependencies": {
-    "@sveltejs/adapter-auto": "next",
-    "@sveltejs/kit": "next",
+    "@sveltejs/adapter-auto": "1.0.0-next.50",
+    "@sveltejs/kit": "1.0.0-next.347",
    "@types/cookie": "^0.4.1",
    "prettier": "^2.5.1",
    "prettier-plugin-svelte": "^2.5.0",
@@ -24,6 +24,7 @@
  "type": "module",
  "dependencies": {
    "@fontsource/fira-mono": "^4.5.0",
-    "cookie": "^0.4.1"
+    "cookie": "^0.4.1",
+    "web-vitals": "^2.1.4"
  }
 }
--- a/examples/sveltekit/pnpm-lock.yaml
+++ b/examples/sveltekit/pnpm-lock.yaml
--- a/examples/sveltekit/src/lib/vitals.js
+++ b/examples/sveltekit/src/lib/vitals.js
@@ -0,0 +1,66 @@
+import { getCLS, getFCP, getFID, getLCP, getTTFB } from 'web-vitals';
+
+const vitalsUrl = 'https://vitals.vercel-analytics.com/v1/vitals';
+
+function getConnectionSpeed() {
+  return 'connection' in navigator &&
+    navigator['connection'] &&
+    'effectiveType' in navigator['connection']
+    ? // @ts-ignore
+      navigator['connection']['effectiveType']
+    : '';
+}
+
+/**
+ * @param {import("web-vitals").Metric} metric
+ * @param {{ params: { [s: string]: any; } | ArrayLike<any>; path: string; analyticsId: string; debug: boolean; }} options
+ */
+function sendToAnalytics(metric, options) {
+  const page = Object.entries(options.params).reduce(
+    (acc, [key, value]) => acc.replace(value, `[${key}]`),
+    options.path
+  );
+
+  const body = {
+    dsn: options.analyticsId,
+    id: metric.id,
+    page,
+    href: location.href,
+    event_name: metric.name,
+    value: metric.value.toString(),
+    speed: getConnectionSpeed()
+  };
+
+  if (options.debug) {
+    console.log('[Analytics]', metric.name, JSON.stringify(body, null, 2));
+  }
+
+  const blob = new Blob([new URLSearchParams(body).toString()], {
+    // This content type is necessary for `sendBeacon`
+    type: 'application/x-www-form-urlencoded'
+  });
+  if (navigator.sendBeacon) {
+    navigator.sendBeacon(vitalsUrl, blob);
+  } else
+    fetch(vitalsUrl, {
+      body: blob,
+      method: 'POST',
+      credentials: 'omit',
+      keepalive: true
+    });
+}
+
+/**
+ * @param {any} options
+ */
+export function webVitals(options) {
+  try {
+    getFID((metric) => sendToAnalytics(metric, options));
+    getTTFB((metric) => sendToAnalytics(metric, options));
+    getLCP((metric) => sendToAnalytics(metric, options));
+    getCLS((metric) => sendToAnalytics(metric, options));
+    getFCP((metric) => sendToAnalytics(metric, options));
+  } catch (err) {
+    console.error('[Analytics]', err);
+  }
+}
--- a/examples/sveltekit/src/routes/__layout.svelte
+++ b/examples/sveltekit/src/routes/__layout.svelte
@@ -1,6 +1,19 @@
 <script>
  import Header from '$lib/header/Header.svelte';
+  import { webVitals } from '$lib/vitals';
+  import { browser } from '$app/env';
+  import { page } from '$app/stores';
  import '../app.css';
+
+  let analyticsId = import.meta.env.VERCEL_ANALYTICS_ID;
+
+  $: if (browser && analyticsId) {
+    webVitals({
+      path: $page.url.pathname,
+      params: $page.params,
+      analyticsId
+    })
+  }
 </script>

 <Header />
--- a/examples/sveltekit/svelte.config.js
+++ b/examples/sveltekit/svelte.config.js
@@ -8,6 +8,11 @@ const config = {
    // Override http methods in the Todo forms
    methodOverride: {
      allowed: ['PATCH', 'DELETE']
+    },
+    vite: {
+      define: {
+        'import.meta.env.VERCEL_ANALYTICS_ID': JSON.stringify(process.env.VERCEL_ANALYTICS_ID)
+      }
    }
  }
 };
--- a/examples/sveltekit/yarn.lock
+++ b/examples/sveltekit/yarn.lock
--- a/package.json
+++ b/package.json
@@ -30,8 +30,8 @@
    "npm-package-arg": "6.1.0",
    "prettier": "2.6.2",
    "ts-eager": "2.0.2",
-    "ts-jest": "28.0.0-next.1",
-    "turbo": "1.2.14"
+    "ts-jest": "28.0.5",
+    "turbo": "1.3.1"
  },
  "scripts": {
    "lerna": "lerna",
@@ -41,7 +41,7 @@
    "publish-from-github": "./utils/publish.sh",
    "changelog": "node utils/changelog.js",
    "build": "turbo run build",
-    "vercel-build": "yarn build && cd api && node -r ts-eager/register ./_lib/script/build.ts",
+    "vercel-build": "yarn build && yarn run pack && 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 && turbo run test-unit",
@@ -49,7 +49,8 @@
    "test-integration-once": "turbo run test-integration-once",
    "test-integration-dev": "turbo run test-integration-dev",
    "lint": "eslint . --ext .ts,.js",
-    "prepare": "husky install"
+    "prepare": "husky install",
+    "pack": "cd utils && node -r ts-eager/register ./pack.ts"
  },
  "lint-staged": {
    "./{*,{api,packages,test,utils}/**/*}.{js,ts}": [
--- a/packages/build-utils/package.json
+++ b/packages/build-utils/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/build-utils",
-  "version": "4.0.0",
+  "version": "5.0.0",
  "license": "MIT",
  "main": "./dist/index.js",
  "types": "./dist/index.d.js",
@@ -23,7 +23,7 @@
    "@types/cross-spawn": "6.0.0",
    "@types/end-of-stream": "^1.4.0",
    "@types/fs-extra": "9.0.13",
-    "@types/glob": "^7.1.1",
+    "@types/glob": "7.2.0",
    "@types/jest": "27.4.1",
    "@types/js-yaml": "3.12.1",
    "@types/ms": "0.7.31",
@@ -31,7 +31,6 @@
    "@types/node-fetch": "^2.1.6",
    "@types/semver": "6.0.0",
    "@types/yazl": "2.4.2",
-    "@vercel/frameworks": "1.0.1",
    "@vercel/ncc": "0.24.0",
    "aggregate-error": "3.0.1",
    "async-retry": "1.2.3",
@@ -40,7 +39,7 @@
    "cross-spawn": "6.0.5",
    "end-of-stream": "1.4.1",
    "fs-extra": "10.0.0",
-    "glob": "7.1.3",
+    "glob": "8.0.3",
    "into-stream": "5.0.0",
    "js-yaml": "3.13.1",
    "minimatch": "3.0.4",
--- a/packages/build-utils/src/fs/run-user-scripts.ts
+++ b/packages/build-utils/src/fs/run-user-scripts.ts
@@ -61,6 +61,13 @@ export interface SpawnOptionsExtended extends SpawnOptions {
   * Pretty formatted command that is being spawned for logging purposes.
   */
  prettyCommand?: string;
+
+  /**
+   * Returns instead of throwing an error when the process exits with a
+   * non-0 exit code. When relevant, the returned object will include
+   * the error code, stdout and stderr.
+   */
+  ignoreNon0Exit?: boolean;
 }

 export function spawnAsync(
@@ -79,7 +86,7 @@ export function spawnAsync(

    child.on('error', reject);
    child.on('close', (code, signal) => {
-      if (code === 0) {
+      if (code === 0 || opts.ignoreNon0Exit) {
        return resolve();
      }

@@ -123,24 +130,24 @@ export function execAsync(

      child.on('error', reject);
      child.on('close', (code, signal) => {
-        if (code !== 0) {
-          const cmd = opts.prettyCommand
-            ? `Command "${opts.prettyCommand}"`
-            : 'Command';
-
-          return reject(
-            new NowBuildError({
-              code: `BUILD_UTILS_EXEC_${code || signal}`,
-              message: `${cmd} exited with ${code || signal}`,
-            })
-          );
+        if (code === 0 || opts.ignoreNon0Exit) {
+          return resolve({
+            code,
+            stdout: Buffer.concat(stdoutList).toString(),
+            stderr: Buffer.concat(stderrList).toString(),
+          });
        }

-        return resolve({
-          code,
-          stdout: Buffer.concat(stdoutList).toString(),
-          stderr: Buffer.concat(stderrList).toString(),
-        });
+        const cmd = opts.prettyCommand
+          ? `Command "${opts.prettyCommand}"`
+          : 'Command';
+
+        return reject(
+          new NowBuildError({
+            code: `BUILD_UTILS_EXEC_${code || signal}`,
+            message: `${cmd} exited with ${code || signal}`,
+          })
+        );
      });
    }
  );
@@ -166,9 +173,30 @@ export async function execCommand(command: string, options: SpawnOptions = {}) {
  return true;
 }

-export async function getNodeBinPath({ cwd }: { cwd: string }) {
-  const { stdout } = await execAsync('npm', ['bin'], { cwd });
-  return stdout.trim();
+export async function getNodeBinPath({
+  cwd,
+}: {
+  cwd: string;
+}): Promise<string> {
+  const { code, stdout, stderr } = await execAsync('npm', ['bin'], {
+    cwd,
+    prettyCommand: 'npm bin',
+
+    // in some rare cases, we saw `npm bin` exit with a non-0 code, but still
+    // output the right bin path, so we ignore the exit code
+    ignoreNon0Exit: true,
+  });
+
+  const nodeBinPath = stdout.trim();
+
+  if (path.isAbsolute(nodeBinPath)) {
+    return nodeBinPath;
+  }
+
+  throw new NowBuildError({
+    code: `BUILD_UTILS_GET_NODE_BIN_PATH`,
+    message: `Running \`npm bin\` failed to return a valid bin path (code=${code}, stdout=${stdout}, stderr=${stderr})`,
+  });
 }

 async function chmodPlusX(fsPath: string) {
@@ -205,10 +233,23 @@ export function getSpawnOptions(
  };

  if (!meta.isDev) {
-    // Ensure that the selected Node version is at the beginning of the `$PATH`
-    opts.env.PATH = `/node${nodeVersion.major}/bin${path.delimiter}${
-      opts.env.PATH || process.env.PATH
-    }`;
+    let found = false;
+    const oldPath = opts.env.PATH || process.env.PATH || '';
+
+    const pathSegments = oldPath.split(path.delimiter).map(segment => {
+      if (/^\/node[0-9]+\/bin/.test(segment)) {
+        found = true;
+        return `/node${nodeVersion.major}/bin`;
+      }
+      return segment;
+    });
+
+    if (!found) {
+      // If we didn't find & replace, prepend at beginning of PATH
+      pathSegments.unshift(`/node${nodeVersion.major}/bin`);
+    }
+
+    opts.env.PATH = pathSegments.filter(Boolean).join(path.delimiter);
  }

  return opts;
@@ -446,20 +487,31 @@ export function getEnvForPackageManager({
  env: { [x: string]: string | undefined };
 }) {
  const newEnv: { [x: string]: string | undefined } = { ...env };
+  const oldPath = env.PATH + '';
+  const npm7 = '/node16/bin-npm7';
+  const pnpm7 = '/pnpm7/node_modules/.bin';
+  const corepackEnabled = env.ENABLE_EXPERIMENTAL_COREPACK === '1';
  if (cliType === 'npm') {
    if (
      typeof lockfileVersion === 'number' &&
      lockfileVersion >= 2 &&
-      (nodeVersion?.major || 0) < 16
+      (nodeVersion?.major || 0) < 16 &&
+      !oldPath.includes(npm7) &&
+      !corepackEnabled
    ) {
      // Ensure that npm 7 is at the beginning of the `$PATH`
-      newEnv.PATH = `/node16/bin-npm7${path.delimiter}${env.PATH}`;
-      console.log('Detected `package-lock.json` generated by npm 7...');
+      newEnv.PATH = `${npm7}${path.delimiter}${oldPath}`;
+      console.log('Detected `package-lock.json` generated by npm 7+...');
    }
  } else if (cliType === 'pnpm') {
-    if (typeof lockfileVersion === 'number' && lockfileVersion === 5.4) {
+    if (
+      typeof lockfileVersion === 'number' &&
+      lockfileVersion === 5.4 &&
+      !oldPath.includes(pnpm7) &&
+      !corepackEnabled
+    ) {
      // Ensure that pnpm 7 is at the beginning of the `$PATH`
-      newEnv.PATH = `/pnpm7/node_modules/.bin${path.delimiter}${env.PATH}`;
+      newEnv.PATH = `${pnpm7}${path.delimiter}${oldPath}`;
      console.log('Detected `pnpm-lock.yaml` generated by pnpm 7...');
    }
  } else {
--- a/packages/build-utils/src/index.ts
+++ b/packages/build-utils/src/index.ts
@@ -80,15 +80,6 @@ export {
 };

 export { EdgeFunction } from './edge-function';
-export {
-  detectBuilders,
-  detectOutputDirectory,
-  detectApiDirectory,
-  detectApiExtensions,
-} from './detect-builders';
-export { detectFileSystemAPI } from './detect-file-system-api';
-export { detectFramework } from './detect-framework';
-export { DetectorFilesystem } from './detectors/filesystem';
 export { readConfigFile } from './fs/read-config-file';
 export { normalizePath } from './fs/normalize-path';

@@ -96,26 +87,3 @@ export * from './should-serve';
 export * from './schemas';
 export * from './types';
 export * from './errors';
-
-/**
- * Helper function to support both `@vercel` and legacy `@now` official Runtimes.
- */
-export const isOfficialRuntime = (desired: string, name?: string): boolean => {
-  if (typeof name !== 'string') {
-    return false;
-  }
-  return (
-    name === `@vercel/${desired}` ||
-    name === `@now/${desired}` ||
-    name.startsWith(`@vercel/${desired}@`) ||
-    name.startsWith(`@now/${desired}@`)
-  );
-};
-
-export const isStaticRuntime = (name?: string): boolean => {
-  return isOfficialRuntime('static', name);
-};
-
-export { workspaceManagers } from './workspaces/workspace-managers';
-export { getWorkspaces } from './workspaces/get-workspaces';
-export { monorepoManagers } from './monorepos/monorepo-managers';
--- a/packages/build-utils/src/types.ts
+++ b/packages/build-utils/src/types.ts
@@ -428,7 +428,9 @@ export interface BuildResultV2Typical {
 export type BuildResultV2 = BuildResultV2Typical | BuildResultBuildOutput;

 export interface BuildResultV3 {
-  output: Lambda;
+  // TODO: use proper `Route` type from `routing-utils` (perhaps move types to a common package)
+  routes?: any[];
+  output: Lambda | EdgeFunction;
 }

 export type BuildV2 = (options: BuildOptions) => Promise<BuildResultV2>;
--- a/packages/build-utils/test/convert-runtime/invalid-functions/api/users.rb
+++ b/packages/build-utils/test/convert-runtime/invalid-functions/api/users.rb
@@ -1 +0,0 @@
-# users.rb
--- a/packages/build-utils/test/convert-runtime/invalid-functions/vercel.json
+++ b/packages/build-utils/test/convert-runtime/invalid-functions/vercel.json
@@ -1,10 +0,0 @@
-{
-  "functions": {
-    "api/users.rb": {
-      "memory": 3008
-    },
-    "api/doesnt-exist.rb": {
-      "memory": 768
-    }
-  }
-}
--- a/packages/build-utils/test/convert-runtime/python-api/api/db/[id].py
+++ b/packages/build-utils/test/convert-runtime/python-api/api/db/[id].py
@@ -1 +0,0 @@
-# [id].py
--- a/packages/build-utils/test/convert-runtime/python-api/api/index.py
+++ b/packages/build-utils/test/convert-runtime/python-api/api/index.py
@@ -1 +0,0 @@
-# index
--- a/packages/build-utils/test/convert-runtime/python-api/api/project/[aid]/[bid]/index.py
+++ b/packages/build-utils/test/convert-runtime/python-api/api/project/[aid]/[bid]/index.py
@@ -1 +0,0 @@
-# project/[aid]/[bid]/index.py
--- a/packages/build-utils/test/convert-runtime/python-api/api/users/get.py
+++ b/packages/build-utils/test/convert-runtime/python-api/api/users/get.py
@@ -1 +0,0 @@
-# get
--- a/packages/build-utils/test/convert-runtime/python-api/api/users/post.py
+++ b/packages/build-utils/test/convert-runtime/python-api/api/users/post.py
@@ -1 +0,0 @@
-# post
--- a/packages/build-utils/test/convert-runtime/python-api/file.txt
+++ b/packages/build-utils/test/convert-runtime/python-api/file.txt
@@ -1 +0,0 @@
-This file should also be included
--- a/packages/build-utils/test/convert-runtime/python-api/util/date.py
+++ b/packages/build-utils/test/convert-runtime/python-api/util/date.py
@@ -1 +0,0 @@
-# date
--- a/packages/build-utils/test/convert-runtime/python-api/util/math.py
+++ b/packages/build-utils/test/convert-runtime/python-api/util/math.py
@@ -1 +0,0 @@
-# math
--- a/packages/build-utils/test/convert-runtime/python-api/vercel.json
+++ b/packages/build-utils/test/convert-runtime/python-api/vercel.json
@@ -1,7 +0,0 @@
-{
-  "functions": {
-    "api/users/post.py": {
-      "memory": 3008
-    }
-  }
-}
--- a/packages/build-utils/test/fixtures/25-multiple-lock-files-yarn/a/package.json
+++ b/packages/build-utils/test/fixtures/25-multiple-lock-files-yarn/a/package.json
--- a/packages/build-utils/test/fixtures/25-multiple-lock-files-yarn/b/package.json
+++ b/packages/build-utils/test/fixtures/25-multiple-lock-files-yarn/b/package.json
--- a/packages/build-utils/test/fixtures/28-turborepo-with-yarn-workspaces/a/package.json
+++ b/packages/build-utils/test/fixtures/28-turborepo-with-yarn-workspaces/a/package.json
--- a/packages/build-utils/test/fixtures/28-turborepo-with-yarn-workspaces/b/package.json
+++ b/packages/build-utils/test/fixtures/28-turborepo-with-yarn-workspaces/b/package.json
--- a/packages/build-utils/test/fixtures/26-multiple-lock-files-pnpm/pnpm-lock.yaml
+++ b/packages/build-utils/test/fixtures/26-multiple-lock-files-pnpm/pnpm-lock.yaml
@@ -1,19 +1,260 @@
-lockfileVersion: 5.3
+lockfileVersion: 5.4

-specifiers:
-  once: ^1.4.0
+importers:

-dependencies:
-  once: 1.4.0
+  .:
+    specifiers:
+      once: ^1.4.0
+    dependencies:
+      once: 1.4.0
+
+  a:
+    specifiers:
+      debug: ^4.3.2
+    dependencies:
+      debug: 4.3.4
+
+  b:
+    specifiers:
+      cowsay: ^1.5.0
+    dependencies:
+      cowsay: 1.5.0

 packages:

+  /ansi-regex/3.0.1:
+    resolution: {integrity: sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==}
+    engines: {node: '>=4'}
+    dev: false
+
+  /ansi-regex/5.0.1:
+    resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==}
+    engines: {node: '>=8'}
+    dev: false
+
+  /ansi-styles/4.3.0:
+    resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==}
+    engines: {node: '>=8'}
+    dependencies:
+      color-convert: 2.0.1
+    dev: false
+
+  /camelcase/5.3.1:
+    resolution: {integrity: sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==}
+    engines: {node: '>=6'}
+    dev: false
+
+  /cliui/6.0.0:
+    resolution: {integrity: sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==}
+    dependencies:
+      string-width: 4.2.3
+      strip-ansi: 6.0.1
+      wrap-ansi: 6.2.0
+    dev: false
+
+  /color-convert/2.0.1:
+    resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==}
+    engines: {node: '>=7.0.0'}
+    dependencies:
+      color-name: 1.1.4
+    dev: false
+
+  /color-name/1.1.4:
+    resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==}
+    dev: false
+
+  /cowsay/1.5.0:
+    resolution: {integrity: sha512-8Ipzr54Z8zROr/62C8f0PdhQcDusS05gKTS87xxdji8VbWefWly0k8BwGK7+VqamOrkv3eGsCkPtvlHzrhWsCA==}
+    engines: {node: '>= 4'}
+    hasBin: true
+    dependencies:
+      get-stdin: 8.0.0
+      string-width: 2.1.1
+      strip-final-newline: 2.0.0
+      yargs: 15.4.1
+    dev: false
+
+  /debug/4.3.4:
+    resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==}
+    engines: {node: '>=6.0'}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+    dependencies:
+      ms: 2.1.2
+    dev: false
+
+  /decamelize/1.2.0:
+    resolution: {integrity: sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==}
+    engines: {node: '>=0.10.0'}
+    dev: false
+
+  /emoji-regex/8.0.0:
+    resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
+    dev: false
+
+  /find-up/4.1.0:
+    resolution: {integrity: sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==}
+    engines: {node: '>=8'}
+    dependencies:
+      locate-path: 5.0.0
+      path-exists: 4.0.0
+    dev: false
+
+  /get-caller-file/2.0.5:
+    resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==}
+    engines: {node: 6.* || 8.* || >= 10.*}
+    dev: false
+
+  /get-stdin/8.0.0:
+    resolution: {integrity: sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==}
+    engines: {node: '>=10'}
+    dev: false
+
+  /is-fullwidth-code-point/2.0.0:
+    resolution: {integrity: sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==}
+    engines: {node: '>=4'}
+    dev: false
+
+  /is-fullwidth-code-point/3.0.0:
+    resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==}
+    engines: {node: '>=8'}
+    dev: false
+
+  /locate-path/5.0.0:
+    resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==}
+    engines: {node: '>=8'}
+    dependencies:
+      p-locate: 4.1.0
+    dev: false
+
+  /ms/2.1.2:
+    resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==}
+    dev: false
+
  /once/1.4.0:
    resolution: {integrity: sha1-WDsap3WWHUsROsF9nFC6753Xa9E=}
    dependencies:
      wrappy: 1.0.2
    dev: false

+  /p-limit/2.3.0:
+    resolution: {integrity: sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==}
+    engines: {node: '>=6'}
+    dependencies:
+      p-try: 2.2.0
+    dev: false
+
+  /p-locate/4.1.0:
+    resolution: {integrity: sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==}
+    engines: {node: '>=8'}
+    dependencies:
+      p-limit: 2.3.0
+    dev: false
+
+  /p-try/2.2.0:
+    resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==}
+    engines: {node: '>=6'}
+    dev: false
+
+  /path-exists/4.0.0:
+    resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==}
+    engines: {node: '>=8'}
+    dev: false
+
+  /require-directory/2.1.1:
+    resolution: {integrity: sha1-jGStX9MNqxyXbiNE/+f3kqam30I=}
+    engines: {node: '>=0.10.0'}
+    dev: false
+
+  /require-main-filename/2.0.0:
+    resolution: {integrity: sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==}
+    dev: false
+
+  /set-blocking/2.0.0:
+    resolution: {integrity: sha1-BF+XgtARrppoA93TgrJDkrPYkPc=}
+    dev: false
+
+  /string-width/2.1.1:
+    resolution: {integrity: sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==}
+    engines: {node: '>=4'}
+    dependencies:
+      is-fullwidth-code-point: 2.0.0
+      strip-ansi: 4.0.0
+    dev: false
+
+  /string-width/4.2.3:
+    resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==}
+    engines: {node: '>=8'}
+    dependencies:
+      emoji-regex: 8.0.0
+      is-fullwidth-code-point: 3.0.0
+      strip-ansi: 6.0.1
+    dev: false
+
+  /strip-ansi/4.0.0:
+    resolution: {integrity: sha1-qEeQIusaw2iocTibY1JixQXuNo8=}
+    engines: {node: '>=4'}
+    dependencies:
+      ansi-regex: 3.0.1
+    dev: false
+
+  /strip-ansi/6.0.1:
+    resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==}
+    engines: {node: '>=8'}
+    dependencies:
+      ansi-regex: 5.0.1
+    dev: false
+
+  /strip-final-newline/2.0.0:
+    resolution: {integrity: sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==}
+    engines: {node: '>=6'}
+    dev: false
+
+  /which-module/2.0.0:
+    resolution: {integrity: sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=}
+    dev: false
+
+  /wrap-ansi/6.2.0:
+    resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==}
+    engines: {node: '>=8'}
+    dependencies:
+      ansi-styles: 4.3.0
+      string-width: 4.2.3
+      strip-ansi: 6.0.1
+    dev: false
+
  /wrappy/1.0.2:
    resolution: {integrity: sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=}
    dev: false
+
+  /y18n/4.0.3:
+    resolution: {integrity: sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==}
+    dev: false
+
+  /yargs-parser/18.1.3:
+    resolution: {integrity: sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==}
+    engines: {node: '>=6'}
+    dependencies:
+      camelcase: 5.3.1
+      decamelize: 1.2.0
+    dev: false
+
+  /yargs/15.4.1:
+    resolution: {integrity: sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==}
+    engines: {node: '>=8'}
+    dependencies:
+      cliui: 6.0.0
+      decamelize: 1.2.0
+      find-up: 4.1.0
+      get-caller-file: 2.0.5
+      require-directory: 2.1.1
+      require-main-filename: 2.0.0
+      set-blocking: 2.0.0
+      string-width: 4.2.3
+      which-module: 2.0.0
+      y18n: 4.0.3
+      yargs-parser: 18.1.3
+    dev: false
--- a/packages/build-utils/test/integration.test.ts
+++ b/packages/build-utils/test/integration.test.ts
@@ -5,7 +5,6 @@ import {
  testDeployment,
  // @ts-ignore
 } from '../../../test/lib/deployment/test-deployment';
-import { glob, detectBuilders } from '../src';

 jest.setTimeout(4 * 60 * 1000);

@@ -32,11 +31,6 @@ const skipFixtures: string[] = [
  '08-zero-config-middleman',
  '21-npm-workspaces',
  '23-pnpm-workspaces',
-  '27-yarn-workspaces',
-  '28-turborepo-with-yarn-workspaces',
-  '29-nested-workspaces',
-  '30-double-nested-workspaces',
-  '31-turborepo-in-package-json',
 ];

 // eslint-disable-next-line no-restricted-syntax
@@ -83,145 +77,3 @@ for (const builder of buildersToTestWith) {
    }
  }
 }
-
-it('Test `detectBuilders` and `detectRoutes`', async () => {
-  const fixture = path.join(__dirname, 'fixtures', '01-zero-config-api');
-  const pkg = await fs.readJSON(path.join(fixture, 'package.json'));
-  const fileList = await glob('**', fixture);
-  const files = Object.keys(fileList);
-
-  const probes = [
-    {
-      path: '/api/my-endpoint',
-      mustContain: 'my-endpoint',
-      status: 200,
-    },
-    {
-      path: '/api/other-endpoint',
-      mustContain: 'other-endpoint',
-      status: 200,
-    },
-    {
-      path: '/api/team/zeit',
-      mustContain: 'team/zeit',
-      status: 200,
-    },
-    {
-      path: '/api/user/myself',
-      mustContain: 'user/myself',
-      status: 200,
-    },
-    {
-      path: '/api/not-okay/',
-      status: 404,
-    },
-    {
-      path: '/api',
-      status: 404,
-    },
-    {
-      path: '/api/',
-      status: 404,
-    },
-    {
-      path: '/',
-      mustContain: 'hello from index.txt',
-    },
-  ];
-
-  const { builders, defaultRoutes } = await detectBuilders(files, pkg);
-
-  const nowConfig = { builds: builders, routes: defaultRoutes, probes };
-
-  await fs.writeFile(
-    path.join(fixture, 'now.json'),
-    JSON.stringify(nowConfig, null, 2)
-  );
-
-  const deployment = await testDeployment(
-    { builderUrl, buildUtilsUrl },
-    fixture
-  );
-  expect(deployment).toBeDefined();
-});
-
-it('Test `detectBuilders` with `index` files', async () => {
-  const fixture = path.join(__dirname, 'fixtures', '02-zero-config-api');
-  const pkg = await fs.readJSON(path.join(fixture, 'package.json'));
-  const fileList = await glob('**', fixture);
-  const files = Object.keys(fileList);
-
-  const probes = [
-    {
-      path: '/api/not-okay',
-      status: 404,
-    },
-    {
-      path: '/api',
-      mustContain: 'hello from api/index.js',
-      status: 200,
-    },
-    {
-      path: '/api/',
-      mustContain: 'hello from api/index.js',
-      status: 200,
-    },
-    {
-      path: '/api/index',
-      mustContain: 'hello from api/index.js',
-      status: 200,
-    },
-    {
-      path: '/api/index.js',
-      mustContain: 'hello from api/index.js',
-      status: 200,
-    },
-    {
-      path: '/api/date.js',
-      mustContain: 'hello from api/date.js',
-      status: 200,
-    },
-    {
-      // Someone might expect this to be `date.js`,
-      // but I doubt that there is any case were both
-      // `date/index.js` and `date.js` exists,
-      // so it is not special cased
-      path: '/api/date',
-      mustContain: 'hello from api/date/index.js',
-      status: 200,
-    },
-    {
-      path: '/api/date/',
-      mustContain: 'hello from api/date/index.js',
-      status: 200,
-    },
-    {
-      path: '/api/date/index',
-      mustContain: 'hello from api/date/index.js',
-      status: 200,
-    },
-    {
-      path: '/api/date/index.js',
-      mustContain: 'hello from api/date/index.js',
-      status: 200,
-    },
-    {
-      path: '/',
-      mustContain: 'hello from index.txt',
-    },
-  ];
-
-  const { builders, defaultRoutes } = await detectBuilders(files, pkg);
-
-  const nowConfig = { builds: builders, routes: defaultRoutes, probes };
-  await fs.writeFile(
-    path.join(fixture, 'now.json'),
-    JSON.stringify(nowConfig, null, 2)
-  );
-
-  const deployment = await testDeployment(
-    { builderUrl, buildUtilsUrl },
-    fixture
-  );
-  expect(deployment).toBeDefined();
-});
--- a/packages/build-utils/test/unit.exec-async.test.ts
+++ b/packages/build-utils/test/unit.exec-async.test.ts
@@ -0,0 +1,29 @@
+import { execAsync, NowBuildError } from '../src';
+
+it('should execute a command', async () => {
+  const { code, stdout, stderr } = await execAsync('echo', ['hello']);
+
+  expect(code).toBe(0);
+  expect(stdout).toContain('hello');
+  expect(stderr).toBe('');
+});
+
+it('should throw if the command exits with non-0 code', async () => {
+  await expect(execAsync('find', ['unknown-file'])).rejects.toBeInstanceOf(
+    NowBuildError
+  );
+});
+
+it('should return if the command exits with non-0 code and ignoreNon0Exit=true', async () => {
+  const { code, stdout, stderr } = await execAsync('find', ['unknown-file'], {
+    ignoreNon0Exit: true,
+  });
+
+  expect(code).toBe(process.platform === 'win32' ? 2 : 1);
+  expect(stdout).toBe('');
+  expect(stderr).toContain(
+    process.platform === 'win32'
+      ? 'Parameter format not correct'
+      : 'No such file or directory'
+  );
+});
--- a/packages/build-utils/test/unit.get-env-for-package-manager.test.ts
+++ b/packages/build-utils/test/unit.get-env-for-package-manager.test.ts
@@ -38,6 +38,38 @@ describe('Test `getEnvForPackageManager()`', () => {
        PATH: `/node16/bin-npm7${delimiter}foo`,
      },
    },
+    {
+      name: 'should not set npm path if corepack enabled',
+      args: {
+        cliType: 'npm',
+        nodeVersion: { major: 14, range: '14.x', runtime: 'nodejs14.x' },
+        lockfileVersion: 2,
+        env: {
+          FOO: 'bar',
+          ENABLE_EXPERIMENTAL_COREPACK: '1',
+        },
+      },
+      want: {
+        FOO: 'bar',
+        ENABLE_EXPERIMENTAL_COREPACK: '1',
+      },
+    },
+    {
+      name: 'should not prepend npm path again if already detected',
+      args: {
+        cliType: 'npm',
+        nodeVersion: { major: 14, range: '14.x', runtime: 'nodejs14.x' },
+        lockfileVersion: 2,
+        env: {
+          FOO: 'bar',
+          PATH: `/node16/bin-npm7${delimiter}foo`,
+        },
+      },
+      want: {
+        FOO: 'bar',
+        PATH: `/node16/bin-npm7${delimiter}foo`,
+      },
+    },
    {
      name: 'should not set path if node is 16 and npm 7+ is detected',
      args: {
@@ -101,6 +133,38 @@ describe('Test `getEnvForPackageManager()`', () => {
        PATH: `/pnpm7/node_modules/.bin${delimiter}foo`,
      },
    },
+    {
+      name: 'should not set pnpm path if corepack is enabled',
+      args: {
+        cliType: 'pnpm',
+        nodeVersion: { major: 16, range: '16.x', runtime: 'nodejs16.x' },
+        lockfileVersion: 5.4,
+        env: {
+          FOO: 'bar',
+          ENABLE_EXPERIMENTAL_COREPACK: '1',
+        },
+      },
+      want: {
+        FOO: 'bar',
+        ENABLE_EXPERIMENTAL_COREPACK: '1',
+      },
+    },
+    {
+      name: 'should not prepend pnpm path again if already detected',
+      args: {
+        cliType: 'pnpm',
+        nodeVersion: { major: 16, range: '16.x', runtime: 'nodejs16.x' },
+        lockfileVersion: 5.4,
+        env: {
+          FOO: 'bar',
+          PATH: `/pnpm7/node_modules/.bin${delimiter}foo`,
+        },
+      },
+      want: {
+        FOO: 'bar',
+        PATH: `/pnpm7/node_modules/.bin${delimiter}foo`,
+      },
+    },
    {
      name: 'should not set path if pnpm 6 is detected',
      args: {
--- a/packages/build-utils/test/unit.get-spawn-options.test.ts
+++ b/packages/build-utils/test/unit.get-spawn-options.test.ts
@@ -0,0 +1,111 @@
+import { delimiter } from 'path';
+import { getSpawnOptions } from '../src';
+
+describe('Test `getSpawnOptions()`', () => {
+  const origProcessEnvPath = process.env.PATH;
+
+  beforeEach(() => {
+    process.env.PATH = undefined;
+  });
+
+  afterEach(() => {
+    process.env.PATH = origProcessEnvPath;
+  });
+
+  const cases: Array<{
+    name: string;
+    args: Parameters<typeof getSpawnOptions>;
+    envPath: string | undefined;
+    want: string | undefined;
+  }> = [
+    {
+      name: 'should do nothing when isDev and node14',
+      args: [
+        { isDev: true },
+        { major: 14, range: '14.x', runtime: 'nodejs14.x' },
+      ],
+      envPath: '/foo',
+      want: '/foo',
+    },
+    {
+      name: 'should do nothing when isDev and node16',
+      args: [
+        { isDev: true },
+        { major: 16, range: '16.x', runtime: 'nodejs16.x' },
+      ],
+      envPath: '/foo',
+      want: '/foo',
+    },
+    {
+      name: 'should replace 14 with 16 when only path',
+      args: [
+        { isDev: false },
+        { major: 16, range: '16.x', runtime: 'nodejs16.x' },
+      ],
+      envPath: '/node14/bin',
+      want: '/node16/bin',
+    },
+    {
+      name: 'should replace 14 with 16 at beginning',
+      args: [
+        { isDev: false },
+        { major: 16, range: '16.x', runtime: 'nodejs16.x' },
+      ],
+      envPath: `/node14/bin${delimiter}/foo`,
+      want: `/node16/bin${delimiter}/foo`,
+    },
+    {
+      name: 'should replace 14 with 16 at end',
+      args: [
+        { isDev: false },
+        { major: 16, range: '16.x', runtime: 'nodejs16.x' },
+      ],
+      envPath: `/foo${delimiter}/node14/bin`,
+      want: `/foo${delimiter}/node16/bin`,
+    },
+    {
+      name: 'should replace 14 with 16 in middle',
+      args: [
+        { isDev: false },
+        { major: 16, range: '16.x', runtime: 'nodejs16.x' },
+      ],
+      envPath: `/foo${delimiter}/node14/bin${delimiter}/bar`,
+      want: `/foo${delimiter}/node16/bin${delimiter}/bar`,
+    },
+    {
+      name: 'should prepend 16 at beginning when nothing to replace',
+      args: [
+        { isDev: false },
+        { major: 16, range: '16.x', runtime: 'nodejs16.x' },
+      ],
+      envPath: `/foo`,
+      want: `/node16/bin${delimiter}/foo`,
+    },
+    {
+      name: 'should prepend 16 at beginning no path input',
+      args: [
+        { isDev: false },
+        { major: 16, range: '16.x', runtime: 'nodejs16.x' },
+      ],
+      envPath: '',
+      want: `/node16/bin`,
+    },
+    {
+      name: 'should replace 12 with 14 when only path',
+      args: [
+        { isDev: false },
+        { major: 14, range: '14.x', runtime: 'nodejs14.x' },
+      ],
+      envPath: '/node12/bin',
+      want: '/node14/bin',
+    },
+  ];
+
+  for (const { name, args, envPath, want } of cases) {
+    it(name, () => {
+      process.env.PATH = envPath;
+      const opts = getSpawnOptions(...args);
+      expect(opts.env?.PATH).toBe(want);
+    });
+  }
+});
--- a/packages/build-utils/test/unit.spawn-async.test.ts
+++ b/packages/build-utils/test/unit.spawn-async.test.ts
@@ -0,0 +1,21 @@
+import { spawnAsync, NowBuildError } from '../src';
+
+it('should execute a command', async () => {
+  // should resolve (it doesn't return anything, so it resolves with "undefined")
+  await expect(spawnAsync('echo', ['hello'])).resolves.toBeUndefined();
+});
+
+it('should throw if the command exits with non-0 code', async () => {
+  await expect(spawnAsync('find', ['unknown-file'])).rejects.toBeInstanceOf(
+    NowBuildError
+  );
+});
+
+it('should return if the command exits with non-0 code and ignoreNon0Exit=true', async () => {
+  // should resolve (it doesn't return anything, so it resolves with "undefined")
+  await expect(
+    spawnAsync('find', ['unknown-file'], {
+      ignoreNon0Exit: true,
+    })
+  ).resolves.toBeUndefined();
+});
--- a/packages/build-utils/test/unit.test.ts
+++ b/packages/build-utils/test/unit.test.ts
@@ -18,6 +18,8 @@ import {
  Meta,
 } from '../src';

+jest.setTimeout(7 * 1000);
+
 async function expectBuilderError(promise: Promise<any>, pattern: string) {
  let result;
  try {
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
  "name": "vercel",
-  "version": "25.0.0",
+  "version": "26.0.0",
  "preferGlobal": true,
  "license": "Apache-2.0",
  "description": "The command-line interface for Vercel",
@@ -42,15 +42,15 @@
    "node": ">= 14"
  },
  "dependencies": {
-    "@vercel/build-utils": "4.0.0",
-    "@vercel/go": "2.0.0",
-    "@vercel/next": "3.0.0",
-    "@vercel/node": "2.0.0",
-    "@vercel/python": "3.0.0",
-    "@vercel/redwood": "1.0.0",
-    "@vercel/remix": "1.0.0",
-    "@vercel/ruby": "1.3.8",
-    "@vercel/static-build": "1.0.0",
+    "@vercel/build-utils": "5.0.0",
+    "@vercel/go": "2.0.4",
+    "@vercel/next": "3.1.3",
+    "@vercel/node": "2.4.0",
+    "@vercel/python": "3.0.4",
+    "@vercel/redwood": "1.0.5",
+    "@vercel/remix": "1.0.5",
+    "@vercel/ruby": "1.3.12",
+    "@vercel/static-build": "1.0.4",
    "update-notifier": "5.1.0"
  },
  "devDependencies": {
@@ -71,6 +71,7 @@
    "@types/fs-extra": "9.0.13",
    "@types/glob": "7.1.1",
    "@types/http-proxy": "1.16.2",
+    "@types/ini": "1.3.31",
    "@types/inquirer": "7.3.1",
    "@types/jest": "27.4.1",
    "@types/jest-expect-message": "1.0.3",
@@ -94,8 +95,9 @@
    "@types/which": "1.3.2",
    "@types/write-json-file": "2.2.1",
    "@types/yauzl-promise": "2.1.0",
-    "@vercel/client": "12.0.0",
-    "@vercel/frameworks": "1.0.1",
+    "@vercel/client": "12.0.4",
+    "@vercel/frameworks": "1.0.2",
+    "@vercel/fs-detectors": "1.0.0",
    "@vercel/ncc": "0.24.0",
    "@zeit/fun": "0.11.2",
    "@zeit/source-map-support": "0.6.2",
@@ -130,11 +132,13 @@
    "fast-deep-equal": "3.1.3",
    "fs-extra": "10.0.0",
    "get-port": "5.1.1",
+    "git-last-commit": "1.0.1",
    "glob": "7.1.2",
    "http-proxy": "1.18.1",
+    "ini": "3.0.0",
    "inquirer": "7.0.4",
    "is-docker": "2.2.1",
-    "is-port-reachable": "3.0.0",
+    "is-port-reachable": "3.1.0",
    "is-url": "1.2.2",
    "jaro-winkler": "0.2.8",
    "jsonlines": "0.1.1",
--- a/packages/cli/src/commands/alias/rm.ts
+++ b/packages/cli/src/commands/alias/rm.ts
@@ -10,7 +10,6 @@ import confirm from '../../util/input/confirm';
 import findAliasByAliasOrId from '../../util/alias/find-alias-by-alias-or-id';

 import { Alias } from '../../types';
-import { Output } from '../../util/output';
 import { isValidName } from '../../util/is-valid-name';
 import { getCommandName } from '../../util/pkg-name';

@@ -71,7 +70,7 @@ export default async function rm(
  }

  const removeStamp = stamp();
-  if (!opts['--yes'] && !(await confirmAliasRemove(output, alias))) {
+  if (!opts['--yes'] && !(await confirmAliasRemove(client, alias))) {
    output.log('Aborted');
    return 0;
  }
@@ -85,7 +84,7 @@ export default async function rm(
  return 0;
 }

-async function confirmAliasRemove(output: Output, alias: Alias) {
+async function confirmAliasRemove(client: Client, alias: Alias) {
  const srcUrl = alias.deployment
    ? chalk.underline(alias.deployment.url)
    : null;
@@ -104,7 +103,7 @@ async function confirmAliasRemove(output: Output, alias: Alias) {
    }
  );

-  output.log(`The following alias will be removed permanently`);
-  output.print(`  ${tbl}\n`);
-  return confirm(chalk.red('Are you sure?'), false);
+  client.output.log(`The following alias will be removed permanently`);
+  client.output.print(`  ${tbl}\n`);
+  return confirm(client, chalk.red('Are you sure?'), false);
 }
--- a/packages/cli/src/commands/billing/add.js
+++ b/packages/cli/src/commands/billing/add.js
@@ -127,7 +127,7 @@ export default async function ({ creditCards, clear = false, contextName }) {
    }

    console.log(''); // New line
-    const stopSpinner = wait('Saving card');
+    const stopSpinner = wait(process.stderr, 'Saving card');

    try {
      const res = await creditCards.add({
--- a/packages/cli/src/commands/billing/index.js
+++ b/packages/cli/src/commands/billing/index.js
@@ -174,7 +174,7 @@ export default async client => {
        )} ${chalk.gray(`[${elapsed}]`)}`;
        const choices = buildInquirerChoices(cards);

-        cardId = await listInput({
+        cardId = await listInput(client, {
          message,
          choices,
          separator: true,
@@ -187,6 +187,7 @@ export default async client => {
      if (cardId) {
        const label = `Are you sure that you to set this card as the default?`;
        const confirmation = await promptBool(label, {
+          ...client,
          trailing: '\n',
        });

@@ -250,7 +251,7 @@ export default async client => {
        )} under ${chalk.bold(contextName)} ${chalk.gray(`[${elapsed}]`)}`;
        const choices = buildInquirerChoices(cards);

-        cardId = await listInput({
+        cardId = await listInput(client, {
          message,
          choices,
          separator: true,
@@ -262,7 +263,7 @@ export default async client => {
      // typed `vercel billing rm <some-id>`) is valid
      if (cardId) {
        const label = `Are you sure that you want to remove this card?`;
-        const confirmation = await promptBool(label);
+        const confirmation = await promptBool(label, client);
        if (!confirmation) {
          console.log('Aborted');
          break;
--- a/packages/cli/src/commands/bisect/index.ts
+++ b/packages/cli/src/commands/bisect/index.ts
@@ -14,8 +14,8 @@ import logo from '../../util/output/logo';
 import getArgs from '../../util/get-args';
 import Client from '../../util/client';
 import { getPkgName } from '../../util/pkg-name';
-import { Output } from '../../util/output';
 import { Deployment, PaginationOptions } from '../../types';
+import { normalizeURL } from '../../util/bisect/normalize-url';

 interface DeploymentV6
  extends Pick<
@@ -85,10 +85,10 @@ export default async function main(client: Client): Promise<number> {

  let bad =
    argv['--bad'] ||
-    (await prompt(output, `Specify a URL where the bug occurs:`));
+    (await prompt(client, `Specify a URL where the bug occurs:`));
  let good =
    argv['--good'] ||
-    (await prompt(output, `Specify a URL where the bug does not occur:`));
+    (await prompt(client, `Specify a URL where the bug does not occur:`));
  let subpath = argv['--path'] || '';
  let run = argv['--run'] || '';
  const openEnabled = argv['--open'] || false;
@@ -97,9 +97,7 @@ export default async function main(client: Client): Promise<number> {
    run = resolve(run);
  }

-  if (!bad.startsWith('https://')) {
-    bad = `https://${bad}`;
-  }
+  bad = normalizeURL(bad);
  let parsed = parse(bad);
  if (!parsed.hostname) {
    output.error('Invalid input: no hostname provided');
@@ -120,9 +118,7 @@ export default async function main(client: Client): Promise<number> {

  const badDeploymentPromise = getDeployment(client, bad).catch(err => err);

-  if (!good.startsWith('https://')) {
-    good = `https://${good}`;
-  }
+  good = normalizeURL(good);
  parsed = parse(good);
  if (!parsed.hostname) {
    output.error('Invalid input: no hostname provided');
@@ -146,7 +142,7 @@ export default async function main(client: Client): Promise<number> {

  if (!subpath) {
    subpath = await prompt(
-      output,
+      client,
      `Specify the URL subpath where the bug occurs:`
    );
  }
@@ -394,10 +390,10 @@ function getCommit(deployment: DeploymentV6) {
  return { sha, message };
 }

-async function prompt(output: Output, message: string): Promise<string> {
+async function prompt(client: Client, message: string): Promise<string> {
  // eslint-disable-next-line no-constant-condition
  while (true) {
-    const { val } = await inquirer.prompt({
+    const { val } = await client.prompt({
      type: 'input',
      name: 'val',
      message,
@@ -405,7 +401,7 @@ async function prompt(output: Output, message: string): Promise<string> {
    if (val) {
      return val;
    } else {
-      output.error('A value must be specified');
+      client.output.error('A value must be specified');
    }
  }
 }
--- a/packages/cli/src/commands/build.ts
+++ b/packages/cli/src/commands/build.ts
@@ -1,9 +1,9 @@
 import fs from 'fs-extra';
 import chalk from 'chalk';
 import dotenv from 'dotenv';
-import { join, relative } from 'path';
+import { join, normalize, relative, resolve } from 'path';
 import {
-  detectBuilders,
+  normalizePath,
  Files,
  FileFsRef,
  PackageJson,
@@ -14,7 +14,9 @@ import {
  BuildResultV2,
  BuildResultV2Typical,
  BuildResultV3,
+  NowBuildError,
 } from '@vercel/build-utils';
+import { detectBuilders } from '@vercel/fs-detectors';
 import minimatch from 'minimatch';
 import {
  appendRoutesToPhase,
@@ -63,6 +65,7 @@ const help = () => {
    'DIR'
  )}    Path to the global ${'`.vercel`'} directory
      --cwd [path]                   The current working directory
+      --output [path]                Directory where built assets should be written to
      --prod                         Build a production deployment
      -d, --debug                    Debug mode [off]
      -y, --yes                      Skip the confirmation prompt
@@ -99,7 +102,9 @@ export default async function main(client: Client): Promise<number> {
  // Parse CLI args
  const argv = getArgs(client.argv.slice(2), {
    '--cwd': String,
+    '--output': String,
    '--prod': Boolean,
+    '--yes': Boolean,
  });

  if (argv['--help']) {
@@ -113,42 +118,54 @@ export default async function main(client: Client): Promise<number> {
  }
  const cwd = process.cwd();

+  // Build `target` influences which environment variables will be used
+  const target = argv['--prod'] ? 'production' : 'preview';
+  const yes = Boolean(argv['--yes']);
+
  // 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;
-    }
+    let confirmed = yes;
+    if (!confirmed) {
+      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
-    );
+      confirmed = await confirm(
+        client,
+        `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 { argv: originalArgv } = client;
+    client.argv = [
+      ...originalArgv.slice(0, 2),
+      'pull',
+      `--environment`,
+      target,
+    ];
    const result = await pull(client);
    if (result !== 0) {
      return result;
    }
+    client.argv = originalArgv;
    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([
@@ -178,7 +195,7 @@ export default async function main(client: Client): Promise<number> {

  // Get a list of source files
  const files = (await getFiles(workPath, client)).map(f =>
-    relative(workPath, f)
+    normalizePath(relative(workPath, f))
  );

  const routesResult = getTransformedRoutes({ nowConfig: vercelConfig || {} });
@@ -266,22 +283,26 @@ export default async function main(client: Client): Promise<number> {
  }

  // Delete output directory from potential previous build
-  await fs.remove(OUTPUT_DIR);
+  const outputDir = argv['--output']
+    ? resolve(argv['--output'])
+    : join(cwd, OUTPUT_DIR);
+  await fs.remove(outputDir);

  const buildStamp = stamp();

  // Create fresh new output directory
-  await fs.mkdirp(OUTPUT_DIR);
+  await fs.mkdirp(outputDir);

  const ops: Promise<Error | void>[] = [];

  // Write the `detectedBuilders` result to output dir
  ops.push(
    fs.writeJSON(
-      join(OUTPUT_DIR, 'builds.json'),
+      join(outputDir, 'builds.json'),
      {
        '//': 'This file was generated by the `vercel build` command. It is not part of the Build Output API.',
        target,
+        argv: process.argv,
        builds: builds.map(build => {
          const builderWithPkg = buildersWithPkgs.get(build.use);
          if (!builderWithPkg) {
@@ -290,6 +311,7 @@ export default async function main(client: Client): Promise<number> {
          const { builder, pkg: builderPkg } = builderWithPkg;
          return {
            require: builderPkg.name,
+            requirePath: builderWithPkg.path,
            apiVersion: builder.version,
            ...build,
          };
@@ -356,6 +378,7 @@ export default async function main(client: Client): Promise<number> {
    // Start flushing the file outputs to the filesystem asynchronously
    ops.push(
      writeBuildResult(
+        outputDir,
        buildResult,
        build,
        builder,
@@ -387,7 +410,7 @@ export default async function main(client: Client): Promise<number> {
  if (hadError) return 1;

  // Merge existing `config.json` file into the one that will be produced
-  const configPath = join(OUTPUT_DIR, 'config.json');
+  const configPath = join(outputDir, 'config.json');
  // TODO: properly type
  const existingConfig = await readJSONFile<any>(configPath);
  if (existingConfig instanceof CantParseJSONFile) {
@@ -445,13 +468,14 @@ export default async function main(client: Client): Promise<number> {
    wildcard: mergedWildcard,
    overrides: mergedOverrides,
  };
-  await fs.writeJSON(join(OUTPUT_DIR, 'config.json'), config, { spaces: 2 });
+  await fs.writeJSON(join(outputDir, 'config.json'), config, { spaces: 2 });

+  const relOutputDir = relative(cwd, outputDir);
  output.print(
    `${prependEmoji(
-      `Build Completed in ${chalk.bold(OUTPUT_DIR)} ${chalk.gray(
-        buildStamp()
-      )}`,
+      `Build Completed in ${chalk.bold(
+        relOutputDir.startsWith('..') ? outputDir : relOutputDir
+      )} ${chalk.gray(buildStamp())}`,
      emoji('success')
    )}\n`
  );
@@ -460,17 +484,33 @@ export default async function main(client: Client): Promise<number> {
 }

 function expandBuild(files: string[], build: Builder): Builder[] {
-  if (!build.src) return [];
+  if (!build.use) {
+    throw new NowBuildError({
+      code: `invalid_build_specification`,
+      message: 'Field `use` is missing in build specification',
+      link: 'https://vercel.com/docs/configuration#project/builds',
+      action: 'View Documentation',
+    });
+  }

-  let pattern = build.src;
-  if (pattern[0] === '/') {
+  let src = normalize(build.src || '**');
+  if (src === '.' || src === './') {
+    throw new NowBuildError({
+      code: `invalid_build_specification`,
+      message: 'A build `src` path resolves to an empty string',
+      link: 'https://vercel.com/docs/configuration#project/builds',
+      action: 'View Documentation',
+    });
+  }
+
+  if (src[0] === '/') {
    // Remove a leading slash so that the globbing is relative
    // to `cwd` instead of the root of the filesystem.
-    pattern = pattern.substring(1);
+    src = src.substring(1);
  }

  const matches = files.filter(
-    name => name === pattern || minimatch(name, pattern, { dot: true })
+    name => name === src || minimatch(name, src, { dot: true })
  );

  return matches.map(m => {
--- a/packages/cli/src/commands/deploy/index.ts
+++ b/packages/cli/src/commands/deploy/index.ts
@@ -43,7 +43,9 @@ import {
 import { SchemaValidationFailed } from '../../util/errors';
 import purchaseDomainIfAvailable from '../../util/domains/purchase-domain-if-available';
 import confirm from '../../util/input/confirm';
-import editProjectSettings from '../../util/input/edit-project-settings';
+import editProjectSettings, {
+  PartialProjectSettings,
+} from '../../util/input/edit-project-settings';
 import {
  getLinkedProject,
  linkFolderToProject,
@@ -63,6 +65,7 @@ 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';
+import { createGitMeta } from '../../util/deploy/create-git-meta';

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

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

-  const quiet = !isTTY;
+  const quiet = !client.stdout.isTTY;

  // check paths
-  const pathValidation = await validatePaths(output, paths);
+  const pathValidation = await validatePaths(client, paths);

  if (!pathValidation.valid) {
    return pathValidation.exitCode;
@@ -240,6 +243,7 @@ export default async (client: Client) => {
    const shouldStartSetup =
      autoConfirm ||
      (await confirm(
+        client,
        `Set up and deploy ${chalk.cyan(`“${toHumanPath(path)}”`)}?`,
        true
      ));
@@ -284,7 +288,7 @@ export default async (client: Client) => {

    if (typeof projectOrNewProjectName === 'string') {
      newProjectName = projectOrNewProjectName;
-      rootDirectory = await inputRootDirectory(path, output, autoConfirm);
+      rootDirectory = await inputRootDirectory(client, path, autoConfirm);
    } else {
      project = projectOrNewProjectName;
      rootDirectory = project.rootDirectory;
@@ -415,6 +419,8 @@ export default async (client: Client) => {
    parseMeta(argv['--meta'])
  );

+  const gitMetadata = await createGitMeta(path, output);
+
  // Merge dotenv config, `env` from vercel.json, and `--env` / `-e` arguments
  const deploymentEnv = Object.assign(
    {},
@@ -453,6 +459,15 @@ export default async (client: Client) => {
  let deployStamp = stamp();
  let deployment = null;

+  const localConfigurationOverrides: PartialProjectSettings = {
+    buildCommand: localConfig?.buildCommand,
+    devCommand: localConfig?.devCommand,
+    framework: localConfig?.framework,
+    commandForIgnoringBuildStep: localConfig?.ignoreCommand,
+    installCommand: localConfig?.installCommand,
+    outputDirectory: localConfig?.outputDirectory,
+  };
+
  try {
    const createArgs: any = {
      name: project ? project.name : newProjectName,
@@ -468,6 +483,7 @@ export default async (client: Client) => {
      nowConfig: localConfig,
      regions,
      meta,
+      gitMetadata,
      deployStamp,
      target,
      skipAutoDetectionConfirmation: autoConfirm,
@@ -475,7 +491,12 @@ export default async (client: Client) => {

    if (!localConfig.builds || localConfig.builds.length === 0) {
      // Only add projectSettings for zero config deployments
-      createArgs.projectSettings = { sourceFilesOutsideRootDirectory };
+      createArgs.projectSettings =
+        status === 'not_linked'
+          ? {
+              sourceFilesOutsideRootDirectory,
+            }
+          : { ...localConfigurationOverrides, sourceFilesOutsideRootDirectory };
    }

    deployment = await createDeploy(
@@ -501,9 +522,11 @@ export default async (client: Client) => {
      }

      const settings = await editProjectSettings(
-        output,
+        client,
        projectSettings,
-        framework
+        framework,
+        false,
+        localConfigurationOverrides
      );

      // deploy again, but send projectSettings this time
--- a/packages/cli/src/commands/dev/dev.ts
+++ b/packages/cli/src/commands/dev/dev.ts
@@ -1,4 +1,5 @@
 import { resolve, join } from 'path';
+import fs from 'fs-extra';

 import DevServer from '../../util/dev/server';
 import parseListen from '../../util/dev/parse-listen';
@@ -12,6 +13,7 @@ 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';
+import { OUTPUT_DIR } from '../../util/build/write-build-result';

 type Options = {
  '--listen': string;
@@ -104,6 +106,17 @@ export default async function dev(
    devCommand = process.env.VERCEL_DEV_COMMAND;
  }

+  // If there is no Development Command, we must delete the
+  // v3 Build Output because it will incorrectly be detected by
+  // @vercel/static-build in BuildOutputV3.getBuildOutputDirectory()
+  if (!devCommand) {
+    const outputDir = join(cwd, OUTPUT_DIR);
+    if (await fs.pathExists(outputDir)) {
+      output.log(`Removing ${OUTPUT_DIR}`);
+      await fs.remove(outputDir);
+    }
+  }
+
  const devServer = new DevServer(cwd, {
    output,
    devCommand,
--- a/packages/cli/src/commands/dns/add.ts
+++ b/packages/cli/src/commands/dns/add.ts
@@ -46,7 +46,7 @@ export default async function add(

  const addStamp = stamp();
  const { domain, data: argData } = parsedParams;
-  const data = await getDNSData(output, argData);
+  const data = await getDNSData(client, argData);
  if (!data) {
    output.log(`Aborted`);
    return 1;
--- a/packages/cli/src/commands/domains/buy.ts
+++ b/packages/cli/src/commands/domains/buy.ts
@@ -87,7 +87,8 @@ export default async function buy(
    !(await promptBool(
      `Buy now for ${chalk.bold(`$${price}`)} (${`${period}yr${
        period > 1 ? 's' : ''
-      }`})?`
+      }`})?`,
+      client
    ))
  ) {
    return 0;
@@ -99,7 +100,7 @@ export default async function buy(
      : `Auto renew every ${renewalPrice.period} years for ${chalk.bold(
          `$${price}`
        )}?`,
-    { defaultValue: true }
+    { ...client, defaultValue: true }
  );

  let buyResult;
--- a/packages/cli/src/commands/domains/inspect.ts
+++ b/packages/cli/src/commands/domains/inspect.ts
@@ -150,17 +150,7 @@ export default async function inspect(
      `This Domain is not configured properly. To configure it you should either:`,
      null,
      null,
-      null,
-      {
-        boxen: {
-          margin: {
-            left: 2,
-            right: 0,
-            bottom: 0,
-            top: 0,
-          },
-        },
-      }
+      null
    );
    output.print(
      `  ${chalk.grey('a)')} ` +
--- a/packages/cli/src/commands/domains/move.ts
+++ b/packages/cli/src/commands/domains/move.ts
@@ -77,7 +77,8 @@ export default async function move(
      !(await promptBool(
        `Are you sure you want to move ${param(domainName)} to ${param(
          destination
-        )}?`
+        )}?`,
+        client
      ))
    ) {
      output.log('Aborted');
@@ -95,7 +96,8 @@ export default async function move(
      );
      if (
        !(await promptBool(
-          `Are you sure you want to move ${param(domainName)}?`
+          `Are you sure you want to move ${param(domainName)}?`,
+          client
        ))
      ) {
        output.log('Aborted');
--- a/packages/cli/src/commands/domains/rm.ts
+++ b/packages/cli/src/commands/domains/rm.ts
@@ -92,7 +92,10 @@ export default async function rm(
  const skipConfirmation = opts['--yes'] || false;
  if (
    !skipConfirmation &&
-    !(await promptBool(`Are you sure you want to remove ${param(domainName)}?`))
+    !(await promptBool(
+      `Are you sure you want to remove ${param(domainName)}?`,
+      client
+    ))
  ) {
    output.log('Aborted');
    return 0;
@@ -230,7 +233,7 @@ async function removeDomain(

    if (
      !skipConfirmation &&
-      !(await promptBool(`Remove conflicts associated with domain?`))
+      !(await promptBool(`Remove conflicts associated with domain?`, client))
    ) {
      output.log('Aborted');
      return 0;
--- a/packages/cli/src/commands/domains/transfer-in.ts
+++ b/packages/cli/src/commands/domains/transfer-in.ts
@@ -81,7 +81,8 @@ export default async function transferIn(
  const shouldTransfer = await promptBool(
    transferPolicy === 'no-change'
      ? `Transfer now for ${chalk.bold(`$${price}`)}?`
-      : `Transfer now with 1yr renewal for ${chalk.bold(`$${price}`)}?`
+      : `Transfer now with 1yr renewal for ${chalk.bold(`$${price}`)}?`,
+    client
  );
  if (!shouldTransfer) {
    return 0;
--- a/packages/cli/src/commands/env/add.ts
+++ b/packages/cli/src/commands/env/add.ts
@@ -31,7 +31,7 @@ export default async function add(
  // improve the way we show inquirer prompts
  require('../../util/input/patch-inquirer');

-  const stdInput = await readStandardInput();
+  const stdInput = await readStandardInput(client.stdin);
  let [envName, envTargetArg, envGitBranch] = args;

  if (args.length > 3) {
--- a/packages/cli/src/commands/env/index.ts
+++ b/packages/cli/src/commands/env/index.ts
@@ -42,6 +42,13 @@ const help = () => {

  ${chalk.dim('Examples:')}

+  ${chalk.gray(
+    '–'
+  )} Pull all Development Environment Variables down from the cloud
+
+      ${chalk.cyan(`$ ${getPkgName()} env pull <file>`)}
+      ${chalk.cyan(`$ ${getPkgName()} env pull .env.development.local`)}
+
  ${chalk.gray('–')} Add a new variable to multiple Environments

      ${chalk.cyan(`$ ${getPkgName()} env add <name>`)}
--- a/packages/cli/src/commands/env/pull.ts
+++ b/packages/cli/src/commands/env/pull.ts
@@ -74,6 +74,7 @@ export default async function pull(
    exists &&
    !skipConfirmation &&
    !(await confirm(
+      client,
      `Found existing file ${param(filename)}. Do you want to overwrite?`,
      false
    ))
--- a/packages/cli/src/commands/env/rm.ts
+++ b/packages/cli/src/commands/env/rm.ts
@@ -104,6 +104,7 @@ export default async function rm(
  if (
    !skipConfirmation &&
    !(await confirm(
+      client,
      `Removing Environment Variable ${param(env.key)} from ${formatEnvTarget(
        env
      )} in Project ${chalk.bold(project.name)}. Are you sure?`,
--- a/packages/cli/src/commands/index.ts
+++ b/packages/cli/src/commands/index.ts
@@ -9,6 +9,7 @@ export default new Map([
  ['certs', 'certs'],
  ['deploy', 'deploy'],
  ['dev', 'dev'],
+  ['develop', 'dev'],
  ['dns', 'dns'],
  ['domain', 'domains'],
  ['domains', 'domains'],
--- a/packages/cli/src/commands/init/init.ts
+++ b/packages/cli/src/commands/init/init.ts
@@ -46,7 +46,11 @@ export default async function init(
  const exampleList = examples.filter(x => x.visible).map(x => x.name);

  if (!name) {
-    const chosen = await chooseFromDropdown('Select example:', exampleList);
+    const chosen = await chooseFromDropdown(
+      client,
+      'Select example:',
+      exampleList
+    );

    if (!chosen) {
      output.log('Aborted');
@@ -65,7 +69,7 @@ export default async function init(
    return extractExample(client, name, dir, force, 'v1');
  }

-  const found = await guess(exampleList, name);
+  const found = await guess(client, exampleList, name);

  if (typeof found === 'string') {
    return extractExample(client, found, dir, force);
@@ -90,14 +94,18 @@ async function fetchExampleList(client: Client) {
 /**
 * Prompt user for choosing which example to init
 */
-async function chooseFromDropdown(message: string, exampleList: string[]) {
+async function chooseFromDropdown(
+  client: Client,
+  message: string,
+  exampleList: string[]
+) {
  const choices = exampleList.map(name => ({
    name,
    value: name,
    short: name,
  }));

-  return listInput({
+  return listInput(client, {
    message,
    choices,
  });
@@ -194,7 +202,7 @@ function prepareFolder(cwd: string, folder: string, force?: boolean) {
 /**
 * Guess which example user try to init
 */
-async function guess(exampleList: string[], name: string) {
+async function guess(client: Client, exampleList: string[], name: string) {
  const GuessError = new Error(
    `No example found for ${chalk.bold(name)}, run ${getCommandName(
      `init`
@@ -208,7 +216,7 @@ async function guess(exampleList: string[], name: string) {
  const found = didYouMean(name, exampleList, 0.7);

  if (typeof found === 'string') {
-    if (await promptBool(`Did you mean ${chalk.bold(found)}?`)) {
+    if (await promptBool(`Did you mean ${chalk.bold(found)}?`, client)) {
      return found;
    }
  } else {
--- a/packages/cli/src/commands/pull.ts
+++ b/packages/cli/src/commands/pull.ts
@@ -25,7 +25,7 @@ import {

 const help = () => {
  return console.log(`
-  ${chalk.bold(`${logo} ${getPkgName()} pull`)} [path]
+  ${chalk.bold(`${logo} ${getPkgName()} pull`)} [project-path]

 ${chalk.dim('Options:')}

@@ -42,25 +42,29 @@ const help = () => {

  ${chalk.dim('Examples:')}

-  ${chalk.gray('–')} Pull the latest Project Settings from the cloud
+  ${chalk.gray(
+    '–'
+  )} Pull the latest Environment Variables and Project Settings from the cloud
+    and stores them in \`.vercel/.env.\${target}.local\` and \`.vercel/project.json\` respectively.

    ${chalk.cyan(`$ ${getPkgName()} pull`)}
    ${chalk.cyan(`$ ${getPkgName()} pull ./path-to-project`)}
-    ${chalk.cyan(`$ ${getPkgName()} pull --env .env.local`)}
-    ${chalk.cyan(`$ ${getPkgName()} pull ./path-to-project --env .env.local`)}

-  ${chalk.gray('–')} Pull specific environment's Project Settings from the cloud
+  ${chalk.gray('–')} Pull for a specific environment

    ${chalk.cyan(
      `$ ${getPkgName()} pull --environment=${getEnvTargetPlaceholder()}`
    )}
+
+  ${chalk.gray(
+    'If you want to download environment variables to a specific file, use `vercel env pull` instead.'
+  )}
 `);
 };

 function processArgs(client: Client) {
  return getArgs(client.argv.slice(2), {
    '--yes': Boolean,
-    '--env': String, // deprecated
    '--environment': String,
    '--debug': Boolean,
    '-d': '--debug',
--- a/packages/cli/src/commands/teams/switch.ts
+++ b/packages/cli/src/commands/teams/switch.ts
@@ -83,7 +83,7 @@ export default async function main(client: Client, desiredSlug?: string) {
    ];

    output.stopSpinner();
-    desiredSlug = await listInput({
+    desiredSlug = await listInput(client, {
      message: 'Switch to:',
      choices,
      eraseFinalAnswer: true,
--- a/packages/cli/src/commands/whoami.ts
+++ b/packages/cli/src/commands/whoami.ts
@@ -54,12 +54,12 @@ export default async (client: Client): Promise<number> => {
    throw err;
  }

-  if (output.isTTY) {
+  if (client.stdout.isTTY) {
    output.log(contextName);
  } else {
    // If stdout is not a TTY, then only print the username
    // to support piping the output to another file / exe
-    output.print(`${contextName}\n`, { w: process.stdout });
+    client.stdout.write(`${contextName}\n`);
  }

  return 0;
--- a/packages/cli/src/index.ts
+++ b/packages/cli/src/index.ts
@@ -23,7 +23,7 @@ import * as Sentry from '@sentry/node';
 import hp from './util/humanize-path';
 import commands from './commands';
 import pkg from './util/pkg';
-import createOutput from './util/output';
+import { Output } from './util/output';
 import cmd from './util/output/cmd';
 import info from './util/output/info';
 import error from './util/output/error';
@@ -109,7 +109,7 @@ const main = async () => {
  }

  const isDebugging = argv['--debug'];
-  const output = createOutput({ debug: isDebugging });
+  const output = new Output(process.stderr, { debug: isDebugging });

  debug = output.debug;

@@ -387,6 +387,9 @@ const main = async () => {
  // Shared API `Client` instance for all sub-commands to utilize
  client = new Client({
    apiUrl,
+    stdin: process.stdin,
+    stdout: process.stdout,
+    stderr: output.stream,
    output,
    config,
    authConfig,
@@ -796,7 +799,5 @@ process.on('uncaughtException', handleUnexpected);
 main()
  .then(exitCode => {
    process.exitCode = exitCode;
-    // @ts-ignore - "nowExit" is a non-standard event name
-    process.emit('nowExit');
  })
  .catch(handleUnexpected);
--- a/packages/cli/src/types.ts
+++ b/packages/cli/src/types.ts
@@ -1,3 +1,5 @@
+import type { Readable, Writable } from 'stream';
+
 export type ProjectSettings = import('@vercel/build-utils').ProjectSettings;

 export type Primitive =
@@ -296,6 +298,15 @@ export interface Token {
  teamId?: string;
 }

+export interface GitMetadata {
+  commitAuthorName?: string | undefined;
+  commitMessage?: string | undefined;
+  commitRef?: string | undefined;
+  commitSha?: string | undefined;
+  dirty?: boolean | undefined;
+  remoteUrl: string;
+}
+
 /**
 * An object representing a Build on Vercel
 */
@@ -433,3 +444,19 @@ export interface BuildOutput {
    layers?: string[];
  } | null;
 }
+
+export interface ReadableTTY extends Readable {
+  isTTY?: boolean;
+  isRaw?: boolean;
+  setRawMode?: (mode: boolean) => void;
+}
+
+export interface WritableTTY extends Writable {
+  isTTY?: boolean;
+}
+
+export interface Stdio {
+  stdin: ReadableTTY;
+  stdout: WritableTTY;
+  stderr: WritableTTY;
+}
--- a/packages/cli/src/util/bisect/normalize-url.ts
+++ b/packages/cli/src/util/bisect/normalize-url.ts
@@ -0,0 +1,7 @@
+function hasScheme(url: string): Boolean {
+  return url.startsWith('http://') || url.startsWith('https://');
+}
+
+export function normalizeURL(url: string): string {
+  return hasScheme(url) ? url : `https://${url}`;
+}
--- a/packages/cli/src/util/build/write-build-result.ts
+++ b/packages/cli/src/util/build/write-build-result.ts
@@ -23,6 +23,7 @@ import { VERCEL_DIR } from '../projects/link';
 export const OUTPUT_DIR = join(VERCEL_DIR, 'output');

 export async function writeBuildResult(
+  outputDir: string,
  buildResult: BuildResultV2 | BuildResultV3,
  build: Builder,
  builder: BuilderV2 | BuilderV3,
@@ -31,9 +32,13 @@ export async function writeBuildResult(
 ) {
  const { version } = builder;
  if (version === 2) {
-    return writeBuildResultV2(buildResult as BuildResultV2, cleanUrls);
+    return writeBuildResultV2(
+      outputDir,
+      buildResult as BuildResultV2,
+      cleanUrls
+    );
  } else if (version === 3) {
-    return writeBuildResultV3(buildResult as BuildResultV3, build);
+    return writeBuildResultV3(outputDir, buildResult as BuildResultV3, build);
  }
  throw new Error(
    `Unsupported Builder version \`${version}\` from "${builderPkg.name}"`
@@ -67,11 +72,12 @@ export interface PathOverride {
 * the filesystem.
 */
 async function writeBuildResultV2(
+  outputDir: string,
  buildResult: BuildResultV2,
  cleanUrls?: boolean
 ) {
  if ('buildOutputPath' in buildResult) {
-    await mergeBuilderOutput(buildResult);
+    await mergeBuilderOutput(outputDir, buildResult);
    return;
  }

@@ -79,16 +85,16 @@ async function writeBuildResultV2(
  const overrides: Record<string, PathOverride> = {};
  for (const [path, output] of Object.entries(buildResult.output)) {
    if (isLambda(output)) {
-      await writeLambda(output, path, lambdas);
+      await writeLambda(outputDir, output, path, lambdas);
    } else if (isPrerender(output)) {
-      await writeLambda(output.lambda, path, lambdas);
+      await writeLambda(outputDir, 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 fallbackPath = join(outputDir, 'functions', fallbackName);
        const stream = fallback.toStream();
        await pipe(
          stream,
@@ -101,7 +107,7 @@ async function writeBuildResultV2(
      }

      const prerenderConfigPath = join(
-        OUTPUT_DIR,
+        outputDir,
        'functions',
        `${path}.prerender-config.json`
      );
@@ -112,9 +118,9 @@ async function writeBuildResultV2(
      };
      await fs.writeJSON(prerenderConfigPath, prerenderConfig, { spaces: 2 });
    } else if (isFile(output)) {
-      await writeStaticFile(output, path, overrides, cleanUrls);
+      await writeStaticFile(outputDir, output, path, overrides, cleanUrls);
    } else if (isEdgeFunction(output)) {
-      await writeEdgeFunction(output, path);
+      await writeEdgeFunction(outputDir, output, path);
    } else {
      throw new Error(
        `Unsupported output type: "${(output as any).type}" for ${path}`
@@ -128,15 +134,24 @@ async function writeBuildResultV2(
 * Writes the output from the `build()` return value of a v3 Builder to
 * the filesystem.
 */
-async function writeBuildResultV3(buildResult: BuildResultV3, build: Builder) {
+async function writeBuildResultV3(
+  outputDir: string,
+  buildResult: BuildResultV3,
+  build: Builder
+) {
  const { output } = buildResult;
+  const src = build.src;
+  if (typeof src !== 'string') {
+    throw new Error(`Expected "build.src" to be a string`);
+  }
+  const ext = extname(src);
+  const path = build.config?.zeroConfig
+    ? src.substring(0, src.length - ext.length)
+    : src;
  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);
+    await writeLambda(outputDir, output, path);
+  } else if (isEdgeFunction(output)) {
+    await writeEdgeFunction(outputDir, output, path);
  } else {
    throw new Error(
      `Unsupported output type: "${(output as any).type}" for ${build.src}`
@@ -154,6 +169,7 @@ async function writeBuildResultV3(buildResult: BuildResultV3, build: Builder) {
 * @param overrides Record of override configuration when a File is renamed or has other metadata
 */
 async function writeStaticFile(
+  outputDir: string,
  file: File,
  path: string,
  overrides: Record<string, PathOverride>,
@@ -191,7 +207,7 @@ async function writeStaticFile(
    overrides[fsPath] = override;
  }

-  const dest = join(OUTPUT_DIR, 'static', fsPath);
+  const dest = join(outputDir, 'static', fsPath);
  await fs.mkdirp(dirname(dest));

  // TODO: handle (or skip) symlinks?
@@ -205,8 +221,12 @@ async function writeStaticFile(
 * @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`);
+async function writeEdgeFunction(
+  outputDir: string,
+  edgeFunction: EdgeFunction,
+  path: string
+) {
+  const dest = join(outputDir, 'functions', `${path}.func`);

  await fs.mkdirp(dest);
  const ops: Promise<any>[] = [];
@@ -235,11 +255,12 @@ async function writeEdgeFunction(edgeFunction: EdgeFunction, path: string) {
 * @param lambdas (optional) Map of `Lambda` instances that have previously been written
 */
 async function writeLambda(
+  outputDir: string,
  lambda: Lambda,
  path: string,
  lambdas?: Map<Lambda, string>
 ) {
-  const dest = join(OUTPUT_DIR, 'functions', `${path}.func`);
+  const dest = join(outputDir, '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
@@ -248,7 +269,7 @@ async function writeLambda(
  if (existingLambdaPath) {
    const destDir = dirname(dest);
    const targetDest = join(
-      OUTPUT_DIR,
+      outputDir,
      'functions',
      `${existingLambdaPath}.func`
    );
@@ -312,14 +333,17 @@ async function writeLambda(
 * `.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);
+async function mergeBuilderOutput(
+  outputDir: string,
+  buildResult: BuildResultBuildOutput
+) {
+  const absOutputDir = resolve(outputDir);
  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);
+  await fs.copy(buildResult.buildOutputPath, outputDir);
 }

 /**
@@ -361,8 +385,14 @@ export async function* findDirs(
  }
  for (const path of paths) {
    const abs = join(dir, path);
-    const s = await fs.stat(abs);
-    if (s.isDirectory()) {
+    let stat: fs.Stats;
+    try {
+      stat = await fs.lstat(abs);
+    } catch (err: any) {
+      if (err.code === 'ENOENT') continue;
+      throw err;
+    }
+    if (stat.isDirectory()) {
      if (path === name) {
        yield relative(root, abs);
      } else {
--- a/packages/cli/src/util/client.ts
+++ b/packages/cli/src/util/client.ts
@@ -1,3 +1,5 @@
+import { bold } from 'chalk';
+import inquirer from 'inquirer';
 import { EventEmitter } from 'events';
 import { URLSearchParams } from 'url';
 import { parse as parseUrl } from 'url';
@@ -11,10 +13,16 @@ import printIndications from './print-indications';
 import reauthenticate from './login/reauthenticate';
 import { SAMLError } from './login/types';
 import { writeToAuthConfigFile } from './config/files';
-import { AuthConfig, GlobalConfig, JSONObject } from '../types';
+import type {
+  AuthConfig,
+  GlobalConfig,
+  JSONObject,
+  Stdio,
+  ReadableTTY,
+  WritableTTY,
+} from '../types';
 import { sharedPromise } from './promise';
 import { APIError } from './errors-ts';
-import { bold } from 'chalk';

 const isSAMLError = (v: any): v is SAMLError => {
  return v && v.saml;
@@ -28,7 +36,7 @@ export interface FetchOptions extends Omit<RequestInit, 'body'> {
  accountId?: string;
 }

-export interface ClientOptions {
+export interface ClientOptions extends Stdio {
  argv: string[];
  apiUrl: string;
  authConfig: AuthConfig;
@@ -41,13 +49,17 @@ export const isJSONObject = (v: any): v is JSONObject => {
  return v && typeof v == 'object' && v.constructor === Object;
 };

-export default class Client extends EventEmitter {
+export default class Client extends EventEmitter implements Stdio {
  argv: string[];
  apiUrl: string;
  authConfig: AuthConfig;
+  stdin: ReadableTTY;
+  stdout: WritableTTY;
+  stderr: WritableTTY;
  output: Output;
  config: GlobalConfig;
  localConfig?: VercelConfig;
+  prompt!: inquirer.PromptModule;
  private requestIdCounter: number;

  constructor(opts: ClientOptions) {
@@ -55,10 +67,14 @@ export default class Client extends EventEmitter {
    this.argv = opts.argv;
    this.apiUrl = opts.apiUrl;
    this.authConfig = opts.authConfig;
+    this.stdin = opts.stdin;
+    this.stdout = opts.stdout;
+    this.stderr = opts.stderr;
    this.output = opts.output;
    this.config = opts.config;
    this.localConfig = opts.localConfig;
    this.requestIdCounter = 1;
+    this._createPromptModule();
  }

  retry<T>(fn: RetryFunction<T>, { retries = 3, maxTimeout = Infinity } = {}) {
@@ -124,7 +140,7 @@ export default class Client extends EventEmitter {
    return this.retry(async bail => {
      const res = await this._fetch(url, opts);

-      printIndications(res);
+      printIndications(this, res);

      if (!res.ok) {
        const error = await responseError(res);
@@ -180,4 +196,11 @@ export default class Client extends EventEmitter {
  _onRetry = (error: Error) => {
    this.output.debug(`Retrying: ${error}\n${error.stack}`);
  };
+
+  _createPromptModule() {
+    this.prompt = inquirer.createPromptModule({
+      input: this.stdin as NodeJS.ReadStream,
+      output: this.stderr as NodeJS.WriteStream,
+    });
+  }
 }
--- a/packages/cli/src/util/deploy/create-git-meta.ts
+++ b/packages/cli/src/util/deploy/create-git-meta.ts
@@ -0,0 +1,79 @@
+import fs from 'fs-extra';
+import { join } from 'path';
+import ini from 'ini';
+import git from 'git-last-commit';
+import { exec } from 'child_process';
+import { GitMetadata } from '../../types';
+import { Output } from '../output';
+
+export function isDirty(directory: string): Promise<boolean> {
+  return new Promise((resolve, reject) => {
+    exec('git status -s', { cwd: directory }, function (err, stdout, stderr) {
+      if (err) return reject(err);
+      if (stderr)
+        return reject(
+          new Error(
+            `Failed to determine if git repo has been modified: ${stderr.trim()}`
+          )
+        );
+      resolve(stdout.trim().length > 0);
+    });
+  });
+}
+
+function getLastCommit(directory: string): Promise<git.Commit> {
+  return new Promise((resolve, reject) => {
+    git.getLastCommit(
+      (err, commit) => {
+        if (err) return reject(err);
+        resolve(commit);
+      },
+      { dst: directory }
+    );
+  });
+}
+
+export async function getRemoteUrl(
+  configPath: string,
+  output: Output
+): Promise<string | null> {
+  let gitConfig;
+  try {
+    gitConfig = ini.parse(await fs.readFile(configPath, 'utf-8'));
+  } catch (error) {
+    output.debug(`Error while parsing repo data: ${error.message}`);
+  }
+  if (!gitConfig) {
+    return null;
+  }
+
+  const originUrl: string = gitConfig['remote "origin"']?.url;
+  if (originUrl) {
+    return originUrl;
+  }
+  return null;
+}
+
+export async function createGitMeta(
+  directory: string,
+  output: Output
+): Promise<GitMetadata | undefined> {
+  const remoteUrl = await getRemoteUrl(join(directory, '.git/config'), output);
+  // If we can't get the repo URL, then don't return any metadata
+  if (!remoteUrl) {
+    return;
+  }
+  const [commit, dirty] = await Promise.all([
+    getLastCommit(directory),
+    isDirty(directory),
+  ]);
+
+  return {
+    remoteUrl,
+    commitAuthorName: commit.author.name,
+    commitMessage: commit.subject,
+    commitRef: commit.branch,
+    commitSha: commit.hash,
+    dirty,
+  };
+}
--- a/packages/cli/src/util/dev/builder.ts
+++ b/packages/cli/src/util/dev/builder.ts
@@ -13,8 +13,8 @@ import {
  Lambda,
  FileBlob,
  FileFsRef,
-  isOfficialRuntime,
 } from '@vercel/build-utils';
+import { isOfficialRuntime } from '@vercel/fs-detectors';
 import plural from 'pluralize';
 import minimatch from 'minimatch';

@@ -417,10 +417,6 @@ export async function getBuildMatches(
      src = src.substring(1);
    }

-    // We need to escape brackets since `glob` will
-    // try to find a group otherwise
-    src = src.replace(/(\[|\])/g, '[$1]');
-
    // lambda function files are trimmed of their file extension
    const mapToEntrypoint = new Map<string, string>();
    const extensionless = devServer.getExtensionlessFile(src);
--- a/packages/cli/src/util/dev/headers.ts
+++ b/packages/cli/src/util/dev/headers.ts
@@ -0,0 +1,18 @@
+import { Headers } from 'node-fetch';
+import { IncomingHttpHeaders, OutgoingHttpHeaders } from 'http';
+
+export function nodeHeadersToFetchHeaders(
+  nodeHeaders: IncomingHttpHeaders | OutgoingHttpHeaders
+): Headers {
+  const headers = new Headers();
+  for (const [name, value] of Object.entries(nodeHeaders)) {
+    if (Array.isArray(value)) {
+      for (const val of value) {
+        headers.append(name, val);
+      }
+    } else if (typeof value !== 'undefined') {
+      headers.set(name, String(value));
+    }
+  }
+  return headers;
+}
--- a/packages/cli/src/util/dev/server.ts
+++ b/packages/cli/src/util/dev/server.ts
@@ -1,12 +1,13 @@
+import ms from 'ms';
 import url, { URL } from 'url';
 import http from 'http';
 import fs from 'fs-extra';
 import chalk from 'chalk';
+import fetch from 'node-fetch';
 import plural from 'pluralize';
 import rawBody from 'raw-body';
 import listen from 'async-listen';
 import minimatch from 'minimatch';
-import ms from 'ms';
 import httpProxy from 'http-proxy';
 import { randomBytes } from 'crypto';
 import serveHandler from 'serve-handler';
@@ -16,11 +17,11 @@ import path, { isAbsolute, basename, dirname, extname, join } from 'path';
 import once from '@tootallnate/once';
 import directoryTemplate from 'serve-handler/src/directory';
 import getPort from 'get-port';
-import { ChildProcess } from 'child_process';
 import isPortReachable from 'is-port-reachable';
 import deepEqual from 'fast-deep-equal';
 import which from 'which';
 import npa from 'npm-package-arg';
+import type { ChildProcess } from 'child_process';

 import { getVercelIgnore, fileNameSymbol } from '@vercel/client';
 import {
@@ -35,12 +36,14 @@ import {
  StartDevServerResult,
  FileFsRef,
  PackageJson,
+  spawnCommand,
+} from '@vercel/build-utils';
+import {
  detectBuilders,
  detectApiDirectory,
  detectApiExtensions,
-  spawnCommand,
  isOfficialRuntime,
-} from '@vercel/build-utils';
+} from '@vercel/fs-detectors';
 import frameworkList from '@vercel/frameworks';

 import cmd from '../output/cmd';
@@ -90,6 +93,7 @@ import {
 import { ProjectEnvVariable, ProjectSettings } from '../../types';
 import exposeSystemEnvs from './expose-system-envs';
 import { treeKill } from '../tree-kill';
+import { nodeHeadersToFetchHeaders } from './headers';

 const frontendRuntimeSet = new Set(
  frameworkList.map(f => f.useRuntime?.use || '@vercel/static-build')
@@ -327,6 +331,8 @@ export default class DevServer {
  ): Promise<void> {
    const name = relative(this.cwd, fsPath);
    try {
+      await this.getVercelConfig();
+
      this.files[name] = await FileFsRef.fromFsPath({ fsPath });
      const extensionless = this.getExtensionlessFile(name);
      if (extensionless) {
@@ -593,7 +599,7 @@ export default class DevServer {
        await this.exit();
      }

-      if (warnings && warnings.length > 0) {
+      if (warnings?.length > 0) {
        warnings.forEach(warning =>
          this.output.warn(warning.message, null, warning.link, warning.action)
        );
@@ -1106,6 +1112,7 @@ export default class DevServer {
        view = errorTemplate({
          http_status_code: statusCode,
          http_status_description,
+          error_code,
          request_id: requestId,
        });
      }
@@ -1337,32 +1344,6 @@ export default class DevServer {
    return false;
  };

-  /*
-  runDevMiddleware = async (
-    req: http.IncomingMessage,
-    res: http.ServerResponse
-  ) => {
-    const { devMiddlewarePlugins } = await loadCliPlugins(
-      this.cwd,
-      this.output
-    );
-    try {
-      for (let plugin of devMiddlewarePlugins) {
-        const result = await plugin.plugin.runDevMiddleware(req, res, this.cwd);
-        if (result.finished) {
-          return result;
-        }
-      }
-      return { finished: false };
-    } catch (e) {
-      return {
-        finished: true,
-        error: e,
-      };
-    }
-  };
-  */
-
  /**
   * Serve project directory as a v2 deployment.
   */
@@ -1429,13 +1410,143 @@ export default class DevServer {
    let statusCode: number | undefined;
    let prevUrl = req.url;
    let prevHeaders: HttpHeadersConfig = {};
+    let middlewarePid: number | undefined;

-    /*
-    const middlewareResult = await this.runDevMiddleware(req, res);
+    // Run the middleware file, if present, and apply any
+    // mutations to the incoming request based on the
+    // result of the middleware invocation.
+    const middleware = [...this.buildMatches.values()].find(
+      m => m.config?.middleware === true
+    );
+    if (middleware) {
+      let startMiddlewareResult: StartDevServerResult | undefined;
+      // TODO: can we add some caching to prevent (re-)starting
+      // the middleware server for every HTTP request?
+      const { envConfigs, files, devCacheDir, cwd: workPath } = this;
+      try {
+        startMiddlewareResult =
+          await middleware.builderWithPkg.builder.startDevServer?.({
+            files,
+            entrypoint: middleware.entrypoint,
+            workPath,
+            repoRootPath: this.cwd,
+            config: middleware.config || {},
+            meta: {
+              isDev: true,
+              devCacheDir,
+              requestUrl: req.url,
+              env: { ...envConfigs.runEnv },
+              buildEnv: { ...envConfigs.buildEnv },
+            },
+          });

-    if (middlewareResult) {
-      if (middlewareResult.error) {
-        this.sendError(
+        if (startMiddlewareResult) {
+          const { port, pid } = startMiddlewareResult;
+          middlewarePid = pid;
+          this.devServerPids.add(pid);
+
+          const middlewareReqHeaders = nodeHeadersToFetchHeaders(req.headers);
+
+          // Add the Vercel platform proxy request headers
+          const proxyHeaders = this.getProxyHeaders(req, requestId, true);
+          for (const [name, value] of nodeHeadersToFetchHeaders(proxyHeaders)) {
+            middlewareReqHeaders.set(name, value);
+          }
+
+          const middlewareRes = await fetch(
+            `http://127.0.0.1:${port}${parsed.path}`,
+            {
+              headers: middlewareReqHeaders,
+              method: req.method,
+              redirect: 'manual',
+            }
+          );
+
+          if (middlewareRes.status === 500) {
+            await this.sendError(
+              req,
+              res,
+              requestId,
+              'EDGE_FUNCTION_INVOCATION_FAILED',
+              500
+            );
+            return;
+          }
+
+          // Apply status code from middleware invocation,
+          // for i.e. redirects or a custom 404 page
+          res.statusCode = middlewareRes.status;
+
+          let rewritePath = '';
+          let contentType = '';
+          let shouldContinue = false;
+          const skipMiddlewareHeaders = new Set([
+            'date',
+            'connection',
+            'content-length',
+            'transfer-encoding',
+          ]);
+          for (const [name, value] of middlewareRes.headers) {
+            if (name === 'x-middleware-next') {
+              shouldContinue = value === '1';
+            } else if (name === 'x-middleware-rewrite') {
+              rewritePath = value;
+              shouldContinue = true;
+            } else if (name === 'content-type') {
+              contentType = value;
+            } else if (!skipMiddlewareHeaders.has(name)) {
+              // Any other kind of response header should be included
+              // on both the incoming HTTP request (for when proxying
+              // to another function) and the outgoing HTTP response.
+              res.setHeader(name, value);
+              req.headers[name] = value;
+            }
+          }
+
+          if (!shouldContinue) {
+            const middlewareBody = await middlewareRes.buffer();
+            this.setResponseHeaders(res, requestId);
+            if (middlewareBody.length > 0) {
+              res.setHeader('content-length', middlewareBody.length);
+              if (contentType) {
+                res.setHeader('content-type', contentType);
+              }
+              res.end(middlewareBody);
+            } else {
+              res.end();
+            }
+            return;
+          }
+
+          if (rewritePath) {
+            // TODO: add validation?
+            debug(`Detected rewrite path from middleware: "${rewritePath}"`);
+            prevUrl = rewritePath;
+
+            // Retain orginal pathname, but override query parameters from the rewrite
+            const beforeRewriteUrl = req.url || '/';
+            const rewriteUrlParsed = url.parse(beforeRewriteUrl, true);
+            delete rewriteUrlParsed.search;
+            rewriteUrlParsed.query = url.parse(rewritePath, true).query;
+            req.url = url.format(rewriteUrlParsed);
+            debug(
+              `Rewrote incoming HTTP URL from "${beforeRewriteUrl}" to "${req.url}"`
+            );
+          }
+        }
+      } catch (err) {
+        // `startDevServer()` threw an error. Most likely this means the dev
+        // server process exited before sending the port information message
+        // (missing dependency at runtime, for example).
+        if (err.code === 'ENOENT') {
+          err.message = `Command not found: ${chalk.cyan(
+            err.path,
+            ...err.spawnargs
+          )}\nPlease ensure that ${cmd(err.path)} is properly installed`;
+          err.link = 'https://vercel.link/command-not-found';
+        }
+
+        await this.sendError(
          req,
          res,
          requestId,
@@ -1443,24 +1554,12 @@ export default class DevServer {
          500
        );
        return;
-      }
-      if (middlewareResult.finished) {
-        return;
-      }
-
-      if (middlewareResult.pathname) {
-        const origUrl = url.parse(req.url || '/', true);
-        origUrl.pathname = middlewareResult.pathname;
-        prevUrl = url.format(origUrl);
-      }
-      if (middlewareResult.query && prevUrl) {
-        const origUrl = url.parse(req.url || '/', true);
-        delete origUrl.search;
-        Object.assign(origUrl.query, middlewareResult.query);
-        prevUrl = url.format(origUrl);
+      } finally {
+        if (middlewarePid) {
+          this.killBuilderDevServer(middlewarePid);
+        }
      }
    }
-    */

    for (const phase of phases) {
      statusCode = undefined;
@@ -1740,7 +1839,10 @@ export default class DevServer {
            isDev: true,
            requestPath,
            devCacheDir,
-            env: { ...envConfigs.runEnv },
+            env: {
+              ...envConfigs.runEnv,
+              VERCEL_BUILDER_DEBUG: this.output.debugEnabled ? '1' : undefined,
+            },
            buildEnv: { ...envConfigs.buildEnv },
          },
        });
@@ -2185,13 +2287,7 @@ function proxyPass(
        `Failed to complete request to ${req.url}: ${error}`
      );
      if (!res.headersSent) {
-        devServer.sendError(
-          req,
-          res,
-          requestId,
-          'NO_RESPONSE_FROM_FUNCTION',
-          502
-        );
+        devServer.sendError(req, res, requestId, 'FUNCTION_INVOCATION_FAILED');
      }
    }
  );
@@ -2269,11 +2365,12 @@ async function findBuildMatch(
      if (!isIndex(match.src)) {
        return match;
      } else {
-        // if isIndex === true and ends in .html, we're done. Otherwise, keep searching
-        bestIndexMatch = match;
+        // If isIndex === true and ends in `.html`, we're done.
+        // Otherwise, keep searching.
        if (extname(match.src) === '.html') {
-          return bestIndexMatch;
+          return match;
        }
+        bestIndexMatch = match;
      }
    }
  }
@@ -2295,6 +2392,13 @@ async function shouldServe(
    config,
    builderWithPkg: { builder },
  } = match;
+
+  // "middleware" file is not served as a regular asset,
+  // instead it gets invoked as part of the routing logic.
+  if (config?.middleware === true) {
+    return false;
+  }
+
  const cleanSrc = src.endsWith('.html') ? src.slice(0, -5) : src;
  const trimmedPath = requestPath.endsWith('/')
    ? requestPath.slice(0, -1)
@@ -2447,12 +2551,10 @@ function needsBlockingBuild(buildMatch: BuildMatch): boolean {
  return typeof builder.shouldServe !== 'function';
 }

-async function checkForPort(
-  port: number | undefined,
-  timeout: number
-): Promise<void> {
+async function checkForPort(port: number, timeout: number): Promise<void> {
+  const opts = { host: '127.0.0.1' };
  const start = Date.now();
-  while (!(await isPortReachable(port))) {
+  while (!(await isPortReachable(port, opts))) {
    if (Date.now() - start > timeout) {
      throw new Error(`Detecting port ${port} timed out after ${timeout}ms`);
    }
--- a/packages/cli/src/util/dns/get-dns-data.ts
+++ b/packages/cli/src/util/dns/get-dns-data.ts
@@ -2,26 +2,29 @@ import chalk from 'chalk';
 import { DNSRecordData } from '../../types';
 import textInput from '../input/text';
 import promptBool from '../input/prompt-bool';
-import { Output } from '../output';
+import Client from '../client';

 const RECORD_TYPES = ['A', 'AAAA', 'ALIAS', 'CAA', 'CNAME', 'MX', 'SRV', 'TXT'];

 export default async function getDNSData(
-  output: Output,
+  client: Client,
  data: null | DNSRecordData
 ): Promise<DNSRecordData | null> {
  if (data) {
    return data;
  }
+  const { output } = client;

  try {
    // first ask for type, branch from there
    const possibleTypes = new Set(RECORD_TYPES);
-    const type = (await textInput({
-      label: `- Record type (${RECORD_TYPES.join(', ')}): `,
-      validateValue: (v: string) =>
-        Boolean(v && possibleTypes.has(v.trim().toUpperCase()))
-    }))
+    const type = (
+      await textInput({
+        label: `- Record type (${RECORD_TYPES.join(', ')}): `,
+        validateValue: (v: string) =>
+          Boolean(v && possibleTypes.has(v.trim().toUpperCase())),
+      })
+    )
      .trim()
      .toUpperCase();

@@ -39,7 +42,7 @@ export default async function getDNSData(
          target
        )}.`
      );
-      return (await verifyData())
+      return (await verifyData(client))
        ? {
            name,
            type,
@@ -47,8 +50,8 @@ export default async function getDNSData(
              priority,
              weight,
              port,
-              target
-            }
+              target,
+            },
          }
        : null;
    }
@@ -61,23 +64,23 @@ export default async function getDNSData(
          `${mxPriority}`
        )} ${chalk.cyan(value)}`
      );
-      return (await verifyData())
+      return (await verifyData(client))
        ? {
            name,
            type,
            value,
-            mxPriority
+            mxPriority,
          }
        : null;
    }

    const value = await getTrimmedString(`- ${type} value: `);
    output.log(`${chalk.cyan(name)} ${chalk.bold(type)} ${chalk.cyan(value)}`);
-    return (await verifyData())
+    return (await verifyData(client))
      ? {
          name,
          type,
-          value
+          value,
        }
      : null;
  } catch (error) {
@@ -85,13 +88,13 @@ export default async function getDNSData(
  }
 }

-async function verifyData() {
-  return promptBool('Is this correct?');
+async function verifyData(client: Client) {
+  return promptBool('Is this correct?', client);
 }

 async function getRecordName(type: string) {
  const input = await textInput({
-    label: `- ${type} name: `
+    label: `- ${type} name: `,
  });
  return input === '@' ? '' : input;
 }
@@ -100,14 +103,14 @@ async function getNumber(label: string) {
  return Number(
    await textInput({
      label,
-      validateValue: v => Boolean(v && Number(v))
+      validateValue: v => Boolean(v && Number(v)),
    })
  );
 }
 async function getTrimmedString(label: string) {
  const res = await textInput({
    label,
-    validateValue: v => Boolean(v && v.trim().length > 0)
+    validateValue: v => Boolean(v && v.trim().length > 0),
  });
  return res.trim();
 }
--- a/packages/cli/src/util/domains/purchase-domain-if-available.ts
+++ b/packages/cli/src/util/domains/purchase-domain-if-available.ts
@@ -54,7 +54,8 @@ export default async function purchaseDomainIfAvailable(
      !(await promptBool(
        `Buy ${chalk.underline(domain)} for ${chalk.bold(
          `$${price}`
-        )} (${plural('yr', period, true)})?`
+        )} (${plural('yr', period, true)})?`,
+        client
      ))
    ) {
      output.print(eraseLines(1));
--- a/packages/cli/src/util/get-files.ts
+++ b/packages/cli/src/util/get-files.ts
@@ -1,6 +1,5 @@
-import { resolve } from 'path';
-import _glob, { IOptions as GlobOptions } from 'glob';
 import fs from 'fs-extra';
+import { resolve } from 'path';
 import { getVercelIgnore } from '@vercel/client';
 import uniqueStrings from './unique-strings';
 import { Output } from './output/create-output';
@@ -21,14 +20,6 @@ function flatten(
  return res;
 }

-async function glob(pattern: string, options: GlobOptions): Promise<string[]> {
-  return new Promise((resolve, reject) => {
-    _glob(pattern, options, (err, files) => {
-      err ? reject(err) : resolve(files);
-    });
-  });
-}
-
 /**
 * Transform relative paths into absolutes,
 * and maintains absolutes as such.
@@ -65,15 +56,16 @@ interface StaticFilesOptions {
 export async function staticFiles(
  path: string,
  { output, src }: StaticFilesOptions
-) {
+): Promise<string[]> {
  const { debug, time } = output;
  let files: string[] = [];

  // The package.json `files` whitelist still
  // honors ignores: https://docs.npmjs.com/files/package.json#files
  const source = src || '.';
-  // Convert all filenames into absolute paths
-  const search = await glob(source, { cwd: path, absolute: true, dot: true });
+
+  // Ensure that `path` is an absolute path
+  const search = resolve(path, source);

  // Compile list of ignored patterns and files
  const { ig } = await getVercelIgnore(path);
@@ -104,7 +96,7 @@ export async function staticFiles(
  // Locate files
  files = await time(
    `Locating files ${path}`,
-    explode(search, {
+    explode([search], {
      accepts,
      output,
    })
@@ -164,7 +156,7 @@ async function explode(
      const all = await fs.readdir(file);
      /* eslint-disable no-use-before-define */
      const recursive = many(all.map(subdir => asAbsolute(subdir, file)));
-      return (recursive as any) as Promise<string | null>;
+      return recursive as any as Promise<string | null>;
      /* eslint-enable no-use-before-define */
    }
    if (!s.isFile()) {
--- a/packages/cli/src/util/index.ts
+++ b/packages/cli/src/util/index.ts
@@ -14,7 +14,7 @@ import { responseError } from './error';
 import stamp from './output/stamp';
 import { APIError, BuildError } from './errors-ts';
 import printIndications from './print-indications';
-import { Org } from '../types';
+import { GitMetadata, Org } from '../types';
 import { VercelConfig } from './dev/types';
 import Client, { FetchOptions, isJSONObject } from './client';
 import { Dictionary } from '@vercel/client';
@@ -38,6 +38,7 @@ export interface CreateOptions {
  prebuilt?: boolean;
  rootDirectory?: string;
  meta: Dictionary<string>;
+  gitMetadata?: GitMetadata;
  regions?: string[];
  quiet?: boolean;
  env: Dictionary<string>;
@@ -116,6 +117,7 @@ export default class Now extends EventEmitter {
      rootDirectory,
      wantsPublic,
      meta,
+      gitMetadata,
      regions,
      quiet = false,
      env,
@@ -142,6 +144,7 @@ export default class Now extends EventEmitter {
      name,
      project,
      meta,
+      gitMetadata,
      regions,
      target: target || undefined,
      projectSettings,
@@ -527,7 +530,7 @@ export default class Now extends EventEmitter {
      `${opts.method || 'GET'} ${this._apiUrl}${_url} ${opts.body || ''}`,
      fetch(`${this._apiUrl}${_url}`, { ...opts, body })
    );
-    printIndications(res);
+    printIndications(this._client, res);
    return res;
  }

--- a/packages/cli/src/util/input/confirm.ts
+++ b/packages/cli/src/util/input/confirm.ts
@@ -1,12 +1,13 @@
-import inquirer from 'inquirer';
+import Client from '../client';

 export default async function confirm(
+  client: Client,
  message: string,
  preferred: boolean
 ): Promise<boolean> {
  require('./patch-inquirer');

-  const answers = await inquirer.prompt({
+  const answers = await client.prompt({
    type: 'confirm',
    name: 'value',
    message,
--- a/packages/cli/src/util/input/edit-project-settings.ts
+++ b/packages/cli/src/util/input/edit-project-settings.ts
@@ -1,38 +1,83 @@
 import inquirer from 'inquirer';
 import confirm from './confirm';
 import chalk from 'chalk';
-import { Output } from '../output';
-import { Framework } from '@vercel/frameworks';
+import frameworkList, { Framework } from '@vercel/frameworks';
+import Client from '../client';
 import { isSettingValue } from '../is-setting-value';
 import { ProjectSettings } from '../../types';

-export interface PartialProjectSettings {
-  buildCommand: string | null;
-  outputDirectory: string | null;
-  devCommand: string | null;
-}
-
-const fields: { name: string; value: keyof PartialProjectSettings }[] = [
-  { name: 'Build Command', value: 'buildCommand' },
-  { name: 'Output Directory', value: 'outputDirectory' },
-  { name: 'Development Command', value: 'devCommand' },
+const settingMap = {
+  buildCommand: 'Build Command',
+  devCommand: 'Development Command',
+  commandForIgnoringBuildStep: 'Ignore Command',
+  installCommand: 'Install Command',
+  outputDirectory: 'Output Directory',
+  framework: 'Framework',
+} as const;
+type ConfigKeys = keyof typeof settingMap;
+const settingKeys = Object.keys(settingMap).sort() as unknown as readonly [
+  ConfigKeys
 ];

+export type PartialProjectSettings = Pick<ProjectSettings, ConfigKeys>;
+
 export default async function editProjectSettings(
-  output: Output,
+  client: Client,
  projectSettings: PartialProjectSettings | null,
  framework: Framework | null,
-  autoConfirm?: boolean
+  autoConfirm: boolean,
+  localConfigurationOverrides: PartialProjectSettings | null
 ): Promise<ProjectSettings> {
-  // create new settings object, missing values will be filled with `null`
+  const { output } = client;
+
+  // Create initial settings object defaulting everything to `null` and assigning what may exist in `projectSettings`
  const settings: ProjectSettings = Object.assign(
-    { framework: null },
+    {
+      buildCommand: null,
+      devCommand: null,
+      framework: null,
+      commandForIgnoringBuildStep: null,
+      installCommand: null,
+      outputDirectory: null,
+    },
    projectSettings
  );

-  for (let field of fields) {
-    settings[field.value] =
-      (projectSettings && projectSettings[field.value]) || null;
+  // Start UX by displaying (and applying) overrides. They will be referenced throughout remainder of CLI.
+  if (localConfigurationOverrides) {
+    // Apply local overrides (from `vercel.json`)
+    for (const setting of settingKeys) {
+      const localConfigValue = localConfigurationOverrides[setting];
+      if (localConfigValue) settings[setting] = localConfigValue;
+    }
+
+    output.print('Local settings detected in vercel.json:\n');
+
+    // Print provided overrides including framework
+    for (const setting of settingKeys) {
+      const override = localConfigurationOverrides[setting];
+      if (override) {
+        output.print(
+          `${chalk.dim(
+            `- ${chalk.bold(`${settingMap[setting]}:`)} ${override}`
+          )}\n`
+        );
+      }
+    }
+
+    // If framework is overridden, set it to the `framework` parameter and let the normal framework-flow occur
+    if (localConfigurationOverrides.framework) {
+      const overrideFramework = frameworkList.find(
+        f => f.slug === localConfigurationOverrides.framework
+      );
+
+      if (overrideFramework) {
+        framework = overrideFramework;
+        output.print(
+          `Merging default Project Settings for ${framework.name}. Previously listed overrides are prioritized.\n`
+        );
+      }
+    }
  }

  // skip editing project settings if no framework is detected
@@ -41,6 +86,7 @@ export default async function editProjectSettings(
    return settings;
  }

+  // A missing framework slug implies the "Other" framework was selected
  output.print(
    !framework.slug
      ? `No framework detected. Default Project Settings:\n`
@@ -49,44 +95,78 @@ export default async function editProjectSettings(

  settings.framework = framework.slug;

-  for (let field of fields) {
-    const defaults = framework.settings[field.value];
+  // Now print defaults for the provided framework whether it was auto-detected or overwritten
+  for (const setting of settingKeys) {
+    if (setting === 'framework' || setting === 'commandForIgnoringBuildStep') {
+      continue;
+    }

-    output.print(
-      chalk.dim(
-        `- ${chalk.bold(`${field.name}:`)} ${`${
-          isSettingValue(defaults)
-            ? defaults.value
-            : chalk.italic(`${defaults.placeholder}`)
-        }`}`
-      ) + '\n'
-    );
+    const defaultSetting = framework.settings[setting];
+    const override = localConfigurationOverrides?.[setting];
+
+    if (!override && defaultSetting) {
+      output.print(
+        `${chalk.dim(
+          `- ${chalk.bold(`${settingMap[setting]}:`)} ${
+            isSettingValue(defaultSetting)
+              ? defaultSetting.value
+              : chalk.italic(`${defaultSetting.placeholder}`)
+          }`
+        )}\n`
+      );
+    }
  }

+  // Prompt the user if they want to modify any settings not defined by local configuration.
  if (
    autoConfirm ||
-    !(await confirm(`Want to override the settings?`, false))
+    !(await confirm(client, 'Want to modify these settings?', false))
  ) {
    return settings;
  }

-  const { settingFields } = await inquirer.prompt({
+  const choices = settingKeys.reduce<Array<{ name: string; value: string }>>(
+    (acc, setting) => {
+      const skip =
+        setting === 'framework' ||
+        setting === 'commandForIgnoringBuildStep' ||
+        setting === 'installCommand' ||
+        localConfigurationOverrides?.[setting];
+      if (!skip) {
+        acc.push({ name: settingMap[setting], value: setting });
+      }
+      return acc;
+    },
+    []
+  );
+
+  const { settingFields } = await inquirer.prompt<{
+    settingFields: Array<
+      Exclude<
+        ConfigKeys,
+        'framework' | 'commandForIgnoringBuildStep' | 'installCommand'
+      >
+    >;
+  }>({
    name: 'settingFields',
    type: 'checkbox',
    message: 'Which settings would you like to overwrite (select multiple)?',
-    choices: fields,
+    choices,
  });

-  for (let setting of settingFields as (keyof PartialProjectSettings)[]) {
-    const field = fields.find(f => f.value === setting);
-    const name = `${Date.now()}`;
-    const answers = await inquirer.prompt({
+  for (let setting of settingFields) {
+    const field = settingMap[setting];
+    const answers = await inquirer.prompt<{
+      [k in Exclude<
+        ConfigKeys,
+        'framework' | 'commandForIgnoringBuildStep' | 'installCommand'
+      >]: string;
+    }>({
      type: 'input',
-      name: name,
-      message: `What's your ${chalk.bold(field ? field.name : setting)}?`,
+      name: setting,
+      message: `What's your ${chalk.bold(field)}?`,
    });
-    settings[setting] = answers[name] as string;
+    settings[setting] = answers[setting];
  }
-
  return settings;
 }
--- a/packages/cli/src/util/input/input-project.ts
+++ b/packages/cli/src/util/input/input-project.ts
@@ -1,5 +1,4 @@
 import Client from '../client';
-import inquirer from 'inquirer';
 import confirm from './confirm';
 import getProjectByIdOrName from '../projects/get-project-by-id-or-name';
 import chalk from 'chalk';
@@ -47,11 +46,16 @@ export default async function inputProject(

  if (!detectedProject) {
    // did not auto-detect a project to link
-    shouldLinkProject = await confirm(`Link to existing project?`, false);
+    shouldLinkProject = await confirm(
+      client,
+      `Link to existing project?`,
+      false
+    );
  } else {
    // auto-detected a project to link
    if (
      await confirm(
+        client,
        `Found project ${chalk.cyan(
          `“${org.slug}/${detectedProject.name}”`
        )}. Link to it?`,
@@ -63,6 +67,7 @@ export default async function inputProject(

    // user doesn't want to link the auto-detected project
    shouldLinkProject = await confirm(
+      client,
      `Link to different existing project?`,
      true
    );
@@ -73,7 +78,7 @@ export default async function inputProject(
    let project: Project | ProjectNotFound | null = null;

    while (!project || project instanceof ProjectNotFound) {
-      const answers = await inquirer.prompt({
+      const answers = await client.prompt({
        type: 'input',
        name: 'existingProjectName',
        message: `What’s the name of your existing project?`,
@@ -104,7 +109,7 @@ export default async function inputProject(
  let newProjectName: string | null = null;

  while (!newProjectName) {
-    const answers = await inquirer.prompt({
+    const answers = await client.prompt({
      type: 'input',
      name: 'newProjectName',
      message: `What’s your project’s name?`,
--- a/packages/cli/src/util/input/input-root-directory.ts
+++ b/packages/cli/src/util/input/input-root-directory.ts
@@ -1,12 +1,11 @@
 import path from 'path';
 import chalk from 'chalk';
-import inquirer from 'inquirer';
-import { Output } from '../output';
 import { validateRootDirectory } from '../validate-paths';
+import Client from '../client';

 export async function inputRootDirectory(
+  client: Client,
  cwd: string,
-  output: Output,
  autoConfirm = false
 ) {
  if (autoConfirm) {
@@ -15,7 +14,7 @@ export async function inputRootDirectory(

  // eslint-disable-next-line no-constant-condition
  while (true) {
-    const { rootDirectory } = await inquirer.prompt({
+    const { rootDirectory } = await client.prompt({
      type: 'input',
      name: 'rootDirectory',
      message: `In which directory is your code located?`,
@@ -38,7 +37,7 @@ export async function inputRootDirectory(

    if (
      (await validateRootDirectory(
-        output,
+        client.output,
        cwd,
        fullPath,
        'Please choose a different one.'
--- a/Show More
+++ b/Show More