Publish Canary

- @vercel/build-utils@2.12.3-canary.19 - vercel@23.1.3-canary.35 - @vercel/client@10.2.3-canary.20 - @vercel/frameworks@0.5.1-canary.12 - vercel-plugin-go@1.0.0-canary.4 - vercel-plugin-node@1.12.2-canary.10 - vercel-plugin-python@1.0.0-canary.4 - vercel-plugin-ruby@1.0.0-canary.3
[frameworks] Fix Parcel default output directory to dist (#7029 )
2025-12-11 04:22:13 +00:00 · 2021-11-20 10:20:05 -05:00 · 2021-11-20 01:44:22 +00:00 · 2021-11-19 19:07:52 -05:00 · 2021-11-19 17:26:32 -05:00 · 2021-11-19 14:42:02 -05:00
477 changed files with 38466 additions and 11819 deletions
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,11 +1,10 @@
 node_modules
 dist
 examples
-packages/build-utils/test/fixtures
+packages/*/test/fixtures
 packages/cli/@types
 packages/cli/download
 packages/cli/dist
-packages/cli/test/fixtures
 packages/cli/test/dev/fixtures
 packages/cli/bin
 packages/cli/link
@@ -13,6 +12,6 @@ packages/cli/src/util/dev/templates/*.ts
 packages/client/tests/fixtures
 packages/client/lib
 packages/node/src/bridge.ts
-packages/node/test/fixtures
 packages/node-bridge/bridge.js
 packages/node-bridge/launcher.js
+packages/middleware/src/entries.js
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,4 +1,4 @@
-blank_issues_enabled: false
+blank_issues_enabled: true
 contact_links:
  - name: Bug Report
    url: https://vercel.com/support/request
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -29,6 +29,6 @@ jobs:
    - name: Publish
      run: yarn publish-from-github
      env:
-        NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+        NPM_TOKEN: ${{ secrets.NPM_TOKEN_ELEVATED }}
        GA_TRACKING_ID: ${{ secrets.GA_TRACKING_ID }}
        SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
--- a/.github/workflows/test-integration-dev.yml
+++ b/.github/workflows/test-integration-dev.yml
@@ -11,7 +11,7 @@ on:
 jobs:
  test:
    name: Dev
-    timeout-minutes: 60
+    timeout-minutes: 75
    strategy:
      fail-fast: false
      matrix:
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@ test/lib/deployment/failed-page.txt
 /public
 __pycache__
 .vercel
+.output
--- a/api/frameworks.ts
+++ b/api/frameworks.ts
@@ -14,8 +14,6 @@ const frameworks = (_frameworks as Framework[])
      sort: undefined,
      dependency: undefined,
      defaultRoutes: undefined,
-      devCommand: undefined,
-      buildCommand: undefined,
    };

    if (framework.logo) {
--- a/codecov.yml
+++ b/codecov.yml
@@ -6,3 +6,5 @@ coverage:
    project: off
    patch: off

+fixes:
+  - "::packages/cli/"         # move root   e.g., "path/" => "after/path/"
--- a/examples/angular/package-lock.json
+++ b/examples/angular/package-lock.json
--- a/examples/angular/package.json
+++ b/examples/angular/package.json
@@ -12,37 +12,38 @@
  },
  "private": true,
  "dependencies": {
-    "@angular/animations": "~8.1.0",
-    "@angular/common": "~8.1.0",
-    "@angular/compiler": "~8.1.0",
-    "@angular/core": "~8.1.0",
-    "@angular/forms": "~8.1.0",
-    "@angular/platform-browser": "~8.1.0",
-    "@angular/platform-browser-dynamic": "~8.1.0",
-    "@angular/router": "~8.1.0",
+    "@angular/animations": "^8.1.0",
+    "@angular/common": "^8.1.0",
+    "@angular/core": "^8.1.0",
+    "@angular/forms": "^8.1.0",
+    "@angular/platform-browser": "^8.1.0",
+    "@angular/platform-browser-dynamic": "^8.1.0",
+    "@angular/router": "^8.1.0",
    "rxjs": "~6.4.0",
    "tslib": "^1.9.0",
    "zone.js": "~0.9.1"
  },
  "devDependencies": {
-    "@angular-devkit/build-angular": "~0.801.0",
-    "@angular/cli": "~8.1.0",
-    "@angular/compiler-cli": "~8.1.0",
+    "@angular-devkit/build-angular": "^12.2.2",
+    "@angular/cli": "^12.2.2",
+    "@angular/compiler": "^12.2.2",
+    "@angular/compiler-cli": "^12.2.2",
    "@angular/language-service": "~8.1.0",
-    "@types/node": "~8.9.4",
    "@types/jasmine": "~3.3.8",
    "@types/jasminewd2": "~2.0.3",
+    "@types/node": "~8.9.4",
    "codelyzer": "^5.0.0",
-    "jasmine-core": "~3.4.0",
+    "glob-parent": "^5.1.2",
+    "jasmine-core": "^3.4.0",
    "jasmine-spec-reporter": "~4.2.1",
-    "karma": "~4.1.0",
+    "karma": "^6.3.4",
    "karma-chrome-launcher": "~2.2.0",
    "karma-coverage-istanbul-reporter": "~2.0.1",
    "karma-jasmine": "~2.0.1",
    "karma-jasmine-html-reporter": "^1.4.0",
-    "protractor": "~5.4.0",
+    "protractor": "^7.0.0",
    "ts-node": "~7.0.0",
    "tslint": "~5.15.0",
-    "typescript": "~3.4.3"
+    "typescript": "^4.2.4"
  }
 }
--- a/examples/angular/yarn.lock
+++ b/examples/angular/yarn.lock
--- a/examples/nextjs/package.json
+++ b/examples/nextjs/package.json
@@ -1,6 +1,6 @@
 {
  "name": "nextjs",
-  "version": "0.1.0",
+  "version": "1.0.0",
  "private": true,
  "scripts": {
    "dev": "next dev",
@@ -9,7 +9,7 @@
    "lint": "next lint"
  },
  "dependencies": {
-    "next": "11.1.0",
+    "next": "12.0.1",
    "react": "17.0.2",
    "react-dom": "17.0.2"
  },
--- a/examples/nextjs/yarn.lock
+++ b/examples/nextjs/yarn.lock
@@ -43,10 +43,10 @@
    core-js-pure "^3.16.0"
    regenerator-runtime "^0.13.4"

-"@babel/runtime@7.12.5":
-  version "7.12.5"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.5.tgz#410e7e487441e1b360c29be715d870d9b985882e"
-  integrity sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==
+"@babel/runtime@7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.4.tgz#fd17d16bfdf878e6dd02d19753a39fa8a8d9c84a"
+  integrity sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==
  dependencies:
    regenerator-runtime "^0.13.4"

@@ -119,10 +119,10 @@
  resolved "https://registry.yarnpkg.com/@napi-rs/triples/-/triples-1.0.3.tgz#76d6d0c3f4d16013c61e45dfca5ff1e6c31ae53c"
  integrity sha512-jDJTpta+P4p1NZTFVLHJ/TLFVYVcOqv6l8xwOeBKNPMgY/zDYH/YH7SJbvrr/h1RcS9GzbPcLKGzpuK9cV56UA==

-"@next/env@11.1.0":
-  version "11.1.0"
-  resolved "https://registry.yarnpkg.com/@next/env/-/env-11.1.0.tgz#cae83d8e0a65aa9f2af3368f8269ffd9d911746a"
-  integrity sha512-zPJkMFRenSf7BLlVee8987G0qQXAhxy7k+Lb/5hLAGkPVHAHm+oFFeL+2ipbI2KTEFlazdmGY0M+AlLQn7pWaw==
+"@next/env@12.0.1":
+  version "12.0.1"
+  resolved "https://registry.yarnpkg.com/@next/env/-/env-12.0.1.tgz#d57141ef1fe844f6f7c18cdaf29a712788c18ca4"
+  integrity sha512-+eJ8mQbAcV/ZILRAgIx9xwDg6hrqm6m/7QLfEvsf2BPnsh+fwU4Xf1zgcbyqD2V4ja4OTWG6ow+Hiukgap3mZQ==

 "@next/eslint-plugin-next@11.1.0":
  version "11.1.0"
@@ -131,15 +131,15 @@
  dependencies:
    glob "7.1.7"

-"@next/polyfill-module@11.1.0":
-  version "11.1.0"
-  resolved "https://registry.yarnpkg.com/@next/polyfill-module/-/polyfill-module-11.1.0.tgz#ee6b9117a1f9bb137479dfa51d5a9e38e066a62f"
-  integrity sha512-64EgW8SzJRQls2yJ5DkuljRxgE24o2kYtX/ghTkPUJYsfidHMWzQGwg26IgRbb/uHqTd1G0W5UkKag+Nt8TWaQ==
+"@next/polyfill-module@12.0.1":
+  version "12.0.1"
+  resolved "https://registry.yarnpkg.com/@next/polyfill-module/-/polyfill-module-12.0.1.tgz#d20abf06f686ee7a8bd0d9056accfd0662f19e87"
+  integrity sha512-fTrndwGuvrQO+4myVGcPtsYI4/tmZBhHHJId7MSHWz+9gW4NFgsmDlr8OI9Th2ZXpqk5WHLsTYQ+dLiQp1zV4g==

-"@next/react-dev-overlay@11.1.0":
-  version "11.1.0"
-  resolved "https://registry.yarnpkg.com/@next/react-dev-overlay/-/react-dev-overlay-11.1.0.tgz#8d4e8020a4cbdacbca431a0bf40c4d28187083af"
-  integrity sha512-h+ry0sTk1W3mJw+TwEf91aqLbBJ5oqAsxfx+QryqEItNtfW6zLSSjxkyTYTqX8DkgSssQQutQfATkzBVgOR+qQ==
+"@next/react-dev-overlay@12.0.1":
+  version "12.0.1"
+  resolved "https://registry.yarnpkg.com/@next/react-dev-overlay/-/react-dev-overlay-12.0.1.tgz#134299ae44fad5a59448d5e671518074f37cba95"
+  integrity sha512-dLv1to40bvadbr0VO8pBsbr9ddgktCLilfejOpEFQkOOrdQBUuIfegqqEDiCL9THkAO3QGYY4t/ZPfv9wrxLZQ==
  dependencies:
    "@babel/code-frame" "7.12.11"
    anser "1.4.9"
@@ -151,12 +151,67 @@
    shell-quote "1.7.2"
    source-map "0.8.0-beta.0"
    stacktrace-parser "0.1.10"
-    strip-ansi "6.0.0"
+    strip-ansi "6.0.1"

-"@next/react-refresh-utils@11.1.0":
-  version "11.1.0"
-  resolved "https://registry.yarnpkg.com/@next/react-refresh-utils/-/react-refresh-utils-11.1.0.tgz#60c3c7b127a5dab8b0a2889a7dcf8a90d2c4e592"
-  integrity sha512-g5DtFTpLTGa36iy9DuZawtJeitI11gysFGKPQQqy+mNbSFazguArcJ10gAYFlbqpIi4boUamWNI5mAoSPx3kog==
+"@next/react-refresh-utils@12.0.1":
+  version "12.0.1"
+  resolved "https://registry.yarnpkg.com/@next/react-refresh-utils/-/react-refresh-utils-12.0.1.tgz#219be7a81696a7bd1e2d4ee397ca100eb8262f23"
+  integrity sha512-CjTBR9a6ai+2fUT8KFya9AiTaCnfDY34H6pDmtdJdkD+vY08AwtPpv10kzsgNEhsL06210yVzH59IsEQLBIllA==
+
+"@next/swc-android-arm64@12.0.1":
+  version "12.0.1"
+  resolved "https://registry.yarnpkg.com/@next/swc-android-arm64/-/swc-android-arm64-12.0.1.tgz#c776853e0911c12fcc69a69cd7ab111dff29f8d2"
+  integrity sha512-zI/6zsZuO2igknzHzfaQep0PeD3d4/qdjXUcQLwLHJQtGdhPvZFMke1z3BBWZqePHVsR1JPjE4QTii7udF5qsQ==
+
+"@next/swc-darwin-arm64@12.0.1":
+  version "12.0.1"
+  resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-12.0.1.tgz#bee9c5932511c993ab384ef9aedb86c02532d41e"
+  integrity sha512-vRfHz7rEt9+TTfwi3uY9ObUSLhzMmgVZ96b+yOSmZ6Kxs/V46IXHOLawCnoldXylpskZ/+HTWcrB1D3aimGeZA==
+
+"@next/swc-darwin-x64@12.0.1":
+  version "12.0.1"
+  resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-12.0.1.tgz#a0bdcbcf11b8b62190ec8e0406cecbbcc810b7fc"
+  integrity sha512-mM7QLIqRUqR8I74gbZ4Uq+dY8k3Whrs98wK+vPurmDTBhXhaVnAYblEkEwe0DJGqlmjD4w6faYfCydmFI69jqw==
+
+"@next/swc-linux-arm-gnueabihf@12.0.1":
+  version "12.0.1"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm-gnueabihf/-/swc-linux-arm-gnueabihf-12.0.1.tgz#d0132637288f452ad5c6a6161e42aebcd4355f82"
+  integrity sha512-QF5LVyAWTah5i1p/yG4a8nTGRXerHoDkS3kWYCdjcwlALOiAJ9m0GUTks/O47izNokBAbZnL7URUdvtGFjP0Ng==
+
+"@next/swc-linux-arm64-gnu@12.0.1":
+  version "12.0.1"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-12.0.1.tgz#6b310344b9bac7700eaff8f4c536540b1226e378"
+  integrity sha512-ETFUh373WsjUJJr32GHSDlVSgwFwS+EJUJuSH40Pr4xB6250YxuRk8ccF6QR5LHqTL4tbbVEEfCD8sZVnccP8w==
+
+"@next/swc-linux-arm64-musl@12.0.1":
+  version "12.0.1"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-12.0.1.tgz#8ab1fc81d18bbb70bb15bcc4250382257bba6298"
+  integrity sha512-pfnXNjKywXyp2DJsjFhkfOlvcNu9xa8HgEhCUKXm1OZ4pGnpeb1+UD4t5Pn9b9ggiWPzauZK1abR/9nShvbSzw==
+
+"@next/swc-linux-x64-gnu@12.0.1":
+  version "12.0.1"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-12.0.1.tgz#a664268aedec402da5df34efac1b337d9b0e492e"
+  integrity sha512-d9cXS27Ar7TTtA3BJ8gxosDDdVNSFy4MQiwsszKlEiqfGrnINeXKdVgeiOa+xxq+JxNvPzonp4sbX6k8InIocg==
+
+"@next/swc-linux-x64-musl@12.0.1":
+  version "12.0.1"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-12.0.1.tgz#4b7e5fee5a62adb6d9c9aad1a4aa00a6a09b53dc"
+  integrity sha512-4SAmi7riavU6TFGX7wQFioFi/vx8uJ2/Cx7ZfrYiZzzKmmuu2eM8onW1kcKu+aQD777x/kvzW4+2pWkM2gyPOA==
+
+"@next/swc-win32-arm64-msvc@12.0.1":
+  version "12.0.1"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-12.0.1.tgz#9ff0c2a2f00f41d40bd44d6da195bdf649d807c6"
+  integrity sha512-JRad3QyXvs5zDkeEmc6z5tEvm/ZZnjnsBY921zWw7OIcIZR5wAs+1AnRVjIxHTEHSExxOvBgPyEMpgVkB8OyxQ==
+
+"@next/swc-win32-ia32-msvc@12.0.1":
+  version "12.0.1"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-12.0.1.tgz#5a927ec832b184ce2e35f8ec668daa34175e47d0"
+  integrity sha512-ierQmzVWPi6a7PqrdgfI6nrQ/SWJ9W5jllByyQeFIOKhOzZiz030Tw+U6V7NqE3gGNeRwpj56Iya8nUb3hlM1g==
+
+"@next/swc-win32-x64-msvc@12.0.1":
+  version "12.0.1"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-12.0.1.tgz#fe145cf7baf79564159a87a545e430f96c835578"
+  integrity sha512-li3CCXpdMX0+wJlQpy0xZmHCgHMebaBf5X2BIAJrv8cQXYc6dejeojttXLFNCF0dNAo3UzlbP6h7N+8p6Wbakw==

 "@node-rs/helper@1.2.1":
  version "1.2.1"
@@ -245,6 +300,16 @@ acorn-jsx@^5.3.1:
  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
  integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==

+acorn@8.5.0:
+  version "8.5.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.5.0.tgz#4512ccb99b3698c752591e9bb4472e38ad43cee2"
+  integrity sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==
+
+acorn@^6.2.1:
+  version "6.4.2"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6"
+  integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==
+
 acorn@^7.4.0:
  version "7.4.1"
  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
@@ -285,6 +350,11 @@ ansi-regex@^5.0.0:
  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
  integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==

+ansi-regex@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
+  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
+
 ansi-styles@^3.2.1:
  version "3.2.1"
  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
@@ -377,24 +447,11 @@ assert@2.0.0:
    object-is "^1.0.1"
    util "^0.12.0"

-assert@^1.1.1:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz#55c109aaf6e0aefdb3dc4b71240c70bf574b18eb"
-  integrity sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==
-  dependencies:
-    object-assign "^4.1.1"
-    util "0.10.3"
-
 ast-types-flow@^0.0.7:
  version "0.0.7"
  resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad"
  integrity sha1-9wtzXGvKGlycItmCw+Oef+ujva0=

-ast-types@0.13.2:
-  version "0.13.2"
-  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.13.2.tgz#df39b677a911a83f3a049644fb74fdded23cea48"
-  integrity sha512-uWMHxJxtfj/1oZClOxDEV1sQ1HCDkA4MG8Gr69KKeBjEVH0R84WlejZ0y2DcwyBlpAEMltmVYkVgqfLFb2oyiA==
-
 astral-regex@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
@@ -519,7 +576,7 @@ browserify-sign@^4.0.0:
    readable-stream "^3.6.0"
    safe-buffer "^5.2.0"

-browserify-zlib@0.2.0, browserify-zlib@^0.2.0:
+browserify-zlib@0.2.0:
  version "0.2.0"
  resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
  integrity sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==
@@ -550,15 +607,6 @@ buffer@5.6.0:
    base64-js "^1.0.2"
    ieee754 "^1.1.4"

-buffer@^4.3.0:
-  version "4.9.2"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz#230ead344002988644841ab0244af8c44bbe3ef8"
-  integrity sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==
-  dependencies:
-    base64-js "^1.0.2"
-    ieee754 "^1.1.4"
-    isarray "^1.0.0"
-
 builtin-status-codes@^3.0.0:
  version "3.0.0"
  resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
@@ -679,12 +727,7 @@ concat-map@0.0.1:
  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=

-console-browserify@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336"
-  integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==
-
-constants-browserify@1.0.0, constants-browserify@^1.0.0:
+constants-browserify@1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
  integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=
@@ -701,11 +744,6 @@ core-js-pure@^3.16.0:
  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.16.1.tgz#b997df2669c957a5b29f06e95813a171f993592e"
  integrity sha512-TyofCdMzx0KMhi84mVRS8rL1XsRk2SPUNz2azmth53iRN0/08Uim9fdhQTaZTG1LqaXHYVci4RDHka6WrXfnvg==

-core-util-is@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
-
 create-ecdh@^4.0.0:
  version "4.0.4"
  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.4.tgz#d6e7f4bffa66736085a0762fd3a632684dabcc4e"
@@ -746,7 +784,7 @@ cross-spawn@^7.0.2:
    shebang-command "^2.0.0"
    which "^2.0.1"

-crypto-browserify@3.12.0, crypto-browserify@^3.11.0:
+crypto-browserify@3.12.0:
  version "3.12.0"
  resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
  integrity sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==
@@ -873,11 +911,6 @@ domain-browser@4.19.0:
  resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-4.19.0.tgz#1093e17c0a17dbd521182fe90d49ac1370054af1"
  integrity sha512-fRA+BaAWOR/yr/t7T9E9GJztHPeFjj8U35ajyAjCDtAAnTn1Rc1f6W6VGPJrO1tkQv9zWu+JRof7z6oQtiYVFQ==

-domain-browser@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
-  integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==
-
 electron-to-chromium@^1.3.723:
  version "1.3.802"
  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.802.tgz#0afa989321de3e904ac653ee79e0d642883731a1"
@@ -1206,7 +1239,7 @@ etag@1.8.1:
  resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
  integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=

-events@^3.0.0:
+events@3.3.0:
  version "3.3.0"
  resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
  integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
@@ -1473,7 +1506,7 @@ http-errors@1.7.3:
    statuses ">= 1.5.0 < 2"
    toidentifier "1.0.0"

-https-browserify@1.0.0, https-browserify@^1.0.0:
+https-browserify@1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
  integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
@@ -1535,21 +1568,11 @@ inflight@^1.0.4:
    once "^1.3.0"
    wrappy "1"

-inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3, inherits@~2.0.4:
+inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3, inherits@~2.0.4:
  version "2.0.4"
  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==

-inherits@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
-  integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=
-
-inherits@2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
-
 internal-slot@^1.0.3:
  version "1.0.3"
  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c"
@@ -1693,11 +1716,6 @@ is-typed-array@^1.1.3, is-typed-array@^1.1.6:
    foreach "^2.0.5"
    has-tostringtag "^1.0.0"

-isarray@^1.0.0, isarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
-
 isexe@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
@@ -1939,32 +1957,30 @@ nanoid@^3.1.23:
  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.23.tgz#f744086ce7c2bc47ee0a8472574d5c78e4183a81"
  integrity sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw==

-native-url@0.3.4:
-  version "0.3.4"
-  resolved "https://registry.yarnpkg.com/native-url/-/native-url-0.3.4.tgz#29c943172aed86c63cee62c8c04db7f5756661f8"
-  integrity sha512-6iM8R99ze45ivyH8vybJ7X0yekIcPf5GgLV5K0ENCbmRcaRIDoj37BC8iLEmaaBfqqb8enuZ5p0uhY+lVAbAcA==
-  dependencies:
-    querystring "^0.2.0"
-
 natural-compare@^1.4.0:
  version "1.4.0"
  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
  integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=

-next@11.1.0:
-  version "11.1.0"
-  resolved "https://registry.yarnpkg.com/next/-/next-11.1.0.tgz#767d4c4fa0b9b0c768cdbd6c9f03dd86b5d701c0"
-  integrity sha512-GHBk/c7Wyr6YbFRFZF37I0X7HKzkHHI8pur/loyXo5AIE8wdkbGPGO0ds3vNAO6f8AxZAKGCRYtAzoGlVLoifA==
+neo-async@^2.6.1:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
+  integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
+
+next@12.0.1:
+  version "12.0.1"
+  resolved "https://registry.yarnpkg.com/next/-/next-12.0.1.tgz#7b82a73bc185bfda7372e7e8309f9b38e6be9cb0"
+  integrity sha512-4MNXAbD9+Tmtejg0TOKbaP52Cgu4mIn2ejKMLHWV0acxWGkkcE7QvdZwvg5pkg3fQBMrgucOxxtmw4D7yWaZvg==
  dependencies:
-    "@babel/runtime" "7.12.5"
+    "@babel/runtime" "7.15.4"
    "@hapi/accept" "5.0.2"
-    "@next/env" "11.1.0"
-    "@next/polyfill-module" "11.1.0"
-    "@next/react-dev-overlay" "11.1.0"
-    "@next/react-refresh-utils" "11.1.0"
+    "@next/env" "12.0.1"
+    "@next/polyfill-module" "12.0.1"
+    "@next/react-dev-overlay" "12.0.1"
+    "@next/react-refresh-utils" "12.0.1"
    "@node-rs/helper" "1.2.1"
+    acorn "8.5.0"
    assert "2.0.0"
-    ast-types "0.13.2"
    browserify-zlib "0.2.0"
    browserslist "4.16.6"
    buffer "5.6.0"
@@ -1977,35 +1993,48 @@ next@11.1.0:
    domain-browser "4.19.0"
    encoding "0.1.13"
    etag "1.8.1"
+    events "3.3.0"
    find-cache-dir "3.3.1"
    get-orientation "1.1.2"
    https-browserify "1.0.0"
    image-size "1.0.0"
    jest-worker "27.0.0-next.5"
-    native-url "0.3.4"
    node-fetch "2.6.1"
    node-html-parser "1.4.9"
-    node-libs-browser "^2.2.1"
    os-browserify "0.3.0"
    p-limit "3.1.0"
    path-browserify "1.0.1"
-    pnp-webpack-plugin "1.6.4"
    postcss "8.2.15"
    process "0.11.10"
    querystring-es3 "0.2.1"
    raw-body "2.4.1"
    react-is "17.0.2"
    react-refresh "0.8.3"
+    react-server-dom-webpack "0.0.0-experimental-3c4c1c470-20211021"
+    regenerator-runtime "0.13.4"
    stream-browserify "3.0.0"
    stream-http "3.1.1"
    string_decoder "1.3.0"
-    styled-jsx "4.0.0"
+    styled-jsx "5.0.0-beta.3"
    timers-browserify "2.0.12"
    tty-browserify "0.0.1"
    use-subscription "1.5.1"
-    util "0.12.3"
+    util "0.12.4"
    vm-browserify "1.1.2"
    watchpack "2.1.1"
+    web-streams-polyfill "3.0.3"
+  optionalDependencies:
+    "@next/swc-android-arm64" "12.0.1"
+    "@next/swc-darwin-arm64" "12.0.1"
+    "@next/swc-darwin-x64" "12.0.1"
+    "@next/swc-linux-arm-gnueabihf" "12.0.1"
+    "@next/swc-linux-arm64-gnu" "12.0.1"
+    "@next/swc-linux-arm64-musl" "12.0.1"
+    "@next/swc-linux-x64-gnu" "12.0.1"
+    "@next/swc-linux-x64-musl" "12.0.1"
+    "@next/swc-win32-arm64-msvc" "12.0.1"
+    "@next/swc-win32-ia32-msvc" "12.0.1"
+    "@next/swc-win32-x64-msvc" "12.0.1"

 node-fetch@2.6.1:
  version "2.6.1"
@@ -2019,35 +2048,6 @@ node-html-parser@1.4.9:
  dependencies:
    he "1.2.0"

-node-libs-browser@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz#b64f513d18338625f90346d27b0d235e631f6425"
-  integrity sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==
-  dependencies:
-    assert "^1.1.1"
-    browserify-zlib "^0.2.0"
-    buffer "^4.3.0"
-    console-browserify "^1.1.0"
-    constants-browserify "^1.0.0"
-    crypto-browserify "^3.11.0"
-    domain-browser "^1.1.1"
-    events "^3.0.0"
-    https-browserify "^1.0.0"
-    os-browserify "^0.3.0"
-    path-browserify "0.0.1"
-    process "^0.11.10"
-    punycode "^1.2.4"
-    querystring-es3 "^0.2.0"
-    readable-stream "^2.3.3"
-    stream-browserify "^2.0.1"
-    stream-http "^2.7.2"
-    string_decoder "^1.0.0"
-    timers-browserify "^2.0.4"
-    tty-browserify "0.0.0"
-    url "^0.11.0"
-    util "^0.11.0"
-    vm-browserify "^1.0.1"
-
 node-releases@^1.1.71:
  version "1.1.74"
  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.74.tgz#e5866488080ebaa70a93b91144ccde06f3c3463e"
@@ -2148,7 +2148,7 @@ optionator@^0.9.1:
    type-check "^0.4.0"
    word-wrap "^1.2.3"

-os-browserify@0.3.0, os-browserify@^0.3.0:
+os-browserify@0.3.0:
  version "0.3.0"
  resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
  integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
@@ -2229,11 +2229,6 @@ parse-json@^4.0.0:
    error-ex "^1.3.1"
    json-parse-better-errors "^1.0.1"

-path-browserify@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz#e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a"
-  integrity sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==
-
 path-browserify@1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-1.0.1.tgz#d98454a9c3753d5790860f16f68867b9e46be1fd"
@@ -2323,13 +2318,6 @@ platform@1.3.6:
  resolved "https://registry.yarnpkg.com/platform/-/platform-1.3.6.tgz#48b4ce983164b209c2d45a107adb31f473a6e7a7"
  integrity sha512-fnWVljUchTro6RiCFvCXBbNhJc2NijN7oIQxbwsyL0buWJPG85v81ehlHI9fXrJsMNgTofEoWIQeClKpgxFLrg==

-pnp-webpack-plugin@1.6.4:
-  version "1.6.4"
-  resolved "https://registry.yarnpkg.com/pnp-webpack-plugin/-/pnp-webpack-plugin-1.6.4.tgz#c9711ac4dc48a685dabafc86f8b6dd9f8df84149"
-  integrity sha512-7Wjy+9E3WwLOEL30D+m8TSTF7qJJUJLONBnwQp0518siuMxUQUbgZwssaFX+QKlZkjHZcw/IpZCt/H0srrntSg==
-  dependencies:
-    ts-pnp "^1.1.6"
-
 postcss@8.2.15:
  version "8.2.15"
  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.15.tgz#9e66ccf07292817d226fc315cbbf9bc148fbca65"
@@ -2344,12 +2332,7 @@ prelude-ls@^1.2.1:
  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
  integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==

-process-nextick-args@~2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
-  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
-
-process@0.11.10, process@^0.11.10:
+process@0.11.10:
  version "0.11.10"
  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
  integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
@@ -2380,36 +2363,16 @@ public-encrypt@^4.0.0:
    randombytes "^2.0.1"
    safe-buffer "^5.1.2"

-punycode@1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
-  integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=
-
-punycode@^1.2.4:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
-  integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
-
 punycode@^2.1.0:
  version "2.1.1"
  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==

-querystring-es3@0.2.1, querystring-es3@^0.2.0:
+querystring-es3@0.2.1:
  version "0.2.1"
  resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
  integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=

-querystring@0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
-  integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
-
-querystring@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.1.tgz#40d77615bb09d16902a85c3e38aa8b5ed761c2dd"
-  integrity sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg==
-
 queue-microtask@^1.2.2:
  version "1.2.3"
  resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
@@ -2471,6 +2434,16 @@ react-refresh@0.8.3:
  resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.8.3.tgz#721d4657672d400c5e3c75d063c4a85fb2d5d68f"
  integrity sha512-X8jZHc7nCMjaCqoU+V2I0cOhNW+QMBwSUkeXnTi8IPe6zaRWfn60ZzvFDZqWPfmSJfjub7dDW1SP0jaHWLu/hg==

+react-server-dom-webpack@0.0.0-experimental-3c4c1c470-20211021:
+  version "0.0.0-experimental-3c4c1c470-20211021"
+  resolved "https://registry.yarnpkg.com/react-server-dom-webpack/-/react-server-dom-webpack-0.0.0-experimental-3c4c1c470-20211021.tgz#cdcaa2f19c8d820c1f4d31252319fb05e2de0e88"
+  integrity sha512-YyRlED5kR0C2aQ3IJ/8BR2TELt51RcDZhnUDKz+m/HU+Gb/qak0CZkG0A8Zxffom9VI6HFkUj1dRFZqm0Lh9Pg==
+  dependencies:
+    acorn "^6.2.1"
+    loose-envify "^1.1.0"
+    neo-async "^2.6.1"
+    object-assign "^4.1.1"
+
 react@17.0.2:
  version "17.0.2"
  resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037"
@@ -2496,19 +2469,6 @@ read-pkg@^3.0.0:
    normalize-package-data "^2.3.2"
    path-type "^3.0.0"

-readable-stream@^2.0.2, readable-stream@^2.3.3, readable-stream@^2.3.6:
-  version "2.3.7"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
-  integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~2.0.0"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.1.1"
-    util-deprecate "~1.0.1"
-
 readable-stream@^3.5.0, readable-stream@^3.6.0:
  version "3.6.0"
  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
@@ -2525,6 +2485,11 @@ readdirp@~3.5.0:
  dependencies:
    picomatch "^2.2.1"

+regenerator-runtime@0.13.4:
+  version "0.13.4"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz#e96bf612a3362d12bb69f7e8f74ffeab25c7ac91"
+  integrity sha512-plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g==
+
 regenerator-runtime@^0.13.4:
  version "0.13.9"
  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52"
@@ -2601,7 +2566,7 @@ safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2,
  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==

-safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+safe-buffer@~5.1.1:
  version "5.1.2"
  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
@@ -2762,14 +2727,6 @@ stream-browserify@3.0.0:
    inherits "~2.0.4"
    readable-stream "^3.5.0"

-stream-browserify@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b"
-  integrity sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==
-  dependencies:
-    inherits "~2.0.1"
-    readable-stream "^2.0.2"
-
 stream-http@3.1.1:
  version "3.1.1"
  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-3.1.1.tgz#0370a8017cf8d050b9a8554afe608f043eaff564"
@@ -2780,17 +2737,6 @@ stream-http@3.1.1:
    readable-stream "^3.6.0"
    xtend "^4.0.2"

-stream-http@^2.7.2:
-  version "2.8.3"
-  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc"
-  integrity sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==
-  dependencies:
-    builtin-status-codes "^3.0.0"
-    inherits "^2.0.1"
-    readable-stream "^2.3.6"
-    to-arraybuffer "^1.0.0"
-    xtend "^4.0.0"
-
 stream-parser@^0.3.1:
  version "0.3.1"
  resolved "https://registry.yarnpkg.com/stream-parser/-/stream-parser-0.3.1.tgz#1618548694420021a1182ff0af1911c129761773"
@@ -2842,21 +2788,21 @@ string.prototype.trimstart@^1.0.4:
    call-bind "^1.0.2"
    define-properties "^1.1.3"

-string_decoder@1.3.0, string_decoder@^1.0.0, string_decoder@^1.1.1:
+string_decoder@1.3.0, string_decoder@^1.1.1:
  version "1.3.0"
  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
  dependencies:
    safe-buffer "~5.2.0"

-string_decoder@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
-  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
+strip-ansi@6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
  dependencies:
-    safe-buffer "~5.1.0"
+    ansi-regex "^5.0.1"

-strip-ansi@6.0.0, strip-ansi@^6.0.0:
+strip-ansi@^6.0.0:
  version "6.0.0"
  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
  integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
@@ -2873,10 +2819,10 @@ strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
  integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==

-styled-jsx@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/styled-jsx/-/styled-jsx-4.0.0.tgz#f7b90e7889d0a4f4635f8d1ae9ac32f3acaedc57"
-  integrity sha512-2USeoWMoJ/Lx5s2y1PxuvLy/cz2Yrr8cTySV3ILHU1Vmaw1bnV7suKdblLPjnyhMD+qzN7B1SWyh4UZTARn/WA==
+styled-jsx@5.0.0-beta.3:
+  version "5.0.0-beta.3"
+  resolved "https://registry.yarnpkg.com/styled-jsx/-/styled-jsx-5.0.0-beta.3.tgz#400d16179b5dff10d5954ab8be27a9a1b7780dd2"
+  integrity sha512-HtDDGSFPvmjHIqWf9n8Oo54tAoY/DTplvlyOH2+YOtD80Sp31Ap8ffSmxhgk5EkUoJ7xepdXMGT650mSffWuRA==
  dependencies:
    "@babel/plugin-syntax-jsx" "7.14.5"
    "@babel/types" "7.15.0"
@@ -2935,18 +2881,13 @@ text-table@^0.2.0:
  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
  integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=

-timers-browserify@2.0.12, timers-browserify@^2.0.4:
+timers-browserify@2.0.12:
  version "2.0.12"
  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.12.tgz#44a45c11fbf407f34f97bccd1577c652361b00ee"
  integrity sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==
  dependencies:
    setimmediate "^1.0.4"

-to-arraybuffer@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
-  integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=
-
 to-fast-properties@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
@@ -2971,11 +2912,6 @@ tr46@^1.0.1:
  dependencies:
    punycode "^2.1.0"

-ts-pnp@^1.1.6:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz#a500ad084b0798f1c3071af391e65912c86bca92"
-  integrity sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw==
-
 tsconfig-paths@^3.9.0:
  version "3.10.1"
  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.10.1.tgz#79ae67a68c15289fdf5c51cb74f397522d795ed7"
@@ -2997,11 +2933,6 @@ tsutils@^3.21.0:
  dependencies:
    tslib "^1.8.1"

-tty-browserify@0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
-  integrity sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=
-
 tty-browserify@0.0.1:
  version "0.0.1"
  resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.1.tgz#3f05251ee17904dfd0677546670db9651682b811"
@@ -3046,14 +2977,6 @@ uri-js@^4.2.2:
  dependencies:
    punycode "^2.1.0"

-url@^0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
-  integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=
-  dependencies:
-    punycode "1.3.2"
-    querystring "0.2.0"
-
 use-subscription@1.5.1:
  version "1.5.1"
  resolved "https://registry.yarnpkg.com/use-subscription/-/use-subscription-1.5.1.tgz#73501107f02fad84c6dd57965beb0b75c68c42d1"
@@ -3061,38 +2984,12 @@ use-subscription@1.5.1:
  dependencies:
    object-assign "^4.1.1"

-util-deprecate@^1.0.1, util-deprecate@~1.0.1:
+util-deprecate@^1.0.1:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=

-util@0.10.3:
-  version "0.10.3"
-  resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
-  integrity sha1-evsa/lCAUkZInj23/g7TeTNqwPk=
-  dependencies:
-    inherits "2.0.1"
-
-util@0.12.3:
-  version "0.12.3"
-  resolved "https://registry.yarnpkg.com/util/-/util-0.12.3.tgz#971bb0292d2cc0c892dab7c6a5d37c2bec707888"
-  integrity sha512-I8XkoQwE+fPQEhy9v012V+TSdH2kp9ts29i20TaaDUXsg7x/onePbhFJUExBfv/2ay1ZOp/Vsm3nDlmnFGSAog==
-  dependencies:
-    inherits "^2.0.3"
-    is-arguments "^1.0.4"
-    is-generator-function "^1.0.7"
-    is-typed-array "^1.1.3"
-    safe-buffer "^5.1.2"
-    which-typed-array "^1.1.2"
-
-util@^0.11.0:
-  version "0.11.1"
-  resolved "https://registry.yarnpkg.com/util/-/util-0.11.1.tgz#3236733720ec64bb27f6e26f421aaa2e1b588d61"
-  integrity sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==
-  dependencies:
-    inherits "2.0.3"
-
-util@^0.12.0:
+util@0.12.4, util@^0.12.0:
  version "0.12.4"
  resolved "https://registry.yarnpkg.com/util/-/util-0.12.4.tgz#66121a31420df8f01ca0c464be15dfa1d1850253"
  integrity sha512-bxZ9qtSlGUWSOy9Qa9Xgk11kSslpuZwaxCg4sNIDj6FLucDab2JxnHwyNTCpHMtK1MjoQiWQ6DiUMZYbSrO+Sw==
@@ -3117,7 +3014,7 @@ validate-npm-package-license@^3.0.1:
    spdx-correct "^3.0.0"
    spdx-expression-parse "^3.0.0"

-vm-browserify@1.1.2, vm-browserify@^1.0.1:
+vm-browserify@1.1.2:
  version "1.1.2"
  resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
  integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
@@ -3130,6 +3027,11 @@ watchpack@2.1.1:
    glob-to-regexp "^0.4.1"
    graceful-fs "^4.1.2"

+web-streams-polyfill@3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-3.0.3.tgz#f49e487eedeca47a207c1aee41ee5578f884b42f"
+  integrity sha512-d2H/t0eqRNM4w2WvmTdoeIvzAUSpK7JmATB8Nr2lb7nQ9BTIJVjbQ/TRFVEh2gUH1HwclPdoPtfMoFfetXaZnA==
+
 webidl-conversions@^4.0.2:
  version "4.0.2"
  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
@@ -3184,7 +3086,7 @@ wrappy@1:
  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=

-xtend@^4.0.0, xtend@^4.0.2:
+xtend@^4.0.2:
  version "4.0.2"
  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
  integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
--- a/examples/parcel/.gitignore
+++ b/examples/parcel/.gitignore
@@ -0,0 +1,7 @@
+node_modules
+.parcel-cache
+dist
+/.pnp
+.pnp.js
+.DS_Store
+.vercel
--- a/examples/parcel/README.md
+++ b/examples/parcel/README.md
@@ -0,0 +1,34 @@
+This is a vanilla web app built with [Parcel](https://parceljs.org).
+
+## Getting Started
+
+Run the dev server:
+
+```bash
+yarn start
+# or
+npm start
+```
+
+And open [localhost:1234](http://localhost:1234) in your browser!
+
+As you make changes, you should see your app automatically update in the browser without even refreshing the page!
+
+## Learn More
+
+- [Getting started guide](https://parceljs.org/getting-started/webapp/)
+- [Documentation](https://parceljs.org/docs/)
+
+## Deploy Your Own
+
+[![Deploy with Vercel](https://vercel.com/button)](https://vercel.com/new/clone?repository-url=https://github.com/vercel/vercel/tree/main/examples/parcel&template=parcel)
+
+_Live Example: https://parcel.examples.vercel.com_
+
+### Deploying From Your Terminal
+
+You can deploy your new Parcel project with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
+
+```shell
+$ vercel
+```
--- a/examples/parcel/package.json
+++ b/examples/parcel/package.json
@@ -0,0 +1,12 @@
+{
+  "name": "parcel-app",
+  "private": true,
+  "source": "src/index.html",
+  "scripts": {
+    "start": "parcel",
+    "build": "parcel build"
+  },
+  "devDependencies": {
+    "parcel": "^2.0.0"
+  }
+}
--- a/examples/parcel/src/app.js
+++ b/examples/parcel/src/app.js
@@ -0,0 +1 @@
+console.log('Hello world!');
--- a/examples/parcel/src/index.html
+++ b/examples/parcel/src/index.html
@@ -0,0 +1,13 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8"/>
+    <title>My First Parcel App</title>
+    <link rel="stylesheet" href="styles.css" />
+    <script type="module" src="app.js"></script>
+  </head>
+  <body>
+    <h1>Hello, Parcel!</h1>
+    <p>This is a vanilla web app built with Parcel 2!<br>Check out the <a href="https://parceljs.org/getting-started/webapp/" target="_blank">getting started guide</a> and the <a href="https://parceljs.org/docs/" target="_blank">documentation</a> to learn more!</p>
+  </body>
+</html>
--- a/examples/parcel/src/styles.css
+++ b/examples/parcel/src/styles.css
@@ -0,0 +1,18 @@
+body {
+  text-align: center;
+}
+
+h1 {
+  color: hotpink;
+  font-family: cursive;
+  font-size: 55px;
+}
+
+p {
+  font-family: Helvetica, Arial, sans-serif;
+  line-height: 1.5em;
+}
+
+a {
+  color: dodgerblue;
+}
--- a/examples/parcel/yarn.lock
+++ b/examples/parcel/yarn.lock
--- a/package.json
+++ b/package.json
@@ -17,7 +17,6 @@
  "devDependencies": {
    "@typescript-eslint/eslint-plugin": "4.28.0",
    "@typescript-eslint/parser": "4.28.0",
-    "@vercel/ncc": "0.24.0",
    "async-retry": "1.2.3",
    "buffer-replace": "1.0.0",
    "cheerio": "1.0.0-rc.3",
@@ -25,7 +24,7 @@
    "eslint-config-prettier": "8.3.0",
    "eslint-plugin-jest": "24.3.6",
    "husky": "6.0.0",
-    "jest": "27.0.6",
+    "jest": "27.3.1",
    "json5": "2.1.1",
    "lint-staged": "9.2.5",
    "node-fetch": "2.6.1",
--- a/packages/build-utils/package.json
+++ b/packages/build-utils/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/build-utils",
-  "version": "2.12.3-canary.0",
+  "version": "2.12.3-canary.19",
  "license": "MIT",
  "main": "./dist/index.js",
  "types": "./dist/index.d.js",
@@ -21,16 +21,16 @@
    "@types/async-retry": "^1.2.1",
    "@types/cross-spawn": "6.0.0",
    "@types/end-of-stream": "^1.4.0",
-    "@types/fs-extra": "^5.0.5",
+    "@types/fs-extra": "9.0.13",
    "@types/glob": "^7.1.1",
-    "@types/jest": "26.0.24",
+    "@types/jest": "27.0.1",
    "@types/js-yaml": "3.12.1",
    "@types/ms": "0.7.31",
    "@types/multistream": "2.1.1",
    "@types/node-fetch": "^2.1.6",
    "@types/semver": "6.0.0",
    "@types/yazl": "^2.4.1",
-    "@vercel/frameworks": "0.5.1-canary.1",
+    "@vercel/frameworks": "0.5.1-canary.12",
    "@vercel/ncc": "0.24.0",
    "aggregate-error": "3.0.1",
    "async-retry": "1.2.3",
@@ -38,7 +38,7 @@
    "boxen": "4.2.0",
    "cross-spawn": "6.0.5",
    "end-of-stream": "1.4.1",
-    "fs-extra": "7.0.0",
+    "fs-extra": "10.0.0",
    "glob": "7.1.3",
    "into-stream": "5.0.0",
    "js-yaml": "3.13.1",
--- a/packages/build-utils/src/convert-runtime-to-plugin.ts
+++ b/packages/build-utils/src/convert-runtime-to-plugin.ts
@@ -0,0 +1,171 @@
+import fs from 'fs-extra';
+import { join, dirname, relative } from 'path';
+import glob from './fs/glob';
+import { normalizePath } from './fs/normalize-path';
+import { FILES_SYMBOL, getLambdaOptionsFromFunction, Lambda } from './lambda';
+import type FileBlob from './file-blob';
+import type { BuilderFunctions, BuildOptions, Files } from './types';
+import minimatch from 'minimatch';
+
+/**
+ * Convert legacy Runtime to a Plugin.
+ * @param buildRuntime - a legacy build() function from a Runtime
+ * @param ext - the file extension, for example `.py`
+ */
+export function convertRuntimeToPlugin(
+  buildRuntime: (options: BuildOptions) => Promise<{ output: Lambda }>,
+  ext: string
+) {
+  return async function build({ workPath }: { workPath: string }) {
+    const opts = { cwd: workPath };
+    const files = await glob('**', opts);
+    delete files['vercel.json']; // Builders/Runtimes didn't have vercel.json
+    const entrypoints = await glob(`api/**/*${ext}`, opts);
+    const pages: { [key: string]: any } = {};
+    const { functions = {} } = await readVercelConfig(workPath);
+    const traceDir = join(workPath, '.output', 'runtime-traced-files');
+    await fs.ensureDir(traceDir);
+
+    for (const entrypoint of Object.keys(entrypoints)) {
+      const key =
+        Object.keys(functions).find(
+          src => src === entrypoint || minimatch(entrypoint, src)
+        ) || '';
+      const config = functions[key] || {};
+
+      const { output } = await buildRuntime({
+        files,
+        entrypoint,
+        workPath,
+        config: {
+          zeroConfig: true,
+          includeFiles: config.includeFiles,
+          excludeFiles: config.excludeFiles,
+        },
+      });
+
+      pages[entrypoint] = {
+        handler: output.handler,
+        runtime: output.runtime,
+        memory: output.memory,
+        maxDuration: output.maxDuration,
+        environment: output.environment,
+        allowQuery: output.allowQuery,
+        regions: output.regions,
+      };
+
+      // @ts-ignore This symbol is a private API
+      const lambdaFiles: Files = output[FILES_SYMBOL];
+
+      const entry = join(workPath, '.output', 'server', 'pages', entrypoint);
+      await fs.ensureDir(dirname(entry));
+      await linkOrCopy(files[entrypoint].fsPath, entry);
+
+      const tracedFiles: {
+        absolutePath: string;
+        relativePath: string;
+      }[] = [];
+
+      Object.entries(lambdaFiles).forEach(async ([relPath, file]) => {
+        const newPath = join(traceDir, relPath);
+        tracedFiles.push({ absolutePath: newPath, relativePath: relPath });
+        if (file.fsPath) {
+          await linkOrCopy(file.fsPath, newPath);
+        } else if (file.type === 'FileBlob') {
+          const { data, mode } = file as FileBlob;
+          await fs.writeFile(newPath, data, { mode });
+        } else {
+          throw new Error(`Unknown file type: ${file.type}`);
+        }
+      });
+
+      const nft = join(
+        workPath,
+        '.output',
+        'server',
+        'pages',
+        `${entrypoint}.nft.json`
+      );
+      const json = JSON.stringify({
+        version: 1,
+        files: tracedFiles.map(f => ({
+          input: normalizePath(relative(nft, f.absolutePath)),
+          output: normalizePath(f.relativePath),
+        })),
+      });
+
+      await fs.ensureDir(dirname(nft));
+      await fs.writeFile(nft, json);
+    }
+
+    await updateFunctionsManifest({ workPath, pages });
+  };
+}
+
+async function linkOrCopy(existingPath: string, newPath: string) {
+  try {
+    await fs.createLink(existingPath, newPath);
+  } catch (err: any) {
+    if (err.code !== 'EEXIST') {
+      await fs.copyFile(existingPath, newPath);
+    }
+  }
+}
+
+async function readJson(filePath: string): Promise<{ [key: string]: any }> {
+  try {
+    const str = await fs.readFile(filePath, 'utf8');
+    return JSON.parse(str);
+  } catch (err) {
+    if (err.code === 'ENOENT') {
+      return {};
+    }
+    throw err;
+  }
+}
+
+async function readVercelConfig(
+  workPath: string
+): Promise<{ functions?: BuilderFunctions; regions?: string[] }> {
+  const vercelJsonPath = join(workPath, 'vercel.json');
+  return readJson(vercelJsonPath);
+}
+
+/**
+ * If `.output/functions-manifest.json` exists, append to the pages
+ * property. Otherwise write a new file. This will also read `vercel.json`
+ * and apply relevant `functions` property config.
+ */
+export async function updateFunctionsManifest({
+  workPath,
+  pages,
+}: {
+  workPath: string;
+  pages: { [key: string]: any };
+}) {
+  const functionsManifestPath = join(
+    workPath,
+    '.output',
+    'functions-manifest.json'
+  );
+  const vercelConfig = await readVercelConfig(workPath);
+  const functionsManifest = await readJson(functionsManifestPath);
+
+  if (!functionsManifest.version) functionsManifest.version = 1;
+  if (!functionsManifest.pages) functionsManifest.pages = {};
+
+  for (const [pageKey, pageConfig] of Object.entries(pages)) {
+    const fnConfig = await getLambdaOptionsFromFunction({
+      sourceFile: pageKey,
+      config: vercelConfig,
+    });
+    functionsManifest.pages[pageKey] = {
+      ...pageConfig,
+      memory: fnConfig.memory || pageConfig.memory,
+      maxDuration: fnConfig.maxDuration || pageConfig.maxDuration,
+      regions: vercelConfig.regions || pageConfig.regions,
+    };
+  }
+
+  await fs.writeFile(functionsManifestPath, JSON.stringify(functionsManifest));
+}
--- a/packages/build-utils/src/detect-builders.ts
+++ b/packages/build-utils/src/detect-builders.ts
@@ -1030,7 +1030,7 @@ function getRouteResult(
    // https://nextjs.org/docs/advanced-features/custom-error-page
    errorRoutes.push({
      status: 404,
-      src: '^/(?!.*api).*$',
+      src: '^(?!/api).*$',
      dest: options.cleanUrls ? '/404' : '/404.html',
    });
  }
--- a/packages/build-utils/src/file-fs-ref.ts
+++ b/packages/build-utils/src/file-fs-ref.ts
@@ -100,4 +100,4 @@ class FileFsRef implements File {
  }
 }

-export = FileFsRef;
+export default FileFsRef;
--- a/packages/build-utils/src/fs/glob.ts
+++ b/packages/build-utils/src/fs/glob.ts
@@ -3,6 +3,7 @@ import assert from 'assert';
 import vanillaGlob_ from 'glob';
 import { promisify } from 'util';
 import { lstat, Stats } from 'fs-extra';
+import { normalizePath } from './normalize-path';
 import FileFsRef from '../file-fs-ref';

 export type GlobOptions = vanillaGlob_.IOptions;
@@ -45,7 +46,7 @@ export default async function glob(
  const files = await vanillaGlob(pattern, options);

  for (const relativePath of files) {
-    const fsPath = path.join(options.cwd!, relativePath).replace(/\\/g, '/');
+    const fsPath = normalizePath(path.join(options.cwd!, relativePath));
    let stat: Stats = options.statCache![fsPath] as Stats;
    assert(
      stat,
--- a/packages/build-utils/src/fs/normalize-path.ts
+++ b/packages/build-utils/src/fs/normalize-path.ts
@@ -0,0 +1,8 @@
+const isWin = process.platform === 'win32';
+
+/**
+ * Convert Windows separators to Unix separators.
+ */
+export function normalizePath(p: string): string {
+  return isWin ? p.replace(/\\/g, '/') : p;
+}
--- a/packages/build-utils/src/index.ts
+++ b/packages/build-utils/src/index.ts
@@ -81,6 +81,11 @@ export {
 export { detectFramework } from './detect-framework';
 export { DetectorFilesystem } from './detectors/filesystem';
 export { readConfigFile } from './fs/read-config-file';
+export { normalizePath } from './fs/normalize-path';
+export {
+  convertRuntimeToPlugin,
+  updateFunctionsManifest,
+} from './convert-runtime-to-plugin';

 export * from './schemas';
 export * from './types';
--- a/packages/build-utils/src/lambda.ts
+++ b/packages/build-utils/src/lambda.ts
@@ -19,6 +19,8 @@ interface LambdaOptions {
  memory?: number;
  maxDuration?: number;
  environment: Environment;
+  allowQuery?: string[];
+  regions?: string[];
 }

 interface CreateLambdaOptions {
@@ -28,13 +30,17 @@ interface CreateLambdaOptions {
  memory?: number;
  maxDuration?: number;
  environment?: Environment;
+  allowQuery?: string[];
+  regions?: string[];
 }

 interface GetLambdaOptionsFromFunctionOptions {
  sourceFile: string;
-  config?: Config;
+  config?: Pick<Config, 'functions'>;
 }

+export const FILES_SYMBOL = Symbol('files');
+
 export class Lambda {
  public type: 'Lambda';
  public zipBuffer: Buffer;
@@ -43,6 +49,8 @@ export class Lambda {
  public memory?: number;
  public maxDuration?: number;
  public environment: Environment;
+  public allowQuery?: string[];
+  public regions?: string[];

  constructor({
    zipBuffer,
@@ -51,6 +59,8 @@ export class Lambda {
    maxDuration,
    memory,
    environment,
+    allowQuery,
+    regions,
  }: LambdaOptions) {
    this.type = 'Lambda';
    this.zipBuffer = zipBuffer;
@@ -59,6 +69,8 @@ export class Lambda {
    this.memory = memory;
    this.maxDuration = maxDuration;
    this.environment = environment;
+    this.allowQuery = allowQuery;
+    this.regions = regions;
  }
 }

@@ -72,6 +84,8 @@ export async function createLambda({
  memory,
  maxDuration,
  environment = {},
+  allowQuery,
+  regions,
 }: CreateLambdaOptions): Promise<Lambda> {
  assert(typeof files === 'object', '"files" must be an object');
  assert(typeof handler === 'string', '"handler" is not a string');
@@ -86,18 +100,38 @@ export async function createLambda({
    assert(typeof maxDuration === 'number', '"maxDuration" is not a number');
  }

+  if (allowQuery !== undefined) {
+    assert(Array.isArray(allowQuery), '"allowQuery" is not an Array');
+    assert(
+      allowQuery.every(q => typeof q === 'string'),
+      '"allowQuery" is not a string Array'
+    );
+  }
+
+  if (regions !== undefined) {
+    assert(Array.isArray(regions), '"regions" is not an Array');
+    assert(
+      regions.every(r => typeof r === 'string'),
+      '"regions" is not a string Array'
+    );
+  }
+
  await sema.acquire();

  try {
    const zipBuffer = await createZip(files);
-    return new Lambda({
+    const lambda = new Lambda({
      zipBuffer,
      handler,
      runtime,
      memory,
      maxDuration,
      environment,
+      regions,
    });
+    // @ts-ignore This symbol is a private API
+    lambda[FILES_SYMBOL] = files;
+    return lambda;
  } finally {
    sema.release();
  }
@@ -131,9 +165,7 @@ export async function createZip(files: Files): Promise<Buffer> {
    }

    zipFile.end();
-    streamToBuffer(zipFile.outputStream)
-      .then(resolve)
-      .catch(reject);
+    streamToBuffer(zipFile.outputStream).then(resolve).catch(reject);
  });

  return zipBuffer;
--- a/packages/build-utils/src/prerender.ts
+++ b/packages/build-utils/src/prerender.ts
@@ -9,6 +9,7 @@ interface PrerenderOptions {
  fallback: FileBlob | FileFsRef | FileRef | null;
  group?: number;
  bypassToken?: string | null /* optional to be non-breaking change */;
+  allowQuery?: string[];
 }

 export class Prerender {
@@ -18,6 +19,7 @@ export class Prerender {
  public fallback: FileBlob | FileFsRef | FileRef | null;
  public group?: number;
  public bypassToken: string | null;
+  public allowQuery?: string[];

  constructor({
    expiration,
@@ -25,6 +27,7 @@ export class Prerender {
    fallback,
    group,
    bypassToken,
+    allowQuery,
  }: PrerenderOptions) {
    this.type = 'Prerender';
    this.expiration = expiration;
@@ -62,5 +65,19 @@ export class Prerender {
      );
    }
    this.fallback = fallback;
+
+    if (allowQuery !== undefined) {
+      if (!Array.isArray(allowQuery)) {
+        throw new Error(
+          'The `allowQuery` argument for `Prerender` must be Array.'
+        );
+      }
+      if (!allowQuery.every(q => typeof q === 'string')) {
+        throw new Error(
+          'The `allowQuery` argument for `Prerender` must be Array of strings.'
+        );
+      }
+      this.allowQuery = allowQuery;
+    }
  }
 }
--- a/packages/build-utils/src/types.ts
+++ b/packages/build-utils/src/types.ts
@@ -10,6 +10,7 @@ export interface File {
  mode: number;
  contentType?: string;
  toStream: () => NodeJS.ReadableStream;
+  toStreamAsync?: () => Promise<NodeJS.ReadableStream>;
  /**
   * The absolute path to the file in the filesystem
   */
--- a/packages/build-utils/test/fixtures/20-npm-7/vercel.json
+++ b/packages/build-utils/test/fixtures/20-npm-7/vercel.json
@@ -1,5 +1,5 @@
 {
  "version": 2,
  "builds": [{ "src": "package.json", "use": "@vercel/static-build" }],
-  "probes": [{ "path": "/", "mustContain": "npm version: 7" }]
+  "probes": [{ "path": "/", "mustContain": "npm version: 8" }]
 }
--- a/packages/build-utils/test/unit.builds-and-routes-detector.test.ts
+++ b/packages/build-utils/test/unit.builds-and-routes-detector.test.ts
@@ -2013,15 +2013,11 @@ describe('Test `detectBuilders` with `featHandleMiss=true`', () => {
      framework: 'redwoodjs',
    };

-    const {
-      builders,
-      defaultRoutes,
-      rewriteRoutes,
-      errorRoutes,
-    } = await detectBuilders(files, null, {
-      projectSettings,
-      featHandleMiss,
-    });
+    const { builders, defaultRoutes, rewriteRoutes, errorRoutes } =
+      await detectBuilders(files, null, {
+        projectSettings,
+        featHandleMiss,
+      });

    expect(builders).toStrictEqual([
      {
@@ -2038,7 +2034,7 @@ describe('Test `detectBuilders` with `featHandleMiss=true`', () => {
    expect(errorRoutes).toStrictEqual([
      {
        status: 404,
-        src: '^/(?!.*api).*$',
+        src: '^(?!/api).*$',
        dest: '/404.html',
      },
    ]);
@@ -2050,15 +2046,11 @@ describe('Test `detectBuilders` with `featHandleMiss=true`', () => {
      framework: 'redwoodjs',
    };

-    const {
-      builders,
-      defaultRoutes,
-      rewriteRoutes,
-      errorRoutes,
-    } = await detectBuilders(files, null, {
-      projectSettings,
-      featHandleMiss,
-    });
+    const { builders, defaultRoutes, rewriteRoutes, errorRoutes } =
+      await detectBuilders(files, null, {
+        projectSettings,
+        featHandleMiss,
+      });

    expect(builders).toStrictEqual([
      {
@@ -2096,7 +2088,7 @@ describe('Test `detectBuilders` with `featHandleMiss=true`', () => {
    expect(errorRoutes).toStrictEqual([
      {
        status: 404,
-        src: '^/(?!.*api).*$',
+        src: '^(?!/api).*$',
        dest: '/404.html',
      },
    ]);
@@ -2417,7 +2409,7 @@ it('Test `detectRoutes` with `featHandleMiss=true`', async () => {
    expect(errorRoutes).toStrictEqual([
      {
        status: 404,
-        src: '^/(?!.*api).*$',
+        src: '^(?!/api).*$',
        dest: '/404.html',
      },
    ]);
@@ -2435,6 +2427,11 @@ it('Test `detectRoutes` with `featHandleMiss=true`', async () => {
      '/another/sub/index.html',
      '/another/sub/page.html',
      '/another/sub/page',
+      '/another/api',
+      '/another/api/page.html',
+      '/rapid',
+      '/rapid/page.html',
+      '/health-api.html',
    ].forEach(file => {
      expect(file).toMatch(pattern);
    });
@@ -2443,12 +2440,12 @@ it('Test `detectRoutes` with `featHandleMiss=true`', async () => {
      '/api',
      '/api/',
      '/api/index.html',
-      '/api/page.html',
-      '/api/page',
+      '/api/users.js',
+      '/api/users',
      '/api/sub',
      '/api/sub/index.html',
-      '/api/sub/page.html',
-      '/api/sub/page',
+      '/api/sub/users.js',
+      '/api/sub/users',
    ].forEach(file => {
      expect(file).not.toMatch(pattern);
    });
@@ -2819,12 +2816,8 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`', async ()
  {
    const files = ['api/user.go', 'api/team.js', 'api/package.json'];

-    const {
-      defaultRoutes,
-      redirectRoutes,
-      rewriteRoutes,
-      errorRoutes,
-    } = await detectBuilders(files, null, options);
+    const { defaultRoutes, redirectRoutes, rewriteRoutes, errorRoutes } =
+      await detectBuilders(files, null, options);
    testHeaders(redirectRoutes);
    expect(defaultRoutes).toStrictEqual([]);
    expect(rewriteRoutes).toStrictEqual([
@@ -2836,7 +2829,7 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`', async ()
    expect(errorRoutes).toStrictEqual([
      {
        status: 404,
-        src: '^/(?!.*api).*$',
+        src: '^(?!/api).*$',
        dest: '/404',
      },
    ]);
@@ -2904,11 +2897,8 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`', async ()
  {
    const files = ['api/[endpoint].js', 'api/[endpoint]/[id].js'];

-    const {
-      defaultRoutes,
-      redirectRoutes,
-      rewriteRoutes,
-    } = await detectBuilders(files, null, options);
+    const { defaultRoutes, redirectRoutes, rewriteRoutes } =
+      await detectBuilders(files, null, options);
    testHeaders(redirectRoutes);
    expect(defaultRoutes).toStrictEqual([]);
    expect(rewriteRoutes).toStrictEqual([
@@ -2936,11 +2926,8 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`', async ()
      'api/[endpoint]/[id].js',
    ];

-    const {
-      defaultRoutes,
-      redirectRoutes,
-      rewriteRoutes,
-    } = await detectBuilders(files, null, options);
+    const { defaultRoutes, redirectRoutes, rewriteRoutes } =
+      await detectBuilders(files, null, options);
    testHeaders(redirectRoutes);
    expect(defaultRoutes).toStrictEqual([]);
    expect(rewriteRoutes).toStrictEqual([
@@ -2974,11 +2961,8 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`', async ()

    const files = ['public/index.html', 'api/[endpoint].js'];

-    const {
-      defaultRoutes,
-      redirectRoutes,
-      rewriteRoutes,
-    } = await detectBuilders(files, pkg, options);
+    const { defaultRoutes, redirectRoutes, rewriteRoutes } =
+      await detectBuilders(files, pkg, options);
    testHeaders(redirectRoutes);
    expect(defaultRoutes).toStrictEqual([]);
    expect(rewriteRoutes).toStrictEqual([
@@ -3004,11 +2988,8 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`', async ()
  {
    const files = ['api/date/index.js', 'api/date.js'];

-    const {
-      defaultRoutes,
-      redirectRoutes,
-      rewriteRoutes,
-    } = await detectBuilders(files, null, options);
+    const { defaultRoutes, redirectRoutes, rewriteRoutes } =
+      await detectBuilders(files, null, options);
    testHeaders(redirectRoutes);
    expect(defaultRoutes).toStrictEqual([]);
    expect(rewriteRoutes).toStrictEqual([
@@ -3022,11 +3003,8 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`', async ()
  {
    const files = ['api/date.js', 'api/[date]/index.js'];

-    const {
-      defaultRoutes,
-      redirectRoutes,
-      rewriteRoutes,
-    } = await detectBuilders(files, null, options);
+    const { defaultRoutes, redirectRoutes, rewriteRoutes } =
+      await detectBuilders(files, null, options);
    testHeaders(redirectRoutes);
    expect(defaultRoutes).toStrictEqual([]);
    expect(rewriteRoutes).toStrictEqual([
@@ -3051,11 +3029,8 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`', async ()
      'api/food.ts',
      'api/ts/gold.ts',
    ];
-    const {
-      defaultRoutes,
-      redirectRoutes,
-      rewriteRoutes,
-    } = await detectBuilders(files, null, options);
+    const { defaultRoutes, redirectRoutes, rewriteRoutes } =
+      await detectBuilders(files, null, options);
    testHeaders(redirectRoutes);
    expect(defaultRoutes).toStrictEqual([]);
    expect(rewriteRoutes).toStrictEqual([
@@ -3071,11 +3046,8 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`', async ()
    const functions = { 'api/user.php': { runtime: 'vercel-php@0.1.0' } };
    const files = ['api/user.php'];

-    const {
-      defaultRoutes,
-      redirectRoutes,
-      rewriteRoutes,
-    } = await detectBuilders(files, null, { functions, ...options });
+    const { defaultRoutes, redirectRoutes, rewriteRoutes } =
+      await detectBuilders(files, null, { functions, ...options });
    testHeaders(redirectRoutes);
    expect(defaultRoutes).toStrictEqual([]);
    expect(rewriteRoutes).toStrictEqual([
@@ -3105,11 +3077,8 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`, `trailingS
  {
    const files = ['api/user.go', 'api/team.js', 'api/package.json'];

-    const {
-      defaultRoutes,
-      redirectRoutes,
-      rewriteRoutes,
-    } = await detectBuilders(files, null, options);
+    const { defaultRoutes, redirectRoutes, rewriteRoutes } =
+      await detectBuilders(files, null, options);
    testHeaders(redirectRoutes);
    expect(defaultRoutes).toStrictEqual([]);
    expect(rewriteRoutes).toStrictEqual([
@@ -3152,11 +3121,8 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`, `trailingS
  {
    const files = ['api/[endpoint].js', 'api/[endpoint]/[id].js'];

-    const {
-      defaultRoutes,
-      redirectRoutes,
-      rewriteRoutes,
-    } = await detectBuilders(files, null, options);
+    const { defaultRoutes, redirectRoutes, rewriteRoutes } =
+      await detectBuilders(files, null, options);
    testHeaders(redirectRoutes);
    expect(defaultRoutes).toStrictEqual([]);
    expect(rewriteRoutes).toStrictEqual([
@@ -3184,11 +3150,8 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`, `trailingS
      'api/[endpoint]/[id].js',
    ];

-    const {
-      defaultRoutes,
-      redirectRoutes,
-      rewriteRoutes,
-    } = await detectBuilders(files, null, options);
+    const { defaultRoutes, redirectRoutes, rewriteRoutes } =
+      await detectBuilders(files, null, options);
    testHeaders(redirectRoutes);
    expect(defaultRoutes).toStrictEqual([]);
    expect(rewriteRoutes).toStrictEqual([
@@ -3222,11 +3185,8 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`, `trailingS

    const files = ['public/index.html', 'api/[endpoint].js'];

-    const {
-      defaultRoutes,
-      redirectRoutes,
-      rewriteRoutes,
-    } = await detectBuilders(files, pkg, options);
+    const { defaultRoutes, redirectRoutes, rewriteRoutes } =
+      await detectBuilders(files, pkg, options);
    testHeaders(redirectRoutes);
    expect(defaultRoutes).toStrictEqual([]);
    expect(rewriteRoutes).toStrictEqual([
@@ -3245,11 +3205,8 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`, `trailingS
  {
    const files = ['api/date/index.js', 'api/date.js'];

-    const {
-      defaultRoutes,
-      redirectRoutes,
-      rewriteRoutes,
-    } = await detectBuilders(files, null, options);
+    const { defaultRoutes, redirectRoutes, rewriteRoutes } =
+      await detectBuilders(files, null, options);
    testHeaders(redirectRoutes);
    expect(defaultRoutes).toStrictEqual([]);
    expect(rewriteRoutes).toStrictEqual([
@@ -3263,11 +3220,8 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`, `trailingS
  {
    const files = ['api/date.js', 'api/[date]/index.js'];

-    const {
-      defaultRoutes,
-      redirectRoutes,
-      rewriteRoutes,
-    } = await detectBuilders(files, null, options);
+    const { defaultRoutes, redirectRoutes, rewriteRoutes } =
+      await detectBuilders(files, null, options);
    testHeaders(redirectRoutes);
    expect(defaultRoutes).toStrictEqual([]);
    expect(rewriteRoutes).toStrictEqual([
@@ -3292,11 +3246,8 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`, `trailingS
      'api/food.ts',
      'api/ts/gold.ts',
    ];
-    const {
-      defaultRoutes,
-      redirectRoutes,
-      rewriteRoutes,
-    } = await detectBuilders(files, null, options);
+    const { defaultRoutes, redirectRoutes, rewriteRoutes } =
+      await detectBuilders(files, null, options);
    testHeaders(redirectRoutes);
    expect(defaultRoutes).toStrictEqual([]);
    expect(rewriteRoutes).toStrictEqual([
@@ -3312,11 +3263,8 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`, `trailingS
    const functions = { 'api/user.php': { runtime: 'vercel-php@0.1.0' } };
    const files = ['api/user.php'];

-    const {
-      defaultRoutes,
-      redirectRoutes,
-      rewriteRoutes,
-    } = await detectBuilders(files, null, { functions, ...options });
+    const { defaultRoutes, redirectRoutes, rewriteRoutes } =
+      await detectBuilders(files, null, { functions, ...options });
    testHeaders(redirectRoutes);
    expect(defaultRoutes).toStrictEqual([]);
    expect(rewriteRoutes).toStrictEqual([
--- a/packages/build-utils/test/unit.convert-runtime-to-plugin.test.ts
+++ b/packages/build-utils/test/unit.convert-runtime-to-plugin.test.ts
@@ -0,0 +1,182 @@
+import { join } from 'path';
+import fs from 'fs-extra';
+import { BuildOptions, createLambda } from '../src';
+import { convertRuntimeToPlugin } from '../src/convert-runtime-to-plugin';
+
+async function fsToJson(dir: string, output: Record<string, any> = {}) {
+  const files = await fs.readdir(dir);
+  for (const file of files) {
+    const fsPath = join(dir, file);
+    const stat = await fs.stat(fsPath);
+    if (stat.isDirectory()) {
+      output[file] = {};
+      await fsToJson(fsPath, output[file]);
+    } else {
+      output[file] = await fs.readFile(fsPath, 'utf8');
+    }
+  }
+  return output;
+}
+
+const workPath = join(__dirname, 'walk', 'python-api');
+
+describe('convert-runtime-to-plugin', () => {
+  afterEach(async () => {
+    await fs.remove(join(workPath, '.output'));
+  });
+
+  it('should create correct fileystem for python', async () => {
+    const lambdaOptions = {
+      handler: 'index.handler',
+      runtime: 'python3.9',
+      memory: 512,
+      maxDuration: 5,
+      environment: {},
+      regions: ['sfo1'],
+    };
+
+    const buildRuntime = async (opts: BuildOptions) => {
+      const lambda = await createLambda({
+        files: opts.files,
+        ...lambdaOptions,
+      });
+      return { output: lambda };
+    };
+
+    const lambdaFiles = await fsToJson(workPath);
+    delete lambdaFiles['vercel.json'];
+    const build = await convertRuntimeToPlugin(buildRuntime, '.py');
+
+    await build({ workPath });
+
+    const output = await fsToJson(join(workPath, '.output'));
+    expect(output).toMatchObject({
+      'functions-manifest.json': expect.stringContaining('{'),
+      'runtime-traced-files': lambdaFiles,
+      server: {
+        pages: {
+          api: {
+            'index.py': expect.stringContaining('index'),
+            'index.py.nft.json': expect.stringContaining('{'),
+            users: {
+              'get.py': expect.stringContaining('get'),
+              'get.py.nft.json': expect.stringContaining('{'),
+              'post.py': expect.stringContaining('post'),
+              'post.py.nft.json': expect.stringContaining('{'),
+            },
+          },
+        },
+      },
+    });
+
+    const funcManifest = JSON.parse(output['functions-manifest.json']);
+    expect(funcManifest).toMatchObject({
+      version: 1,
+      pages: {
+        'api/index.py': lambdaOptions,
+        'api/users/get.py': lambdaOptions,
+        'api/users/post.py': { ...lambdaOptions, memory: 3008 },
+      },
+    });
+
+    const indexJson = JSON.parse(output.server.pages.api['index.py.nft.json']);
+    expect(indexJson).toMatchObject({
+      version: 1,
+      files: [
+        {
+          input: '../../../../runtime-traced-files/api/index.py',
+          output: 'api/index.py',
+        },
+        {
+          input: '../../../../runtime-traced-files/api/users/get.py',
+          output: 'api/users/get.py',
+        },
+        {
+          input: '../../../../runtime-traced-files/api/users/post.py',
+          output: 'api/users/post.py',
+        },
+        {
+          input: '../../../../runtime-traced-files/file.txt',
+          output: 'file.txt',
+        },
+        {
+          input: '../../../../runtime-traced-files/util/date.py',
+          output: 'util/date.py',
+        },
+        {
+          input: '../../../../runtime-traced-files/util/math.py',
+          output: 'util/math.py',
+        },
+      ],
+    });
+
+    const getJson = JSON.parse(
+      output.server.pages.api.users['get.py.nft.json']
+    );
+    expect(getJson).toMatchObject({
+      version: 1,
+      files: [
+        {
+          input: '../../../../../runtime-traced-files/api/index.py',
+          output: 'api/index.py',
+        },
+        {
+          input: '../../../../../runtime-traced-files/api/users/get.py',
+          output: 'api/users/get.py',
+        },
+        {
+          input: '../../../../../runtime-traced-files/api/users/post.py',
+          output: 'api/users/post.py',
+        },
+        {
+          input: '../../../../../runtime-traced-files/file.txt',
+          output: 'file.txt',
+        },
+        {
+          input: '../../../../../runtime-traced-files/util/date.py',
+          output: 'util/date.py',
+        },
+        {
+          input: '../../../../../runtime-traced-files/util/math.py',
+          output: 'util/math.py',
+        },
+      ],
+    });
+
+    const postJson = JSON.parse(
+      output.server.pages.api.users['post.py.nft.json']
+    );
+    expect(postJson).toMatchObject({
+      version: 1,
+      files: [
+        {
+          input: '../../../../../runtime-traced-files/api/index.py',
+          output: 'api/index.py',
+        },
+        {
+          input: '../../../../../runtime-traced-files/api/users/get.py',
+          output: 'api/users/get.py',
+        },
+        {
+          input: '../../../../../runtime-traced-files/api/users/post.py',
+          output: 'api/users/post.py',
+        },
+        {
+          input: '../../../../../runtime-traced-files/file.txt',
+          output: 'file.txt',
+        },
+        {
+          input: '../../../../../runtime-traced-files/util/date.py',
+          output: 'util/date.py',
+        },
+        {
+          input: '../../../../../runtime-traced-files/util/math.py',
+          output: 'util/math.py',
+        },
+      ],
+    });
+
+    expect(output.server.pages['file.txt']).toBeUndefined();
+    expect(output.server.pages.api['file.txt']).toBeUndefined();
+  });
+});
--- a/packages/build-utils/test/walk/python-api/api/index.py
+++ b/packages/build-utils/test/walk/python-api/api/index.py
@@ -0,0 +1 @@
+# index
--- a/packages/build-utils/test/walk/python-api/api/users/get.py
+++ b/packages/build-utils/test/walk/python-api/api/users/get.py
@@ -0,0 +1 @@
+# get
--- a/packages/build-utils/test/walk/python-api/api/users/post.py
+++ b/packages/build-utils/test/walk/python-api/api/users/post.py
@@ -0,0 +1 @@
+# post
--- a/packages/build-utils/test/walk/python-api/file.txt
+++ b/packages/build-utils/test/walk/python-api/file.txt
@@ -0,0 +1 @@
+This file should also be included
--- a/packages/build-utils/test/walk/python-api/util/date.py
+++ b/packages/build-utils/test/walk/python-api/util/date.py
@@ -0,0 +1 @@
+# date
--- a/packages/build-utils/test/walk/python-api/util/math.py
+++ b/packages/build-utils/test/walk/python-api/util/math.py
@@ -0,0 +1 @@
+# math
--- a/packages/build-utils/test/walk/python-api/vercel.json
+++ b/packages/build-utils/test/walk/python-api/vercel.json
@@ -0,0 +1,10 @@
+{
+  "functions": {
+    "api/users/post.py": {
+      "memory": 3008
+    },
+    "api/not-matching-anything.py": {
+      "memory": 768
+    }
+  }
+}
--- a/packages/cli/@types/intercept-stdout/index.d.ts
+++ b/packages/cli/@types/intercept-stdout/index.d.ts
@@ -1,11 +0,0 @@
-declare module 'intercept-stdout' {
-  export default function (fn?: InterceptFn): UnhookIntercept
-}
-
-interface InterceptFn {
-  (text: string): string | void
-}
-
-interface UnhookIntercept {
-  (): void
-}
--- a/packages/cli/@types/promisepipe/index.d.ts
+++ b/packages/cli/@types/promisepipe/index.d.ts
@@ -1,5 +0,0 @@
-declare module 'promisepipe' {
-  export default function (
-    ...streams: Array<NodeJS.ReadableStream | NodeJS.WritableStream | NodeJS.ReadWriteStream>
-  ): Promise<void>
-}
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
  "name": "vercel",
-  "version": "23.1.3-canary.0",
+  "version": "23.1.3-canary.35",
  "preferGlobal": true,
  "license": "Apache-2.0",
  "description": "The command-line interface for Vercel",
@@ -12,33 +12,15 @@
  },
  "scripts": {
    "preinstall": "node ./scripts/preinstall.js",
-    "test-unit": "nyc ava test/unit.js test/dev-builder.unit.js test/dev-router.unit.js test/dev-server.unit.js test/dev-validate.unit.js --serial --fail-fast --verbose",
+    "test": "jest",
+    "test-unit": "jest --coverage --verbose",
    "test-integration-cli": "rimraf test/fixtures/integration && ava test/integration.js --serial --fail-fast --verbose",
    "test-integration-dev": "ava test/dev/integration.js --serial --fail-fast --verbose",
    "prepublishOnly": "yarn build",
-    "coverage": "nyc report --reporter=text-lcov > coverage.lcov && codecov",
+    "coverage": "codecov",
    "build": "node -r ts-eager/register ./scripts/build.ts",
    "build-dev": "node -r ts-eager/register ./scripts/build.ts --dev"
  },
-  "nyc": {
-    "include": [
-      "src/**"
-    ],
-    "extension": [
-      ".js",
-      ".ts"
-    ],
-    "require": [
-      "ts-node/register"
-    ],
-    "reporter": [
-      "text",
-      "html"
-    ],
-    "sourceMap": true,
-    "instrument": true,
-    "all": true
-  },
  "bin": {
    "vc": "./dist/index.js",
    "vercel": "./dist/index.js"
@@ -61,14 +43,17 @@
    "node": ">= 12"
  },
  "dependencies": {
-    "@vercel/build-utils": "2.12.3-canary.0",
-    "@vercel/go": "1.2.4-canary.0",
-    "@vercel/node": "1.12.2-canary.0",
-    "@vercel/python": "2.0.6-canary.0",
-    "@vercel/ruby": "1.2.8-canary.0",
-    "update-notifier": "4.1.0"
+    "@vercel/build-utils": "2.12.3-canary.19",
+    "@vercel/go": "1.2.4-canary.4",
+    "@vercel/node": "1.12.2-canary.6",
+    "@vercel/python": "2.0.6-canary.6",
+    "@vercel/ruby": "1.2.8-canary.4",
+    "update-notifier": "4.1.0",
+    "vercel-plugin-middleware": "0.0.0-canary.7",
+    "vercel-plugin-node": "1.12.2-canary.10"
  },
  "devDependencies": {
+    "@next/env": "11.1.2",
    "@sentry/node": "5.5.0",
    "@sindresorhus/slugify": "0.11.0",
    "@tootallnate/once": "1.1.2",
@@ -76,13 +61,16 @@
    "@types/ansi-regex": "4.0.0",
    "@types/async-retry": "1.2.1",
    "@types/bytes": "3.0.0",
+    "@types/chance": "1.1.3",
    "@types/debug": "0.0.31",
    "@types/dotenv": "6.1.1",
    "@types/escape-html": "0.0.20",
-    "@types/fs-extra": "5.0.5",
+    "@types/express": "4.17.13",
+    "@types/fs-extra": "9.0.13",
    "@types/glob": "7.1.1",
    "@types/http-proxy": "1.16.2",
    "@types/inquirer": "7.3.1",
+    "@types/jest": "27.0.1",
    "@types/load-json-file": "2.0.7",
    "@types/mime-types": "2.1.0",
    "@types/minimatch": "3.0.3",
@@ -99,10 +87,12 @@
    "@types/text-table": "0.2.0",
    "@types/title": "3.4.1",
    "@types/universal-analytics": "0.4.2",
+    "@types/update-notifier": "5.1.0",
    "@types/which": "1.3.2",
    "@types/write-json-file": "2.2.1",
-    "@vercel/frameworks": "0.5.1-canary.1",
+    "@vercel/frameworks": "0.5.1-canary.12",
    "@vercel/ncc": "0.24.0",
+    "@vercel/nft": "0.17.0",
    "@zeit/fun": "0.11.2",
    "@zeit/source-map-support": "0.6.2",
    "ajv": "6.12.2",
@@ -116,6 +106,7 @@
    "ava": "2.2.0",
    "bytes": "3.0.0",
    "chalk": "4.1.0",
+    "chance": "1.1.7",
    "chokidar": "3.3.1",
    "clipboardy": "2.1.0",
    "codecov": "3.8.2",
@@ -131,8 +122,9 @@
    "escape-html": "1.0.3",
    "esm": "3.1.4",
    "execa": "3.2.0",
+    "express": "4.17.1",
    "fast-deep-equal": "3.1.3",
-    "fs-extra": "7.0.1",
+    "fs-extra": "10.0.0",
    "get-port": "5.1.1",
    "glob": "7.1.2",
    "http-proxy": "1.18.1",
@@ -149,7 +141,6 @@
    "ms": "2.1.2",
    "node-fetch": "2.6.1",
    "npm-package-arg": "6.1.0",
-    "nyc": "13.2.0",
    "open": "8.2.0",
    "ora": "3.4.0",
    "pcre-to-regexp": "1.0.0",
@@ -162,7 +153,6 @@
    "rimraf": "3.0.2",
    "semver": "5.5.0",
    "serve-handler": "6.1.1",
-    "sinon": "4.4.2",
    "strip-ansi": "5.2.0",
    "stripe": "5.1.0",
    "tar-fs": "1.16.3",
@@ -179,5 +169,19 @@
    "which": "2.0.2",
    "write-json-file": "2.2.0",
    "xdg-app-paths": "5.1.0"
+  },
+  "jest": {
+    "preset": "ts-jest",
+    "globals": {
+      "ts-jest": {
+        "diagnostics": false,
+        "isolatedModules": true
+      }
+    },
+    "verbose": false,
+    "testEnvironment": "node",
+    "testMatch": [
+      "<rootDir>/test/**/*.test.ts"
+    ]
  }
 }
--- a/packages/cli/scripts/build.ts
+++ b/packages/cli/scripts/build.ts
@@ -4,6 +4,7 @@ import { join } from 'path';
 import { remove, writeFile } from 'fs-extra';

 const dirRoot = join(__dirname, '..');
+const distRoot = join(dirRoot, 'dist');

 async function createConstants() {
  console.log('Creating constants.ts');
@@ -48,13 +49,12 @@ async function main() {

  // Do the initial `ncc` build
  console.log();
-  const src = join(dirRoot, 'src');
  const args = ['ncc', 'build', '--external', 'update-notifier'];
  if (isDev) {
    args.push('--source-map');
  }
-  args.push(src);
-  await execa('yarn', args, { stdio: 'inherit' });
+  args.push('src/index.ts');
+  await execa('yarn', args, { stdio: 'inherit', cwd: dirRoot });

  // `ncc` has some issues with `@zeit/fun`'s runtime files:
  //   - Executable bits on the `bootstrap` files appear to be lost:
@@ -72,19 +72,13 @@ async function main() {
    dirRoot,
    '../../node_modules/@zeit/fun/dist/src/runtimes'
  );
-  const dest = join(dirRoot, 'dist/runtimes');
-  await cpy('**/*', dest, { parents: true, cwd: runtimes });
+  await cpy('**/*', join(distRoot, 'runtimes'), {
+    parents: true,
+    cwd: runtimes,
+  });

-  // Band-aid to delete stuff that `ncc` bundles, but it shouldn't:
-
-  // TypeScript definition files from `@vercel/build-utils`
-  await remove(join(dirRoot, 'dist', 'dist'));
-
-  // The Readme and `package.json` from "config-chain" module
-  await remove(join(dirRoot, 'dist', 'config-chain'));
-
-  // A bunch of source `.ts` files from CLI's `util` directory
-  await remove(join(dirRoot, 'dist', 'util'));
+  // Band-aid to bundle stuff that `ncc` neglects to bundle
+  await cpy(join(dirRoot, 'src/util/projects/VERCEL_DIR_README.txt'), distRoot);

  console.log('Finished building Vercel CLI');
 }
--- a/packages/cli/src/commands/alias/set.ts
+++ b/packages/cli/src/commands/alias/set.ts
@@ -421,7 +421,7 @@ function handleCreateAliasError<T>(
  return error;
 }

-function getTargetsForAlias(args: string[], { alias }: VercelConfig) {
+function getTargetsForAlias(args: string[], { alias }: VercelConfig = {}) {
  if (args.length) {
    return [args[args.length - 1]]
      .map(target => (target.indexOf('.') !== -1 ? toHost(target) : target))
--- a/packages/cli/src/commands/billing/index.js
+++ b/packages/cli/src/commands/billing/index.js
@@ -51,8 +51,6 @@ const help = () => {
 };

 let argv;
-let debug;
-let apiUrl;
 let subcommand;

 export default async client => {
@@ -65,8 +63,6 @@ export default async client => {

  argv._ = argv._.slice(1);

-  debug = argv['--debug'];
-  apiUrl = client.apiUrl;
  subcommand = argv._[0];

  if (argv['--help'] || !subcommand) {
@@ -76,17 +72,13 @@ export default async client => {

  const {
    output,
-    authConfig: { token },
    config: { currentTeam },
  } = client;

  const start = new Date();
  const creditCards = new NowCreditCards({
-    apiUrl,
-    token,
-    debug,
+    client,
    currentTeam,
-    output,
  });

  let contextName = null;
--- a/packages/cli/src/commands/build.ts
+++ b/packages/cli/src/commands/build.ts
@@ -0,0 +1,791 @@
+import { loadEnvConfig, processEnv } from '@next/env';
+import {
+  execCommand,
+  getScriptName,
+  GlobOptions,
+  scanParentDirs,
+  spawnAsync,
+} from '@vercel/build-utils';
+import { nodeFileTrace } from '@vercel/nft';
+import Sema from 'async-sema';
+import chalk from 'chalk';
+import { SpawnOptions } from 'child_process';
+import { assert } from 'console';
+import { createHash } from 'crypto';
+import fs from 'fs-extra';
+import ogGlob from 'glob';
+import { isAbsolute, join, parse, relative, resolve } from 'path';
+import pluralize from 'pluralize';
+import Client from '../util/client';
+import { emoji, prependEmoji } from '../util/emoji';
+import getArgs from '../util/get-args';
+import handleError from '../util/handle-error';
+import confirm from '../util/input/confirm';
+import { isSettingValue } from '../util/is-setting-value';
+import cmd from '../util/output/cmd';
+import logo from '../util/output/logo';
+import param from '../util/output/param';
+import stamp from '../util/output/stamp';
+import { getCommandName, getPkgName } from '../util/pkg-name';
+import { loadCliPlugins } from '../util/plugins';
+import { findFramework } from '../util/projects/find-framework';
+import { VERCEL_DIR } from '../util/projects/link';
+import { readProjectSettings } from '../util/projects/project-settings';
+import pull from './pull';
+
+const sema = new Sema(16, {
+  capacity: 100,
+});
+
+const help = () => {
+  return console.log(`
+  ${chalk.bold(`${logo} ${getPkgName()} build`)}
+
+ ${chalk.dim('Options:')}
+
+    -h, --help                     Output usage information
+    -A ${chalk.bold.underline('FILE')}, --local-config=${chalk.bold.underline(
+    'FILE'
+  )}   Path to the local ${'`vercel.json`'} file
+    -Q ${chalk.bold.underline('DIR')}, --global-config=${chalk.bold.underline(
+    'DIR'
+  )}    Path to the global ${'`.vercel`'} directory
+    --cwd [path]                   The current working directory
+    -d, --debug                    Debug mode [off]
+    -y, --yes                      Skip the confirmation prompt
+
+  ${chalk.dim('Examples:')}
+
+  ${chalk.gray('–')} Build the project
+
+    ${chalk.cyan(`$ ${getPkgName()} build`)}
+    ${chalk.cyan(`$ ${getPkgName()} build --cwd ./path-to-project`)}
+`);
+};
+
+const OUTPUT_DIR = '.output';
+
+export default async function main(client: Client) {
+  if (process.env.__VERCEL_BUILD_RUNNING) {
+    client.output.error(
+      `${cmd(
+        `${getPkgName()} build`
+      )} must not recursively invoke itself. Check the Build Command in the Project Settings or the ${cmd(
+        'build'
+      )} script in ${cmd('package.json')}`
+    );
+    client.output.error(
+      `Learn More: https://vercel.link/recursive-invocation-of-commands`
+    );
+    return 1;
+  } else {
+    process.env.__VERCEL_BUILD_RUNNING = '1';
+  }
+
+  let argv;
+  const buildStamp = stamp();
+  try {
+    argv = getArgs(client.argv.slice(2), {
+      '--debug': Boolean,
+      '--cwd': String,
+    });
+  } catch (err) {
+    handleError(err);
+    return 1;
+  }
+
+  if (argv['--help']) {
+    help();
+    return 2;
+  }
+
+  let cwd = argv['--cwd'] || process.cwd();
+
+  let project = await readProjectSettings(join(cwd, VERCEL_DIR));
+  // If there are no project settings, only then do we pull them down
+  while (!project?.settings) {
+    const confirmed = await confirm(
+      `No Project Settings found locally. Run ${getCommandName(
+        'pull'
+      )} for retrieving them?`,
+      true
+    );
+    if (!confirmed) {
+      client.output.print(`Aborted. No Project Settings retrieved.\n`);
+      return 0;
+    }
+    const result = await pull(client);
+    if (result !== 0) {
+      return result;
+    }
+    project = await readProjectSettings(join(cwd, VERCEL_DIR));
+  }
+
+  // If `rootDirectory` exists, then `baseDir` will be the repo's root directory.
+  const baseDir = cwd;
+
+  cwd = project.settings.rootDirectory
+    ? join(cwd, project.settings.rootDirectory)
+    : cwd;
+
+  // Load the environment
+  const { combinedEnv, loadedEnvFiles } = loadEnvConfig(cwd, false, {
+    info: () => ({}), // we don't want to log this yet.
+    error: (...args: any[]) => client.output.error(args.join(' ')),
+  });
+
+  // Set process.env with loaded environment variables
+  await processEnv(loadedEnvFiles);
+
+  const spawnOpts = {
+    env: { ...combinedEnv, VERCEL: '1' },
+  };
+
+  process.chdir(cwd);
+
+  const framework = findFramework(project.settings.framework);
+  // If this is undefined, we bail. If it is null, then findFramework should return "Other",
+  // so this should really never happen, but just in case....
+  if (framework === undefined) {
+    client.output.error(
+      `Framework detection failed or is malformed. Please run ${getCommandName(
+        'pull'
+      )} again.`
+    );
+    return 1;
+  }
+
+  const buildState = { ...project.settings };
+  const formatSetting = (
+    name: string,
+    override: string | null | undefined,
+    defaults: typeof framework.settings.outputDirectory
+  ) =>
+    `  - ${chalk.bold(`${name}:`)} ${`${
+      override
+        ? override + ` (override)`
+        : 'placeholder' in defaults
+        ? chalk.italic(`${defaults.placeholder}`)
+        : defaults.value
+    }`}`;
+  console.log(`Retrieved Project Settings:`);
+  console.log(
+    chalk.dim(`  - ${chalk.bold(`Framework Preset:`)} ${framework.name}`)
+  );
+  console.log(
+    chalk.dim(
+      formatSetting(
+        'Build Command',
+        project.settings.buildCommand,
+        framework.settings.buildCommand
+      )
+    )
+  );
+  console.log(
+    chalk.dim(
+      formatSetting(
+        'Output Directory',
+        project.settings.outputDirectory,
+        framework.settings.outputDirectory
+      )
+    )
+  );
+
+  buildState.outputDirectory =
+    project.settings.outputDirectory ||
+    (isSettingValue(framework.settings.outputDirectory)
+      ? framework.settings.outputDirectory.value
+      : null);
+  buildState.rootDirectory = project.settings.rootDirectory;
+
+  if (loadedEnvFiles.length > 0) {
+    console.log(
+      `Loaded Environment Variables from ${loadedEnvFiles.length} ${pluralize(
+        'file',
+        loadedEnvFiles.length
+      )}:`
+    );
+    for (let envFile of loadedEnvFiles) {
+      console.log(chalk.dim(`  - ${envFile.path}`));
+    }
+  }
+
+  // Load plugins
+  const debug = argv['--debug'];
+  let plugins;
+  try {
+    plugins = await loadCliPlugins(cwd, client.output);
+  } catch (error) {
+    client.output.error('Failed to load CLI Plugins');
+    handleError(error, { debug });
+    return 1;
+  }
+
+  const origLog = console.log;
+  const origErr = console.error;
+  const prefixedLog = (
+    prefix: string,
+    args: any[],
+    logger: (...args: any[]) => void
+  ) => {
+    if (typeof args[0] === 'string') {
+      args[0] = `${prefix} ${args[0]}`;
+    } else {
+      args.unshift(prefix);
+    }
+    return logger(...args);
+  };
+
+  if (plugins?.pluginCount && plugins?.pluginCount > 0) {
+    console.log(
+      `Loaded ${plugins.pluginCount} CLI ${pluralize(
+        'Plugin',
+        plugins.pluginCount
+      )}`
+    );
+    // preBuild Plugins
+    if (plugins.preBuildPlugins.length > 0) {
+      console.log(
+        `Running ${plugins.pluginCount} CLI ${pluralize(
+          'Plugin',
+          plugins.pluginCount
+        )} before Build Command:`
+      );
+      for (let item of plugins.preBuildPlugins) {
+        const { name, plugin, color } = item;
+        if (typeof plugin.preBuild === 'function') {
+          const pluginStamp = stamp();
+          const fullName = name + '.preBuild';
+          const prefix = chalk.gray('  > ') + color(fullName + ':');
+          client.output.debug(`Running ${fullName}:`);
+          try {
+            console.log = (...args: any[]) =>
+              prefixedLog(prefix, args, origLog);
+            console.error = (...args: any[]) =>
+              prefixedLog(prefix, args, origErr);
+            await plugin.preBuild();
+            client.output.debug(
+              `Completed ${fullName} ${chalk.dim(`${pluginStamp()}`)}`
+            );
+          } catch (error) {
+            client.output.error(`${prefix} failed`);
+            handleError(error, { debug });
+            return 1;
+          } finally {
+            console.log = origLog;
+            console.error = origErr;
+          }
+        }
+      }
+    }
+  }
+
+  // Clean the output directory
+  fs.removeSync(join(cwd, OUTPUT_DIR));
+
+  // Yarn v2 PnP mode may be activated, so force
+  // "node-modules" linker style
+  const env = {
+    YARN_NODE_LINKER: 'node-modules',
+    ...spawnOpts.env,
+  };
+
+  if (typeof buildState.buildCommand === 'string') {
+    console.log(`Running Build Command: ${cmd(buildState.buildCommand)}`);
+    await execCommand(buildState.buildCommand, {
+      ...spawnOpts,
+      env,
+      cwd,
+    });
+  } else if (fs.existsSync(join(cwd, 'package.json'))) {
+    await runPackageJsonScript(
+      client,
+      cwd,
+      ['vercel-build', 'now-build', 'build'],
+      spawnOpts
+    );
+  } else if (typeof framework.settings.buildCommand.value === 'string') {
+    console.log(
+      `Running Build Command: ${cmd(framework.settings.buildCommand.value)}`
+    );
+    await execCommand(framework.settings.buildCommand.value, {
+      ...spawnOpts,
+      env,
+      cwd,
+    });
+  }
+
+  if (!fs.existsSync(join(cwd, OUTPUT_DIR))) {
+    let outputDir = join(OUTPUT_DIR, 'static');
+    let distDir = await framework.getFsOutputDir(cwd);
+    if (framework.slug === 'nextjs') {
+      outputDir = OUTPUT_DIR;
+    }
+    const copyStamp = stamp();
+    await fs.ensureDir(join(cwd, outputDir));
+    const relativeDistDir = relative(cwd, distDir);
+    client.output.spinner(
+      `Copying files from ${param(distDir)} to ${param(outputDir)}`
+    );
+    const files = await glob(join(relativeDistDir, '**'), {
+      ignore: [
+        'node_modules/**',
+        '.vercel/**',
+        '.env',
+        '.env.*',
+        '.*ignore',
+        '_middleware.ts',
+        '_middleware.mts',
+        '_middleware.cts',
+        '_middleware.mjs',
+        '_middleware.cjs',
+        '_middleware.js',
+        'api/**',
+        '.git/**',
+        '.next/cache/**',
+      ],
+      nodir: true,
+      dot: true,
+      cwd,
+      absolute: true,
+    });
+    await Promise.all(
+      files.map(f =>
+        smartCopy(
+          client,
+          f,
+          distDir === '.'
+            ? join(cwd, outputDir, relative(cwd, f))
+            : f.replace(distDir, outputDir)
+        )
+      )
+    );
+    client.output.stopSpinner();
+    console.log(
+      `Copied ${files.length.toLocaleString()} files from ${param(
+        distDir
+      )} to ${param(outputDir)} ${copyStamp()}`
+    );
+
+    const buildManifestPath = join(cwd, OUTPUT_DIR, 'build-manifest.json');
+    const routesManifestPath = join(cwd, OUTPUT_DIR, 'routes-manifest.json');
+
+    if (!fs.existsSync(buildManifestPath)) {
+      client.output.debug(
+        `Generating build manifest: ${param(buildManifestPath)}`
+      );
+      const buildManifest = {
+        cache: framework.cachePattern ? [framework.cachePattern] : [],
+      };
+      await fs.writeJSON(buildManifestPath, buildManifest, { spaces: 2 });
+    }
+
+    if (!fs.existsSync(routesManifestPath)) {
+      client.output.debug(
+        `Generating routes manifest: ${param(routesManifestPath)}`
+      );
+      const routesManifest = {
+        version: 3,
+        pages404: true,
+        basePath: '',
+        redirects: framework.defaultRedirects ?? [],
+        headers: framework.defaultHeaders ?? [],
+        dynamicRoutes: [],
+        dataRoutes: [],
+        rewrites: framework.defaultRewrites ?? [],
+      };
+      await fs.writeJSON(
+        join(cwd, OUTPUT_DIR, 'routes-manifest.json'),
+        routesManifest,
+        { spaces: 2 }
+      );
+    }
+
+    // Special Next.js processing.
+    if (framework.slug === 'nextjs') {
+      // The contents of `.output/static` should be placed inside of `.output/static/_next/static`
+      const tempStatic = '___static';
+      await fs.rename(
+        join(cwd, OUTPUT_DIR, 'static'),
+        join(cwd, OUTPUT_DIR, tempStatic)
+      );
+      await fs.mkdirp(join(cwd, OUTPUT_DIR, 'static', '_next', 'static'));
+      await fs.rename(
+        join(cwd, OUTPUT_DIR, tempStatic),
+        join(cwd, OUTPUT_DIR, 'static', '_next', 'static')
+      );
+
+      // Next.js might reference files from the `static` directory in `middleware-manifest.json`.
+      // Since we move all files from `static` to `static/_next/static`, we'll need to change
+      // those references as well and update the manifest file.
+      const middlewareManifest = join(
+        cwd,
+        OUTPUT_DIR,
+        'server',
+        'middleware-manifest.json'
+      );
+      if (fs.existsSync(middlewareManifest)) {
+        const manifest = await fs.readJSON(middlewareManifest);
+        Object.keys(manifest.middleware).forEach(key => {
+          const files = manifest.middleware[key].files.map((f: string) => {
+            if (f.startsWith('static/')) {
+              const next = f.replace(/^static\//gm, 'static/_next/static/');
+              client.output.debug(
+                `Replacing file in \`middleware-manifest.json\`: ${f} => ${next}`
+              );
+              return next;
+            }
+
+            return f;
+          });
+
+          manifest.middleware[key].files = files;
+        });
+
+        await fs.writeJSON(middlewareManifest, manifest);
+      }
+
+      // We want to pick up directories for user-provided static files into `.`output/static`.
+      // More specifically, the static directory contents would then be mounted to `output/static/static`,
+      // and the public directory contents would be mounted to `output/static`. Old Next.js versions
+      // allow `static`, and newer ones allow both, but since there's nobody that actually uses both,
+      // we can check for the existence of both and pick the first match that we find (first
+      // `public`, then`static`). We can't read both at the same time because that would mean we'd
+      // read public for old Next.js versions that don't support it, which might be breaking (and
+      // we don't want to make vercel build specific framework versions).
+      const publicFiles = await glob('public/**', {
+        nodir: true,
+        dot: true,
+        cwd,
+        absolute: true,
+      });
+      if (publicFiles.length > 0) {
+        await Promise.all(
+          publicFiles.map(f =>
+            smartCopy(
+              client,
+              f,
+              f.replace('public', join(OUTPUT_DIR, 'static'))
+            )
+          )
+        );
+      } else {
+        const staticFiles = await glob('static/**', {
+          nodir: true,
+          dot: true,
+          cwd,
+          absolute: true,
+        });
+        await Promise.all(
+          staticFiles.map(f =>
+            smartCopy(
+              client,
+              f,
+              f.replace('static', join(OUTPUT_DIR, 'static', 'static'))
+            )
+          )
+        );
+      }
+
+      // Regardless of the Next.js version, we make sure that it is compatible with
+      // the Filesystem API. We get there by  moving all the files needed
+      // into the outputs directory `inputs` folder.  Next.js is > 12, we can
+      // read the .nft.json files directly. If there aren't .nft.json files
+      // we trace and create them. We then resolve the files in each nft file list
+      // and move them into the "inputs" directory. We rename them with hashes to
+      // prevent collisions and then update the related .nft files accordingly
+      // to point to the newly named input files. Again, all of this is so that Next.js
+      // works with the Filesystem API (and so .output contains all inputs
+      // needed to run Next.js) and `vc --prebuilt`.
+      const nftFiles = await glob(join(OUTPUT_DIR, '**', '*.nft.json'), {
+        nodir: true,
+        dot: true,
+        cwd,
+        absolute: true,
+      });
+
+      // If there are no .nft.json files, we know that Next.js < 12. We then
+      // execute the tracing on our own.
+      if (nftFiles.length === 0) {
+        const serverFiles = await glob(
+          join(OUTPUT_DIR, 'server', 'pages', '**', '*.js'),
+          {
+            nodir: true,
+            dot: true,
+            cwd,
+            ignore: ['webpack-runtime.js'],
+            absolute: true,
+          }
+        );
+        for (let f of serverFiles) {
+          const { ext, dir } = parse(f);
+          const { fileList } = await nodeFileTrace([f], {
+            ignore: [
+              relative(cwd, f),
+              'node_modules/next/dist/pages/**/*',
+              'node_modules/next/dist/compiled/webpack/(bundle4|bundle5).js',
+              'node_modules/react/**/*.development.js',
+              'node_modules/react-dom/**/*.development.js',
+              'node_modules/use-subscription/**/*.development.js',
+              'node_modules/sharp/**/*',
+            ],
+          });
+          fileList.delete(relative(cwd, f));
+          await resolveNftToOutput({
+            client,
+            baseDir,
+            outputDir: OUTPUT_DIR,
+            nftFileName: f.replace(ext, '.js.nft.json'),
+            nft: {
+              version: 1,
+              files: Array.from(fileList).map(fileListEntry =>
+                relative(dir, fileListEntry)
+              ),
+            },
+          });
+        }
+      } else {
+        for (let f of nftFiles) {
+          const json = await fs.readJson(f);
+          await resolveNftToOutput({
+            client,
+            baseDir,
+            outputDir: OUTPUT_DIR,
+            nftFileName: f,
+            nft: json,
+          });
+        }
+      }
+
+      const requiredServerFilesPath = join(
+        OUTPUT_DIR,
+        'required-server-files.json'
+      );
+      const requiredServerFilesJson = await fs.readJSON(
+        requiredServerFilesPath
+      );
+      await fs.writeJSON(requiredServerFilesPath, {
+        ...requiredServerFilesJson,
+        appDir: '.',
+        files: requiredServerFilesJson.files.map((i: string) => {
+          const absolutePath = join(cwd, i.replace('.next', '.output'));
+          const output = relative(baseDir, absolutePath);
+
+          return {
+            input: i.replace('.next', '.output'),
+            output,
+          };
+        }),
+      });
+    }
+  }
+
+  // Build Plugins
+  if (plugins?.buildPlugins && plugins.buildPlugins.length > 0) {
+    console.log(
+      `Running ${plugins.pluginCount} CLI ${pluralize(
+        'Plugin',
+        plugins.pluginCount
+      )} after Build Command:`
+    );
+    for (let item of plugins.buildPlugins) {
+      const { name, plugin, color } = item;
+      if (typeof plugin.build === 'function') {
+        const pluginStamp = stamp();
+        const fullName = name + '.build';
+        const prefix = chalk.gray('  > ') + color(fullName + ':');
+        client.output.debug(`Running ${fullName}:`);
+        try {
+          console.log = (...args: any[]) => prefixedLog(prefix, args, origLog);
+          console.error = (...args: any[]) =>
+            prefixedLog(prefix, args, origErr);
+          await plugin.build({
+            workPath: cwd,
+          });
+          client.output.debug(
+            `Completed ${fullName} ${chalk.dim(`${pluginStamp()}`)}`
+          );
+        } catch (error) {
+          client.output.error(`${prefix} failed`);
+          handleError(error, { debug });
+          return 1;
+        } finally {
+          console.log = origLog;
+          console.error = origLog;
+        }
+      }
+    }
+  }
+
+  console.log(
+    `${prependEmoji(
+      `Build Completed in ${chalk.bold(OUTPUT_DIR)} ${chalk.gray(
+        buildStamp()
+      )}`,
+      emoji('success')
+    )}`
+  );
+
+  return 0;
+}
+
+export async function runPackageJsonScript(
+  client: Client,
+  destPath: string,
+  scriptNames: string | Iterable<string>,
+  spawnOpts?: SpawnOptions
+) {
+  assert(isAbsolute(destPath));
+
+  const { packageJson, cliType, lockfileVersion } = await scanParentDirs(
+    destPath,
+    true
+  );
+  const scriptName = getScriptName(
+    packageJson,
+    typeof scriptNames === 'string' ? [scriptNames] : scriptNames
+  );
+  if (!scriptName) return false;
+
+  client.output.debug('Running user script...');
+  const runScriptTime = Date.now();
+
+  const opts: any = { cwd: destPath, ...spawnOpts };
+  const env = (opts.env = { ...process.env, ...opts.env });
+
+  if (cliType === 'npm') {
+    opts.prettyCommand = `npm run ${scriptName}`;
+
+    if (typeof lockfileVersion === 'number' && lockfileVersion >= 2) {
+      // Ensure that npm 7 is at the beginning of the `$PATH`
+      env.PATH = `/node16/bin-npm7:${env.PATH}`;
+    }
+  } else {
+    opts.prettyCommand = `yarn run ${scriptName}`;
+
+    // Yarn v2 PnP mode may be activated, so force "node-modules" linker style
+    if (!env.YARN_NODE_LINKER) {
+      env.YARN_NODE_LINKER = 'node-modules';
+    }
+  }
+
+  console.log(`Running Build Command: ${cmd(opts.prettyCommand)}\n`);
+  await spawnAsync(cliType, ['run', scriptName], opts);
+  console.log(); // give it some room
+  client.output.debug(`Script complete [${Date.now() - runScriptTime}ms]`);
+  return true;
+}
+
+async function linkOrCopy(existingPath: string, newPath: string) {
+  try {
+    if (
+      newPath.endsWith('.nft.json') ||
+      newPath.endsWith('middleware-manifest.json') ||
+      newPath.endsWith('required-server-files.json')
+    ) {
+      await fs.copy(existingPath, newPath, {
+        overwrite: true,
+      });
+    } else {
+      await fs.createSymlink(existingPath, newPath, 'file');
+    }
+  } catch (err: any) {
+    // eslint-disable-line
+    // If a symlink to the same file already exists
+    // then trying to copy it will make an empty file from it.
+    if (err['code'] === 'EEXIST') return;
+    // In some VERY rare cases (1 in a thousand), symlink creation fails on Windows.
+    // In that case, we just fall back to copying.
+    // This issue is reproducible with "pnpm add @material-ui/icons@4.9.1"
+    await fs.copy(existingPath, newPath, {
+      overwrite: true,
+    });
+  }
+}
+
+async function smartCopy(client: Client, from: string, to: string) {
+  sema.acquire();
+  try {
+    client.output.debug(`Copying from ${from} to ${to}`);
+    await linkOrCopy(from, to);
+  } finally {
+    sema.release();
+  }
+}
+
+async function glob(pattern: string, options: GlobOptions): Promise<string[]> {
+  return new Promise((resolve, reject) => {
+    ogGlob(pattern, options, (err, files) => {
+      err ? reject(err) : resolve(files);
+    });
+  });
+}
+
+/**
+ * Computes a hash for the given buf.
+ *
+ * @param {Buffer} file data
+ * @return {String} hex digest
+ */
+function hash(buf: Buffer): string {
+  return createHash('sha1').update(buf).digest('hex');
+}
+
+interface NftFile {
+  version: number;
+  files: (string | { input: string; output: string })[];
+}
+
+// resolveNftToOutput takes nft file and moves all of its trace files
+// into the specified directory + `inputs`, (renaming them to their hash + ext) and
+// subsequently updating the original nft file accordingly. This is done
+// to make the `.output` directory be self-contained, so that it works
+// properly with `vc --prebuilt`.
+async function resolveNftToOutput({
+  client,
+  baseDir,
+  outputDir,
+  nftFileName,
+  nft,
+}: {
+  client: Client;
+  baseDir: string;
+  outputDir: string;
+  nftFileName: string;
+  nft: NftFile;
+}) {
+  client.output.debug(`Processing and resolving ${nftFileName}`);
+  await fs.ensureDir(join(outputDir, 'inputs'));
+  const newFilesList: NftFile['files'] = [];
+  for (let fileEntity of nft.files) {
+    const relativeInput: string =
+      typeof fileEntity === 'string' ? fileEntity : fileEntity.input;
+    const fullInput = resolve(join(parse(nftFileName).dir, relativeInput));
+
+    // if the resolved path is NOT in the .output directory we move in it there
+    if (!fullInput.includes(outputDir)) {
+      const { ext } = parse(fullInput);
+      const raw = await fs.readFile(fullInput);
+      const newFilePath = join(outputDir, 'inputs', hash(raw) + ext);
+      smartCopy(client, fullInput, newFilePath);
+
+      // We have to use `baseDir` instead of `cwd`, because we want to
+      // mount everything from there (especially `node_modules`).
+      // This is important for NPM Workspaces where `node_modules` is not
+      // in the directory of the workspace.
+      const output = relative(baseDir, fullInput).replace('.output', '.next');
+
+      newFilesList.push({
+        input: relative(parse(nftFileName).dir, newFilePath),
+        output,
+      });
+    } else {
+      newFilesList.push(relativeInput);
+    }
+  }
+  // Update the .nft.json with new input and output mapping
+  await fs.writeJSON(nftFileName, {
+    ...nft,
+    files: newFilesList,
+  });
+}
--- a/packages/cli/src/commands/deploy/args.ts
+++ b/packages/cli/src/commands/deploy/args.ts
@@ -18,9 +18,10 @@ export const help = () => `
      init                 [example]   Initialize an example project
      ls | list            [app]       Lists deployments
      inspect              [id]        Displays information related to a deployment
-      link                             Link local directory to a Vercel Project
+      link                 [path]      Link local directory to a Vercel Project
      login                [email]     Logs into your account or creates a new one
      logout                           Logs out of your account
+      pull                 [path]      Pull your Project Settings from the cloud
      switch               [scope]     Switches between teams and your personal account
      help                 [cmd]       Displays complete help for [cmd]

--- a/packages/cli/src/commands/deploy/index.ts
+++ b/packages/cli/src/commands/deploy/index.ts
@@ -60,13 +60,10 @@ import { getCommandName } from '../../util/pkg-name';
 import { getPreferredPreviewURL } from '../../util/deploy/get-preferred-preview-url';
 import { Output } from '../../util/output';
 import { help } from './args';
+import { getDeploymentChecks } from '../../util/deploy/get-deployment-checks';

 export default async (client: Client) => {
-  const {
-    apiUrl,
-    output,
-    authConfig: { token },
-  } = client;
+  const { output } = client;

  let argv = null;

@@ -82,6 +79,7 @@ export default async (client: Client) => {
      // This is not an array in favor of matching
      // the config property name.
      '--regions': String,
+      '--prebuilt': Boolean,
      '--prod': Boolean,
      '--confirm': Boolean,
      '-f': '--force',
@@ -120,10 +118,7 @@ export default async (client: Client) => {
    paths = [process.cwd()];
  }

-  let localConfig: VercelConfig | null = client.localConfig;
-  if (!localConfig || localConfig instanceof Error) {
-    localConfig = readLocalConfig(paths[0]);
-  }
+  let localConfig = client.localConfig || readLocalConfig(paths[0]);

  for (const path of paths) {
    try {
@@ -160,10 +155,8 @@ export default async (client: Client) => {
    }
  }

-  const { log, debug, error, warn } = output;
-  const debugEnabled = argv['--debug'];
+  const { log, debug, error, warn, isTTY } = output;

-  const { isTTY } = process.stdout;
  const quiet = !isTTY;

  // check paths
@@ -439,7 +432,10 @@ export default async (client: Client) => {
  }

  const currentTeam = org?.type === 'team' ? org.id : undefined;
-  const now = new Now({ apiUrl, token, debug: debugEnabled, currentTeam });
+  const now = new Now({
+    client,
+    currentTeam,
+  });
  let deployStamp = stamp();
  let deployment = null;

@@ -450,6 +446,7 @@ export default async (client: Client) => {
      build: { env: deploymentBuildEnv },
      forceNew: argv['--force'],
      withCache: argv['--with-cache'],
+      prebuilt: argv['--prebuilt'],
      quiet,
      wantsPublic: argv['--public'] || localConfig.public,
      isFile,
@@ -533,6 +530,20 @@ export default async (client: Client) => {
      return 1;
    }

+    if (deployment.checksConclusion === 'failed') {
+      const { checks } = await getDeploymentChecks(client, deployment.id);
+      const counters = new Map<string, number>();
+      checks.forEach(c => {
+        counters.set(c.conclusion, (counters.get(c.conclusion) ?? 0) + 1);
+      });
+
+      const counterList = Array.from(counters)
+        .map(([name, no]) => `${no} ${name}`)
+        .join(', ');
+      output.error(`Running Checks: ${counterList}`);
+      return 1;
+    }
+
    const deploymentResponse = await getDeploymentByIdOrHost(
      client,
      contextName,
--- a/packages/cli/src/commands/dev/dev.ts
+++ b/packages/cli/src/commands/dev/dev.ts
@@ -6,15 +6,13 @@ import { ProjectEnvVariable } from '../../types';
 import Client from '../../util/client';
 import { getLinkedProject } from '../../util/projects/link';
 import { getFrameworks } from '../../util/get-frameworks';
-import { isSettingValue } from '../../util/is-setting-value';
 import { ProjectSettings } from '../../types';
 import getDecryptedEnvRecords from '../../util/get-decrypted-env-records';
 import setupAndLink from '../../util/link/setup-and-link';
 import getSystemEnvValues from '../../util/env/get-system-env-values';

 type Options = {
-  '--debug'?: boolean;
-  '--listen'?: string;
+  '--listen': string;
  '--confirm': boolean;
 };

@@ -27,7 +25,6 @@ export default async function dev(
  const [dir = '.'] = args;
  let cwd = resolve(dir);
  const listen = parseListen(opts['--listen'] || '3000');
-  const debug = opts['--debug'] || false;

  // retrieve dev command
  let [link, frameworks] = await Promise.all([
@@ -73,9 +70,9 @@ export default async function dev(
          frameworkSlug = framework.slug;
        }

-        const defaults = framework.settings.devCommand;
-        if (isSettingValue(defaults)) {
-          devCommand = defaults.value;
+        const defaults = framework.settings.devCommand.value;
+        if (defaults) {
+          devCommand = defaults;
        }
      }
    }
@@ -94,7 +91,6 @@ export default async function dev(

  const devServer = new DevServer(cwd, {
    output,
-    debug,
    devCommand,
    frameworkSlug,
    projectSettings,
--- a/packages/cli/src/commands/dev/index.ts
+++ b/packages/cli/src/commands/dev/index.ts
@@ -48,6 +48,22 @@ const help = () => {
 };

 export default async function main(client: Client) {
+  if (process.env.__VERCEL_DEV_RUNNING) {
+    client.output.error(
+      `${cmd(
+        `${getPkgName()} dev`
+      )} must not recursively invoke itself. Check the Development Command in the Project Settings or the ${cmd(
+        'dev'
+      )} script in ${cmd('package.json')}`
+    );
+    client.output.error(
+      `Learn More: https://vercel.link/recursive-invocation-of-commands`
+    );
+    return 1;
+  } else {
+    process.env.__VERCEL_DEV_RUNNING = '1';
+  }
+
  let argv;
  let args;
  const { output } = client;
@@ -90,22 +106,21 @@ export default async function main(client: Client) {
    if (pkg) {
      const { scripts } = pkg as PackageJson;

-      if (scripts && scripts.dev && /\bnow\b\W+\bdev\b/.test(scripts.dev)) {
-        output.error(
-          `The ${cmd('dev')} script in ${cmd(
-            'package.json'
-          )} must not contain ${cmd('now dev')}`
+      if (
+        scripts &&
+        scripts.dev &&
+        /\b(now|vercel)\b\W+\bdev\b/.test(scripts.dev)
+      ) {
+        client.output.error(
+          `${cmd(
+            `${getPkgName()} dev`
+          )} must not recursively invoke itself. Check the Development Command in the Project Settings or the ${cmd(
+            'dev'
+          )} script in ${cmd('package.json')}`
        );
-        output.error(`Learn More: http://err.sh/vercel/now-dev-as-dev-script`);
-        return 1;
-      }
-      if (scripts && scripts.dev && /\bvercel\b\W+\bdev\b/.test(scripts.dev)) {
-        output.error(
-          `The ${cmd('dev')} script in ${cmd(
-            'package.json'
-          )} must not contain ${cmd('vercel dev')}`
+        client.output.error(
+          `Learn More: https://vercel.link/recursive-invocation-of-commands`
        );
-        output.error(`Learn More: http://err.sh/vercel/now-dev-as-dev-script`);
        return 1;
      }
    }
@@ -121,7 +136,7 @@ export default async function main(client: Client) {
  } catch (err) {
    if (err.code === 'ENOTFOUND') {
      // Error message will look like the following:
-      // "request to https://api.vercel.com/www/user failed, reason: getaddrinfo ENOTFOUND api.vercel.com"
+      // "request to https://api.vercel.com/v2/user failed, reason: getaddrinfo ENOTFOUND api.vercel.com"
      const matches = /getaddrinfo ENOTFOUND (.*)$/.exec(err.message || '');
      if (matches && matches[1]) {
        const hostname = matches[1];
--- a/packages/cli/src/commands/domains/move.ts
+++ b/packages/cli/src/commands/domains/move.ts
@@ -12,7 +12,7 @@ import param from '../../util/output/param';
 import getDomainAliases from '../../util/alias/get-domain-aliases';
 import getDomainByName from '../../util/domains/get-domain-by-name';
 import promptBool from '../../util/input/prompt-bool';
-import getTeams from '../../util/get-teams';
+import getTeams from '../../util/teams/get-teams';
 import { getCommandName } from '../../util/pkg-name';

 type Options = {
@@ -194,8 +194,8 @@ async function findDestinationMatch(
  user: User,
  teams: Team[]
 ) {
-  if (user.uid === destination || user.username === destination) {
-    return user.uid;
+  if (user.id === destination || user.username === destination) {
+    return user.id;
  }

  for (const team of teams) {
--- a/packages/cli/src/commands/env/index.ts
+++ b/packages/cli/src/commands/env/index.ts
@@ -1,18 +1,16 @@
 import chalk from 'chalk';
-
-import getArgs from '../../util/get-args';
-import getSubcommand from '../../util/get-subcommand';
-import getInvalidSubcommand from '../../util/get-invalid-subcommand';
-import { getEnvTargetPlaceholder } from '../../util/env/env-target';
-import { getLinkedProject } from '../../util/projects/link';
 import Client from '../../util/client';
+import { getEnvTargetPlaceholder } from '../../util/env/env-target';
+import getArgs from '../../util/get-args';
+import getInvalidSubcommand from '../../util/get-invalid-subcommand';
+import getSubcommand from '../../util/get-subcommand';
 import handleError from '../../util/handle-error';
 import logo from '../../util/output/logo';
 import { getCommandName, getPkgName } from '../../util/pkg-name';
-
+import { getLinkedProject } from '../../util/projects/link';
 import add from './add';
-import pull from './pull';
 import ls from './ls';
+import pull from './pull';
 import rm from './rm';

 const help = () => {
@@ -139,6 +137,13 @@ export default async function main(client: Client) {
      case 'rm':
        return rm(client, project, argv, args, output);
      case 'pull':
+        output.warn(
+          `${getCommandName(
+            'env pull'
+          )} is deprecated and will be removed in future releases. Run ${getCommandName(
+            'pull'
+          )} instead.`
+        );
        return pull(client, project, argv, args, output);
      default:
        output.error(getInvalidSubcommand(COMMAND_CONFIG));
--- a/packages/cli/src/commands/env/pull.ts
+++ b/packages/cli/src/commands/env/pull.ts
@@ -1,18 +1,18 @@
 import chalk from 'chalk';
+import { closeSync, openSync, promises, readSync } from 'fs';
+import { resolve } from 'path';
 import { Project } from '../../types';
-import { Output } from '../../util/output';
-import confirm from '../../util/input/confirm';
 import Client from '../../util/client';
-import stamp from '../../util/output/stamp';
-import getDecryptedEnvRecords from '../../util/get-decrypted-env-records';
-import param from '../../util/output/param';
-import { join } from 'path';
-import { promises, openSync, closeSync, readSync } from 'fs';
+import exposeSystemEnvs from '../../util/dev/expose-system-envs';
 import { emoji, prependEmoji } from '../../util/emoji';
+import getSystemEnvValues from '../../util/env/get-system-env-values';
+import getDecryptedEnvRecords from '../../util/get-decrypted-env-records';
+import confirm from '../../util/input/confirm';
+import { Output } from '../../util/output';
+import param from '../../util/output/param';
+import stamp from '../../util/output/stamp';
 import { getCommandName } from '../../util/pkg-name';
 const { writeFile } = promises;
-import exposeSystemEnvs from '../../util/dev/expose-system-envs';
-import getSystemEnvValues from '../../util/env/get-system-env-values';

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

@@ -56,8 +56,9 @@ export default async function pull(
    return 1;
  }

+  // handle relative or absolute filename
  const [filename = '.env'] = args;
-  const fullPath = join(process.cwd(), filename);
+  const fullPath = resolve(filename);
  const skipConfirmation = opts['--yes'];

  const head = tryReadHeadSync(fullPath, Buffer.byteLength(CONTENTS_PREFIX));
--- a/packages/cli/src/commands/index.ts
+++ b/packages/cli/src/commands/index.ts
@@ -2,6 +2,7 @@ export default new Map([
  ['alias', 'alias'],
  ['aliases', 'alias'],
  ['billing', 'billing'],
+  ['build', 'build'],
  ['cc', 'billing'],
  ['cert', 'certs'],
  ['certs', 'certs'],
@@ -10,7 +11,6 @@ export default new Map([
  ['dns', 'dns'],
  ['domain', 'domains'],
  ['domains', 'domains'],
-  ['downgrade', 'upgrade'],
  ['env', 'env'],
  ['help', 'help'],
  ['init', 'init'],
@@ -25,6 +25,7 @@ export default new Map([
  ['ls', 'list'],
  ['project', 'projects'],
  ['projects', 'projects'],
+  ['pull', 'pull'],
  ['remove', 'remove'],
  ['rm', 'remove'],
  ['secret', 'secrets'],
--- a/packages/cli/src/commands/inspect.ts
+++ b/packages/cli/src/commands/inspect.ts
@@ -117,9 +117,7 @@ export default async function main(client: Client) {

  const { builds } =
    deployment.version === 2
-      ? await client.fetch<{ builds: Build[] }>(
-          `/v1/now/deployments/${id}/builds`
-        )
+      ? await client.fetch<{ builds: Build[] }>(`/v1/deployments/${id}/builds`)
      : { builds: [] };

  log(
--- a/packages/cli/src/commands/list.ts
+++ b/packages/cli/src/commands/list.ts
@@ -77,14 +77,8 @@ export default async function main(client: Client) {
    return 1;
  }

-  const {
-    authConfig: { token },
-    output,
-    apiUrl,
-    config,
-  } = client;
+  const { output, config } = client;

-  const debugEnabled = argv['--debug'];
  const { print, log, error, note, debug, spinner } = output;

  if (argv._.length > 2) {
@@ -92,8 +86,8 @@ export default async function main(client: Client) {
    return 1;
  }

-  let app: string | null = argv._[1];
-  let host: string | null = null;
+  let app: string | undefined = argv._[1];
+  let host: string | undefined = undefined;

  if (argv['--help']) {
    help();
@@ -126,10 +120,7 @@ export default async function main(client: Client) {
  spinner(`Fetching deployments in ${chalk.bold(contextName)}`);

  const now = new Now({
-    apiUrl,
-    token,
-    debug: debugEnabled,
-    output,
+    client,
    currentTeam,
  });
  const start = Date.now();
@@ -156,7 +147,7 @@ export default async function main(client: Client) {
      return 1;
    }

-    app = null;
+    app = undefined;
    host = asHost;
  }

--- a/packages/cli/src/commands/login.ts
+++ b/packages/cli/src/commands/login.ts
@@ -2,7 +2,6 @@ import { validate as validateEmail } from 'email-validator';
 import chalk from 'chalk';
 import hp from '../util/humanize-path';
 import getArgs from '../util/get-args';
-import handleError from '../util/handle-error';
 import logo from '../util/output/logo';
 import prompt from '../util/login/prompt';
 import doSamlLogin from '../util/login/saml';
@@ -52,20 +51,14 @@ const help = () => {
 };

 export default async function login(client: Client): Promise<number> {
-  let argv;
  const { output } = client;

-  try {
-    argv = getArgs(client.argv.slice(2), {
-      '--oob': Boolean,
-      '--github': Boolean,
-      '--gitlab': Boolean,
-      '--bitbucket': Boolean,
-    });
-  } catch (err) {
-    handleError(err);
-    return 1;
-  }
+  const argv = getArgs(client.argv.slice(2), {
+    '--oob': Boolean,
+    '--github': Boolean,
+    '--gitlab': Boolean,
+    '--bitbucket': Boolean,
+  });

  if (argv['--help']) {
    help();
@@ -115,8 +108,7 @@ export default async function login(client: Client): Promise<number> {
    }
  }

-  // When `result` is a string it's the user's authentication token.
-  // It needs to be saved to the configuration file.
+  // Save the user's authentication token to the configuration file.
  client.authConfig.token = result.token;

  writeToAuthConfigFile(client.authConfig);
@@ -124,9 +116,9 @@ export default async function login(client: Client): Promise<number> {

  output.debug(`Saved credentials in "${hp(getGlobalPathConfig())}"`);

-  console.log(
+  output.print(
    `${chalk.cyan('Congratulations!')} ` +
-      `You are now logged in. In order to deploy something, run ${getCommandName()}.`
+      `You are now logged in. In order to deploy something, run ${getCommandName()}.\n`
  );

  output.print(
--- a/packages/cli/src/commands/pull.ts
+++ b/packages/cli/src/commands/pull.ts
@@ -0,0 +1,116 @@
+import chalk from 'chalk';
+import { join } from 'path';
+import Client from '../util/client';
+import { emoji, prependEmoji } from '../util/emoji';
+import getArgs from '../util/get-args';
+import handleError from '../util/handle-error';
+import setupAndLink from '../util/link/setup-and-link';
+import logo from '../util/output/logo';
+import stamp from '../util/output/stamp';
+import { getPkgName } from '../util/pkg-name';
+import {
+  getLinkedProject,
+  VERCEL_DIR,
+  VERCEL_DIR_PROJECT,
+} from '../util/projects/link';
+import { writeProjectSettings } from '../util/projects/project-settings';
+import pull from './env/pull';
+
+const help = () => {
+  return console.log(`
+  ${chalk.bold(`${logo} ${getPkgName()} pull`)} [path]
+
+ ${chalk.dim('Options:')}
+
+    -h, --help                     Output usage information
+    -A ${chalk.bold.underline('FILE')}, --local-config=${chalk.bold.underline(
+    'FILE'
+  )}   Path to the local ${'`vercel.json`'} file
+    -Q ${chalk.bold.underline('DIR')}, --global-config=${chalk.bold.underline(
+    'DIR'
+  )}    Path to the global ${'`.vercel`'} directory
+    -d, --debug                    Debug mode [off]
+    --env [filename]               The file to write Development Environment Variables to [.env]
+    -y, --yes                      Skip the confirmation prompt
+
+  ${chalk.dim('Examples:')}
+
+  ${chalk.gray('–')} Pull the latest Project Settings from the cloud
+
+    ${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`)}
+`);
+};
+export default async function main(client: Client) {
+  let argv;
+  try {
+    argv = getArgs(client.argv.slice(2), {
+      '--yes': Boolean,
+      '--env': String,
+      '--debug': Boolean,
+      '-d': '--debug',
+      '-y': '--yes',
+    });
+  } catch (err) {
+    handleError(err);
+    return 1;
+  }
+
+  if (argv['--help']) {
+    help();
+    return 2;
+  }
+
+  const cwd = argv._[1] || process.cwd();
+  const yes = argv['--yes'];
+  const env = argv['--env'] ?? '.env';
+  const settingsStamp = stamp();
+  let link = await getLinkedProject(client, cwd);
+  if (link.status === 'not_linked') {
+    link = await setupAndLink(client, cwd, {
+      autoConfirm: yes,
+      successEmoji: 'link',
+      setupMsg: 'Set up',
+    });
+
+    if (link.status === 'not_linked') {
+      // User aborted project linking questions
+      return 0;
+    }
+  }
+
+  if (link.status === 'error') {
+    return link.exitCode;
+  }
+
+  const { project, org } = link;
+
+  client.config.currentTeam = org.type === 'team' ? org.id : undefined;
+
+  const result = await pull(
+    client,
+    project,
+    argv,
+    [join(cwd, env)],
+    client.output
+  );
+  if (result !== 0) {
+    // an error happened
+    return result;
+  }
+
+  await writeProjectSettings(cwd, project, org);
+
+  client.output.print(
+    `${prependEmoji(
+      `Downloaded project settings to ${chalk.bold(
+        join(VERCEL_DIR, VERCEL_DIR_PROJECT)
+      )} ${chalk.gray(settingsStamp())}`,
+      emoji('success')
+    )}\n`
+  );
+
+  return 0;
+}
--- a/packages/cli/src/commands/remove.ts
+++ b/packages/cli/src/commands/remove.ts
@@ -85,8 +85,6 @@ export default async function main(client: Client) {
  argv._ = argv._.slice(1);

  const {
-    apiUrl,
-    authConfig: { token },
    output,
    config: { currentTeam },
  } = client;
@@ -245,11 +243,8 @@ export default async function main(client: Client) {
  }

  const now = new Now({
-    apiUrl,
-    token,
-    debug: argv['--debug'],
+    client,
    currentTeam,
-    output,
  });
  const start = Date.now();

--- a/packages/cli/src/commands/secrets.js
+++ b/packages/cli/src/commands/secrets.js
@@ -72,8 +72,6 @@ const help = () => {

 // Options
 let argv;
-let debug;
-let apiUrl;
 let subcommand;
 let nextTimestamp;

@@ -90,8 +88,6 @@ const main = async client => {

  argv._ = argv._.slice(1);

-  debug = argv.debug;
-  apiUrl = client.apiUrl;
  subcommand = argv._[0];
  nextTimestamp = argv.next;

@@ -101,7 +97,6 @@ const main = async client => {
  }

  const {
-    authConfig: { token },
    output,
    config: { currentTeam },
  } = client;
@@ -118,7 +113,7 @@ const main = async client => {
    throw err;
  }

-  return run({ output, token, contextName, currentTeam, client });
+  return run({ output, contextName, currentTeam, client });
 };

 export default async client => {
@@ -130,8 +125,8 @@ export default async client => {
  }
 };

-async function run({ output, token, contextName, currentTeam, client }) {
-  const secrets = new NowSecrets({ apiUrl, token, debug, currentTeam, output });
+async function run({ output, contextName, currentTeam, client }) {
+  const secrets = new NowSecrets({ client, currentTeam });
  const args = argv._.slice(1);
  const start = Date.now();
  const { 'test-warning': testWarningFlag } = argv;
--- a/packages/cli/src/commands/teams/add.ts
+++ b/packages/cli/src/commands/teams/add.ts
@@ -1,5 +1,5 @@
 import chalk from 'chalk';
-import stamp from '../../util/output/stamp.ts';
+import stamp from '../../util/output/stamp';
 import info from '../../util/output/info';
 import eraseLines from '../../util/output/erase-lines';
 import chars from '../../util/output/chars';
@@ -7,14 +7,17 @@ import note from '../../util/output/note';
 import textInput from '../../util/input/text';
 import invite from './invite';
 import { writeToConfigFile } from '../../util/config/files';
-import { getPkgName, getCommandName } from '../../util/pkg-name.ts';
+import { getPkgName, getCommandName } from '../../util/pkg-name';
+import Client from '../../util/client';
+import createTeam from '../../util/teams/create-team';
+import patchTeam from '../../util/teams/patch-team';

-const validateSlugKeypress = (data, value) =>
+const validateSlugKeypress = (data: string, value: string) =>
  // TODO: the `value` here should contain the current value + the keypress
  // should be fixed on utils/input/text.js
  /^[a-zA-Z]+[a-zA-Z0-9_-]*$/.test(value + data);

-const validateNameKeypress = (data, value) =>
+const validateNameKeypress = (data: string, value: string) =>
  // TODO: the `value` here should contain the current value + the keypress
  // should be fixed on utils/input/text.js
  /^[ a-zA-Z0-9_-]+$/.test(value + data);
@@ -32,14 +35,14 @@ const gracefulExit = () => {
 const teamUrlPrefix = 'Team URL'.padEnd(14) + chalk.gray('vercel.com/');
 const teamNamePrefix = 'Team Name'.padEnd(14);

-export default async function add(client, teams) {
+export default async function add(client: Client): Promise<number> {
  let slug;
  let team;
  let elapsed;
  const { output } = client;

  output.log(
-    `Pick a team identifier for its url (e.g.: ${chalk.cyan(
+    `Pick a team identifier for its URL (e.g.: ${chalk.cyan(
      '`vercel.com/acme`'
    )})`
  );
@@ -65,14 +68,12 @@ export default async function add(client, teams) {
    elapsed = stamp();
    output.spinner(teamUrlPrefix + slug);

-    let res;
    try {
      // eslint-disable-next-line no-await-in-loop
-      res = await teams.create({ slug });
-      team = res;
+      team = await createTeam(client, { slug });
    } catch (err) {
      output.stopSpinner();
-      process.stdout.write(eraseLines(2));
+      output.print(eraseLines(2));
      output.error(err.message);
    }
  } while (!team);
@@ -103,11 +104,12 @@ export default async function add(client, teams) {
  elapsed = stamp();
  output.spinner(teamNamePrefix + name);

-  const res = await teams.edit({ id: team.id, name });
+  const res = await patchTeam(client, team.id, { name });

  output.stopSpinner();
  process.stdout.write(eraseLines(2));

+  /*
  if (res.error) {
    output.error(res.error.message);
    output.log(`${chalk.red(`✖ ${teamNamePrefix}`)}${name}`);
@@ -116,33 +118,25 @@ export default async function add(client, teams) {
    // TODO: maybe we want to ask the user to retry? not sure if
    // there's a scenario where that would be wanted
  }
+  */

  team = Object.assign(team, res);

  output.success(`Team name saved ${elapsed()}`);
  output.log(`${chalk.cyan(`${chars.tick} `) + teamNamePrefix + team.name}\n`);

-  output.spinner('Saving');
-
  // Update config file
-  const configCopy = Object.assign({}, client.config);
-
-  if (configCopy.sh) {
-    configCopy.sh.currentTeam = team;
-  } else {
-    configCopy.currentTeam = team.id;
-  }
-
-  writeToConfigFile(configCopy);
-
+  output.spinner('Saving');
+  client.config.currentTeam = team.id;
+  writeToConfigFile(client.config);
  output.stopSpinner();

-  await invite(client, { _: [] }, teams, {
+  await invite(client, [], {
    introMsg: 'Invite your teammates! When done, press enter on an empty field',
    noopMsg: `You can invite teammates later by running ${getCommandName(
      `teams invite`
    )}`,
  });

-  gracefulExit();
+  return gracefulExit();
 }
--- a/packages/cli/src/commands/teams/index.ts
+++ b/packages/cli/src/commands/teams/index.ts
@@ -1,6 +1,5 @@
 import chalk from 'chalk';
 import error from '../../util/output/error';
-import NowTeams from '../../util/teams';
 import logo from '../../util/output/logo';
 import list from './list';
 import add from './add';
@@ -8,7 +7,6 @@ import change from './switch';
 import invite from './invite';
 import { getPkgName } from '../../util/pkg-name';
 import getArgs from '../../util/get-args';
-import handleError from '../../util/handle-error';
 import Client from '../../util/client';

 const help = () => {
@@ -61,28 +59,11 @@ const help = () => {
  `);
 };

-let argv;
-let debug;
-let apiUrl;
-let subcommand;
-
 export default async (client: Client) => {
-  try {
-    argv = getArgs(client.argv.slice(2), {
-      '--since': String,
-      '--until': String,
-      '--next': Number,
-      '-N': '--next',
-    });
-  } catch (error) {
-    handleError(error);
-    return 1;
-  }
+  let subcommand;

-  debug = argv['--debug'];
-  apiUrl = client.apiUrl;
-
-  const isSwitch = argv._[0] && argv._[0] === 'switch';
+  const argv = getArgs(client.argv.slice(2), undefined, { permissive: true });
+  const isSwitch = argv._[0] === 'switch';

  argv._ = argv._.slice(1);

@@ -97,19 +78,11 @@ export default async (client: Client) => {
    return 2;
  }

-  const {
-    authConfig: { token },
-    config,
-  } = client;
-
-  const { currentTeam } = config;
-  const teams = new NowTeams({ apiUrl, token, debug, currentTeam });
-
-  let exitCode;
+  let exitCode = 0;
  switch (subcommand) {
    case 'list':
    case 'ls': {
-      exitCode = await list(client, argv, teams);
+      exitCode = await list(client);
      break;
    }
    case 'switch':
@@ -119,12 +92,12 @@ export default async (client: Client) => {
    }
    case 'add':
    case 'create': {
-      exitCode = await add(client, teams);
+      exitCode = await add(client);
      break;
    }

    case 'invite': {
-      exitCode = await invite(client, argv, teams);
+      exitCode = await invite(client, argv._);
      break;
    }
    default: {
@@ -137,6 +110,5 @@ export default async (client: Client) => {
      help();
    }
  }
-  teams.close();
-  return exitCode || 0;
+  return exitCode;
 };
--- a/packages/cli/src/commands/teams/invite.ts
+++ b/packages/cli/src/commands/teams/invite.ts
@@ -1,15 +1,19 @@
 import chalk from 'chalk';
-import { email as regexEmail } from '../../util/input/regexes';
-import cmd from '../../util/output/cmd.ts';
-import stamp from '../../util/output/stamp.ts';
-import param from '../../util/output/param.ts';
+import Client from '../../util/client';
+import cmd from '../../util/output/cmd';
+import stamp from '../../util/output/stamp';
+import param from '../../util/output/param';
 import chars from '../../util/output/chars';
 import textInput from '../../util/input/text';
 import eraseLines from '../../util/output/erase-lines';
-import getUser from '../../util/get-user.ts';
-import { getCommandName } from '../../util/pkg-name.ts';
+import getUser from '../../util/get-user';
+import { getCommandName } from '../../util/pkg-name';
+import { email as regexEmail } from '../../util/input/regexes';
+import getTeams from '../../util/teams/get-teams';
+import inviteUserToTeam from '../../util/teams/invite-user-to-team';

-const validateEmail = data => regexEmail.test(data.trim()) || data.length === 0;
+const validateEmail = (data: string) =>
+  regexEmail.test(data.trim()) || data.length === 0;

 const domains = Array.from(
  new Set([
@@ -28,12 +32,12 @@ const domains = Array.from(
  ])
 );

-const emailAutoComplete = (value, teamSlug) => {
+const emailAutoComplete = (value: string, teamSlug: string) => {
  const parts = value.split('@');

  if (parts.length === 2 && parts[1].length > 0) {
    const [, host] = parts;
-    let suggestion = false;
+    let suggestion: string | false = false;

    domains.unshift(teamSlug);
    for (const domain of domains) {
@@ -51,17 +55,16 @@ const emailAutoComplete = (value, teamSlug) => {
 };

 export default async function invite(
-  client,
-  argv,
-  teams,
-  { introMsg, noopMsg = 'No changes made' } = {}
-) {
+  client: Client,
+  emails: string[] = [],
+  { introMsg = '', noopMsg = 'No changes made' } = {}
+): Promise<number> {
  const { config, output } = client;
  const { currentTeam: currentTeamId } = config;

  output.spinner('Fetching teams');
-  const list = (await teams.ls()).teams;
-  const currentTeam = list.find(team => team.id === currentTeamId);
+  const teams = await getTeams(client);
+  const currentTeam = teams.find(team => team.id === currentTeamId);

  output.spinner('Fetching user information');
  let user;
@@ -93,8 +96,8 @@ export default async function invite(
    introMsg || `Inviting team members to ${chalk.bold(currentTeam.name)}`
  );

-  if (argv._.length > 0) {
-    for (const email of argv._) {
+  if (emails.length > 0) {
+    for (const email of emails) {
      if (regexEmail.test(email)) {
        output.spinner(email);
        const elapsed = stamp();
@@ -102,8 +105,8 @@ export default async function invite(

        try {
          // eslint-disable-next-line no-await-in-loop
-          const res = await teams.inviteUser({ teamId: currentTeam.id, email });
-          userInfo = res.name || res.username;
+          const res = await inviteUserToTeam(client, currentTeam.id, email);
+          userInfo = res.username;
        } catch (err) {
          if (err.code === 'user_not_found') {
            output.error(`No user exists with the email address "${email}".`);
@@ -122,12 +125,11 @@ export default async function invite(
        output.log(`${chalk.red(`✖ ${email}`)} ${chalk.gray('[invalid]')}`);
      }
    }
-    return;
+    return 0;
  }

  const inviteUserPrefix = 'Invite User'.padEnd(14);
  const sentEmailPrefix = 'Sent Email'.padEnd(14);
-  const emails = [];
  let hasError = false;
  let email;
  do {
@@ -150,12 +152,12 @@ export default async function invite(
      output.spinner(inviteUserPrefix + email);
      try {
        // eslint-disable-next-line no-await-in-loop
-        const { name, username } = await teams.inviteUser({
-          teamId: currentTeam.id,
-          email,
-        });
-        const userInfo = name || username;
-        email = `${email}${userInfo ? ` (${userInfo})` : ''} ${elapsed()}`;
+        const { username } = await inviteUserToTeam(
+          client,
+          currentTeam.id,
+          email
+        );
+        email = `${email}${username ? ` (${username})` : ''} ${elapsed()}`;
        emails.push(email);
        output.log(`${chalk.cyan(chars.tick)} ${sentEmailPrefix}${email}`);
        if (hasError) {
@@ -193,4 +195,6 @@ export default async function invite(
      output.log(`${chalk.cyan(chars.tick)} ${inviteUserPrefix}${email}`);
    }
  }
+
+  return 0;
 }
--- a/packages/cli/src/commands/teams/list.ts
+++ b/packages/cli/src/commands/teams/list.ts
@@ -1,22 +1,41 @@
 import chars from '../../util/output/chars';
 import table from '../../util/output/table';
-import getUser from '../../util/get-user.ts';
+import getUser from '../../util/get-user';
+import getTeams from '../../util/teams/get-teams';
 import getPrefixedFlags from '../../util/get-prefixed-flags';
-import { getPkgName } from '../../util/pkg-name.ts';
+import { getPkgName } from '../../util/pkg-name';
 import getCommandFlags from '../../util/get-command-flags';
-import cmd from '../../util/output/cmd.ts';
+import cmd from '../../util/output/cmd';
+import Client from '../../util/client';
+import getArgs from '../../util/get-args';

-export default async function list(client, argv, teams) {
+export default async function list(client: Client): Promise<number> {
  const { config, output } = client;
-  const { next } = argv;
+
+  const argv = getArgs(client.argv.slice(2), {
+    '--since': String,
+    '--until': String,
+    '--count': Number,
+    '--next': Number,
+    '-C': '--count',
+    '-N': '--next',
+  });
+
+  const next = argv['--next'];
+  const count = argv['--count'];

  if (typeof next !== 'undefined' && !Number.isInteger(next)) {
-    output.error('Please provide a number for flag --next');
+    output.error('Please provide a number for flag `--next`');
+    return 1;
+  }
+
+  if (typeof count !== 'undefined' && !Number.isInteger(next)) {
+    output.error('Please provide a number for flag `--count`');
    return 1;
  }

  output.spinner('Fetching teams');
-  const { teams: list, pagination } = await teams.ls({
+  const { teams, pagination } = await getTeams(client, {
    next,
    apiVersion: 2,
  });
@@ -37,40 +56,31 @@ export default async function list(client, argv, teams) {
  }

  if (accountIsCurrent) {
-    currentTeam = {
-      slug: user.username || user.email,
-    };
+    currentTeam = user.id;
  }

-  const teamList = list.map(({ slug, name }) => ({
+  const teamList = teams.map(({ id, slug, name }) => ({
+    id,
    name,
    value: slug,
-    current: slug === currentTeam.slug ? chars.tick : '',
+    current: id === currentTeam ? chars.tick : '',
  }));

  teamList.unshift({
+    id: user.id,
    name: user.email,
    value: user.username || user.email,
-    current: (accountIsCurrent && chars.tick) || '',
+    current: accountIsCurrent ? chars.tick : '',
  });

-  // Let's bring the current team to the beginning of the list
+  // Bring the current Team to the beginning of the list
  if (!accountIsCurrent) {
-    const index = teamList.findIndex(
-      choice => choice.value === currentTeam.slug
-    );
+    const index = teamList.findIndex(choice => choice.id === currentTeam);
    const choice = teamList.splice(index, 1)[0];
    teamList.unshift(choice);
  }

  // Printing
-  const count = teamList.length;
-  if (!count) {
-    // Maybe should not happen
-    output.error(`No teams found`);
-    return 1;
-  }
-
  output.stopSpinner();
  console.log(); // empty line

@@ -80,7 +90,7 @@ export default async function list(client, argv, teams) {
    [1, 5]
  );

-  if (pagination && pagination.count === 20) {
+  if (pagination?.count === 20) {
    const prefixedArgs = getPrefixedFlags(argv);
    const flags = getCommandFlags(prefixedArgs, ['_', '--next', '-N', '-d']);
    const nextCmd = `${getPkgName()} teams ls${flags} --next ${
@@ -89,4 +99,6 @@ export default async function list(client, argv, teams) {
    console.log(); // empty line
    output.log(`To display the next page run ${cmd(nextCmd)}`);
  }
+
+  return 0;
 }
--- a/packages/cli/src/commands/teams/switch.ts
+++ b/packages/cli/src/commands/teams/switch.ts
@@ -5,7 +5,7 @@ import chalk from 'chalk';
 import Client from '../../util/client';
 import { emoji } from '../../util/emoji';
 import getUser from '../../util/get-user';
-import getTeams from '../../util/get-teams';
+import getTeams from '../../util/teams/get-teams';
 import listInput from '../../util/input/list';
 import { Team, GlobalConfig } from '../../types';
 import { writeToConfigFile } from '../../util/config/files';
--- a/packages/cli/src/commands/whoami.ts
+++ b/packages/cli/src/commands/whoami.ts
@@ -3,7 +3,6 @@ import logo from '../util/output/logo';
 import getScope from '../util/get-scope';
 import { getPkgName } from '../util/pkg-name';
 import getArgs from '../util/get-args';
-import handleError from '../util/handle-error';
 import Client from '../util/client';

 const help = () => {
@@ -32,16 +31,9 @@ const help = () => {
 `);
 };

-export default async (client: Client) => {
+export default async (client: Client): Promise<number> => {
  const { output } = client;
-  let argv;
-  try {
-    argv = getArgs(client.argv.slice(2), {});
-  } catch (error) {
-    handleError(error);
-    return 1;
-  }
-
+  const argv = getArgs(client.argv.slice(2), {});
  argv._ = argv._.slice(1);

  if (argv['--help'] || argv._[0] === 'help') {
@@ -62,9 +54,13 @@ export default async (client: Client) => {
    throw err;
  }

-  if (process.stdout.isTTY) {
-    process.stdout.write('> ');
+  if (output.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 });
  }

-  console.log(contextName);
+  return 0;
 };
--- a/packages/cli/src/index.ts
+++ b/packages/cli/src/index.ts
@@ -20,10 +20,9 @@ import epipebomb from 'epipebomb';
 import updateNotifier from 'update-notifier';
 import { URL } from 'url';
 import * as Sentry from '@sentry/node';
-import { NowBuildError } from '@vercel/build-utils';
 import hp from './util/humanize-path';
-import commands from './commands/index.ts';
-import pkg from './util/pkg.ts';
+import commands from './commands';
+import pkg from './util/pkg';
 import createOutput from './util/output';
 import cmd from './util/output/cmd';
 import info from './util/output/info';
@@ -31,9 +30,9 @@ import error from './util/output/error';
 import param from './util/output/param';
 import highlight from './util/output/highlight';
 import getArgs from './util/get-args';
-import getUser from './util/get-user.ts';
-import Client from './util/client.ts';
-import NowTeams from './util/teams';
+import getUser from './util/get-user';
+import getTeams from './util/teams/get-teams';
+import Client from './util/client';
 import { handleError } from './util/error';
 import reportError from './util/report-error';
 import getConfig from './util/get-config';
@@ -44,13 +43,14 @@ import {
  getDefaultAuthConfig,
 } from './util/config/get-default';
 import * as ERRORS from './util/errors-ts';
-import { NowError } from './util/now-error';
-import { APIError } from './util/errors-ts.ts';
-import { SENTRY_DSN } from './util/constants.ts';
+import { APIError } from './util/errors-ts';
+import { SENTRY_DSN } from './util/constants';
 import getUpdateCommand from './util/get-update-command';
-import { metrics, shouldCollectMetrics } from './util/metrics.ts';
-import { getCommandName, getTitleName } from './util/pkg-name.ts';
-import doLoginPrompt from './util/login/prompt.ts';
+import { metrics, shouldCollectMetrics } from './util/metrics';
+import { getCommandName, getTitleName } from './util/pkg-name';
+import doLoginPrompt from './util/login/prompt';
+import { GlobalConfig } from './types';
+import { VercelConfig } from '@vercel/client';

 const isCanary = pkg.version.includes('canary');

@@ -77,8 +77,8 @@ Sentry.init({
  environment: isCanary ? 'canary' : 'stable',
 });

-let client;
-let debug = () => {};
+let client: Client;
+let debug: (s: string) => void = () => {};
 let apiUrl = 'https://api.vercel.com';

 const main = async () => {
@@ -108,26 +108,30 @@ const main = async () => {
  debug = output.debug;

  const localConfigPath = argv['--local-config'];
-  const localConfig = await getConfig(output, localConfigPath);
-
-  if (localConfigPath && localConfig instanceof ERRORS.CantFindConfig) {
-    output.error(
-      `Couldn't find a project configuration file at \n    ${localConfig.meta.paths.join(
-        ' or\n    '
-      )}`
-    );
-    return 1;
-  }
+  let localConfig: VercelConfig | Error | undefined = await getConfig(
+    output,
+    localConfigPath
+  );

  if (localConfig instanceof ERRORS.CantParseJSONFile) {
    output.error(`Couldn't parse JSON file ${localConfig.meta.file}.`);
    return 1;
  }

-  if (
-    (localConfig instanceof NowError || localConfig instanceof NowBuildError) &&
-    !(localConfig instanceof ERRORS.CantFindConfig)
-  ) {
+  if (localConfig instanceof ERRORS.CantFindConfig) {
+    if (localConfigPath) {
+      output.error(
+        `Couldn't find a project configuration file at \n    ${localConfig.meta.paths.join(
+          ' or\n    '
+        )}`
+      );
+      return 1;
+    } else {
+      localConfig = undefined;
+    }
+  }
+
+  if (localConfig instanceof Error) {
    output.prettyError(localConfig);
    return 1;
  }
@@ -156,18 +160,26 @@ const main = async () => {
  //  * a path to deploy (as in: `vercel path/`)
  //  * a subcommand (as in: `vercel ls`)
  const targetOrSubcommand = argv._[2];
+  const isBuildOrDev =
+    targetOrSubcommand === 'build' || targetOrSubcommand === 'dev';

-  output.print(
-    `${chalk.grey(
-      `${getTitleName()} CLI ${pkg.version}${
-        targetOrSubcommand === 'dev' ? ' dev (beta)' : ''
-      }${
-        isCanary || targetOrSubcommand === 'dev'
-          ? ' — https://vercel.com/feedback'
-          : ''
-      }`
-    )}\n`
-  );
+  if (isBuildOrDev) {
+    console.log(
+      `${chalk.grey(
+        `${getTitleName()} CLI ${
+          pkg.version
+        } ${targetOrSubcommand} (beta) — https://vercel.com/feedback`
+      )}`
+    );
+  } else {
+    output.print(
+      `${chalk.grey(
+        `${getTitleName()} CLI ${pkg.version}${
+          isCanary ? ' — https://vercel.com/feedback' : ''
+        }`
+      )}\n`
+    );
+  }

  // Handle `--version` directly
  if (!targetOrSubcommand && argv['--version']) {
@@ -207,7 +219,7 @@ const main = async () => {
    return 0;
  }

-  let config;
+  let config: GlobalConfig | null = null;

  if (configExists) {
    try {
@@ -229,8 +241,11 @@ const main = async () => {
    // multiple providers. In that case, we really
    // need to migrate.
    if (
+      // @ts-ignore
      config.sh ||
+      // @ts-ignore
      config.user ||
+      // @ts-ignore
      typeof config.user === 'object' ||
      typeof config.currentTeam === 'object'
    ) {
@@ -279,7 +294,14 @@ const main = async () => {

  let authConfig = null;

-  const subcommandsWithoutToken = ['login', 'logout', 'help', 'init', 'update'];
+  const subcommandsWithoutToken = [
+    'login',
+    'logout',
+    'help',
+    'init',
+    'update',
+    'build',
+  ];

  if (authConfigExists) {
    try {
@@ -300,6 +322,7 @@ const main = async () => {
    // This is from when Vercel CLI supported
    // multiple providers. In that case, we really
    // need to migrate.
+    // @ts-ignore
    if (authConfig.credentials) {
      authConfigExists = false;
    }
@@ -346,6 +369,11 @@ const main = async () => {
    return 1;
  }

+  if (!config) {
+    output.error(`Vercel global config was not loaded.`);
+    return 1;
+  }
+
  // Shared API `Client` instance for all sub-commands to utilize
  client = new Client({
    apiUrl,
@@ -380,24 +408,37 @@ const main = async () => {
      } else if (commands.has(singular)) {
        alternative = singular;
      }
-      console.error(
-        error(
-          `The supplied argument ${param(targetOrSubcommand)} is ambiguous.` +
-            `\nIf you wish to deploy the ${fileType} ${param(
-              targetOrSubcommand
-            )}, first run "cd ${targetOrSubcommand}". ` +
+      if (targetOrSubcommand === 'build') {
+        output.note(
+          `If you wish to deploy the ${fileType} ${param(
+            targetOrSubcommand
+          )}, run ${getCommandName('deploy build')}.` +
            (alternative
              ? `\nIf you wish to use the subcommand ${param(
                  targetOrSubcommand
                )}, use ${param(alternative)} instead.`
              : '')
-        )
-      );
-      return 1;
+        );
+      } else {
+        console.error(
+          error(
+            `The supplied argument ${param(targetOrSubcommand)} is ambiguous.` +
+              `\nIf you wish to deploy the ${fileType} ${param(
+                targetOrSubcommand
+              )}, first run "cd ${targetOrSubcommand}". ` +
+              (alternative
+                ? `\nIf you wish to use the subcommand ${param(
+                    targetOrSubcommand
+                  )}, use ${param(alternative)} instead.`
+                : '')
+          )
+        );
+        return 1;
+      }
    }

    if (subcommandExists) {
-      debug('user supplied known subcommand', targetOrSubcommand);
+      debug(`user supplied known subcommand: "${targetOrSubcommand}"`);
      subcommand = targetOrSubcommand;
    } else {
      debug('user supplied a possible target for deployment');
@@ -457,14 +498,12 @@ const main = async () => {
  }

  if (typeof argv['--token'] === 'string' && subcommand === 'switch') {
-    console.error(
-      error({
-        message: `This command doesn't work with ${param(
-          '--token'
-        )}. Please use ${param('--scope')}.`,
-        slug: 'no-token-allowed',
-      })
-    );
+    output.prettyError({
+      message: `This command doesn't work with ${param(
+        '--token'
+      )}. Please use ${param('--scope')}.`,
+      link: 'https://err.sh/vercel/no-token-allowed',
+    });

    return 1;
  }
@@ -473,12 +512,10 @@ const main = async () => {
    const token = argv['--token'];

    if (token.length === 0) {
-      console.error(
-        error({
-          message: `You defined ${param('--token')}, but it's missing a value`,
-          slug: 'missing-token-value',
-        })
-      );
+      output.prettyError({
+        message: `You defined ${param('--token')}, but it's missing a value`,
+        link: 'https://err.sh/vercel/missing-token-value',
+      });

      return 1;
    }
@@ -486,16 +523,14 @@ const main = async () => {
    const invalid = token.match(/(\W)/g);
    if (invalid) {
      const notContain = Array.from(new Set(invalid)).sort();
-      console.error(
-        error({
-          message: `You defined ${param(
-            '--token'
-          )}, but its contents are invalid. Must not contain: ${notContain
-            .map(c => JSON.stringify(c))
-            .join(', ')}`,
-          slug: 'invalid-token-value',
-        })
-      );
+      output.prettyError({
+        message: `You defined ${param(
+          '--token'
+        )}, but its contents are invalid. Must not contain: ${notContain
+          .map(c => JSON.stringify(c))
+          .join(', ')}`,
+        link: 'https://err.sh/vercel/invalid-token-value',
+      });

      return 1;
    }
@@ -516,13 +551,8 @@ const main = async () => {
    );
  }

-  const {
-    authConfig: { token },
-  } = client;
-
-  let scope = argv['--scope'] || argv['--team'] || localConfig.scope;
-
  const targetCommand = commands.get(subcommand);
+  const scope = argv['--scope'] || argv['--team'] || localConfig?.scope;

  if (
    typeof scope === 'string' &&
@@ -536,12 +566,10 @@ const main = async () => {
      user = await getUser(client);
    } catch (err) {
      if (err.code === 'NOT_AUTHORIZED') {
-        console.error(
-          error({
-            message: `You do not have access to the specified account`,
-            slug: 'scope-not-accessible',
-          })
-        );
+        output.prettyError({
+          message: `You do not have access to the specified account`,
+          link: 'https://err.sh/vercel/scope-not-accessible',
+        });

        return 1;
      }
@@ -550,22 +578,19 @@ const main = async () => {
      return 1;
    }

-    if (user.uid === scope || user.email === scope || user.username === scope) {
+    if (user.id === scope || user.email === scope || user.username === scope) {
      delete client.config.currentTeam;
    } else {
-      let list = [];
+      let teams = [];

      try {
-        const teams = new NowTeams({ apiUrl, token, debug: isDebugging });
-        list = (await teams.ls()).teams;
+        teams = await getTeams(client);
      } catch (err) {
        if (err.code === 'not_authorized') {
-          console.error(
-            error({
-              message: `You do not have access to the specified team`,
-              slug: 'scope-not-accessible',
-            })
-          );
+          output.prettyError({
+            message: `You do not have access to the specified team`,
+            link: 'https://err.sh/vercel/scope-not-accessible',
+          });

          return 1;
        }
@@ -575,15 +600,13 @@ const main = async () => {
      }

      const related =
-        list && list.find(item => item.id === scope || item.slug === scope);
+        teams && teams.find(team => team.id === scope || team.slug === scope);

      if (!related) {
-        console.error(
-          error({
-            message: 'The specified scope does not exist',
-            slug: 'scope-not-existent',
-          })
-        );
+        output.prettyError({
+          message: 'The specified scope does not exist',
+          link: 'https://err.sh/vercel/scope-not-existent',
+        });

        return 1;
      }
@@ -592,20 +615,99 @@ const main = async () => {
    }
  }

-  if (!targetCommand) {
-    const sub = param(subcommand);
-    console.error(error(`The ${sub} subcommand does not exist`));
-    return 1;
-  }
-
  const metric = metrics();
  let exitCode;
  const eventCategory = 'Exit Code';

  try {
    const start = Date.now();
-    const full = require(`./commands/${targetCommand}`).default;
-    exitCode = await full(client);
+    let func: any;
+    switch (targetCommand) {
+      case 'alias':
+        func = await import('./commands/alias');
+        break;
+      case 'billing':
+        func = await import('./commands/billing');
+        break;
+      case 'build':
+        func = await import('./commands/build');
+        break;
+      case 'certs':
+        func = await import('./commands/certs');
+        break;
+      case 'deploy':
+        func = await import('./commands/deploy');
+        break;
+      case 'dev':
+        func = await import('./commands/dev');
+        break;
+      case 'dns':
+        func = await import('./commands/dns');
+        break;
+      case 'domains':
+        func = await import('./commands/domains');
+        break;
+      case 'env':
+        func = await import('./commands/env');
+        break;
+      case 'init':
+        func = await import('./commands/init');
+        break;
+      case 'inspect':
+        func = await import('./commands/inspect');
+        break;
+      case 'link':
+        func = await import('./commands/link');
+        break;
+      case 'list':
+        func = await import('./commands/list');
+        break;
+      case 'logs':
+        func = await import('./commands/logs');
+        break;
+      case 'login':
+        func = await import('./commands/login');
+        break;
+      case 'logout':
+        func = await import('./commands/logout');
+        break;
+      case 'projects':
+        func = await import('./commands/projects');
+        break;
+      case 'pull':
+        func = await import('./commands/pull');
+        break;
+      case 'remove':
+        func = await import('./commands/remove');
+        break;
+      case 'secrets':
+        func = await import('./commands/secrets');
+        break;
+      case 'teams':
+        func = await import('./commands/teams');
+        break;
+      case 'update':
+        func = await import('./commands/update');
+        break;
+      case 'whoami':
+        func = await import('./commands/whoami');
+        break;
+      default:
+        func = null;
+        break;
+    }
+
+    if (!func || !targetCommand) {
+      const sub = param(subcommand);
+      output.error(`The ${sub} subcommand does not exist`);
+      return 1;
+    }
+
+    if (func.default) {
+      func = func.default;
+    }
+
+    exitCode = await func(client);
    const end = Date.now() - start;

    if (shouldCollectMetrics) {
@@ -619,7 +721,7 @@ const main = async () => {
  } catch (err) {
    if (err.code === 'ENOTFOUND') {
      // Error message will look like the following:
-      // "request to https://api.vercel.com/www/user failed, reason: getaddrinfo ENOTFOUND api.vercel.com"
+      // "request to https://api.vercel.com/v2/user failed, reason: getaddrinfo ENOTFOUND api.vercel.com"
      const matches = /getaddrinfo ENOTFOUND (.*)$/.exec(err.message || '');
      if (matches && matches[1]) {
        const hostname = matches[1];
@@ -678,7 +780,7 @@ const main = async () => {
  return exitCode;
 };

-const handleRejection = async err => {
+const handleRejection = async (err: any) => {
  debug('handling rejection');

  if (err) {
@@ -695,7 +797,7 @@ const handleRejection = async err => {
  process.exit(1);
 };

-const handleUnexpected = async err => {
+const handleUnexpected = async (err: Error) => {
  const { message } = err;

  // We do not want to render errors about Sentry not being reachable
@@ -704,9 +806,8 @@ const handleUnexpected = async err => {
    return;
  }

-  await reportError(Sentry, client, err);
-
  console.error(error(`An unexpected error occurred!\n${err.stack}`));
+  await reportError(Sentry, client, err);

  process.exit(1);
 };
@@ -717,6 +818,7 @@ 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
@@ -16,13 +16,13 @@ export interface JSONObject {
 }

 export interface AuthConfig {
-  _: string;
+  _?: string;
  token?: string;
  skipWrite?: boolean;
 }

 export interface GlobalConfig {
-  _: string;
+  _?: string;
  currentTeam?: string;
  includeScheme?: string;
  collectMetrics?: boolean;
@@ -45,25 +45,12 @@ type Billing = {
 };

 export type User = {
-  uid: string;
+  id: string;
  avatar: string;
-  bio?: string;
-  date: number;
+  createdAt: number;
  email: string;
  username: string;
-  website?: string;
-  billingChecked: boolean;
  billing: Billing;
-  github?: {
-    email: string;
-    installation: {
-      id: string;
-      login: string;
-      loginType: string;
-    };
-    login: string;
-    updatedAt: number;
-  };
  name?: string;
  limited?: boolean;
 };
--- a/packages/cli/src/util/alias/get-deployment-by-alias.ts
+++ b/packages/cli/src/util/alias/get-deployment-by-alias.ts
@@ -18,7 +18,7 @@ async function getAppLastDeployment(
  const deployments = await getDeploymentsByAppName(client, appName);
  const deploymentItem = deployments
    .sort((a, b) => b.created - a.created)
-    .filter(dep => dep.state === 'READY' && dep.creator.uid === user.uid)[0];
+    .filter(dep => dep.state === 'READY' && dep.creator.uid === user.id)[0];

  // Try to fetch deployment details
  if (deploymentItem) {
@@ -35,7 +35,7 @@ export async function getDeploymentForAlias(
  localConfigPath: string | undefined,
  user: User,
  contextName: string,
-  localConfig: VercelConfig
+  localConfig?: VercelConfig
 ) {
  output.spinner(`Fetching deployment to alias in ${chalk.bold(contextName)}`);

@@ -52,7 +52,7 @@ export async function getDeploymentForAlias(
  }

  const appName =
-    (localConfig && localConfig.name) ||
+    localConfig?.name ||
    path.basename(path.resolve(process.cwd(), localConfigPath || ''));

  if (!appName) {
--- a/packages/cli/src/util/client.ts
+++ b/packages/cli/src/util/client.ts
@@ -34,10 +34,10 @@ export interface ClientOptions {
  authConfig: AuthConfig;
  output: Output;
  config: GlobalConfig;
-  localConfig: VercelConfig;
+  localConfig?: VercelConfig;
 }

-const isJSONObject = (v: any): v is JSONObject => {
+export const isJSONObject = (v: any): v is JSONObject => {
  return v && typeof v == 'object' && v.constructor === Object;
 };

@@ -47,7 +47,7 @@ export default class Client extends EventEmitter {
  authConfig: AuthConfig;
  output: Output;
  config: GlobalConfig;
-  localConfig: VercelConfig;
+  localConfig?: VercelConfig;
  private requestIdCounter: number;

  constructor(opts: ClientOptions) {
@@ -69,7 +69,7 @@ export default class Client extends EventEmitter {
    });
  }

-  _fetch(_url: string, opts: FetchOptions = {}) {
+  private _fetch(_url: string, opts: FetchOptions = {}) {
    const parsedUrl = parseUrl(_url, true);
    const apiUrl = parsedUrl.host
      ? `${parsedUrl.protocol}//${parsedUrl.host}`
@@ -100,7 +100,7 @@ export default class Client extends EventEmitter {
    let body;
    if (isJSONObject(opts.body)) {
      body = JSON.stringify(opts.body);
-      headers.set('content-type', 'application/json; charset=utf8');
+      headers.set('content-type', 'application/json; charset=utf-8');
    } else {
      body = opts.body;
    }
--- a/packages/cli/src/util/config/files.ts
+++ b/packages/cli/src/util/config/files.ts
@@ -100,8 +100,8 @@ export function getAuthConfigFilePath() {

 export function readLocalConfig(
  prefix: string = process.cwd()
-): VercelConfig | null {
-  let config: VercelConfig | null = null;
+): VercelConfig | undefined {
+  let config: VercelConfig | undefined = undefined;
  let target = '';

  try {
@@ -116,7 +116,7 @@ export function readLocalConfig(
  }

  if (!target) {
-    return null;
+    return;
  }

  try {
@@ -134,7 +134,7 @@ export function readLocalConfig(
  }

  if (!config) {
-    return null;
+    return;
  }

  config[fileNameSymbol] = basename(target);
--- a/packages/cli/src/util/config/get-default.ts
+++ b/packages/cli/src/util/config/get-default.ts
@@ -1,6 +1,6 @@
 import { AuthConfig, GlobalConfig } from '../../types';

-export const getDefaultConfig = async (existingCopy: GlobalConfig) => {
+export const getDefaultConfig = async (existingCopy?: GlobalConfig | null) => {
  let migrated = false;

  const config: GlobalConfig = {
@@ -51,7 +51,7 @@ export const getDefaultConfig = async (existingCopy: GlobalConfig) => {
  return { config, migrated };
 };

-export const getDefaultAuthConfig = async (existing?: AuthConfig) => {
+export const getDefaultAuthConfig = async (existing?: AuthConfig | null) => {
  let migrated = false;

  const config: AuthConfig = {
--- a/packages/cli/src/util/config/global-path.ts
+++ b/packages/cli/src/util/config/global-path.ts
@@ -18,12 +18,8 @@ export const isDirectory = (path: string): boolean => {
 const getGlobalPathConfig = (): string => {
  let customPath: string | undefined;

-  try {
-    const argv = getArgs(process.argv.slice(2), {});
-    customPath = argv['--global-config'];
-  } catch (_error) {
-    // args are optional so consume error
-  }
+  const argv = getArgs(process.argv.slice(2), {}, { permissive: true });
+  customPath = argv['--global-config'];

  const vercelDirectories = XDGAppPaths('com.vercel.cli').dataDirs();

--- a/packages/cli/src/util/config/local-path.ts
+++ b/packages/cli/src/util/config/local-path.ts
@@ -7,12 +7,8 @@ import getArgs from '../../util/get-args';
 export default function getLocalPathConfig(prefix: string) {
  let customPath: string | undefined;

-  try {
-    const argv = getArgs(process.argv.slice(2), {});
-    customPath = argv['--local-config'];
-  } catch (_error) {
-    // args are optional so consume error
-  }
+  const argv = getArgs(process.argv.slice(2), {}, { permissive: true });
+  customPath = argv['--local-config'];

  // If `--local-config` flag was specified, then that takes priority
  if (customPath) {
--- a/packages/cli/src/util/deploy/create-deploy.ts
+++ b/packages/cli/src/util/deploy/create-deploy.ts
@@ -4,7 +4,7 @@ import * as ERRORS from '../errors';
 import { NowError } from '../now-error';
 import mapCertError from '../certs/map-cert-error';
 import { Org } from '../../types';
-import Now from '..';
+import Now, { CreateOptions } from '..';
 import Client from '../client';
 import { DeploymentError } from '../../../../client/dist';

@@ -13,8 +13,8 @@ export default async function createDeploy(
  now: Now,
  contextName: string,
  paths: string[],
-  createArgs: any,
-  org: Org | null,
+  createArgs: CreateOptions,
+  org: Org,
  isSettingUpProject: boolean,
  cwd?: string
 ): Promise<any | DeploymentError> {
--- a/packages/cli/src/util/deploy/get-deployment-checks.ts
+++ b/packages/cli/src/util/deploy/get-deployment-checks.ts
@@ -0,0 +1,37 @@
+import Client from '../client';
+
+type CheckStatus = 'registered' | 'running' | 'completed';
+type CheckConclusion =
+  | 'canceled'
+  | 'failed'
+  | 'neutral'
+  | 'succeeded'
+  | 'skipped'
+  | 'stale';
+
+export interface DeploymentCheck {
+  id: string;
+  status: CheckStatus;
+  conclusion: CheckConclusion;
+  name: string;
+  startedAt: number;
+  completedAt: number;
+  createdAt: number;
+  updatedAt: number;
+  integrationId: string;
+  rerequestable: boolean;
+}
+
+export interface DeploymentChecksResponse {
+  checks: DeploymentCheck[];
+}
+
+export async function getDeploymentChecks(
+  client: Client,
+  deploymentId: string
+) {
+  const checksResponse = await client.fetch<DeploymentChecksResponse>(
+    `/v1/deployments/${encodeURIComponent(deploymentId)}/checks`
+  );
+  return checksResponse;
+}
--- a/packages/cli/src/util/deploy/process-deployment.ts
+++ b/packages/cli/src/util/deploy/process-deployment.ts
@@ -47,6 +47,7 @@ export default async function processDeployment({
  force?: boolean;
  withCache?: boolean;
  org: Org;
+  prebuilt: boolean;
  projectName: string;
  isSettingUpProject: boolean;
  skipAutoDetectionConfirmation?: boolean;
@@ -62,6 +63,7 @@ export default async function processDeployment({
    withCache,
    nowConfig,
    quiet,
+    prebuilt,
  } = args;

  const { debug } = output;
@@ -69,15 +71,21 @@ export default async function processDeployment({

  const { env = {} } = requestBody;

+  const token = now._token;
+  if (!token) {
+    throw new Error('Missing authentication token');
+  }
+
  const clientOptions: VercelClientOptions = {
    teamId: org.type === 'team' ? org.id : undefined,
    apiUrl: now._apiUrl,
-    token: now._token,
+    token,
    debug: now._debug,
    userAgent: ua,
    path: paths[0],
    force,
    withCache,
+    prebuilt,
    skipAutoDetectionConfirmation,
  };

@@ -149,7 +157,6 @@ export default async function processDeployment({
          org.slug
        );

-        // @ts-ignore
        now.url = event.payload.url;

        output.stopSpinner();
@@ -175,10 +182,26 @@ export default async function processDeployment({
        return event.payload;
      }

-      if (event.type === 'ready') {
+      // If `checksState` is present, we can only continue to "Completing" if the checks finished,
+      // otherwise we might show "Completing" before "Running Checks".
+      if (
+        event.type === 'ready' &&
+        (event.payload.checksState
+          ? event.payload.checksState === 'completed'
+          : true)
+      ) {
        output.spinner('Completing', 0);
      }

+      if (event.type === 'checks-running') {
+        output.spinner('Running Checks', 0);
+      }
+
+      if (event.type === 'checks-conclusion-failed') {
+        output.stopSpinner();
+        return event.payload;
+      }
+
      // Handle error events
      if (event.type === 'error') {
        output.stopSpinner();
--- a/packages/cli/src/util/dev/builder-cache.ts
+++ b/packages/cli/src/util/dev/builder-cache.ts
@@ -19,7 +19,7 @@ import { BuilderWithPackage } from './types';

 type CliPackageJson = typeof cliPkg;

-declare const __non_webpack_require__: typeof require;
+const require_: typeof require = eval('require');

 const registryTypes = new Set(['version', 'tag', 'range']);

@@ -104,7 +104,7 @@ export function filterPackage(
  builderSpec: string,
  distTag: string,
  buildersPkg: PackageJson,
-  cliPkg: CliPackageJson
+  cliPkg: Partial<CliPackageJson>
 ) {
  if (builderSpec in localBuilders) return false;
  const parsed = npa(builderSpec);
@@ -355,8 +355,8 @@ export async function getBuilder(

    try {
      output.debug(`Requiring runtime: "${requirePath}"`);
-      const mod = require(requirePath);
-      const pkg = require(join(requirePath, 'package.json'));
+      const mod = require_(requirePath);
+      const pkg = require_(join(requirePath, 'package.json'));
      builderWithPkg = {
        requirePath,
        builder: Object.freeze(mod),
@@ -432,18 +432,13 @@ function purgeRequireCache(
  builderDir: string,
  output: Output
 ) {
-  const _require =
-    typeof __non_webpack_require__ === 'function'
-      ? __non_webpack_require__
-      : require;
-
  // The `require()` cache for the builder's assets must be purged
  const packagesPaths = packages.map(b => join(builderDir, 'node_modules', b));
-  for (const id of Object.keys(_require.cache)) {
+  for (const id of Object.keys(require_.cache)) {
    for (const path of packagesPaths) {
      if (id.startsWith(path)) {
        output.debug(`Purging require cache for "${id}"`);
-        delete _require.cache[id];
+        delete require_.cache[id];
      }
    }
  }
--- a/packages/cli/src/util/dev/builder.ts
+++ b/packages/cli/src/util/dev/builder.ts
@@ -109,7 +109,8 @@ export async function executeBuild(
    builderWithPkg: { runInProcess, requirePath, builder, package: pkg },
  } = match;
  const { entrypoint } = match;
-  const { debug, envConfigs, cwd: workPath, devCacheDir } = devServer;
+  const { envConfigs, cwd: workPath, devCacheDir } = devServer;
+  const debug = devServer.output.isDebugEnabled();

  const startTime = Date.now();
  const showBuildTimestamp =
@@ -216,13 +217,13 @@ export async function executeBuild(

    if (output.maxDuration) {
      throw new Error(
-        'The result of "builder.build()" must not contain `memory`'
+        'The result of "builder.build()" must not contain `maxDuration`'
      );
    }

    if (output.memory) {
      throw new Error(
-        'The result of "builder.build()" must not contain `maxDuration`'
+        'The result of "builder.build()" must not contain `memory`'
      );
    }

--- a/packages/cli/src/util/dev/server.ts
+++ b/packages/cli/src/util/dev/server.ts
@@ -89,6 +89,7 @@ import {
 } from './types';
 import { ProjectEnvVariable, ProjectSettings } from '../../types';
 import exposeSystemEnvs from './expose-system-envs';
+import { loadCliPlugins } from '../plugins';

 const frontendRuntimeSet = new Set(
  frameworkList.map(f => f.useRuntime?.use || '@vercel/static-build')
@@ -117,7 +118,6 @@ function sortBuilders(buildA: Builder, buildB: Builder) {

 export default class DevServer {
  public cwd: string;
-  public debug: boolean;
  public output: Output;
  public proxy: httpProxy;
  public envConfigs: EnvConfigs;
@@ -157,7 +157,6 @@ export default class DevServer {

  constructor(cwd: string, options: DevServerOptions) {
    this.cwd = cwd;
-    this.debug = options.debug;
    this.output = options.output;
    this.envConfigs = { buildEnv: {}, runEnv: {}, allEnv: {} };
    this.systemEnvValues = options.systemEnvValues || [];
@@ -1351,6 +1350,30 @@ 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.
   */
@@ -1418,6 +1441,36 @@ export default class DevServer {
    let prevUrl = req.url;
    let prevHeaders: HttpHeadersConfig = {};

+    const middlewareResult = await this.runDevMiddleware(req, res);
+
+    if (middlewareResult) {
+      if (middlewareResult.error) {
+        this.sendError(
+          req,
+          res,
+          requestId,
+          'EDGE_FUNCTION_INVOCATION_FAILED',
+          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);
+      }
+    }
+
    for (const phase of phases) {
      statusCode = undefined;

@@ -2108,7 +2161,10 @@ export default class DevServer {
      process.stdout.write(data.replace(proxyPort, devPort));
    });

-    p.on('exit', () => {
+    p.on('exit', (code: number) => {
+      if (code > 0) {
+        process.exit(code);
+      }
      this.devProcessPort = undefined;
    });

--- a/packages/cli/src/util/dev/types.ts
+++ b/packages/cli/src/util/dev/types.ts
@@ -23,7 +23,6 @@ export { VercelConfig };

 export interface DevServerOptions {
  output: Output;
-  debug: boolean;
  devCommand?: string;
  frameworkSlug?: string;
  projectSettings?: ProjectSettings;
--- a/packages/cli/src/util/error.ts
+++ b/packages/cli/src/util/error.ts
@@ -1,14 +1,22 @@
+import { Response } from 'node-fetch';
 import errorOutput from './output/error';

 export { default as handleError } from './handle-error';
 export const error = errorOutput;

+export interface ResponseError extends Error {
+  status: number;
+  serverMessage: string;
+  retryAfter?: number;
+  [key: string]: any;
+}
+
 export async function responseError(
-  res,
-  fallbackMessage = null,
+  res: Response,
+  fallbackMessage: string | null = null,
  parsedBody = {}
 ) {
-  let message;
+  let message = '';
  let bodyError;

  if (res.status >= 400 && res.status < 500) {
@@ -25,11 +33,11 @@ export async function responseError(
    message = bodyError.message;
  }

-  if (message == null) {
+  if (!message) {
    message = fallbackMessage === null ? 'Response Error' : fallbackMessage;
  }

-  const err = new Error(`${message} (${res.status})`);
+  const err = new Error(`${message} (${res.status})`) as ResponseError;

  err.status = res.status;
  err.serverMessage = message;
@@ -54,7 +62,10 @@ export async function responseError(
  return err;
 }

-export async function responseErrorMessage(res, fallbackMessage = null) {
+export async function responseErrorMessage(
+  res: Response,
+  fallbackMessage: string | null = null
+) {
  let message;

  if (res.status >= 400 && res.status < 500) {
--- a/packages/cli/src/util/errors-ts.ts
+++ b/packages/cli/src/util/errors-ts.ts
@@ -15,6 +15,7 @@ export class APIError extends Error {
  status: number;
  serverMessage: string;
  link?: string;
+  slug?: string;
  action?: string;
  retryAfter: number | null | 'never';
  [key: string]: any;
--- a/packages/cli/src/util/get-project-name.ts
+++ b/packages/cli/src/util/get-project-name.ts
@@ -1,18 +1,17 @@
-import arg from 'arg';
 import { basename } from 'path';
 import { VercelConfig } from '@vercel/client';

 export interface GetProjectNameOptions {
-  argv: arg.Result<{ '--name': StringConstructor }>;
+  argv: { '--name'?: string };
  nowConfig?: VercelConfig;
-  isFile: boolean;
-  paths: string[];
+  isFile?: boolean;
+  paths?: string[];
 }

 export default function getProjectName({
  argv,
  nowConfig = {},
-  isFile,
+  isFile = false,
  paths = [],
 }: GetProjectNameOptions) {
  const nameCli = argv['--name'];
--- a/packages/cli/src/util/get-scope.ts
+++ b/packages/cli/src/util/get-scope.ts
@@ -1,6 +1,6 @@
 import Client from './client';
 import getUser from './get-user';
-import getTeamById from './get-team-by-id';
+import getTeamById from './teams/get-team-by-id';
 import { TeamDeleted } from './errors-ts';
 import { Team } from '../types';

--- a/packages/cli/src/util/get-teams.ts
+++ b/packages/cli/src/util/get-teams.ts
@@ -1,22 +0,0 @@
-import Client from './client';
-import { Team } from '../types';
-import { APIError, InvalidToken } from './errors-ts';
-
-let teams: Team[] | undefined;
-
-export default async function getTeams(client: Client): Promise<Team[]> {
-  if (teams) return teams;
-
-  try {
-    const body = await client.fetch<{ teams: Team[] }>('/v1/teams', {
-      useCurrentTeam: false,
-    });
-    teams = body.teams || [];
-    return teams;
-  } catch (error) {
-    if (error instanceof APIError && error.status === 403) {
-      throw new InvalidToken();
-    }
-    throw error;
-  }
-}
--- a/packages/cli/src/util/get-update-command.ts
+++ b/packages/cli/src/util/get-update-command.ts
@@ -1,11 +1,9 @@
 import { Stats } from 'fs';
 import { sep, dirname, join, resolve } from 'path';
-import { readJSON, lstat, readlink, readFile, realpath } from 'fs-extra';
+import { lstat, readlink, readFile, realpath } from 'fs-extra';
 import { isCanary } from './is-canary';
 import { getPkgName } from './pkg-name';

-// `npm` tacks a bunch of extra properties on the `package.json` file,
-// so check for one of them to determine yarn vs. npm.
 async function isYarn(): Promise<boolean> {
  let s: Stats;
  let binPath = process.argv[1];
@@ -20,8 +18,12 @@ async function isYarn(): Promise<boolean> {
    }
  }
  const pkgPath = join(dirname(binPath), '..', 'package.json');
-  const pkg = await readJSON(pkgPath).catch(() => ({}));
-  return !('_id' in pkg);
+  /*
+   * Generally, pkgPath looks like:
+   * "/Users/username/.config/yarn/global/node_modules/vercel/package.json"
+   * "/usr/local/share/.config/yarn/global/node_modules/vercel/package.json"
+   */
+  return pkgPath.includes(join('yarn', 'global'));
 }

 async function getConfigPrefix() {
--- a/packages/cli/src/util/get-user.ts
+++ b/packages/cli/src/util/get-user.ts
@@ -2,13 +2,9 @@ import Client from './client';
 import { User } from '../types';
 import { APIError, InvalidToken, MissingUser } from './errors-ts';

-let user: User | undefined;
-
 export default async function getUser(client: Client) {
-  if (user) return user;
-
  try {
-    const res = await client.fetch<{ user: User }>('/www/user', {
+    const res = await client.fetch<{ user: User }>('/v2/user', {
      useCurrentTeam: false,
    });

@@ -16,8 +12,7 @@ export default async function getUser(client: Client) {
      throw new MissingUser();
    }

-    user = res.user;
-    return user;
+    return res.user;
  } catch (error) {
    if (error instanceof APIError && error.status === 403) {
      throw new InvalidToken();
--- a/packages/cli/src/util/index.ts
+++ b/packages/cli/src/util/index.ts
@@ -3,52 +3,116 @@ import qs from 'querystring';
 import { parse as parseUrl } from 'url';
 import retry from 'async-retry';
 import ms from 'ms';
-import fetch from 'node-fetch';
+import fetch, { Headers } from 'node-fetch';
 import { URLSearchParams } from 'url';
 import bytes from 'bytes';
 import chalk from 'chalk';
-import ua from './ua.ts';
-import processDeployment from './deploy/process-deployment.ts';
+import ua from './ua';
+import processDeployment from './deploy/process-deployment';
 import highlight from './output/highlight';
-import createOutput from './output';
 import { responseError } from './error';
 import stamp from './output/stamp';
-import { BuildError } from './errors-ts';
-import printIndications from './print-indications.ts';
+import { APIError, BuildError } from './errors-ts';
+import printIndications from './print-indications';
+import { Org } from '../types';
+import { VercelConfig } from './dev/types';
+import Client, { FetchOptions, isJSONObject } from './client';
+import { Dictionary } from '@vercel/client';
+
+export interface NowOptions {
+  client: Client;
+  url?: string | null;
+  currentTeam?: string | null;
+  forceNew?: boolean;
+  withCache?: boolean;
+}
+
+export interface CreateOptions {
+  // Legacy
+  nowConfig?: VercelConfig;
+  isFile?: boolean;
+
+  // Latest
+  name: string;
+  project?: string;
+  wantsPublic: boolean;
+  prebuilt?: boolean;
+  meta: Dictionary<string>;
+  regions?: string[];
+  quiet?: boolean;
+  env: Dictionary<string>;
+  build: { env: Dictionary<string> };
+  forceNew?: boolean;
+  withCache?: boolean;
+  target?: string | null;
+  deployStamp: () => string;
+  projectSettings?: any;
+  skipAutoDetectionConfirmation?: boolean;
+}
+
+export interface RemoveOptions {
+  hard?: boolean;
+}
+
+export interface ListOptions {
+  version?: number;
+  meta?: Dictionary<string>;
+  nextTimestamp?: number;
+}

 export default class Now extends EventEmitter {
+  url: string | null;
+  currentTeam: string | null;
+  _client: Client;
+  _forceNew: boolean;
+  _withCache: boolean;
+  _syncAmount?: number;
+  _files?: any[];
+  _missing?: string[];
+
  constructor({
-    apiUrl,
-    token,
+    client,
    url = null,
    currentTeam = null,
    forceNew = false,
    withCache = false,
-    debug = false,
-    output = createOutput({ debug }),
-  }) {
+  }: NowOptions) {
    super();

    this.url = url;
-    this._token = token;
-    this._debug = debug;
+    this._client = client;
    this._forceNew = forceNew;
    this._withCache = withCache;
-    this._output = output;
-    this._apiUrl = apiUrl;
    this._onRetry = this._onRetry.bind(this);
    this.currentTeam = currentTeam;
  }

+  get _apiUrl() {
+    return this._client.apiUrl;
+  }
+
+  get _token() {
+    return this._client.authConfig.token;
+  }
+
+  get _output() {
+    return this._client.output;
+  }
+
+  get _debug() {
+    return this._client.output.isDebugEnabled();
+  }
+
  async create(
-    paths,
+    paths: string[],
    {
      // Legacy
-      nowConfig = {},
+      nowConfig: nowConfig = {},

      // Latest
      name,
      project,
+      prebuilt = false,
      wantsPublic,
      meta,
      regions,
@@ -61,12 +125,12 @@ export default class Now extends EventEmitter {
      deployStamp,
      projectSettings,
      skipAutoDetectionConfirmation,
-    },
-    org,
-    isSettingUpProject,
-    cwd
+    }: CreateOptions,
+    org: Org,
+    isSettingUpProject: boolean,
+    cwd?: string
  ) {
-    let hashes = {};
+    let hashes: any = {};
    const uploadStamp = stamp();

    let requestBody = {
@@ -103,13 +167,14 @@ export default class Now extends EventEmitter {
      isSettingUpProject,
      skipAutoDetectionConfirmation,
      cwd,
+      prebuilt,
    });

    if (deployment && deployment.warnings) {
      let sizeExceeded = 0;
      const { log, warn } = this._output;

-      deployment.warnings.forEach(warning => {
+      deployment.warnings.forEach((warning: any) => {
        if (warning.reason === 'size_limit_exceeded') {
          const { sha, limit } = warning;
          const n = hashes[sha].names.pop();
@@ -135,14 +200,14 @@ export default class Now extends EventEmitter {
    return deployment;
  }

-  async handleDeploymentError(error, { env }) {
+  async handleDeploymentError(error: any, { env }: any) {
    if (error.status === 429) {
      if (error.code === 'builds_rate_limited') {
-        const err = new Error(error.message);
+        const err = Object.create(APIError.prototype);
+        err.message = error.message;
        err.status = error.status;
        err.retryAfter = 'never';
        err.code = error.code;
-
        return err;
      }

@@ -157,8 +222,8 @@ export default class Now extends EventEmitter {
        msg += 'Please slow down.';
      }

-      const err = new Error(msg);
-
+      const err = Object.create(APIError.prototype);
+      err.message = msg;
      err.status = error.status;
      err.retryAfter = 'never';

@@ -172,7 +237,6 @@ export default class Now extends EventEmitter {

    if (error.status === 400 && error.code === 'missing_files') {
      this._missing = error.missing || [];
-
      return error;
    }

@@ -199,7 +263,7 @@ export default class Now extends EventEmitter {
            '.vercelignore'
          )}):` +
          `\n- ${unreferencedBuildSpecs
-            .map(item => JSON.stringify(item))
+            .map((item: any) => JSON.stringify(item))
            .join('\n- ')}`;
      } else {
        Object.assign(err, error);
@@ -211,6 +275,7 @@ export default class Now extends EventEmitter {
    // Handle build errors
    if (error.id && error.id.startsWith('bld_')) {
      return new BuildError({
+        message: 'Build failed',
        meta: {
          entrypoint: error.entrypoint,
        },
@@ -230,7 +295,7 @@ export default class Now extends EventEmitter {
    return new Error(error.message);
  }

-  async listSecrets(next, testWarningFlag) {
+  async listSecrets(next?: number, testWarningFlag?: boolean) {
    const payload = await this.retry(async bail => {
      let secretsUrl = '/v3/now/secrets?limit=20';

@@ -259,8 +324,11 @@ export default class Now extends EventEmitter {
    return payload;
  }

-  async list(app, { version = 4, meta = {}, nextTimestamp } = {}) {
-    const fetchRetry = async (url, options = {}) => {
+  async list(
+    app?: string,
+    { version = 4, meta = {}, nextTimestamp }: ListOptions = {}
+  ) {
+    const fetchRetry = async (url: string, options: FetchOptions = {}) => {
      return this.retry(
        async bail => {
          const res = await this._fetch(url, options);
@@ -296,8 +364,8 @@ export default class Now extends EventEmitter {
      );

      const deployments = await Promise.all(
-        projects.map(async ({ id: projectId }) => {
-          const query = new URLSearchParams({ limit: 1, projectId });
+        projects.map(async ({ id: projectId }: any) => {
+          const query = new URLSearchParams({ limit: '1', projectId });
          const { deployments } = await fetchRetry(
            `/v${version}/now/deployments?${query}`
          );
@@ -326,7 +394,7 @@ export default class Now extends EventEmitter {
    return response;
  }

-  async findDeployment(hostOrId) {
+  async findDeployment(hostOrId: string) {
    const { debug } = this._output;

    let id = hostOrId && !hostOrId.includes('.');
@@ -390,7 +458,7 @@ export default class Now extends EventEmitter {
    );
  }

-  async remove(deploymentId, { hard }) {
+  async remove(deploymentId: string, { hard = false }: RemoveOptions) {
    const url = `/now/deployments/${deploymentId}?hard=${hard ? 1 : 0}`;

    await this.retry(async bail => {
@@ -412,56 +480,51 @@ export default class Now extends EventEmitter {
    return true;
  }

-  retry(fn, { retries = 3, maxTimeout = Infinity } = {}) {
-    return retry(fn, {
+  retry<T>(
+    fn: retry.RetryFunction<T>,
+    { retries = 3, maxTimeout = Infinity }: retry.Options = {}
+  ) {
+    return retry<T>(fn, {
      retries,
      maxTimeout,
      onRetry: this._onRetry,
    });
  }

-  _onRetry(err) {
+  _onRetry(err: Error) {
    this._output.debug(`Retrying: ${err}\n${err.stack}`);
  }

  close() {}

-  get syncAmount() {
-    if (!this._syncAmount) {
-      this._syncAmount = this._missing
-        .map(sha => this._files.get(sha).data.length)
-        .reduce((a, b) => a + b, 0);
-    }
-
-    return this._syncAmount;
-  }
-
-  async _fetch(_url, opts = {}) {
+  async _fetch(_url: string, opts: FetchOptions = {}) {
    if (opts.useCurrentTeam !== false && this.currentTeam) {
      const parsedUrl = parseUrl(_url, true);
      const query = parsedUrl.query;

      query.teamId = this.currentTeam;
-      _url = `${parsedUrl.pathname}?${qs.encode(query)}`;
+      _url = `${parsedUrl.pathname}?${qs.stringify(query)}`;
      delete opts.useCurrentTeam;
    }

-    opts.headers = opts.headers || {};
-    opts.headers.accept = 'application/json';
-    opts.headers.authorization = `Bearer ${this._token}`;
-    opts.headers['user-agent'] = ua;
-
-    if (
-      opts.body &&
-      typeof opts.body === 'object' &&
-      opts.body.constructor === Object
-    ) {
-      opts.body = JSON.stringify(opts.body);
-      opts.headers['content-type'] = 'application/json; charset=utf-8';
+    opts.headers = new Headers(opts.headers);
+    opts.headers.set('accept', 'application/json');
+    if (this._token) {
+      opts.headers.set('authorization', `Bearer ${this._token}`);
    }
+    opts.headers.set('user-agent', ua);
+
+    let body;
+    if (isJSONObject(opts.body)) {
+      body = JSON.stringify(opts.body);
+      opts.headers.set('content-type', 'application/json; charset=utf8');
+    } else {
+      body = opts.body;
+    }
+
    const res = await this._output.time(
      `${opts.method || 'GET'} ${this._apiUrl}${_url} ${opts.body || ''}`,
-      fetch(`${this._apiUrl}${_url}`, opts)
+      fetch(`${this._apiUrl}${_url}`, { ...opts, body })
    );
    printIndications(res);
    return res;
@@ -475,7 +538,7 @@ export default class Now extends EventEmitter {
  // which automatically returns the json response body
  // if the response is ok and content-type json
  // it does the same for JSON` body` in opts
-  async fetch(url, opts = {}) {
+  async fetch(url: string, opts: FetchOptions = {}) {
    return this.retry(async bail => {
      if (opts.json !== false && opts.body && typeof opts.body === 'object') {
        opts = Object.assign({}, opts, {
@@ -495,7 +558,7 @@ export default class Now extends EventEmitter {
          return null;
        }

-        return res.headers.get('content-type').includes('application/json')
+        return res.headers.get('content-type')?.includes('application/json')
          ? res.json()
          : res;
      }
--- a/packages/cli/src/util/input/patch-inquirer-legacy.ts
+++ b/packages/cli/src/util/input/patch-inquirer-legacy.ts
@@ -1,10 +1,11 @@
-import inquirer from 'inquirer';
 import chalk from 'chalk';
+import inquirer from 'inquirer';
+import Prompt from 'inquirer/lib/prompts/base';

 // Here we patch inquirer to use a `>` instead of the ugly green `?`

 /* eslint-disable no-multiple-empty-lines, no-var, no-undef, no-eq-null, eqeqeq, semi */
-const getQuestion = function() {
+const getQuestion = function (this: Prompt) {
  var message = `${chalk.bold(`> ${this.opt.message}`)} `;

  // Append the default if available, and if question isn't answered
--- a/packages/cli/src/util/input/patch-inquirer.ts
+++ b/packages/cli/src/util/input/patch-inquirer.ts
@@ -1,5 +1,8 @@
-import inquirer from 'inquirer';
 import chalk from 'chalk';
+import inquirer from 'inquirer';
+import Prompt from 'inquirer/lib/prompts/base';
+import Choice from 'inquirer/lib/objects/choice';
+import Separator from 'inquirer/lib/objects/separator';

 /**
 * Here we patch inquirer with some tweaks:
@@ -10,7 +13,7 @@ import chalk from 'chalk';
 */

 // adjusted from https://github.com/SBoudrias/Inquirer.js/blob/942908f17319343d1acc7b876f990797c5695918/packages/inquirer/lib/prompts/base.js#L126
-const getQuestion = function () {
+const getQuestion = function (this: Prompt) {
  let message = `${chalk.gray('?')} ${this.opt.message} `;

  if (this.opt.type === 'confirm') {
@@ -57,7 +60,7 @@ inquirer.prompt.prompts.list.prototype.render = function () {
  this.screen.render(message);
 };

-function listRender(choices, pointer) {
+function listRender(choices: (Choice | Separator)[], pointer: number) {
  let output = '';
  let separatorOffset = 0;

@@ -89,7 +92,7 @@ function listRender(choices, pointer) {
 }

 // adjusted from https://github.com/SBoudrias/Inquirer.js/blob/942908f17319343d1acc7b876f990797c5695918/packages/inquirer/lib/prompts/checkbox.js#L84
-inquirer.prompt.prompts.checkbox.prototype.render = function (error) {
+inquirer.prompt.prompts.checkbox.prototype.render = function (error?: string) {
  // Render question
  let message = this.getQuestion();
  let bottomContent = '';
@@ -125,7 +128,7 @@ inquirer.prompt.prompts.checkbox.prototype.render = function (error) {
  this.screen.render(message, bottomContent);
 };

-function renderChoices(choices, pointer) {
+function renderChoices(choices: (Choice | Separator)[], pointer: number) {
  let output = '';
  let separatorOffset = 0;

@@ -162,7 +165,7 @@ function renderChoices(choices, pointer) {
 }

 // adjusted from https://github.com/SBoudrias/Inquirer.js/blob/942908f17319343d1acc7b876f990797c5695918/packages/inquirer/lib/prompts/input.js#L44
-inquirer.prompt.prompts.input.prototype.render = function (error) {
+inquirer.prompt.prompts.input.prototype.render = function (error?: string) {
  let bottomContent = '';
  let appendContent = '';
  let message = this.getQuestion();
@@ -189,7 +192,7 @@ inquirer.prompt.prompts.input.prototype.render = function (error) {
 };

 // adjusted from https://github.com/SBoudrias/Inquirer.js/blob/942908f17319343d1acc7b876f990797c5695918/packages/inquirer/lib/prompts/confirm.js#L64
-inquirer.prompt.prompts.confirm.prototype.render = function (answer) {
+inquirer.prompt.prompts.confirm.prototype.render = function (answer?: boolean) {
  let message = this.getQuestion();

  if (this.status === 'answered') {
--- a/packages/cli/src/util/input/select-org.ts
+++ b/packages/cli/src/util/input/select-org.ts
@@ -1,7 +1,7 @@
-import Client from '../client';
 import inquirer from 'inquirer';
+import Client from '../client';
 import getUser from '../get-user';
-import getTeams from '../get-teams';
+import getTeams from '../teams/get-teams';
 import { User, Team, Org } from '../../types';

 type Choice = { name: string; value: Org };
@@ -29,7 +29,7 @@ export default async function selectOrg(
  const choices: Choice[] = [
    {
      name: user.name || user.username,
-      value: { type: 'user', id: user.uid, slug: user.username },
+      value: { type: 'user', id: user.id, slug: user.username },
    },
    ...teams.map<Choice>(team => ({
      name: team.name || team.slug,
--- a/packages/cli/src/util/link/setup-and-link.ts
+++ b/packages/cli/src/util/link/setup-and-link.ts
@@ -2,7 +2,6 @@ import { join, basename } from 'path';
 import chalk from 'chalk';
 import { remove } from 'fs-extra';
 import { ProjectLinkResult, ProjectSettings } from '../../types';
-import { VercelConfig } from '../dev/types';
 import {
  getLinkedProject,
  linkFolderToProject,
@@ -23,7 +22,7 @@ import editProjectSettings from '../input/edit-project-settings';
 import stamp from '../output/stamp';
 import { EmojiLabel } from '../emoji';
 import createDeploy from '../deploy/create-deploy';
-import Now from '../index';
+import Now, { CreateOptions } from '../index';

 export interface SetupAndLinkOptions {
  forceDelete?: boolean;
@@ -44,12 +43,7 @@ export default async function setupAndLink(
    projectName,
  }: SetupAndLinkOptions
 ): Promise<ProjectLinkResult> {
-  const {
-    authConfig: { token },
-    apiUrl,
-    output,
-    config,
-  } = client;
+  const { localConfig, output, config } = client;
  const debug = output.isDebugEnabled();

  const isFile = !isDirectory(path);
@@ -144,35 +138,27 @@ export default async function setupAndLink(
    return { status: 'error', exitCode: 1 };
  }

-  let localConfig: VercelConfig = {};
-  if (client.localConfig && !(client.localConfig instanceof Error)) {
-    localConfig = client.localConfig;
-  }
-
  config.currentTeam = org.type === 'team' ? org.id : undefined;
-  const isZeroConfig = !localConfig.builds || localConfig.builds.length === 0;
+  const isZeroConfig =
+    !localConfig || !localConfig.builds || localConfig.builds.length === 0;

  try {
    let settings: ProjectSettings = {};

    if (isZeroConfig) {
      const now = new Now({
-        apiUrl,
-        token,
-        debug,
-        output,
+        client,
        currentTeam: config.currentTeam,
      });
-      const createArgs: any = {
+      const createArgs: CreateOptions = {
        name: newProjectName,
        env: {},
        build: { env: {} },
        forceNew: undefined,
        withCache: undefined,
        quiet,
-        wantsPublic: localConfig.public,
+        wantsPublic: localConfig?.public || false,
        isFile,
-        type: null,
        nowConfig: localConfig,
        regions: undefined,
        meta: {},
@@ -181,7 +167,7 @@ export default async function setupAndLink(
        skipAutoDetectionConfirmation: false,
      };

-      if (!localConfig.builds || localConfig.builds.length === 0) {
+      if (isZeroConfig) {
        // Only add projectSettings for zero config deployments
        createArgs.projectSettings = { sourceFilesOutsideRootDirectory };
      }
--- a/packages/cli/src/util/login/verify.ts
+++ b/packages/cli/src/util/login/verify.ts
@@ -31,5 +31,5 @@ export default function verify(
    url.searchParams.set('ssoUserId', ssoUserId);
  }

-  return client.fetch<LoginResultSuccess>(url.href);
+  return client.fetch<LoginResultSuccess>(url.href, { useCurrentTeam: false });
 }
--- a/packages/cli/src/util/output/chars.ts
+++ b/packages/cli/src/util/output/chars.ts
@@ -1,8 +1,6 @@
 const chars = {
-  // in some setups now.exe crashes if we use
-  // the normal tick unicode character :|
  tick: process.platform === 'win32' ? '√' : '✔',
-  cross: process.platform === 'win32' ? '☓' : '✘'
-};
+  cross: process.platform === 'win32' ? '☓' : '✘',
+} as const;

 export default chars;
--- a/packages/cli/src/util/output/color-name-cache.ts
+++ b/packages/cli/src/util/output/color-name-cache.ts
@@ -0,0 +1,24 @@
+import chalk from 'chalk';
+
+const colors = [
+  chalk.cyan,
+  chalk.magenta,
+  chalk.green,
+  chalk.yellow,
+  chalk.blue,
+];
+
+let childIndex = 0;
+const packageNameColorCache = new Map<string, chalk.Chalk>();
+
+/** Return a consistent (gradient) color for a given package name */
+export function getColorForPkgName(pkgName: string) {
+  let color = packageNameColorCache.get(pkgName);
+
+  if (!color) {
+    color = colors[childIndex++ % colors.length];
+    packageNameColorCache.set(pkgName, color);
+  }
+
+  return color;
+}
--- a/packages/cli/src/util/output/create-output.ts
+++ b/packages/cli/src/util/output/create-output.ts
@@ -2,45 +2,52 @@ import chalk from 'chalk';
 import boxen from 'boxen';
 import renderLink from './link';
 import wait, { StopSpinner } from './wait';
-
-export type Output = ReturnType<typeof _createOutput>;
+import { Writable } from 'stream';

 export interface OutputOptions {
  debug?: boolean;
 }

-// Singleton
-let instance: Output | null = null;
-
-export default function createOutput(opts?: OutputOptions) {
-  if (!instance) {
-    instance = _createOutput(opts);
-  }
-  return instance;
+export interface PrintOptions {
+  w?: Writable;
 }

-function _createOutput({ debug: debugEnabled = false }: OutputOptions = {}) {
-  let spinnerMessage = '';
-  let spinner: StopSpinner | null = null;
+export interface LogOptions extends PrintOptions {
+  color?: typeof chalk;
+}

-  function isDebugEnabled() {
-    return debugEnabled;
+export class Output {
+  private debugEnabled: boolean;
+  private spinnerMessage: string;
+  private _spinner: StopSpinner | null;
+  isTTY: boolean;
+
+  constructor({ debug: debugEnabled = false }: OutputOptions = {}) {
+    this.debugEnabled = debugEnabled;
+    this.spinnerMessage = '';
+    this._spinner = null;
+    this.isTTY = process.stdout.isTTY || false;
  }

-  function print(str: string) {
-    stopSpinner();
-    process.stderr.write(str);
-  }
+  isDebugEnabled = () => {
+    return this.debugEnabled;
+  };

-  function log(str: string, color = chalk.grey) {
-    print(`${color('>')} ${str}\n`);
-  }
+  print = (str: string, { w }: PrintOptions = { w: process.stderr }) => {
+    this.stopSpinner();
+    const stream: Writable = w || process.stderr;
+    stream.write(str);
+  };

-  function dim(str: string, color = chalk.grey) {
-    print(`${color(`> ${str}`)}\n`);
-  }
+  log = (str: string, color = chalk.grey) => {
+    this.print(`${color('>')} ${str}\n`);
+  };

-  function warn(
+  dim = (str: string, color = chalk.grey) => {
+    this.print(`${color(`> ${str}`)}\n`);
+  };
+
+  warn = (
    str: string,
    slug: string | null = null,
    link: string | null = null,
@@ -48,10 +55,10 @@ function _createOutput({ debug: debugEnabled = false }: OutputOptions = {}) {
    options?: {
      boxen?: boxen.Options;
    }
-  ) {
+  ) => {
    const details = slug ? `https://err.sh/vercel/${slug}` : link;

-    print(
+    this.print(
      boxen(
        chalk.bold.yellow('WARN! ') +
          str +
@@ -68,110 +75,103 @@ function _createOutput({ debug: debugEnabled = false }: OutputOptions = {}) {
        }
      )
    );
-    print('\n');
-  }
+    this.print('\n');
+  };

-  function note(str: string) {
-    log(chalk`{yellow.bold NOTE:} ${str}`);
-  }
+  note = (str: string) => {
+    this.log(chalk`{yellow.bold NOTE:} ${str}`);
+  };

-  function error(
+  error = (
    str: string,
    slug?: string,
    link?: string,
    action = 'Learn More'
-  ) {
-    print(`${chalk.red(`Error!`)} ${str}\n`);
+  ) => {
+    this.print(`${chalk.red(`Error!`)} ${str}\n`);
    const details = slug ? `https://err.sh/vercel/${slug}` : link;
    if (details) {
-      print(`${chalk.bold(action)}: ${renderLink(details)}\n`);
+      this.print(`${chalk.bold(action)}: ${renderLink(details)}\n`);
    }
-  }
+  };

-  function prettyError(err: Error & { link?: string; action?: string }) {
-    return error(err.message, undefined, err.link, err.action);
-  }
+  prettyError = (
+    err: Pick<Error, 'message'> & { link?: string; action?: string }
+  ) => {
+    return this.error(err.message, undefined, err.link, err.action);
+  };

-  function ready(str: string) {
-    print(`${chalk.cyan('> Ready!')} ${str}\n`);
-  }
+  ready = (str: string) => {
+    this.print(`${chalk.cyan('> Ready!')} ${str}\n`);
+  };

-  function success(str: string) {
-    print(`${chalk.cyan('> Success!')} ${str}\n`);
-  }
+  success = (str: string) => {
+    this.print(`${chalk.cyan('> Success!')} ${str}\n`);
+  };

-  function debug(str: string) {
-    if (debugEnabled) {
-      log(
+  debug = (str: string) => {
+    if (this.debugEnabled) {
+      this.log(
        `${chalk.bold('[debug]')} ${chalk.gray(
          `[${new Date().toISOString()}]`
        )} ${str}`
      );
    }
-  }
+  };

-  function setSpinner(message: string, delay: number = 300): void {
-    spinnerMessage = message;
-    if (debugEnabled) {
-      debug(`Spinner invoked (${message}) with a ${delay}ms delay`);
+  spinner = (message: string, delay: number = 300): void => {
+    this.spinnerMessage = message;
+    if (this.debugEnabled) {
+      this.debug(`Spinner invoked (${message}) with a ${delay}ms delay`);
      return;
    }
-    if (spinner) {
-      spinner.text = message;
+    if (this.isTTY) {
+      if (this._spinner) {
+        this._spinner.text = message;
+      } else {
+        this._spinner = wait(message, delay);
+      }
    } else {
-      spinner = wait(message, delay);
+      this.print(`${message}\n`);
    }
-  }
+  };

-  function stopSpinner() {
-    if (debugEnabled && spinnerMessage) {
-      const msg = `Spinner stopped (${spinnerMessage})`;
-      spinnerMessage = '';
-      debug(msg);
+  stopSpinner = () => {
+    if (this.debugEnabled && this.spinnerMessage) {
+      const msg = `Spinner stopped (${this.spinnerMessage})`;
+      this.spinnerMessage = '';
+      this.debug(msg);
    }
-    if (spinner) {
-      spinner();
-      spinner = null;
-      spinnerMessage = '';
+    if (this._spinner) {
+      this._spinner();
+      this._spinner = null;
+      this.spinnerMessage = '';
    }
-  }
+  };

-  async function time<T>(
+  time = async <T>(
    label: string | ((r?: T) => string),
    fn: Promise<T> | (() => Promise<T>)
-  ) {
+  ) => {
    const promise = typeof fn === 'function' ? fn() : fn;

-    if (debugEnabled) {
+    if (this.debugEnabled) {
      const startLabel = typeof label === 'function' ? label() : label;
-      debug(startLabel);
+      this.debug(startLabel);
      const start = Date.now();
      const r = await promise;
      const endLabel = typeof label === 'function' ? label(r) : label;
      const duration = Date.now() - start;
      const durationPretty =
        duration < 1000 ? `${duration}ms` : `${(duration / 1000).toFixed(2)}s`;
-      debug(`${endLabel} ${chalk.gray(`[${durationPretty}]`)}`);
+      this.debug(`${endLabel} ${chalk.gray(`[${durationPretty}]`)}`);
      return r;
    }

    return promise;
-  }
-
-  return {
-    isDebugEnabled,
-    print,
-    log,
-    warn,
-    error,
-    prettyError,
-    ready,
-    success,
-    debug,
-    dim,
-    time,
-    note,
-    spinner: setSpinner,
-    stopSpinner,
  };
 }
+
+export default function createOutput(opts?: OutputOptions) {
+  return new Output(opts);
+}
--- a/packages/cli/src/util/output/error.ts
+++ b/packages/cli/src/util/output/error.ts
@@ -5,7 +5,9 @@ import renderLink from './link';

 const metric = metrics();

-export default function error(...input: string[] | [APIError]) {
+export default function error(
+  ...input: string[] | [Pick<APIError, 'slug' | 'message' | 'link' | 'action'>]
+) {
  let messages = input;
  if (typeof input[0] === 'object') {
    const { slug, message, link, action = 'Learn More' } = input[0];
--- a/packages/cli/src/util/path-helpers.ts
+++ b/packages/cli/src/util/path-helpers.ts
@@ -1,11 +1,6 @@
 import { relative as nativeRelative } from 'path';
-
-const isWin = process.platform === 'win32';
+import { normalizePath } from '@vercel/build-utils';

 export function relative(a: string, b: string): string {
-  let p = nativeRelative(a, b);
-  if (isWin) {
-    p = p.replace(/\\/g, '/');
-  }
-  return p;
+  return normalizePath(nativeRelative(a, b));
 }
--- a/Show More
+++ b/Show More