Patch into undici to disable body decompression

WIP
2025-12-27 19:00:11 +00:00 · 2023-07-06 16:59:23 -04:00 · 2023-07-06 22:06:30 +02:00
189 changed files with 5002 additions and 10258 deletions
--- a/.changeset/auto-update-next.md
+++ b/.changeset/auto-update-next.md
@@ -0,0 +1,2 @@
+---
+---
--- a/.changeset/config.json
+++ b/.changeset/config.json
@@ -10,5 +10,5 @@
  "access": "public",
  "baseBranch": "main",
  "updateInternalDependencies": "patch",
-  "ignore": []
+  "ignore": ["@vercel-internals/*", "api", "examples"]
 }
--- a/.changeset/cool-stingrays-fry.md
+++ b/.changeset/cool-stingrays-fry.md
@@ -0,0 +1,2 @@
+---
+---
--- a/.changeset/dry-hotels-worry.md
+++ b/.changeset/dry-hotels-worry.md
@@ -0,0 +1,5 @@
+---
+"@vercel/build-utils": patch
+---
+
+Revert "[build-utils] Allow file-ref sema to be controlled through env flag"
--- a/.changeset/neat-apples-burn.md
+++ b/.changeset/neat-apples-burn.md
@@ -0,0 +1,5 @@
+---
+'vercel': patch
+---
+
+Allow additional project settings in `createProject()`
--- a/.changeset/tame-ads-swim.md
+++ b/.changeset/tame-ads-swim.md
@@ -0,0 +1,5 @@
+---
+'vercel': patch
+---
+
+Added trailing new line at end of help output
--- a/.changeset/twenty-pants-jam.md
+++ b/.changeset/twenty-pants-jam.md
@@ -0,0 +1,6 @@
+---
+'@vercel-internals/constants': patch
+'vercel': patch
+---
+
+Create new help output and arg parsing for deploy command
--- a/.changeset/upgrade-turbo-repo.md
+++ b/.changeset/upgrade-turbo-repo.md
@@ -0,0 +1,2 @@
+---
+---
--- a/.changeset/vercel-remix-run-dev-1-18-1.md
+++ b/.changeset/vercel-remix-run-dev-1-18-1.md
@@ -0,0 +1,5 @@
+---
+'@vercel/remix-builder': patch
+---
+
+Update `@remix-run/dev` fork to v1.18.1
--- a/.changeset/wet-spoons-boil.md
+++ b/.changeset/wet-spoons-boil.md
@@ -0,0 +1,5 @@
+---
+"vercel": patch
+---
+
+[cli] Remove `preinstall` script
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -2,19 +2,19 @@
 # https://help.github.com/en/articles/about-code-owners

 # Restricted Paths
-*                                        @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood @trek
-/.github/workflows                       @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood @trek @ijjk
-/packages/fs-detectors                   @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood @trek @agadzik @chloetedder
-/packages/next                           @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood @trek @ijjk
-/packages/routing-utils                  @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood @trek @ijjk
-/packages/edge                           @vercel/compute
+*                                        @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood
+/.github/workflows                       @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood @ijjk
+/packages/fs-detectors                   @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood @agadzik @chloetedder
+/packages/next                           @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood @ijjk
+/packages/routing-utils                  @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood @ijjk
+/packages/edge                           @vercel/edge-compute
 /examples                                @leerob
 /examples/create-react-app               @Timer
 /examples/nextjs                         @timneutkens @ijjk @styfle
 /examples/hugo                           @styfle
 /examples/jekyll                         @styfle
 /examples/zola                           @styfle
-/packages/node                           @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood @trek @Kikobeats
+/packages/node                           @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood @Kikobeats

 # Unrestricted Paths
 .changeset/
--- a/examples/hydrogen/package.json
+++ b/examples/hydrogen/package.json
@@ -44,5 +44,6 @@
    "react-use": "^17.4.0",
    "title": "^3.4.4",
    "typographic-base": "^1.0.4"
-  }
+  },
+  "author": "nrajlich"
 }
--- a/examples/nextjs/package-lock.json
+++ b/examples/nextjs/package-lock.json
@@ -8,9 +8,9 @@
      "name": "nextjs",
      "version": "0.1.0",
      "dependencies": {
-        "eslint": "8.45.0",
-        "eslint-config-next": "13.4.12",
-        "next": "13.4.12",
+        "eslint": "8.44.0",
+        "eslint-config-next": "13.4.8",
+        "next": "13.4.8",
        "react": "18.2.0",
        "react-dom": "18.2.0"
      }
@@ -24,9 +24,9 @@
      }
    },
    "node_modules/@babel/runtime": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.6.tgz",
-      "integrity": "sha512-wDb5pWm4WDdF6LFUde3Jl8WzPA+3ZbxYqkC6xAXuD3irdEHN1k0NfTRrJD8ZD378SJ61miMLCqIOXYhd8x+AJQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.5.tgz",
+      "integrity": "sha512-ecjvYlnAaZ/KVneE/OdKYBYfgXV3Ptu6zQWmgEF7vwKhQnvVS6bjMD2XYgj+SNvQ1GfK/pjgokfPkC/2CO8CuA==",
      "dependencies": {
        "regenerator-runtime": "^0.13.11"
      },
@@ -117,22 +117,22 @@
      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="
    },
    "node_modules/@next/env": {
-      "version": "13.4.12",
-      "resolved": "https://registry.npmjs.org/@next/env/-/env-13.4.12.tgz",
-      "integrity": "sha512-RmHanbV21saP/6OEPBJ7yJMuys68cIf8OBBWd7+uj40LdpmswVAwe1uzeuFyUsd6SfeITWT3XnQfn6wULeKwDQ=="
+      "version": "13.4.8",
+      "resolved": "https://registry.npmjs.org/@next/env/-/env-13.4.8.tgz",
+      "integrity": "sha512-twuSf1klb3k9wXI7IZhbZGtFCWvGD4wXTY2rmvzIgVhXhs7ISThrbNyutBx3jWIL8Y/Hk9+woytFz5QsgtcRKQ=="
    },
    "node_modules/@next/eslint-plugin-next": {
-      "version": "13.4.12",
-      "resolved": "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-13.4.12.tgz",
-      "integrity": "sha512-6rhK9CdxEgj/j1qvXIyLTWEaeFv7zOK8yJMulz3Owel0uek0U9MJCGzmKgYxM3aAUBo3gKeywCZKyQnJKto60A==",
+      "version": "13.4.8",
+      "resolved": "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-13.4.8.tgz",
+      "integrity": "sha512-cmfVHpxWjjcETFt2WHnoFU6EmY69QcPJRlRNAooQlNe53Ke90vg1Ci/dkPffryJZaxxiRziP9bQrV8lDVCn3Fw==",
      "dependencies": {
        "glob": "7.1.7"
      }
    },
    "node_modules/@next/swc-darwin-arm64": {
-      "version": "13.4.12",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.4.12.tgz",
-      "integrity": "sha512-deUrbCXTMZ6ZhbOoloqecnUeNpUOupi8SE2tx4jPfNS9uyUR9zK4iXBvH65opVcA/9F5I/p8vDXSYbUlbmBjZg==",
+      "version": "13.4.8",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.4.8.tgz",
+      "integrity": "sha512-MSFplVM4dTWOuKAUv0XR9gY7AWtMSBu9os9f+kp+s5rWhM1I2CdR3obFttd6366nS/W/VZxbPM5oEIdlIa46zA==",
      "cpu": [
        "arm64"
      ],
@@ -145,9 +145,9 @@
      }
    },
    "node_modules/@next/swc-darwin-x64": {
-      "version": "13.4.12",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-13.4.12.tgz",
-      "integrity": "sha512-WRvH7RxgRHlC1yb5oG0ZLx8F7uci9AivM5/HGGv9ZyG2Als8Ij64GC3d+mQ5sJhWjusyU6T6V1WKTUoTmOB0zQ==",
+      "version": "13.4.8",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-13.4.8.tgz",
+      "integrity": "sha512-Reox+UXgonon9P0WNDE6w85DGtyBqGitl/ryznOvn6TvfxEaZIpTgeu3ZrJLU9dHSMhiK7YAM793mE/Zii2/Qw==",
      "cpu": [
        "x64"
      ],
@@ -160,9 +160,9 @@
      }
    },
    "node_modules/@next/swc-linux-arm64-gnu": {
-      "version": "13.4.12",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.4.12.tgz",
-      "integrity": "sha512-YEKracAWuxp54tKiAvvq73PUs9lok57cc8meYRibTWe/VdPB2vLgkTVWFcw31YDuRXdEhdX0fWS6Q+ESBhnEig==",
+      "version": "13.4.8",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.4.8.tgz",
+      "integrity": "sha512-kdyzYvAYtqQVgzIKNN7e1rLU8aZv86FDSRqPlOkKZlvqudvTO0iohuTPmnEEDlECeBM6qRPShNffotDcU/R2KA==",
      "cpu": [
        "arm64"
      ],
@@ -175,9 +175,9 @@
      }
    },
    "node_modules/@next/swc-linux-arm64-musl": {
-      "version": "13.4.12",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.4.12.tgz",
-      "integrity": "sha512-LhJR7/RAjdHJ2Isl2pgc/JaoxNk0KtBgkVpiDJPVExVWA1c6gzY57+3zWuxuyWzTG+fhLZo2Y80pLXgIJv7g3g==",
+      "version": "13.4.8",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.4.8.tgz",
+      "integrity": "sha512-oWxx4yRkUGcR81XwbI+T0zhZ3bDF6V1aVLpG+C7hSG50ULpV8gC39UxVO22/bv93ZlcfMY4zl8xkz9Klct6dpQ==",
      "cpu": [
        "arm64"
      ],
@@ -190,9 +190,9 @@
      }
    },
    "node_modules/@next/swc-linux-x64-gnu": {
-      "version": "13.4.12",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.4.12.tgz",
-      "integrity": "sha512-1DWLL/B9nBNiQRng+1aqs3OaZcxC16Nf+mOnpcrZZSdyKHek3WQh6j/fkbukObgNGwmCoVevLUa/p3UFTTqgqg==",
+      "version": "13.4.8",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.4.8.tgz",
+      "integrity": "sha512-anhtvuO6eE9YRhYnaEGTfbpH3L5gT/9qPFcNoi6xS432r/4DAtpJY8kNktqkTVevVIC/pVumqO8tV59PR3zbNg==",
      "cpu": [
        "x64"
      ],
@@ -205,9 +205,9 @@
      }
    },
    "node_modules/@next/swc-linux-x64-musl": {
-      "version": "13.4.12",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.4.12.tgz",
-      "integrity": "sha512-kEAJmgYFhp0VL+eRWmUkVxLVunn7oL9Mdue/FS8yzRBVj7Z0AnIrHpTIeIUl1bbdQq1VaoOztnKicAjfkLTRCQ==",
+      "version": "13.4.8",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.4.8.tgz",
+      "integrity": "sha512-aR+J4wWfNgH1DwCCBNjan7Iumx0lLtn+2/rEYuhIrYLY4vnxqSVGz9u3fXcgUwo6Q9LT8NFkaqK1vPprdq+BXg==",
      "cpu": [
        "x64"
      ],
@@ -220,9 +220,9 @@
      }
    },
    "node_modules/@next/swc-win32-arm64-msvc": {
-      "version": "13.4.12",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.4.12.tgz",
-      "integrity": "sha512-GMLuL/loR6yIIRTnPRY6UGbLL9MBdw2anxkOnANxvLvsml4F0HNIgvnU3Ej4BjbqMTNjD4hcPFdlEow4XHPdZA==",
+      "version": "13.4.8",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.4.8.tgz",
+      "integrity": "sha512-OWBKIrJwQBTqrat0xhxEB/jcsjJR3+diD9nc/Y8F1mRdQzsn4bPsomgJyuqPVZs6Lz3K18qdIkvywmfSq75SsQ==",
      "cpu": [
        "arm64"
      ],
@@ -235,9 +235,9 @@
      }
    },
    "node_modules/@next/swc-win32-ia32-msvc": {
-      "version": "13.4.12",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.4.12.tgz",
-      "integrity": "sha512-PhgNqN2Vnkm7XaMdRmmX0ZSwZXQAtamBVSa9A/V1dfKQCV1rjIZeiy/dbBnVYGdj63ANfsOR/30XpxP71W0eww==",
+      "version": "13.4.8",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.4.8.tgz",
+      "integrity": "sha512-agiPWGjUndXGTOn4ChbKipQXRA6/UPkywAWIkx7BhgGv48TiJfHTK6MGfBoL9tS6B4mtW39++uy0wFPnfD0JWg==",
      "cpu": [
        "ia32"
      ],
@@ -250,9 +250,9 @@
      }
    },
    "node_modules/@next/swc-win32-x64-msvc": {
-      "version": "13.4.12",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.4.12.tgz",
-      "integrity": "sha512-Z+56e/Ljt0bUs+T+jPjhFyxYBcdY2RIq9ELFU+qAMQMteHo7ymbV7CKmlcX59RI9C4YzN8PgMgLyAoi916b5HA==",
+      "version": "13.4.8",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.4.8.tgz",
+      "integrity": "sha512-UIRKoByVKbuR6SnFG4JM8EMFlJrfEGuUQ1ihxzEleWcNwRMMiVaCj1KyqfTOW8VTQhJ0u8P1Ngg6q1RwnIBTtw==",
      "cpu": [
        "x64"
      ],
@@ -297,16 +297,16 @@
      }
    },
    "node_modules/@pkgr/utils": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/@pkgr/utils/-/utils-2.4.2.tgz",
-      "integrity": "sha512-POgTXhjrTfbTV63DiFXav4lBHiICLKKwDeaKn9Nphwj7WH6m0hMMCaJkMyRWjgtPFyRKRVoMXXjczsTQRDEhYw==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@pkgr/utils/-/utils-2.4.1.tgz",
+      "integrity": "sha512-JOqwkgFEyi+OROIyq7l4Jy28h/WwhDnG/cPkXG2Z1iFbubB6jsHW1NDvmyOzTBxHr3yg68YGirmh1JUgMqa+9w==",
      "dependencies": {
        "cross-spawn": "^7.0.3",
-        "fast-glob": "^3.3.0",
+        "fast-glob": "^3.2.12",
        "is-glob": "^4.0.3",
        "open": "^9.1.0",
        "picocolors": "^1.0.0",
-        "tslib": "^2.6.0"
+        "tslib": "^2.5.0"
      },
      "engines": {
        "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
@@ -334,13 +334,13 @@
      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ=="
    },
    "node_modules/@typescript-eslint/parser": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz",
-      "integrity": "sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==",
+      "version": "5.61.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.61.0.tgz",
+      "integrity": "sha512-yGr4Sgyh8uO6fSi9hw3jAFXNBHbCtKKFMdX2IkT3ZqpKmtAq3lHS4ixB/COFuAIJpwl9/AqF7j72ZDWYKmIfvg==",
      "dependencies": {
-        "@typescript-eslint/scope-manager": "5.62.0",
-        "@typescript-eslint/types": "5.62.0",
-        "@typescript-eslint/typescript-estree": "5.62.0",
+        "@typescript-eslint/scope-manager": "5.61.0",
+        "@typescript-eslint/types": "5.61.0",
+        "@typescript-eslint/typescript-estree": "5.61.0",
        "debug": "^4.3.4"
      },
      "engines": {
@@ -360,12 +360,12 @@
      }
    },
    "node_modules/@typescript-eslint/scope-manager": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz",
-      "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==",
+      "version": "5.61.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.61.0.tgz",
+      "integrity": "sha512-W8VoMjoSg7f7nqAROEmTt6LoBpn81AegP7uKhhW5KzYlehs8VV0ZW0fIDVbcZRcaP3aPSW+JZFua+ysQN+m/Nw==",
      "dependencies": {
-        "@typescript-eslint/types": "5.62.0",
-        "@typescript-eslint/visitor-keys": "5.62.0"
+        "@typescript-eslint/types": "5.61.0",
+        "@typescript-eslint/visitor-keys": "5.61.0"
      },
      "engines": {
        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -376,9 +376,9 @@
      }
    },
    "node_modules/@typescript-eslint/types": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz",
-      "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==",
+      "version": "5.61.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.61.0.tgz",
+      "integrity": "sha512-ldyueo58KjngXpzloHUog/h9REmHl59G1b3a5Sng1GfBo14BkS3ZbMEb3693gnP1k//97lh7bKsp6/V/0v1veQ==",
      "engines": {
        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
      },
@@ -388,12 +388,12 @@
      }
    },
    "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz",
-      "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==",
+      "version": "5.61.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.61.0.tgz",
+      "integrity": "sha512-Fud90PxONnnLZ36oR5ClJBLTLfU4pIWBmnvGwTbEa2cXIqj70AEDEmOmpkFComjBZ/037ueKrOdHuYmSFVD7Rw==",
      "dependencies": {
-        "@typescript-eslint/types": "5.62.0",
-        "@typescript-eslint/visitor-keys": "5.62.0",
+        "@typescript-eslint/types": "5.61.0",
+        "@typescript-eslint/visitor-keys": "5.61.0",
        "debug": "^4.3.4",
        "globby": "^11.1.0",
        "is-glob": "^4.0.3",
@@ -414,11 +414,11 @@
      }
    },
    "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz",
-      "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==",
+      "version": "5.61.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.61.0.tgz",
+      "integrity": "sha512-50XQ5VdbWrX06mQXhy93WywSFZZGsv3EOjq+lqp6WC2t+j3mb6A9xYVdrRxafvK88vg9k9u+CT4l6D8PEatjKg==",
      "dependencies": {
-        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/types": "5.61.0",
        "eslint-visitor-keys": "^3.3.0"
      },
      "engines": {
@@ -430,9 +430,9 @@
      }
    },
    "node_modules/acorn": {
-      "version": "8.10.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
-      "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
+      "version": "8.9.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.9.0.tgz",
+      "integrity": "sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ==",
      "bin": {
        "acorn": "bin/acorn"
      },
@@ -582,25 +582,6 @@
        "get-intrinsic": "^1.1.3"
      }
    },
-    "node_modules/arraybuffer.prototype.slice": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz",
-      "integrity": "sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw==",
-      "dependencies": {
-        "array-buffer-byte-length": "^1.0.0",
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "get-intrinsic": "^1.2.1",
-        "is-array-buffer": "^3.0.2",
-        "is-shared-array-buffer": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
    "node_modules/ast-types-flow": {
      "version": "0.0.7",
      "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
@@ -723,9 +704,9 @@
      }
    },
    "node_modules/caniuse-lite": {
-      "version": "1.0.30001517",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001517.tgz",
-      "integrity": "sha512-Vdhm5S11DaFVLlyiKu4hiUTkpZu+y1KA/rZZqVQfOD5YdDT/eQKlkt7NaE0WGOFgX32diqt9MiP9CAiFeRklaA==",
+      "version": "1.0.30001511",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001511.tgz",
+      "integrity": "sha512-NaWPJawcoedlghN4P7bDNeADD7K+rZaY6V8ZcME7PkEZo/nfOg+lnrUgRWiKbNxcQ4/toFKSxnS4WdbyPZnKkw==",
      "funding": [
        {
          "type": "opencollective",
@@ -927,18 +908,17 @@
      }
    },
    "node_modules/es-abstract": {
-      "version": "1.22.1",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.1.tgz",
-      "integrity": "sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==",
+      "version": "1.21.2",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.2.tgz",
+      "integrity": "sha512-y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg==",
      "dependencies": {
        "array-buffer-byte-length": "^1.0.0",
-        "arraybuffer.prototype.slice": "^1.0.1",
        "available-typed-arrays": "^1.0.5",
        "call-bind": "^1.0.2",
        "es-set-tostringtag": "^2.0.1",
        "es-to-primitive": "^1.2.1",
        "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.2.1",
+        "get-intrinsic": "^1.2.0",
        "get-symbol-description": "^1.0.0",
        "globalthis": "^1.0.3",
        "gopd": "^1.0.1",
@@ -958,18 +938,14 @@
        "object-inspect": "^1.12.3",
        "object-keys": "^1.1.1",
        "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.5.0",
-        "safe-array-concat": "^1.0.0",
+        "regexp.prototype.flags": "^1.4.3",
        "safe-regex-test": "^1.0.0",
        "string.prototype.trim": "^1.2.7",
        "string.prototype.trimend": "^1.0.6",
        "string.prototype.trimstart": "^1.0.6",
-        "typed-array-buffer": "^1.0.0",
-        "typed-array-byte-length": "^1.0.0",
-        "typed-array-byte-offset": "^1.0.0",
        "typed-array-length": "^1.0.4",
        "unbox-primitive": "^1.0.2",
-        "which-typed-array": "^1.1.10"
+        "which-typed-array": "^1.1.9"
      },
      "engines": {
        "node": ">= 0.4"
@@ -1027,9 +1003,9 @@
      }
    },
    "node_modules/eslint": {
-      "version": "8.45.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.45.0.tgz",
-      "integrity": "sha512-pd8KSxiQpdYRfYa9Wufvdoct3ZPQQuVuU5O6scNgMuOMYuxvH0IGaYK0wUFjo4UYYQQCUndlXiMbnxopwvvTiw==",
+      "version": "8.44.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.44.0.tgz",
+      "integrity": "sha512-0wpHoUbDUHgNCyvFB5aXLiQVfK9B0at6gUvzy83k4kAsQ/u769TQDX6iKC+aO4upIHO9WSaA3QoXYQDHbNwf1A==",
      "dependencies": {
        "@eslint-community/eslint-utils": "^4.2.0",
        "@eslint-community/regexpp": "^4.4.0",
@@ -1056,6 +1032,7 @@
        "globals": "^13.19.0",
        "graphemer": "^1.4.0",
        "ignore": "^5.2.0",
+        "import-fresh": "^3.0.0",
        "imurmurhash": "^0.1.4",
        "is-glob": "^4.0.0",
        "is-path-inside": "^3.0.3",
@@ -1067,6 +1044,7 @@
        "natural-compare": "^1.4.0",
        "optionator": "^0.9.3",
        "strip-ansi": "^6.0.1",
+        "strip-json-comments": "^3.1.0",
        "text-table": "^0.2.0"
      },
      "bin": {
@@ -1080,11 +1058,11 @@
      }
    },
    "node_modules/eslint-config-next": {
-      "version": "13.4.12",
-      "resolved": "https://registry.npmjs.org/eslint-config-next/-/eslint-config-next-13.4.12.tgz",
-      "integrity": "sha512-ZF0r5vxKaVazyZH/37Au/XItiG7qUOBw+HaH3PeyXltIMwXorsn6bdrl0Nn9N5v5v9spc+6GM2ryjugbjF6X2g==",
+      "version": "13.4.8",
+      "resolved": "https://registry.npmjs.org/eslint-config-next/-/eslint-config-next-13.4.8.tgz",
+      "integrity": "sha512-2hE0b6lHuhtHBX8VgEXi8v4G8PVrPUBMOSLCTq8qtcQ2qQOX7+uBOLK2kU4FD2qDZzyXNlhmuH+WLT5ptY4XLA==",
      "dependencies": {
-        "@next/eslint-plugin-next": "13.4.12",
+        "@next/eslint-plugin-next": "13.4.8",
        "@rushstack/eslint-patch": "^1.1.3",
        "@typescript-eslint/parser": "^5.42.0",
        "eslint-import-resolver-node": "^0.3.6",
@@ -1092,7 +1070,7 @@
        "eslint-plugin-import": "^2.26.0",
        "eslint-plugin-jsx-a11y": "^6.5.1",
        "eslint-plugin-react": "^7.31.7",
-        "eslint-plugin-react-hooks": "5.0.0-canary-7118f5dd7-20230705"
+        "eslint-plugin-react-hooks": "^4.5.0"
      },
      "peerDependencies": {
        "eslint": "^7.23.0 || ^8.0.0",
@@ -1148,13 +1126,13 @@
      }
    },
    "node_modules/eslint-import-resolver-typescript/node_modules/globby": {
-      "version": "13.2.2",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-13.2.2.tgz",
-      "integrity": "sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==",
+      "version": "13.2.1",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-13.2.1.tgz",
+      "integrity": "sha512-DPCBxctI7dN4EeIqjW2KGqgdcUMbrhJ9AzON+PlxCtvppWhubTLD4+a0GFxiym14ZvacUydTPjLPc2DlKz7EIg==",
      "dependencies": {
        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.3.0",
-        "ignore": "^5.2.4",
+        "fast-glob": "^3.2.11",
+        "ignore": "^5.2.0",
        "merge2": "^1.4.1",
        "slash": "^4.0.0"
      },
@@ -1248,9 +1226,9 @@
      }
    },
    "node_modules/eslint-plugin-import/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
      "bin": {
        "semver": "bin/semver.js"
      }
@@ -1285,17 +1263,17 @@
      }
    },
    "node_modules/eslint-plugin-jsx-a11y/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
      "bin": {
        "semver": "bin/semver.js"
      }
    },
    "node_modules/eslint-plugin-react": {
-      "version": "7.33.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.33.0.tgz",
-      "integrity": "sha512-qewL/8P34WkY8jAqdQxsiL82pDUeT7nhs8IsuXgfgnsEloKCT4miAV9N9kGtx7/KM9NH/NCGUE7Edt9iGxLXFw==",
+      "version": "7.32.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.32.2.tgz",
+      "integrity": "sha512-t2fBMa+XzonrrNkyVirzKlvn5RXzzPwRHtMvLAtVZrt8oxgnTQaYbU6SXTOO1mwQgp1y5+toMSKInnzGr0Knqg==",
      "dependencies": {
        "array-includes": "^3.1.6",
        "array.prototype.flatmap": "^1.3.1",
@@ -1310,7 +1288,7 @@
        "object.values": "^1.1.6",
        "prop-types": "^15.8.1",
        "resolve": "^2.0.0-next.4",
-        "semver": "^6.3.1",
+        "semver": "^6.3.0",
        "string.prototype.matchall": "^4.0.8"
      },
      "engines": {
@@ -1321,9 +1299,9 @@
      }
    },
    "node_modules/eslint-plugin-react-hooks": {
-      "version": "5.0.0-canary-7118f5dd7-20230705",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-5.0.0-canary-7118f5dd7-20230705.tgz",
-      "integrity": "sha512-AZYbMo/NW9chdL7vk6HQzQhT+PvTAEVqWk9ziruUoW2kAOcN5qNyelv70e0F1VNQAbvutOC9oc+xfWycI9FxDw==",
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz",
+      "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==",
      "engines": {
        "node": ">=10"
      },
@@ -1359,17 +1337,17 @@
      }
    },
    "node_modules/eslint-plugin-react/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
      "bin": {
        "semver": "bin/semver.js"
      }
    },
    "node_modules/eslint-scope": {
-      "version": "7.2.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.1.tgz",
-      "integrity": "sha512-CvefSOsDdaYYvxChovdrPo/ZGt8d5lrJWleAc1diXRKhHGiTYEI26cvo8Kle/wGnsizoCJjK73FMg1/IkIwiNA==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz",
+      "integrity": "sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==",
      "dependencies": {
        "esrecurse": "^4.3.0",
        "estraverse": "^5.2.0"
@@ -1393,9 +1371,9 @@
      }
    },
    "node_modules/espree": {
-      "version": "9.6.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
-      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
+      "version": "9.6.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.0.tgz",
+      "integrity": "sha512-1FH/IiruXZ84tpUlm0aCUEwMl2Ho5ilqVh0VvQXw+byAz/4SAciyHLlfmL5WYqsvD38oymdUwBss0LtK8m4s/A==",
      "dependencies": {
        "acorn": "^8.9.0",
        "acorn-jsx": "^5.3.2",
@@ -2140,11 +2118,15 @@
      }
    },
    "node_modules/is-typed-array": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz",
-      "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==",
+      "version": "1.1.10",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz",
+      "integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==",
      "dependencies": {
-        "which-typed-array": "^1.1.11"
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-tostringtag": "^1.0.0"
      },
      "engines": {
        "node": ">= 0.4"
@@ -2189,11 +2171,6 @@
        "url": "https://github.com/sponsors/sindresorhus"
      }
    },
-    "node_modules/isarray": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="
-    },
    "node_modules/isexe": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
@@ -2399,11 +2376,11 @@
      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="
    },
    "node_modules/next": {
-      "version": "13.4.12",
-      "resolved": "https://registry.npmjs.org/next/-/next-13.4.12.tgz",
-      "integrity": "sha512-eHfnru9x6NRmTMcjQp6Nz0J4XH9OubmzOa7CkWL+AUrUxpibub3vWwttjduu9No16dug1kq04hiUUpo7J3m3Xw==",
+      "version": "13.4.8",
+      "resolved": "https://registry.npmjs.org/next/-/next-13.4.8.tgz",
+      "integrity": "sha512-lxUjndYKjZHGK3CWeN2RI+/6ni6EUvjiqGWXAYPxUfGIdFGQ5XoisrqAJ/dF74aP27buAfs8MKIbIMMdxjqSBg==",
      "dependencies": {
-        "@next/env": "13.4.12",
+        "@next/env": "13.4.8",
        "@swc/helpers": "0.5.1",
        "busboy": "1.6.0",
        "caniuse-lite": "^1.0.30001406",
@@ -2419,15 +2396,15 @@
        "node": ">=16.8.0"
      },
      "optionalDependencies": {
-        "@next/swc-darwin-arm64": "13.4.12",
-        "@next/swc-darwin-x64": "13.4.12",
-        "@next/swc-linux-arm64-gnu": "13.4.12",
-        "@next/swc-linux-arm64-musl": "13.4.12",
-        "@next/swc-linux-x64-gnu": "13.4.12",
-        "@next/swc-linux-x64-musl": "13.4.12",
-        "@next/swc-win32-arm64-msvc": "13.4.12",
-        "@next/swc-win32-ia32-msvc": "13.4.12",
-        "@next/swc-win32-x64-msvc": "13.4.12"
+        "@next/swc-darwin-arm64": "13.4.8",
+        "@next/swc-darwin-x64": "13.4.8",
+        "@next/swc-linux-arm64-gnu": "13.4.8",
+        "@next/swc-linux-arm64-musl": "13.4.8",
+        "@next/swc-linux-x64-gnu": "13.4.8",
+        "@next/swc-linux-x64-musl": "13.4.8",
+        "@next/swc-win32-arm64-msvc": "13.4.8",
+        "@next/swc-win32-ia32-msvc": "13.4.8",
+        "@next/swc-win32-x64-msvc": "13.4.8"
      },
      "peerDependencies": {
        "@opentelemetry/api": "^1.1.0",
@@ -3008,23 +2985,6 @@
        "queue-microtask": "^1.2.2"
      }
    },
-    "node_modules/safe-array-concat": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.0.tgz",
-      "integrity": "sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.0",
-        "has-symbols": "^1.0.3",
-        "isarray": "^2.0.5"
-      },
-      "engines": {
-        "node": ">=0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
    "node_modules/safe-regex-test": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
@@ -3047,9 +3007,9 @@
      }
    },
    "node_modules/semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz",
+      "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==",
      "dependencies": {
        "lru-cache": "^6.0.0"
      },
@@ -3373,54 +3333,6 @@
        "url": "https://github.com/sponsors/sindresorhus"
      }
    },
-    "node_modules/typed-array-buffer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz",
-      "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.1",
-        "is-typed-array": "^1.1.10"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/typed-array-byte-length": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz",
-      "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "for-each": "^0.3.3",
-        "has-proto": "^1.0.1",
-        "is-typed-array": "^1.1.10"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/typed-array-byte-offset": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz",
-      "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==",
-      "dependencies": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
-        "for-each": "^0.3.3",
-        "has-proto": "^1.0.1",
-        "is-typed-array": "^1.1.10"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
    "node_modules/typed-array-length": {
      "version": "1.0.4",
      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz",
@@ -3519,15 +3431,16 @@
      }
    },
    "node_modules/which-typed-array": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz",
-      "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==",
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz",
+      "integrity": "sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==",
      "dependencies": {
        "available-typed-arrays": "^1.0.5",
        "call-bind": "^1.0.2",
        "for-each": "^0.3.3",
        "gopd": "^1.0.1",
-        "has-tostringtag": "^1.0.0"
+        "has-tostringtag": "^1.0.0",
+        "is-typed-array": "^1.1.10"
      },
      "engines": {
        "node": ">= 0.4"
--- a/examples/nextjs/package.json
+++ b/examples/nextjs/package.json
@@ -9,9 +9,9 @@
    "lint": "next lint"
  },
  "dependencies": {
-    "eslint": "8.45.0",
-    "eslint-config-next": "13.4.12",
-    "next": "13.4.12",
+    "eslint": "8.44.0",
+    "eslint-config-next": "13.4.8",
+    "next": "13.4.8",
    "react": "18.2.0",
    "react-dom": "18.2.0"
  }
--- a/examples/nuxtjs/README.md
+++ b/examples/nuxtjs/README.md
@@ -45,4 +45,4 @@ Locally preview production build:
 npm run preview
 ```

-Checkout the [deployment documentation](https://nuxt.com/docs/getting-started/deployment#presets) for more information.
+Checkout the [deployment documentation](https://v3.nuxtjs.org/guide/deploy/presets) for more information.
--- a/examples/package.json
+++ b/examples/package.json
@@ -9,6 +9,6 @@
  },
  "devDependencies": {
    "@types/jest": "27.4.1",
-    "@vercel/frameworks": "1.5.0"
+    "@vercel/frameworks": "1.4.3"
  }
 }
--- a/internals/constants/CHANGELOG.md
+++ b/internals/constants/CHANGELOG.md
@@ -1,11 +1,5 @@
 # @vercel-internals/constants

-## 1.0.4
-
-### Patch Changes
-
- Create new help output and arg parsing for deploy command ([#10090](https://github.com/vercel/vercel/pull/10090))
-
 ## 1.0.3

 ### Patch Changes
--- a/internals/constants/package.json
+++ b/internals/constants/package.json
@@ -1,7 +1,7 @@
 {
  "private": true,
  "name": "@vercel-internals/constants",
-  "version": "1.0.4",
+  "version": "1.0.3",
  "types": "dist/index.d.ts",
  "main": "dist/index.js",
  "scripts": {
--- a/internals/types/CHANGELOG.md
+++ b/internals/types/CHANGELOG.md
@@ -1,20 +1,5 @@
 # @vercel-internals/types

-## 1.0.5
-
-### Patch Changes
-
- Updated dependencies [[`0750517af`](https://github.com/vercel/vercel/commit/0750517af99aea41410d4f1f772ce427699554e7)]:
-  - @vercel/build-utils@6.8.2
-
-## 1.0.4
-
-### Patch Changes
-
- Updated dependencies [[`7021279b2`](https://github.com/vercel/vercel/commit/7021279b284f314a4d1bdbb4306b4c22291efa08), [`718bbd365`](https://github.com/vercel/vercel/commit/718bbd365a50271a980bdca231ca801a0eead32b)]:
-  - @vercel/build-utils@6.8.1
-  - @vercel-internals/constants@1.0.4
-
 ## 1.0.3

 ### Patch Changes
--- a/internals/types/package.json
+++ b/internals/types/package.json
@@ -1,13 +1,13 @@
 {
  "private": true,
  "name": "@vercel-internals/types",
-  "version": "1.0.5",
+  "version": "1.0.3",
  "types": "index.d.ts",
  "main": "index.d.ts",
  "dependencies": {
    "@types/node": "14.14.31",
-    "@vercel-internals/constants": "1.0.4",
-    "@vercel/build-utils": "6.8.2",
+    "@vercel-internals/constants": "1.0.3",
+    "@vercel/build-utils": "6.8.0",
    "@vercel/routing-utils": "2.2.1"
  },
  "devDependencies": {
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
    "source-map-support": "0.5.12",
    "ts-eager": "2.0.2",
    "ts-jest": "29.1.0",
-    "turbo": "1.10.12",
+    "turbo": "1.10.7",
    "typescript": "4.9.5"
  },
  "scripts": {
--- a/packages/build-utils/CHANGELOG.md
+++ b/packages/build-utils/CHANGELOG.md
@@ -1,17 +1,5 @@
 # @vercel/build-utils

-## 6.8.2
-
-### Patch Changes
-
- Push back `nodejs16.x` discontinue date to `2024-02-06` ([#10209](https://github.com/vercel/vercel/pull/10209))
-
-## 6.8.1
-
-### Patch Changes
-
- Revert "[build-utils] Allow file-ref sema to be controlled through env flag" ([#10167](https://github.com/vercel/vercel/pull/10167))
-
 ## 6.8.0

 ### Minor Changes
--- a/packages/build-utils/package.json
+++ b/packages/build-utils/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/build-utils",
-  "version": "6.8.2",
+  "version": "6.8.0",
  "license": "Apache-2.0",
  "main": "./dist/index.js",
  "types": "./dist/index.d.js",
--- a/packages/build-utils/src/fs/node-version.ts
+++ b/packages/build-utils/src/fs/node-version.ts
@@ -10,7 +10,7 @@ function getOptions() {
      major: 16,
      range: '16.x',
      runtime: 'nodejs16.x',
-      discontinueDate: new Date('2024-02-06'),
+      discontinueDate: new Date('2023-08-15'),
    },
    {
      major: 14,
--- a/packages/build-utils/test/unit.test.ts
+++ b/packages/build-utils/test/unit.test.ts
@@ -238,7 +238,7 @@ it('should get latest node version', async () => {
 it('should throw for discontinued versions', async () => {
  // Mock a future date so that Node 8 and 10 become discontinued
  const realDateNow = Date.now.bind(global.Date);
-  global.Date.now = () => new Date('2024-02-13').getTime();
+  global.Date.now = () => new Date('2023-10-01').getTime();

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

  global.Date.now = realDateNow;
--- a/packages/cli/CHANGELOG.md
+++ b/packages/cli/CHANGELOG.md
@@ -1,134 +1,5 @@
 # vercel

-## 31.2.2
-
-### Patch Changes
-
- Migrate list command to new structure ([#10284](https://github.com/vercel/vercel/pull/10284))
-
- Migrate whoami command to new structure ([#10266](https://github.com/vercel/vercel/pull/10266))
-
- Migrate logs command to new structure ([#10281](https://github.com/vercel/vercel/pull/10281))
-
- Migrate login command to new structure ([#10283](https://github.com/vercel/vercel/pull/10283))
-
- Migrate pull command to new structure ([#10280](https://github.com/vercel/vercel/pull/10280))
-
- Migrate logout command to new structure ([#10282](https://github.com/vercel/vercel/pull/10282))
-
- Migrate build command to new structure ([#10286](https://github.com/vercel/vercel/pull/10286))
-
- Migrate inspect command to new structure ([#10277](https://github.com/vercel/vercel/pull/10277))
-
- Migrate redeploy command to new structure ([#10279](https://github.com/vercel/vercel/pull/10279))
-
- Migrate link command to new structure ([#10285](https://github.com/vercel/vercel/pull/10285))
-
- Update spacing of --help output for CLI ([#10287](https://github.com/vercel/vercel/pull/10287))
-
- Updated dependencies [[`4af242af8`](https://github.com/vercel/vercel/commit/4af242af8633e58b6a9bf920564416da3ef22ad4), [`0cbdae141`](https://github.com/vercel/vercel/commit/0cbdae1411aa7936ff7dfe551919ca5e56cd6e98), [`85dd66778`](https://github.com/vercel/vercel/commit/85dd667781693539d753d587566e53964bbe189d)]:
-  - @vercel/node@2.15.8
-  - @vercel/remix-builder@1.9.1
-  - @vercel/static-build@1.3.44
-
-## 31.2.1
-
-### Patch Changes
-
- Migrate bisect command to new structure ([#10276](https://github.com/vercel/vercel/pull/10276))
-
- Migrate remove command to new structure ([#10268](https://github.com/vercel/vercel/pull/10268))
-
- Updated dependencies [[`fc413707d`](https://github.com/vercel/vercel/commit/fc413707d017e234d5013b761d885f65f9b981bc)]:
-  - @vercel/node@2.15.7
-  - @vercel/static-build@1.3.43
-
-## 31.2.0
-
-### Minor Changes
-
- Add a "Global Options" section to help output ([#10250](https://github.com/vercel/vercel/pull/10250))
-
-### Patch Changes
-
- Updated dependencies [[`d1b0dbe3a`](https://github.com/vercel/vercel/commit/d1b0dbe3a7d8754286aa2b7ba0c8b55d3adafdea), [`4a8622a10`](https://github.com/vercel/vercel/commit/4a8622a10d52260cb629a1c4a6f797ade05ea154), [`6469ef1b8`](https://github.com/vercel/vercel/commit/6469ef1b8ce37e93f50ab4a108aa0953d7631fe8)]:
-  - @vercel/remix-builder@1.9.0
-  - @vercel/next@3.9.3
-
-## 31.1.1
-
-### Patch Changes
-
- Updated dependencies [[`7c30b13cc`](https://github.com/vercel/vercel/commit/7c30b13ccb79bdf0ac240282bba4c084f1d0d122)]:
-  - @vercel/next@3.9.2
-
-## 31.1.0
-
-### Minor Changes
-
- Add 'Environment' column to 'vc list' with new '--environment' filter and pipe URLs to stdout ([#10239](https://github.com/vercel/vercel/pull/10239))
-
-### Patch Changes
-
- Update `proxy-agent` to v6.3.0 ([#10226](https://github.com/vercel/vercel/pull/10226))
-
- Use `getNodeBinPaths()` in `vc dev` ([#10225](https://github.com/vercel/vercel/pull/10225))
-
- Updated dependencies [[`b1c14cde0`](https://github.com/vercel/vercel/commit/b1c14cde03f94b2c15ba12c9be9d19c72df2fdbb), [`ce4633fe4`](https://github.com/vercel/vercel/commit/ce4633fe4d00cb5c251cdabbfab08f39ec3f3b5f)]:
-  - @vercel/next@3.9.1
-  - @vercel/static-build@1.3.42
-
-## 31.0.4
-
-### Patch Changes
-
- Detect multiple frameworks within the same root directory during `vc link --repo` ([#10203](https://github.com/vercel/vercel/pull/10203))
-
- Updated dependencies [[`b56639b62`](https://github.com/vercel/vercel/commit/b56639b624e9ad1df048a4c85083e26888696060), [`cae60155f`](https://github.com/vercel/vercel/commit/cae60155f34883f08a5e4f51b547e2a1a5fee694), [`c670e5171`](https://github.com/vercel/vercel/commit/c670e51712022193e078bd68b055f7e61013015d), [`5439d7c0c`](https://github.com/vercel/vercel/commit/5439d7c0c9b79e7161bf4fa84ffdb357365f9e7e)]:
-  - @vercel/node@2.15.6
-  - @vercel/next@3.9.0
-  - @vercel/remix-builder@1.8.18
-  - @vercel/static-build@1.3.41
-
-## 31.0.3
-
-### Patch Changes
-
- Fix redeploy target to be undefined when null ([#10201](https://github.com/vercel/vercel/pull/10201))
-
- Respect forbidden API responses ([#10178](https://github.com/vercel/vercel/pull/10178))
-
- Update `supports-hyperlinks` to v3 ([#10208](https://github.com/vercel/vercel/pull/10208))
-
- Updated dependencies [[`0750517af`](https://github.com/vercel/vercel/commit/0750517af99aea41410d4f1f772ce427699554e7)]:
-  - @vercel/build-utils@6.8.2
-  - @vercel/static-build@1.3.40
-  - @vercel/node@2.15.5
-  - @vercel/remix-builder@1.8.17
-
-## 31.0.2
-
-### Patch Changes
-
- Allow additional project settings in `createProject()` ([#10172](https://github.com/vercel/vercel/pull/10172))
-
- Run local Project detection during `vc link --repo`. ([#10094](https://github.com/vercel/vercel/pull/10094))
-  This allows for creation of new Projects that do not yet exist under the selected scope.
-
- Redeploy command no longer redeploys preview deployments to production ([#10186](https://github.com/vercel/vercel/pull/10186))
-
- Added trailing new line at end of help output ([#10170](https://github.com/vercel/vercel/pull/10170))
-
- Create new help output and arg parsing for deploy command ([#10090](https://github.com/vercel/vercel/pull/10090))
-
- [cli] Remove `preinstall` script ([#10157](https://github.com/vercel/vercel/pull/10157))
-
- Updated dependencies [[`7021279b2`](https://github.com/vercel/vercel/commit/7021279b284f314a4d1bdbb4306b4c22291efa08), [`5e5332fbc`](https://github.com/vercel/vercel/commit/5e5332fbc9317a8f3cc4ed0b72ec1a2c76020891), [`027bce00b`](https://github.com/vercel/vercel/commit/027bce00b3821d9b4a8f7ec320cd1c43ab9f4215)]:
-  - @vercel/build-utils@6.8.1
-  - @vercel/node@2.15.4
-  - @vercel/remix-builder@1.8.16
-  - @vercel/static-build@1.3.39
-
 ## 31.0.1

 ### Patch Changes
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
  "name": "vercel",
-  "version": "31.2.2",
+  "version": "31.0.1",
  "preferGlobal": true,
  "license": "Apache-2.0",
  "description": "The command-line interface for Vercel",
@@ -31,16 +31,16 @@
    "node": ">= 14"
  },
  "dependencies": {
-    "@vercel/build-utils": "6.8.2",
+    "@vercel/build-utils": "6.8.0",
    "@vercel/go": "2.5.1",
    "@vercel/hydrogen": "0.0.64",
-    "@vercel/next": "3.9.3",
-    "@vercel/node": "2.15.8",
+    "@vercel/next": "3.8.8",
+    "@vercel/node": "2.15.3",
    "@vercel/python": "3.1.60",
    "@vercel/redwood": "1.1.15",
-    "@vercel/remix-builder": "1.9.1",
+    "@vercel/remix-builder": "1.8.15",
    "@vercel/ruby": "1.3.76",
-    "@vercel/static-build": "1.3.44"
+    "@vercel/static-build": "1.3.38"
  },
  "devDependencies": {
    "@alex_neo/jest-expect-message": "1.0.5",
@@ -84,13 +84,13 @@
    "@types/which": "3.0.0",
    "@types/write-json-file": "2.2.1",
    "@types/yauzl-promise": "2.1.0",
-    "@vercel-internals/constants": "1.0.4",
+    "@vercel-internals/constants": "1.0.3",
    "@vercel-internals/get-package-json": "1.0.0",
-    "@vercel-internals/types": "1.0.5",
-    "@vercel/client": "12.6.5",
+    "@vercel-internals/types": "1.0.3",
+    "@vercel/client": "12.6.3",
    "@vercel/error-utils": "1.0.10",
-    "@vercel/frameworks": "1.5.0",
-    "@vercel/fs-detectors": "4.1.1",
+    "@vercel/frameworks": "1.4.3",
+    "@vercel/fs-detectors": "4.0.1",
    "@vercel/fun": "1.0.4",
    "@vercel/ncc": "0.24.0",
    "@vercel/routing-utils": "2.2.1",
@@ -149,7 +149,7 @@
    "pluralize": "7.0.0",
    "promisepipe": "3.0.0",
    "proxy": "2.0.0",
-    "proxy-agent": "6.3.0",
+    "proxy-agent": "6.1.1",
    "psl": "1.1.31",
    "qr-image": "3.2.0",
    "raw-body": "2.4.1",
@@ -158,7 +158,7 @@
    "serve-handler": "6.1.1",
    "strip-ansi": "6.0.1",
    "stripe": "5.1.0",
-    "supports-hyperlinks": "3.0.0",
+    "supports-hyperlinks": "2.2.0",
    "tar-fs": "1.16.3",
    "test-listen": "1.1.0",
    "text-table": "0.2.0",
--- a/packages/cli/src/commands/bisect/command.ts
+++ b/packages/cli/src/commands/bisect/command.ts
@@ -1,69 +0,0 @@
-import { Command } from '../help';
-import { getPkgName } from '../../util/pkg-name';
-
-export const bisectCommand: Command = {
-  name: 'bisect',
-  description: 'Bisect the current project interactively.',
-  arguments: [],
-  options: [
-    {
-      name: 'bad',
-      description: 'Known bad URL',
-      argument: 'URL',
-      shorthand: 'b',
-      type: 'string',
-      deprecated: false,
-      multi: false,
-    },
-    {
-      name: 'good',
-      description: 'Known good URL',
-      argument: 'URL',
-      shorthand: 'g',
-      type: 'string',
-      deprecated: false,
-      multi: false,
-    },
-    {
-      name: 'open',
-      description: 'Automatically open each URL in the browser',
-      argument: 'URL',
-      shorthand: 'o',
-      type: 'string',
-      deprecated: false,
-      multi: false,
-    },
-    {
-      name: 'path',
-      description: 'Subpath of the deployment URL to test',
-      argument: 'URL',
-      shorthand: 'p',
-      type: 'string',
-      deprecated: false,
-      multi: false,
-    },
-    {
-      name: 'run',
-      description: 'Test script to run for each deployment',
-      argument: 'URL',
-      shorthand: 'r',
-      type: 'string',
-      deprecated: false,
-      multi: false,
-    },
-  ],
-  examples: [
-    {
-      name: 'Bisect the current project interactively',
-      value: `${getPkgName()} bisect`,
-    },
-    {
-      name: 'Bisect with a known bad deployment',
-      value: `${getPkgName()} bisect --bad example-310pce9i0.vercel.app`,
-    },
-    {
-      name: 'Automated bisect with a run script',
-      value: `${getPkgName()} bisect --run ./test.sh`,
-    },
-  ],
-};
--- a/packages/cli/src/commands/bisect/index.ts
+++ b/packages/cli/src/commands/bisect/index.ts
@@ -8,19 +8,53 @@ import { URLSearchParams, parse } from 'url';
 import box from '../../util/output/box';
 import formatDate from '../../util/format-date';
 import link from '../../util/output/link';
+import logo from '../../util/output/logo';
 import getArgs from '../../util/get-args';
 import Client from '../../util/client';
+import { getPkgName } from '../../util/pkg-name';
 import { Deployment } from '@vercel-internals/types';
 import { normalizeURL } from '../../util/bisect/normalize-url';
 import getScope from '../../util/get-scope';
 import getDeployment from '../../util/get-deployment';
-import { help } from '../help';
-import { bisectCommand } from './command';

 interface Deployments {
  deployments: Deployment[];
 }
-export default async function bisect(client: Client): Promise<number> {
+
+const pkgName = getPkgName();
+
+const help = () => {
+  console.log(`
+  ${chalk.bold(`${logo} ${pkgName} bisect`)} [options]
+
+  ${chalk.dim('Options:')}
+
+    -h, --help                 Output usage information
+    -d, --debug                Debug mode [off]
+    --no-color                 No color mode [off]
+    -b, --bad                  Known bad URL
+    -g, --good                 Known good URL
+    -o, --open                 Automatically open each URL in the browser
+    -p, --path                 Subpath of the deployment URL to test
+    -r, --run                  Test script to run for each deployment
+
+  ${chalk.dim('Examples:')}
+
+  ${chalk.gray('–')} Bisect the current project interactively
+
+      ${chalk.cyan(`$ ${pkgName} bisect`)}
+
+  ${chalk.gray('–')} Bisect with a known bad deployment
+
+      ${chalk.cyan(`$ ${pkgName} bisect --bad example-310pce9i0.vercel.app`)}
+
+  ${chalk.gray('–')} Automated bisect with a run script
+
+      ${chalk.cyan(`$ ${pkgName} bisect --run ./test.sh`)}
+  `);
+};
+
+export default async function main(client: Client): Promise<number> {
  const { output } = client;
  const scope = await getScope(client);
  const { contextName } = scope;
@@ -39,7 +73,7 @@ export default async function bisect(client: Client): Promise<number> {
  });

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

--- a/packages/cli/src/commands/build/index.ts
+++ b/packages/cli/src/commands/build/index.ts
@@ -38,37 +38,35 @@ import {
 import { fileNameSymbol } from '@vercel/client';
 import type { VercelConfig } from '@vercel/client';

-import pull from '../pull';
-import { staticFiles as getFiles } from '../../util/get-files';
-import Client from '../../util/client';
-import getArgs from '../../util/get-args';
-import cmd from '../../util/output/cmd';
-import * as cli from '../../util/pkg-name';
-import cliPkg from '../../util/pkg';
-import readJSONFile from '../../util/read-json-file';
-import { CantParseJSONFile } from '../../util/errors-ts';
+import pull from './pull';
+import { staticFiles as getFiles } from '../util/get-files';
+import Client from '../util/client';
+import getArgs from '../util/get-args';
+import cmd from '../util/output/cmd';
+import * as cli from '../util/pkg-name';
+import cliPkg from '../util/pkg';
+import readJSONFile from '../util/read-json-file';
+import { CantParseJSONFile } from '../util/errors-ts';
 import {
  pickOverrides,
  ProjectLinkAndSettings,
  readProjectSettings,
-} from '../../util/projects/project-settings';
-import { getProjectLink, VERCEL_DIR } from '../../util/projects/link';
-import confirm from '../../util/input/confirm';
-import { emoji, prependEmoji } from '../../util/emoji';
-import stamp from '../../util/output/stamp';
+} from '../util/projects/project-settings';
+import { getProjectLink, VERCEL_DIR } from '../util/projects/link';
+import confirm from '../util/input/confirm';
+import { emoji, prependEmoji } from '../util/emoji';
+import stamp from '../util/output/stamp';
 import {
  OUTPUT_DIR,
  PathOverride,
  writeBuildResult,
-} from '../../util/build/write-build-result';
-import { importBuilders } from '../../util/build/import-builders';
-import { initCorepack, cleanupCorepack } from '../../util/build/corepack';
-import { sortBuilders } from '../../util/build/sort-builders';
-import { toEnumerableError } from '../../util/error';
-import { validateConfig } from '../../util/validate-config';
-import { setMonorepoDefaultSettings } from '../../util/build/monorepo';
-import { help } from '../help';
-import { buildCommand } from './command';
+} from '../util/build/write-build-result';
+import { importBuilders } from '../util/build/import-builders';
+import { initCorepack, cleanupCorepack } from '../util/build/corepack';
+import { sortBuilders } from '../util/build/sort-builders';
+import { toEnumerableError } from '../util/error';
+import { validateConfig } from '../util/validate-config';
+import { setMonorepoDefaultSettings } from '../util/build/monorepo';

 type BuildResult = BuildResultV2 | BuildResultV3;

@@ -105,6 +103,35 @@ export interface BuildsManifest {
  builds?: SerializedBuilder[];
 }

+const help = () => {
+  return console.log(`
+   ${chalk.bold(`${cli.logo} ${cli.name} build`)}
+
+   ${chalk.dim('Options:')}
+
+      -h, --help                     Output usage information
+      -A ${chalk.bold.underline('FILE')}, --local-config=${chalk.bold.underline(
+    'FILE'
+  )}   Path to the local ${'`vercel.json`'} file
+      -Q ${chalk.bold.underline('DIR')}, --global-config=${chalk.bold.underline(
+    'DIR'
+  )}    Path to the global ${'`.vercel`'} directory
+      --cwd [path]                   The current working directory
+      --output [path]                Directory where built assets should be written to
+      --prod                         Build a production deployment
+      -d, --debug                    Debug mode [off]
+      --no-color                     No color mode [off]
+      -y, --yes                      Skip the confirmation prompt about pulling environment variables and project settings when not found locally
+
+    ${chalk.dim('Examples:')}
+
+    ${chalk.gray('-')} Build the project
+
+      ${chalk.cyan(`$ ${cli.name} build`)}
+      ${chalk.cyan(`$ ${cli.name} build --cwd ./path-to-project`)}
+`);
+};
+
 export default async function main(client: Client): Promise<number> {
  let { cwd } = client;
  const { output } = client;
@@ -135,7 +162,7 @@ export default async function main(client: Client): Promise<number> {
  });

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

--- a/packages/cli/src/commands/build/command.ts
+++ b/packages/cli/src/commands/build/command.ts
@@ -1,46 +0,0 @@
-import { Command } from '../help';
-import { getPkgName } from '../../util/pkg-name';
-
-export const buildCommand: Command = {
-  name: 'build',
-  description: 'Build the project.',
-  arguments: [],
-  options: [
-    {
-      name: 'prod',
-      description: 'Build a production deployment',
-      shorthand: null,
-      type: 'string',
-      deprecated: false,
-      multi: false,
-    },
-    {
-      name: 'output',
-      description: 'Directory where built assets should be written to',
-      shorthand: null,
-      argument: 'PATH',
-      type: 'string',
-      deprecated: false,
-      multi: false,
-    },
-    {
-      name: 'yes',
-      description:
-        'Skip the confirmation prompt about pulling environment variables and project settings when not found locally',
-      shorthand: 'y',
-      type: 'boolean',
-      deprecated: false,
-      multi: false,
-    },
-  ],
-  examples: [
-    {
-      name: 'Build the project',
-      value: `${getPkgName()} build`,
-    },
-    {
-      name: 'Build the project in a specific directory',
-      value: `${getPkgName()} build --cwd ./path-to-project`,
-    },
-  ],
-};
--- a/packages/cli/src/commands/dev/dev.ts
+++ b/packages/cli/src/commands/dev/dev.ts
@@ -57,13 +57,12 @@ export default async function dev(

  let projectSettings: ProjectSettings | undefined;
  let envValues: Record<string, string> = {};
-  let repoRoot: string | undefined;
  if (link.status === 'linked') {
-    const { project, org } = link;
+    const { project, org, repoRoot } = link;

    // If repo linked, update `cwd` to the repo root
-    if (link.repoRoot) {
-      repoRoot = cwd = link.repoRoot;
+    if (repoRoot) {
+      cwd = repoRoot;
    }

    client.config.currentTeam = org.type === 'team' ? org.id : undefined;
@@ -83,7 +82,6 @@ export default async function dev(
    output,
    projectSettings,
    envValues,
-    repoRoot,
  });

  // listen to SIGTERM for graceful shutdown
--- a/packages/cli/src/commands/help.ts
+++ b/packages/cli/src/commands/help.ts
@@ -30,86 +30,6 @@ export interface Command {
  examples: CommandExample[];
 }

-const globalCommandOptions: CommandOption[] = [
-  {
-    name: 'help',
-    shorthand: 'h',
-    type: 'string',
-    description: 'Output usage information',
-    deprecated: false,
-    multi: false,
-  },
-  {
-    name: 'version',
-    shorthand: 'v',
-    type: 'string',
-    description: 'Output the version number',
-    deprecated: false,
-    multi: false,
-  },
-  {
-    name: 'cwd',
-    shorthand: null,
-    type: 'string',
-    argument: 'DIR',
-    description:
-      'Sets the current working directory for a single run of a command',
-    deprecated: false,
-    multi: false,
-  },
-  {
-    name: 'local-config',
-    shorthand: 'A',
-    type: 'string',
-    argument: 'FILE',
-    description: 'Path to the local `vercel.json` file',
-    deprecated: false,
-    multi: false,
-  },
-  {
-    name: 'global-config',
-    shorthand: 'Q',
-    type: 'string',
-    argument: 'DIR',
-    description: 'Path to the global `.vercel` directory',
-    deprecated: false,
-    multi: false,
-  },
-  {
-    name: 'debug',
-    shorthand: 'd',
-    type: 'string',
-    description: 'Debug mode (default off)',
-    deprecated: false,
-    multi: false,
-  },
-  {
-    name: 'no-color',
-    shorthand: null,
-    type: 'string',
-    description: 'No color mode (default off)',
-    deprecated: false,
-    multi: false,
-  },
-  {
-    name: 'scope',
-    shorthand: 'S',
-    type: 'string',
-    description: 'Set a custom scope',
-    deprecated: false,
-    multi: false,
-  },
-  {
-    name: 'token',
-    shorthand: 't',
-    type: 'string',
-    argument: 'TOKEN',
-    description: 'Login token',
-    deprecated: false,
-    multi: false,
-  },
-];
-
 export function calcLineLength(line: string[]) {
  return stripAnsi(lineToString(line)).length;
 }
@@ -132,8 +52,8 @@ export function lineToString(line: string[]) {
  return string;
 }

-export function outputArrayToString(outputArray: (string | null)[]) {
-  return outputArray.filter(line => line !== null).join(NEWLINE);
+export function outputArrayToString(outputArray: string[]) {
+  return outputArray.join(NEWLINE);
 }

 /**
@@ -142,12 +62,7 @@ export function outputArrayToString(outputArray: (string | null)[]) {
 * @returns
 */
 export function buildCommandSynopsisLine(command: Command) {
-  const line: string[] = [
-    INDENT,
-    LOGO,
-    chalk.bold(NAME),
-    chalk.bold(command.name),
-  ];
+  const line: string[] = [LOGO, chalk.bold(NAME), chalk.bold(command.name)];
  if (command.arguments.length > 0) {
    for (const argument of command.arguments) {
      line.push(argument.required ? argument.name : `[${argument.name}]`);
@@ -156,39 +71,32 @@ export function buildCommandSynopsisLine(command: Command) {
  if (command.options.length > 0) {
    line.push('[options]');
  }
-
-  line.push(NEWLINE);
  return lineToString(line);
 }

 export function buildCommandOptionLines(
-  commandOptions: CommandOption[],
-  options: BuildHelpOutputOptions,
-  sectionTitle: String
+  command: Command,
+  options: BuildHelpOutputOptions
 ) {
  // Filter out deprecated and intentionally undocumented options
-  commandOptions = commandOptions.filter(
+  command.options = command.options.filter(
    option => !option.deprecated && option.description !== undefined
  );

-  if (commandOptions.length === 0) {
-    return null;
-  }
-
  // Initialize output array with header and empty line
-  const outputArray: string[] = [`${INDENT}${chalk.dim(sectionTitle)}:`, ''];
+  const outputArray: string[] = [chalk.dim(`Options:`), ''];

  // Start building option lines
  const optionLines: string[][] = [];
  // Sort command options alphabetically
-  commandOptions.sort((a, b) =>
+  command.options.sort((a, b) =>
    a.name < b.name ? -1 : a.name > b.name ? 1 : 0
  );
  // Keep track of longest "start" of an option line to determine description spacing
  let maxLineStartLength = 0;
  // Iterate over options and create the "start" of each option (e.g. `  -b, --build-env <key=value>`)
-  for (const option of commandOptions) {
-    const startLine: string[] = [INDENT, INDENT, INDENT];
+  for (const option of command.options) {
+    const startLine: string[] = [INDENT];
    if (option.shorthand) {
      startLine.push(`-${option.shorthand},`);
    }
@@ -227,7 +135,7 @@ export function buildCommandOptionLines(
   */
  for (let i = 0; i < optionLines.length; i++) {
    const optionLine = optionLines[i];
-    const option = commandOptions[i];
+    const option = command.options[i];
    // Add only 2 spaces to the longest line, and then make all shorter lines the same length.
    optionLine.push(
      ' '.repeat(2 + (maxLineStartLength - calcLineLength(optionLine)))
@@ -254,13 +162,16 @@ export function buildCommandOptionLines(
    for (const line of lines) {
      outputArray.push(lineToString(line));
    }
+    // add an empty line in between in each option block for readability (skip the last block)
+    if (i !== optionLines.length - 1) outputArray.push('');
  }

-  return `${outputArrayToString(outputArray)}${NEWLINE}`;
+  // return the entire list of options as a single string after delete the last '\n' added to the option list
+  return outputArrayToString(outputArray);
 }

 export function buildCommandExampleLines(command: Command) {
-  const outputArray: string[] = [`${INDENT}${chalk.dim('Examples:')}`, ''];
+  const outputArray: string[] = [chalk.dim(`Examples:`), ''];
  for (const example of command.examples) {
    const nameLine: string[] = [INDENT];
    nameLine.push(chalk.gray('-'));
@@ -279,15 +190,12 @@ export function buildCommandExampleLines(command: Command) {
    }
    outputArray.push('');
  }
+  // delete the last newline added after examples iteration
+  outputArray.splice(-1);

  return outputArrayToString(outputArray);
 }

-function buildDescriptionLine(command: Command) {
-  const line: string[] = [INDENT, command.description, NEWLINE];
-  return lineToString(line);
-}
-
 interface BuildHelpOutputOptions {
  columns: number;
 }
@@ -296,12 +204,13 @@ export function buildHelpOutput(
  command: Command,
  options: BuildHelpOutputOptions
 ) {
-  const outputArray: (string | null)[] = [
-    '',
+  const outputArray: string[] = [
    buildCommandSynopsisLine(command),
-    buildDescriptionLine(command),
-    buildCommandOptionLines(command.options, options, 'Options'),
-    buildCommandOptionLines(globalCommandOptions, options, 'Global Options'),
+    '',
+    command.description,
+    '',
+    buildCommandOptionLines(command, options),
+    '',
    buildCommandExampleLines(command),
    '',
  ];
--- a/packages/cli/src/commands/inspect/index.ts
+++ b/packages/cli/src/commands/inspect/index.ts
@@ -1,27 +1,71 @@
 import chalk from 'chalk';
-import getArgs from '../../util/get-args';
-import buildsList from '../../util/output/builds';
-import routesList from '../../util/output/routes';
-import indent from '../../util/output/indent';
-import elapsed from '../../util/output/elapsed';
-import { handleError } from '../../util/error';
-import getScope from '../../util/get-scope';
-import { getCommandName } from '../../util/pkg-name';
-import Client from '../../util/client';
-import getDeployment from '../../util/get-deployment';
+import getArgs from '../util/get-args';
+import buildsList from '../util/output/builds';
+import routesList from '../util/output/routes';
+import indent from '../util/output/indent';
+import logo from '../util/output/logo';
+import elapsed from '../util/output/elapsed';
+import { handleError } from '../util/error';
+import getScope from '../util/get-scope';
+import { getPkgName, getCommandName } from '../util/pkg-name';
+import Client from '../util/client';
+import getDeployment from '../util/get-deployment';
 import type { Build, Deployment } from '@vercel-internals/types';
 import title from 'title';
 import { isErrnoException } from '@vercel/error-utils';
 import { URL } from 'url';
-import readStandardInput from '../../util/input/read-standard-input';
-import sleep from '../../util/sleep';
+import readStandardInput from '../util/input/read-standard-input';
+import sleep from '../util/sleep';
 import ms from 'ms';
-import { isDeploying } from '../../util/deploy/is-deploying';
-import { help } from '../help';
-import { inspectCommand } from './command';
+import { isDeploying } from '../util/deploy/is-deploying';

-export default async function inspect(client: Client) {
-  const { output } = client;
+const help = () => {
+  console.log(`
+  ${chalk.bold(`${logo} ${getPkgName()} inspect`)} <url>
+
+  ${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
+    -t ${chalk.bold.underline('TOKEN')}, --token=${chalk.bold.underline(
+    'TOKEN'
+  )}        Login token
+    -d, --debug                    Debug mode [off]
+    --no-color                     No color mode [off]
+    -S, --scope                    Set a custom scope
+    --timeout=${chalk.bold.underline(
+      'TIME'
+    )}                 Time to wait for deployment completion [3m]
+    --wait                         Blocks until deployment completes
+
+  ${chalk.dim('Examples:')}
+
+  ${chalk.gray('–')} Get information about a deployment by its unique URL
+
+    ${chalk.cyan(`$ ${getPkgName()} inspect my-deployment-ji2fjij2.vercel.app`)}
+
+  ${chalk.gray('-')} Get information about the deployment an alias points to
+
+    ${chalk.cyan(`$ ${getPkgName()} inspect my-deployment.vercel.app`)}
+
+  ${chalk.gray('-')} Get information about a deployment by piping in the URL
+
+    ${chalk.cyan(`$ echo my-deployment.vercel.app | ${getPkgName()} inspect`)}
+
+  ${chalk.gray('-')} Wait up to 90 seconds for deployment to complete
+
+    ${chalk.cyan(
+      `$ ${getPkgName()} inspect my-deployment.vercel.app --wait --timeout 90s`
+    )}
+  `);
+};
+
+export default async function main(client: Client) {
  let argv;

  try {
@@ -35,7 +79,7 @@ export default async function inspect(client: Client) {
  }

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

@@ -55,7 +99,7 @@ export default async function inspect(client: Client) {

  if (!deploymentIdOrHost) {
    error(`${getCommandName('inspect <url>')} expects exactly one argument`);
-    output.print(help(inspectCommand, { columns: client.stderr.columns }));
+    help();
    return 1;
  }

--- a/packages/cli/src/commands/inspect/command.ts
+++ b/packages/cli/src/commands/inspect/command.ts
@@ -1,50 +0,0 @@
-import { Command } from '../help';
-import { getPkgName } from '../../util/pkg-name';
-
-export const inspectCommand: Command = {
-  name: 'inspect',
-  description: 'Show information about a deployment.',
-  arguments: [
-    {
-      name: 'url',
-      required: true,
-    },
-  ],
-  options: [
-    {
-      name: 'timeout',
-      description: 'Time to wait for deployment completion [3m]',
-      argument: 'TIME',
-      shorthand: null,
-      type: 'string',
-      deprecated: false,
-      multi: false,
-    },
-    {
-      name: 'wait',
-      description: 'Blocks until deployment completes',
-      shorthand: null,
-      type: 'string',
-      deprecated: false,
-      multi: false,
-    },
-  ],
-  examples: [
-    {
-      name: 'Get information about a deployment by its unique URL',
-      value: `${getPkgName()} inspect my-deployment-ji2fjij2.vercel.app`,
-    },
-    {
-      name: 'Get information about the deployment an alias points to',
-      value: `${getPkgName()} inspect my-deployment.vercel.app`,
-    },
-    {
-      name: 'Get information about a deployment by piping in the URL',
-      value: `echo my-deployment.vercel.app | ${getPkgName()} inspect`,
-    },
-    {
-      name: 'Wait up to 90 seconds for deployment to complete',
-      value: `${getPkgName()} inspect my-deployment.vercel.app --wait --timeout 90s`,
-    },
-  ],
-};
--- a/packages/cli/src/commands/link/command.ts
+++ b/packages/cli/src/commands/link/command.ts
@@ -1,54 +0,0 @@
-import { Command } from '../help';
-import { getPkgName } from '../../util/pkg-name';
-
-export const linkCommand: Command = {
-  name: 'link',
-  description: 'Link a local directory to a Vercel Project.',
-  arguments: [],
-  options: [
-    {
-      name: 'repo',
-      description: 'Link multiple projects based on Git repository (alpha)',
-      shorthand: 'r',
-      type: 'string',
-      deprecated: false,
-      multi: false,
-    },
-    {
-      name: 'project',
-      description: 'Specify a project name',
-      shorthand: 'p',
-      argument: 'NAME',
-      type: 'string',
-      deprecated: false,
-      multi: false,
-    },
-    {
-      name: 'yes',
-      description:
-        'Skip questions when setting up new project using default scope and settings',
-      shorthand: 'y',
-      type: 'boolean',
-      deprecated: false,
-      multi: false,
-    },
-  ],
-  examples: [
-    {
-      name: 'Link current directory to a Vercel Project',
-      value: `${getPkgName()} link`,
-    },
-    {
-      name: 'Link current directory with default options and skip questions',
-      value: `${getPkgName()} link --yes`,
-    },
-    {
-      name: 'Link a specific directory to a Vercel Project',
-      value: `${getPkgName()} link --cwd /path/to/project`,
-    },
-    {
-      name: 'Link to the current Git repository, allowing for multiple Vercel Projects to be linked simultaneously (useful for monorepos)',
-      value: `${getPkgName()} link --repo`,
-    },
-  ],
-};
--- a/packages/cli/src/commands/link/index.ts
+++ b/packages/cli/src/commands/link/index.ts
@@ -1,12 +1,62 @@
+import chalk from 'chalk';
 import Client from '../../util/client';
 import getArgs from '../../util/get-args';
+import logo from '../../util/output/logo';
 import cmd from '../../util/output/cmd';
+import { getPkgName } from '../../util/pkg-name';
 import { ensureLink } from '../../util/link/ensure-link';
 import { ensureRepoLink } from '../../util/link/repo';
-import { help } from '../help';
-import { linkCommand } from './command';

-export default async function link(client: Client) {
+const help = () => {
+  console.log(`
+  ${chalk.bold(`${logo} ${getPkgName()} link`)} [options]
+
+  ${chalk.dim('Options:')}
+
+    -h, --help                     Output usage information
+    -r, --repo                     Link multiple projects based on Git repository (alpha)
+    -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]
+    --no-color                     No color mode [off]
+    -t ${chalk.bold.underline('TOKEN')}, --token=${chalk.bold.underline(
+    'TOKEN'
+  )}        Login token
+    -p ${chalk.bold.underline('NAME')}, --project=${chalk.bold.underline(
+    'NAME'
+  )}        Project name
+    -y, --yes                      Skip questions when setting up new project using default scope and settings
+
+  ${chalk.dim('Examples:')}
+
+  ${chalk.gray('–')} Link current directory to a Vercel Project
+
+      ${chalk.cyan(`$ ${getPkgName()} link`)}
+
+  ${chalk.gray(
+    '–'
+  )} Link current directory with default options and skip questions
+
+      ${chalk.cyan(`$ ${getPkgName()} link --yes`)}
+
+  ${chalk.gray('–')} Link a specific directory to a Vercel Project
+
+      ${chalk.cyan(`$ ${getPkgName()} link --cwd /path/to/project`)}
+
+  ${chalk.gray('–')} ${chalk.yellow(
+    '(alpha)'
+  )} Link to the current Git repository, allowing for multiple
+    Vercel Projects to be linked simultaneously (useful for monorepos)
+
+      ${chalk.cyan(`$ ${getPkgName()} link --repo`)}
+`);
+};
+
+export default async function main(client: Client) {
  const argv = getArgs(client.argv.slice(2), {
    '--yes': Boolean,
    '-y': '--yes',
@@ -21,7 +71,7 @@ export default async function link(client: Client) {
  });

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

@@ -47,7 +97,7 @@ export default async function link(client: Client) {
    client.output.warn(
      `The ${cmd('--repo')} flag is in alpha, please report issues`
    );
-    await ensureRepoLink(client, cwd, { yes, overwrite: true });
+    await ensureRepoLink(client, cwd, yes);
  } else {
    const link = await ensureLink('link', client, cwd, {
      autoConfirm: yes,
--- a/packages/cli/src/commands/list/index.ts
+++ b/packages/cli/src/commands/list/index.ts
@@ -2,37 +2,85 @@ import chalk from 'chalk';
 import ms from 'ms';
 import table from 'text-table';
 import title from 'title';
-import Now from '../../util';
-import getArgs from '../../util/get-args';
-import { handleError } from '../../util/error';
-import elapsed from '../../util/output/elapsed';
-import strlen from '../../util/strlen';
-import toHost from '../../util/to-host';
-import parseMeta from '../../util/parse-meta';
-import { isValidName } from '../../util/is-valid-name';
-import getCommandFlags from '../../util/get-command-flags';
-import { getCommandName } from '../../util/pkg-name';
-import Client from '../../util/client';
+import Now from '../util';
+import getArgs from '../util/get-args';
+import { handleError } from '../util/error';
+import logo from '../util/output/logo';
+import elapsed from '../util/output/elapsed';
+import strlen from '../util/strlen';
+import toHost from '../util/to-host';
+import parseMeta from '../util/parse-meta';
+import { isValidName } from '../util/is-valid-name';
+import getCommandFlags from '../util/get-command-flags';
+import { getPkgName, getCommandName } from '../util/pkg-name';
+import Client from '../util/client';
 import { Deployment } from '@vercel/client';
-import { getLinkedProject } from '../../util/projects/link';
-import { ensureLink } from '../../util/link/ensure-link';
-import getScope from '../../util/get-scope';
-import { isAPIError } from '../../util/errors-ts';
+import { getLinkedProject } from '../util/projects/link';
+import { ensureLink } from '../util/link/ensure-link';
+import getScope from '../util/get-scope';
+import { isAPIError } from '../util/errors-ts';
 import { isErrnoException } from '@vercel/error-utils';
-import { help } from '../help';
-import { listCommand } from './command';

-export default async function list(client: Client) {
+const help = () => {
+  console.log(`
+  ${chalk.bold(`${logo} ${getPkgName()} list`)} [app]
+
+  ${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]
+    --no-color                     No color mode [off]
+    -y, --yes                      Skip questions when setting up new project using default scope and settings
+    -t ${chalk.bold.underline('TOKEN')}, --token=${chalk.bold.underline(
+    'TOKEN'
+  )}        Login token
+    -S, --scope                    Set a custom scope
+    -m, --meta                     Filter deployments by metadata (e.g.: ${chalk.dim(
+      '`-m KEY=value`'
+    )}). Can appear many times.
+    --prod                         Filter for production URLs
+    -N, --next                     Show next page of results
+
+  ${chalk.dim('Examples:')}
+
+  ${chalk.gray('–')} List all deployments for the currently linked project
+
+    ${chalk.cyan(`$ ${getPkgName()} ls`)}
+
+  ${chalk.gray('–')} List all deployments for the project ${chalk.dim(
+    '`my-app`'
+  )} in the team of the currently linked project
+
+    ${chalk.cyan(`$ ${getPkgName()} ls my-app`)}
+
+  ${chalk.gray('–')} Filter deployments by metadata
+
+    ${chalk.cyan(`$ ${getPkgName()} ls -m key1=value1 -m key2=value2`)}
+
+  ${chalk.gray('–')} Paginate deployments for a project, where ${chalk.dim(
+    '`1584722256178`'
+  )} is the time in milliseconds since the UNIX epoch.
+
+    ${chalk.cyan(`$ ${getPkgName()} ls my-app --next 1584722256178`)}
+`);
+};
+
+export default async function main(client: Client) {
  let argv;

  try {
    argv = getArgs(client.argv.slice(2), {
-      '--environment': String,
      '--meta': [String],
      '-m': '--meta',
      '--next': Number,
      '-N': '--next',
-      '--prod': Boolean, // this can be deprecated someday
+      '--prod': Boolean,
      '--yes': Boolean,
      '-y': '--yes',

@@ -60,19 +108,14 @@ export default async function list(client: Client) {
  }

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

  const autoConfirm = !!argv['--yes'];
+  const prod = argv['--prod'] || false;
  const meta = parseMeta(argv['--meta']);

-  const target = argv['--prod']
-    ? 'production'
-    : typeof argv['--environment'] === 'string'
-    ? argv['--environment'].toLowerCase()
-    : undefined;
-
  // retrieve `project` and `org` from .vercel
  let link = await getLinkedProject(client, cwd);

@@ -176,12 +219,15 @@ export default async function list(client: Client) {

  debug('Fetching deployments');

-  const response = await now.list(app, {
-    version: 6,
-    meta,
-    nextTimestamp,
-    target,
-  });
+  const response = await now.list(
+    app,
+    {
+      version: 6,
+      meta,
+      nextTimestamp,
+    },
+    prod
+  );

  let {
    deployments,
@@ -234,11 +280,9 @@ export default async function list(client: Client) {
  }

  log(
-    `${
-      target === 'production' ? `Production deployments` : `Deployments`
-    } for ${chalk.bold(app)} under ${chalk.bold(contextName)} ${elapsed(
-      Date.now() - start
-    )}`
+    `${prod ? `Production deployments` : `Deployments`} for ${chalk.bold(
+      app
+    )} under ${chalk.bold(contextName)} ${elapsed(Date.now() - start)}`
  );

  // information to help the user find other deployments or instances
@@ -248,9 +292,8 @@ export default async function list(client: Client) {

  print('\n');

-  const headers = ['Age', 'Deployment', 'Status', 'Environment', 'Duration'];
+  const headers = ['Age', 'Deployment', 'Status', 'Duration'];
  if (showUsername) headers.push('Username');
-  const urls: string[] = [];

  client.output.print(
    `${table(
@@ -258,17 +301,18 @@ export default async function list(client: Client) {
        headers.map(header => chalk.bold(chalk.cyan(header))),
        ...deployments
          .sort(sortRecent())
-          .map(dep => {
-            urls.push(`https://${dep.url}`);
-            return [
+          .map(dep => [
+            [
              chalk.gray(ms(Date.now() - dep.createdAt)),
              `https://${dep.url}`,
              stateString(dep.state || ''),
-              dep.target === 'production' ? 'Production' : 'Preview',
              chalk.gray(getDeploymentDuration(dep)),
              showUsername ? chalk.gray(dep.creator?.username) : '',
-            ];
-          })
+            ],
+          ])
+          // flatten since the previous step returns a nested
+          // array of the deployment and (optionally) its instances
+          .flat()
          .filter(app =>
            // if an app wasn't supplied to filter by,
            // we only want to render one deployment per app
@@ -283,11 +327,6 @@ export default async function list(client: Client) {
    ).replace(/^/gm, '  ')}\n\n`
  );

-  if (!client.stdout.isTTY) {
-    client.stdout.write(urls.join('\n'));
-    client.stdout.write('\n');
-  }
-
  if (pagination && pagination.count === 20) {
    const flags = getCommandFlags(argv, ['_', '--next']);
    log(
--- a/packages/cli/src/commands/list/command.ts
+++ b/packages/cli/src/commands/list/command.ts
@@ -1,61 +0,0 @@
-import { Command } from '../help';
-import { getPkgName } from '../../util/pkg-name';
-
-export const listCommand: Command = {
-  name: 'list',
-  description: 'List app deployments for an app.',
-  arguments: [
-    {
-      name: 'app',
-      required: false,
-    },
-  ],
-  options: [
-    {
-      name: 'meta',
-      description:
-        'Filter deployments by metadata (e.g.: `-m KEY=value`). Can appear many times.',
-      argument: 'KEY=value',
-      shorthand: null,
-      type: 'string',
-      deprecated: false,
-      multi: true,
-    },
-    {
-      name: 'environment',
-      description: '',
-      argument: 'production|preview',
-      shorthand: null,
-      type: 'string',
-      deprecated: false,
-      multi: false,
-    },
-    {
-      name: 'next',
-      description: 'Show next page of results',
-      argument: 'MS',
-      shorthand: 'n',
-      type: 'string',
-      deprecated: false,
-      multi: false,
-    },
-  ],
-  examples: [
-    {
-      name: 'List all deployments for the currently linked project',
-      value: `${getPkgName()} list`,
-    },
-    {
-      name: 'List all deployments for the project `my-app` in the team of the currently linked project',
-      value: `${getPkgName()} list my-app`,
-    },
-    {
-      name: 'Filter deployments by metadata',
-      value: `${getPkgName()} list -m key1=value1 -m key2=value2`,
-    },
-    {
-      name: 'Paginate deployments for a project, where `1584722256178` is the time in milliseconds since the UNIX epoch',
-      value: `${getPkgName()} list my-app --next 1584722256178`,
-    },
-  ],
-};
--- a/packages/cli/src/commands/login/index.ts
+++ b/packages/cli/src/commands/login/index.ts
@@ -1,24 +1,55 @@
 import { validate as validateEmail } from 'email-validator';
 import chalk from 'chalk';
-import hp from '../../util/humanize-path';
-import getArgs from '../../util/get-args';
-import prompt from '../../util/login/prompt';
-import doSamlLogin from '../../util/login/saml';
-import doEmailLogin from '../../util/login/email';
-import doGithubLogin from '../../util/login/github';
-import doGitlabLogin from '../../util/login/gitlab';
-import doBitbucketLogin from '../../util/login/bitbucket';
-import { prependEmoji, emoji } from '../../util/emoji';
-import { getCommandName } from '../../util/pkg-name';
-import getGlobalPathConfig from '../../util/config/global-path';
-import {
-  writeToAuthConfigFile,
-  writeToConfigFile,
-} from '../../util/config/files';
-import Client from '../../util/client';
-import { LoginResult } from '../../util/login/types';
-import { help } from '../help';
-import { loginCommand } from './command';
+import hp from '../util/humanize-path';
+import getArgs from '../util/get-args';
+import logo from '../util/output/logo';
+import prompt from '../util/login/prompt';
+import doSamlLogin from '../util/login/saml';
+import doEmailLogin from '../util/login/email';
+import doGithubLogin from '../util/login/github';
+import doGitlabLogin from '../util/login/gitlab';
+import doBitbucketLogin from '../util/login/bitbucket';
+import { prependEmoji, emoji } from '../util/emoji';
+import { getCommandName, getPkgName } from '../util/pkg-name';
+import getGlobalPathConfig from '../util/config/global-path';
+import { writeToAuthConfigFile, writeToConfigFile } from '../util/config/files';
+import Client from '../util/client';
+import { LoginResult } from '../util/login/types';
+
+const help = () => {
+  console.log(`
+  ${chalk.bold(`${logo} ${getPkgName()} login`)} <email or team>
+
+  ${chalk.dim('Options:')}
+
+    -h, --help                     Output usage information
+    --no-color                     No color mode [off]
+    -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
+
+  ${chalk.dim('Examples:')}
+
+  ${chalk.gray('–')} Log into the Vercel platform
+
+    ${chalk.cyan(`$ ${getPkgName()} login`)}
+
+  ${chalk.gray('–')} Log in using a specific email address
+
+    ${chalk.cyan(`$ ${getPkgName()} login john@doe.com`)}
+
+  ${chalk.gray('–')} Log in using a specific team "slug" for SAML Single Sign-On
+
+    ${chalk.cyan(`$ ${getPkgName()} login acme`)}
+
+  ${chalk.gray('–')} Log in using GitHub in "out-of-band" mode
+
+    ${chalk.cyan(`$ ${getPkgName()} login --github --oob`)}
+`);
+};

 export default async function login(client: Client): Promise<number> {
  const { output } = client;
@@ -31,7 +62,7 @@ export default async function login(client: Client): Promise<number> {
  });

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

--- a/packages/cli/src/commands/login/command.ts
+++ b/packages/cli/src/commands/login/command.ts
@@ -1,49 +0,0 @@
-import { Command } from '../help';
-import { getPkgName } from '../../util/pkg-name';
-
-export const loginCommand: Command = {
-  name: 'login',
-  description: 'Authenticate using your email or team id.',
-  arguments: [
-    {
-      name: 'email or team id',
-      required: false,
-    },
-  ],
-  options: [
-    {
-      name: 'github',
-      description: 'Log in with GitHub',
-      shorthand: null,
-      type: 'string',
-      deprecated: false,
-      multi: false,
-    },
-    {
-      name: 'oob',
-      description: 'Log in with "out of band" authentication',
-      shorthand: null,
-      type: 'string',
-      deprecated: false,
-      multi: false,
-    },
-  ],
-  examples: [
-    {
-      name: 'Log into the Vercel platform',
-      value: `${getPkgName()} login`,
-    },
-    {
-      name: 'Log in using a specific email address',
-      value: `${getPkgName()} login username@example.com`,
-    },
-    {
-      name: 'Log in using a specific team "slug" for SAML Single Sign-On',
-      value: `${getPkgName()} login acme`,
-    },
-    {
-      name: 'Log in using GitHub in "out-of-band" mode',
-      value: `${getPkgName()} login --github --oob`,
-    },
-  ],
-};
--- a/packages/cli/src/commands/logout/index.ts
+++ b/packages/cli/src/commands/logout/index.ts
@@ -1,19 +1,37 @@
-import { handleError } from '../../util/error';
-import {
-  writeToConfigFile,
-  writeToAuthConfigFile,
-} from '../../util/config/files';
-import getArgs from '../../util/get-args';
-import Client from '../../util/client';
-import { getCommandName } from '../../util/pkg-name';
-import { isAPIError } from '../../util/errors-ts';
+import chalk from 'chalk';
+import logo from '../util/output/logo';
+import { handleError } from '../util/error';
+import { writeToConfigFile, writeToAuthConfigFile } from '../util/config/files';
+import getArgs from '../util/get-args';
+import Client from '../util/client';
+import { getCommandName, getPkgName } from '../util/pkg-name';
+import { isAPIError } from '../util/errors-ts';
 import { errorToString } from '@vercel/error-utils';
-import { help } from '../help';
-import { logoutCommand } from './command';
+
+const help = () => {
+  console.log(`
+  ${chalk.bold(`${logo} ${getPkgName()} logout`)}
+
+  ${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
+
+  ${chalk.dim('Examples:')}
+
+  ${chalk.gray('–')} Logout from the CLI:
+
+    ${chalk.cyan(`$ ${getPkgName()} logout`)}
+`);
+};

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

  try {
    argv = getArgs(client.argv.slice(2), {
@@ -26,10 +44,12 @@ export default async function main(client: Client): Promise<number> {
  }

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

+  const { authConfig, config, output } = client;
+
  if (!authConfig.token) {
    output.note(
      `Not currently logged in, so ${getCommandName('logout')} did nothing`
--- a/packages/cli/src/commands/logout/command.ts
+++ b/packages/cli/src/commands/logout/command.ts
@@ -1,15 +0,0 @@
-import { Command } from '../help';
-import { getPkgName } from '../../util/pkg-name';
-
-export const logoutCommand: Command = {
-  name: 'logout',
-  description: 'Logout the current authenticated user or team.',
-  arguments: [],
-  options: [],
-  examples: [
-    {
-      name: 'Logout from the CLI',
-      value: `${getPkgName()} logout`,
-    },
-  ],
-};
--- a/packages/cli/src/commands/logs/index.ts
+++ b/packages/cli/src/commands/logs/index.ts
@@ -1,15 +1,60 @@
 import chalk from 'chalk';
-import elapsed from '../../util/output/elapsed';
-import { maybeURL, normalizeURL } from '../../util/url';
-import printEvents, { DeploymentEvent } from '../../util/events';
-import getScope from '../../util/get-scope';
-import getArgs from '../../util/get-args';
-import Client from '../../util/client';
-import getDeployment from '../../util/get-deployment';
-import { help } from '../help';
-import { logsCommand } from './command';
+import logo from '../util/output/logo';
+import elapsed from '../util/output/elapsed';
+import { maybeURL, normalizeURL } from '../util/url';
+import printEvents, { DeploymentEvent } from '../util/events';
+import getScope from '../util/get-scope';
+import { getPkgName } from '../util/pkg-name';
+import getArgs from '../util/get-args';
+import Client from '../util/client';
+import getDeployment from '../util/get-deployment';

-export default async function logs(client: Client) {
+const help = () => {
+  console.log(`
+  ${chalk.bold(`${logo} ${getPkgName()} logs`)} <url|deploymentId>
+
+  ${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]
+    --no-color                     No color mode [off]
+    -f, --follow                   Wait for additional data [off]
+    -n ${chalk.bold.underline(
+      'NUMBER'
+    )}                      Number of logs [100]
+    -t ${chalk.bold.underline('TOKEN')}, --token=${chalk.bold.underline(
+    'TOKEN'
+  )}        Login token
+    --since=${chalk.bold.underline(
+      'SINCE'
+    )}                  Only return logs after date (ISO 8601)
+    --until=${chalk.bold.underline(
+      'UNTIL'
+    )}                  Only return logs before date (ISO 8601), ignored for ${'`-f`'}
+    -S, --scope                    Set a custom scope
+    -o ${chalk.bold.underline('MODE')}, --output=${chalk.bold.underline(
+    'MODE'
+  )}         Specify the output format (${Object.keys(logPrinters).join(
+    '|'
+  )}) [short]
+
+  ${chalk.dim('Examples:')}
+
+  ${chalk.gray('–')} Print the logs for the deployment ${chalk.dim(
+    '`deploymentId`'
+  )}
+
+    ${chalk.cyan(`$ ${getPkgName()} logs deploymentId`)}
+`);
+};
+
+export default async function main(client: Client) {
  let head;
  let limit;
  let follow;
@@ -31,13 +76,14 @@ export default async function logs(client: Client) {

  argv._ = argv._.slice(1);
  deploymentIdOrURL = argv._[0];
-  const { output } = client;

  if (argv['--help'] || !deploymentIdOrURL || deploymentIdOrURL === 'help') {
-    output.print(help(logsCommand, { columns: client.stderr.columns }));
+    help();
    return 2;
  }

+  const { output } = client;
+
  try {
    since = argv['--since'] ? toTimestamp(argv['--since']) : 0;
  } catch (err) {
--- a/packages/cli/src/commands/logs/command.ts
+++ b/packages/cli/src/commands/logs/command.ts
@@ -1,66 +0,0 @@
-import { Command } from '../help';
-import { getPkgName } from '../../util/pkg-name';
-
-export const logsCommand: Command = {
-  name: 'logs',
-  description: 'Display logs for a specific deployment.',
-  arguments: [
-    {
-      name: 'url|deploymentId',
-      required: true,
-    },
-  ],
-  options: [
-    {
-      name: 'follow',
-      shorthand: 'f',
-      description: 'Wait for additional data [off]',
-      type: 'string',
-      deprecated: false,
-      multi: false,
-    },
-    {
-      name: 'limit',
-      shorthand: 'n',
-      description: 'Number of log entries [100]',
-      argument: 'NUMBER',
-      type: 'string',
-      deprecated: false,
-      multi: false,
-    },
-    {
-      name: 'since',
-      shorthand: null,
-      description: 'Only return logs after date (ISO 8601)',
-      argument: 'SINCE',
-      type: 'string',
-      deprecated: false,
-      multi: false,
-    },
-    {
-      name: 'until',
-      shorthand: null,
-      description:
-        'Only return logs before date (ISO 8601), ignored when used with --follow',
-      argument: 'UNTIL',
-      type: 'string',
-      deprecated: false,
-      multi: false,
-    },
-    {
-      name: 'output',
-      shorthand: 'o',
-      description: `Specify the output format (short|raw) [short]`,
-      argument: 'MODE',
-      type: 'string',
-      deprecated: false,
-      multi: false,
-    },
-  ],
-  examples: [
-    {
-      name: 'Print the logs for the deployment DEPLOYMENT_ID',
-      value: `${getPkgName()} logs DEPLOYMENT_ID`,
-    },
-  ],
-};
--- a/packages/cli/src/commands/project/rm.ts
+++ b/packages/cli/src/commands/project/rm.ts
@@ -38,10 +38,6 @@ export default async function rm(client: Client, args: string[]) {
      client.output.error('No such project exists');
      return 1;
    }
-    if (isAPIError(err) && err.status === 403) {
-      client.output.error(err.message);
-      return 1;
-    }
  }
  const elapsed = ms(Date.now() - start);
  client.output.log(
--- a/packages/cli/src/commands/pull/index.ts
+++ b/packages/cli/src/commands/pull/index.ts
@@ -1,26 +1,65 @@
 import chalk from 'chalk';
 import { join } from 'path';
-import Client from '../../util/client';
+import Client from '../util/client';
 import type {
  Project,
  ProjectEnvTarget,
  ProjectLinked,
 } from '@vercel-internals/types';
-import { emoji, prependEmoji } from '../../util/emoji';
-import getArgs from '../../util/get-args';
-import stamp from '../../util/output/stamp';
-import { VERCEL_DIR, VERCEL_DIR_PROJECT } from '../../util/projects/link';
-import { writeProjectSettings } from '../../util/projects/project-settings';
-import envPull from '../env/pull';
+import { emoji, prependEmoji } from '../util/emoji';
+import getArgs from '../util/get-args';
+import logo from '../util/output/logo';
+import stamp from '../util/output/stamp';
+import { getPkgName } from '../util/pkg-name';
+import { VERCEL_DIR, VERCEL_DIR_PROJECT } from '../util/projects/link';
+import { writeProjectSettings } from '../util/projects/project-settings';
+import envPull from './env/pull';
 import {
  isValidEnvTarget,
  getEnvTargetPlaceholder,
-} from '../../util/env/env-target';
-import { ensureLink } from '../../util/link/ensure-link';
-import humanizePath from '../../util/humanize-path';
+} from '../util/env/env-target';
+import { ensureLink } from '../util/link/ensure-link';
+import humanizePath from '../util/humanize-path';

-import { help } from '../help';
-import { pullCommand } from './command';
+const help = () => {
+  return console.log(`
+  ${chalk.bold(`${logo} ${getPkgName()} pull`)} [project-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]
+    --no-color                     No color mode [off]
+    --environment [environment]    Deployment environment [development]
+    -y, --yes                      Skip questions when setting up new project using default scope and settings
+
+  ${chalk.dim('Examples:')}
+
+  ${chalk.gray(
+    '–'
+  )} Pull the latest Environment Variables and Project Settings from the cloud
+    and stores them in \`.vercel/.env.\${target}.local\` and \`.vercel/project.json\` respectively.
+
+    ${chalk.cyan(`$ ${getPkgName()} pull`)}
+    ${chalk.cyan(`$ ${getPkgName()} pull ./path-to-project`)}
+
+  ${chalk.gray('–')} Pull for a specific environment
+
+    ${chalk.cyan(
+      `$ ${getPkgName()} pull --environment=${getEnvTargetPlaceholder()}`
+    )}
+
+  ${chalk.gray(
+    'If you want to download environment variables to a specific file, use `vercel env pull` instead.'
+  )}
+`);
+};

 function processArgs(client: Client) {
  return getArgs(client.argv.slice(2), {
@@ -37,7 +76,7 @@ function parseArgs(client: Client) {
  const argv = processArgs(client);

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

--- a/packages/cli/src/commands/pull/command.ts
+++ b/packages/cli/src/commands/pull/command.ts
@@ -1,53 +0,0 @@
-import { Command } from '../help';
-import { getPkgName } from '../../util/pkg-name';
-import { getEnvTargetPlaceholder } from '../../util/env/env-target';
-
-export const pullCommand: Command = {
-  name: 'pull',
-  description:
-    'Pull latest environment variables and project settings from Vercel. ',
-  arguments: [
-    {
-      name: 'project-path',
-      required: false,
-    },
-  ],
-  options: [
-    {
-      name: 'environment',
-      description: 'Deployment environment [development]',
-      argument: 'environment',
-      shorthand: null,
-      type: 'string',
-      deprecated: false,
-      multi: false,
-    },
-    {
-      name: 'yes',
-      description:
-        'Skip questions when setting up new project using default scope and settings',
-      shorthand: 'y',
-      type: 'string',
-      deprecated: false,
-      multi: false,
-    },
-  ],
-  examples: [
-    {
-      name: 'Pull the latest Environment Variables and Project Settings from the cloud',
-      value: `${getPkgName()} pull`,
-    },
-    {
-      name: 'Pull the latest Environment Variables and Project Settings from the cloud targeting a directory',
-      value: `${getPkgName()} pull ./path-to-project`,
-    },
-    {
-      name: 'Pull for a specific environment',
-      value: `${getPkgName()} pull --environment=${getEnvTargetPlaceholder()}`,
-    },
-    {
-      name: 'If you want to download environment variables to a specific file, use `vercel env pull` instead',
-      value: `${getPkgName()} env pull`,
-    },
-  ],
-};
--- a/packages/cli/src/commands/redeploy/index.ts
+++ b/packages/cli/src/commands/redeploy/index.ts
@@ -1,29 +1,66 @@
 import chalk from 'chalk';
 import { checkDeploymentStatus } from '@vercel/client';
-import type Client from '../../util/client';
-import { emoji, prependEmoji } from '../../util/emoji';
-import getArgs from '../../util/get-args';
-import { getCommandName } from '../../util/pkg-name';
-import { getDeploymentByIdOrURL } from '../../util/deploy/get-deployment-by-id-or-url';
-import getScope from '../../util/get-scope';
-import handleError from '../../util/handle-error';
+import type Client from '../util/client';
+import { emoji, prependEmoji } from '../util/emoji';
+import getArgs from '../util/get-args';
+import { getCommandName, getPkgName } from '../util/pkg-name';
+import { getDeploymentByIdOrURL } from '../util/deploy/get-deployment-by-id-or-url';
+import getScope from '../util/get-scope';
+import handleError from '../util/handle-error';
 import { isErrnoException } from '@vercel/error-utils';
-import Now from '../../util';
-import { printDeploymentStatus } from '../../util/deploy/print-deployment-status';
-import stamp from '../../util/output/stamp';
-import ua from '../../util/ua';
+import logo from '../util/output/logo';
+import Now from '../util';
+import { printDeploymentStatus } from '../util/deploy/print-deployment-status';
+import stamp from '../util/output/stamp';
+import ua from '../util/ua';
 import type { VercelClientOptions } from '@vercel/client';
-import { help } from '../help';
-import { redeployCommand } from './command';
+
+const help = () => {
+  console.log(`
+  ${chalk.bold(
+    `${logo} ${getPkgName()} redeploy`
+  )} [deploymentId|deploymentName]
+
+  Rebuild and deploy a previous deployment.
+
+  ${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]
+    --no-color                     No color mode [off]
+    --no-wait                      Don't wait for the redeploy to finish
+    -t ${chalk.bold.underline('TOKEN')}, --token=${chalk.bold.underline(
+    'TOKEN'
+  )}        Login token
+    -y, --yes                      Skip questions when setting up new project using default scope and settings
+
+  ${chalk.dim('Examples:')}
+
+  ${chalk.gray('–')} Rebuild and deploy an existing deployment using id or url
+
+    ${chalk.cyan(`$ ${getPkgName()} redeploy my-deployment.vercel.app`)}
+
+  ${chalk.gray('–')} Write Deployment URL to a file
+
+    ${chalk.cyan(
+      `$ ${getPkgName()} redeploy my-deployment.vercel.app > deployment-url.txt`
+    )}
+`);
+};

 /**
 * `vc redeploy` command
 * @param {Client} client
 * @returns {Promise<number>} Resolves an exit code; 0 on success
 */
-export default async function redeploy(client: Client): Promise<number> {
+export default async (client: Client): Promise<number> => {
  let argv;
-  const { output } = client;
  try {
    argv = getArgs(client.argv.slice(2), {
      '--no-wait': Boolean,
@@ -36,10 +73,11 @@ export default async function redeploy(client: Client): Promise<number> {
  }

  if (argv['--help'] || argv._[0] === 'help') {
-    output.print(help(redeployCommand, { columns: client.stderr.columns }));
+    help();
    return 2;
  }

+  const { output } = client;
  const deployIdOrUrl = argv._[1];
  if (!deployIdOrUrl) {
    output.error(
@@ -70,7 +108,7 @@ export default async function redeploy(client: Client): Promise<number> {
          action: 'redeploy',
        },
        name: fromDeployment.name,
-        target: fromDeployment.target ?? undefined,
+        target: fromDeployment.target || 'production',
      },
      method: 'POST',
    });
@@ -163,4 +201,4 @@ export default async function redeploy(client: Client): Promise<number> {
    }
    return 1;
  }
-}
+};
--- a/packages/cli/src/commands/redeploy/command.ts
+++ b/packages/cli/src/commands/redeploy/command.ts
@@ -1,33 +0,0 @@
-import { Command } from '../help';
-import { getPkgName } from '../../util/pkg-name';
-
-export const redeployCommand: Command = {
-  name: 'redeploy',
-  description: 'Rebuild and deploy a previous deployment.',
-  arguments: [
-    {
-      name: 'deploymentId|deploymentName',
-      required: false,
-    },
-  ],
-  options: [
-    {
-      name: 'no-wait',
-      shorthand: null,
-      description: "Don't wait for the redeploy to finish",
-      type: 'boolean',
-      deprecated: false,
-      multi: false,
-    },
-  ],
-  examples: [
-    {
-      name: 'Rebuild and deploy an existing deployment using id or url',
-      value: `${getPkgName()} redeploy my-deployment.vercel.app`,
-    },
-    {
-      name: 'Write Deployment URL to a file',
-      value: `${getPkgName()} redeploy my-deployment.vercel.app > deployment-url.txt`,
-    },
-  ],
-};
--- a/packages/cli/src/commands/remove/index.ts
+++ b/packages/cli/src/commands/remove/index.ts
@@ -2,31 +2,74 @@ import chalk from 'chalk';
 import ms from 'ms';
 import plural from 'pluralize';
 import table from 'text-table';
-import Now from '../../util';
-import getAliases from '../../util/alias/get-aliases';
-import elapsed from '../../util/output/elapsed';
-import { normalizeURL } from '../../util/url';
-import getScope from '../../util/get-scope';
-import { isValidName } from '../../util/is-valid-name';
-import removeProject from '../../util/projects/remove-project';
-import getProjectByIdOrName from '../../util/projects/get-project-by-id-or-name';
-import getDeployment from '../../util/get-deployment';
-import getDeploymentsByProjectId from '../../util/deploy/get-deployments-by-project-id';
-import { getCommandName } from '../../util/pkg-name';
-import getArgs from '../../util/get-args';
-import handleError from '../../util/handle-error';
-import type Client from '../../util/client';
-import { Output } from '../../util/output';
+import Now from '../util';
+import getAliases from '../util/alias/get-aliases';
+import logo from '../util/output/logo';
+import elapsed from '../util/output/elapsed';
+import { normalizeURL } from '../util/url';
+import getScope from '../util/get-scope';
+import { isValidName } from '../util/is-valid-name';
+import removeProject from '../util/projects/remove-project';
+import getProjectByIdOrName from '../util/projects/get-project-by-id-or-name';
+import getDeployment from '../util/get-deployment';
+import getDeploymentsByProjectId from '../util/deploy/get-deployments-by-project-id';
+import { getPkgName, getCommandName } from '../util/pkg-name';
+import getArgs from '../util/get-args';
+import handleError from '../util/handle-error';
+import type Client from '../util/client';
+import { Output } from '../util/output';
 import { Alias, Deployment, Project } from '@vercel-internals/types';
-import { NowError } from '../../util/now-error';
-import { help } from '../help';
-import { removeCommand } from './command';
+import { NowError } from '../util/now-error';

 type DeploymentWithAliases = Deployment & {
  aliases: Alias[];
 };

-export default async function remove(client: Client) {
+const help = () => {
+  console.log(`
+  ${chalk.bold(
+    `${logo} ${getPkgName()} remove`
+  )} [...deploymentId|deploymentName]
+
+  ${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]
+    --no-color                     No color mode [off]
+    -t ${chalk.bold.underline('TOKEN')}, --token=${chalk.bold.underline(
+    'TOKEN'
+  )}        Login token
+    -y, --yes                      Skip confirmation
+    -s, --safe                     Skip deployments with an active alias
+    -S, --scope                    Set a custom scope
+
+  ${chalk.dim('Examples:')}
+
+  ${chalk.gray('–')} Remove a deployment identified by ${chalk.dim(
+    '`deploymentId`'
+  )}
+
+    ${chalk.cyan(`$ ${getPkgName()} rm deploymentId`)}
+
+  ${chalk.gray('–')} Remove all deployments with name ${chalk.dim('`my-app`')}
+
+    ${chalk.cyan(`$ ${getPkgName()} rm my-app`)}
+
+  ${chalk.gray('–')} Remove two deployments with IDs ${chalk.dim(
+    '`eyWt6zuSdeus`'
+  )} and ${chalk.dim('`uWHoA9RQ1d1o`')}
+
+    ${chalk.cyan(`$ ${getPkgName()} rm eyWt6zuSdeus uWHoA9RQ1d1o`)}
+`);
+};
+
+export default async function main(client: Client) {
  let argv;

  try {
@@ -55,13 +98,13 @@ export default async function remove(client: Client) {
  const { success, error, log } = output;

  if (argv['--help'] || ids[0] === 'help') {
-    output.print(help(removeCommand, { columns: client.stderr.columns }));
+    help();
    return 2;
  }

  if (ids.length < 1) {
    error(`${getCommandName('rm')} expects at least one argument`);
-    output.print(help(removeCommand, { columns: client.stderr.columns }));
+    help();
    return 1;
  }

--- a/packages/cli/src/commands/remove/command.ts
+++ b/packages/cli/src/commands/remove/command.ts
@@ -1,45 +0,0 @@
-import { Command } from '../help';
-import { getPkgName } from '../../util/pkg-name';
-
-export const removeCommand: Command = {
-  name: 'remove',
-  description: 'Remove a deployment by name or id.',
-  arguments: [
-    {
-      name: '...deploymentId|deploymentName',
-      required: true,
-    },
-  ],
-  options: [
-    {
-      name: 'yes',
-      shorthand: 'y',
-      type: 'boolean',
-      deprecated: false,
-      description: 'Skip confirmation',
-      multi: false,
-    },
-    {
-      name: 'safe',
-      shorthand: 's',
-      type: 'boolean',
-      deprecated: false,
-      description: 'Skip deployments with an active alias',
-      multi: false,
-    },
-  ],
-  examples: [
-    {
-      name: 'Remove a deployment identified by `deploymentId`',
-      value: `${getPkgName()} remove my-app`,
-    },
-    {
-      name: 'Remove all deployments with name `my-app`',
-      value: `${getPkgName()} remove deploymentId`,
-    },
-    {
-      name: 'Remove two deployments with IDs `eyWt6zuSdeus` and `uWHoA9RQ1d1o`',
-      value: `${getPkgName()} remove eyWt6zuSdeus uWHoA9RQ1d1o`,
-    },
-  ],
-};
--- a/packages/cli/src/commands/whoami.ts
+++ b/packages/cli/src/commands/whoami.ts
@@ -0,0 +1,56 @@
+import chalk from 'chalk';
+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 Client from '../util/client';
+
+const help = () => {
+  console.log(`
+  ${chalk.bold(`${logo} ${getPkgName()} whoami`)}
+
+  ${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]
+    --no-color                     No color mode [off]
+    -t ${chalk.bold.underline('TOKEN')}, --token=${chalk.bold.underline(
+    'TOKEN'
+  )}        Login token
+
+  ${chalk.dim('Examples:')}
+
+  ${chalk.gray('–')} Shows the username of the currently logged in user
+
+    ${chalk.cyan(`$ ${getPkgName()} whoami`)}
+`);
+};
+
+export default async (client: Client): Promise<number> => {
+  const { output } = client;
+  const argv = getArgs(client.argv.slice(2), {});
+  argv._ = argv._.slice(1);
+
+  if (argv['--help'] || argv._[0] === 'help') {
+    help();
+    return 2;
+  }
+
+  const { contextName } = await getScope(client, { getTeam: false });
+
+  if (client.stdout.isTTY) {
+    output.log(contextName);
+  } else {
+    // If stdout is not a TTY, then only print the username
+    // to support piping the output to another file / exe
+    client.stdout.write(`${contextName}\n`);
+  }
+
+  return 0;
+};
--- a/packages/cli/src/commands/whoami/command.ts
+++ b/packages/cli/src/commands/whoami/command.ts
@@ -1,15 +0,0 @@
-import { Command } from '../help';
-import { getPkgName } from '../../util/pkg-name';
-
-export const whoamiCommand: Command = {
-  name: 'whoami',
-  description: 'Shows the username of the currently logged in user.',
-  arguments: [],
-  options: [],
-  examples: [
-    {
-      name: 'Shows the username of the currently logged in user',
-      value: `${getPkgName()} whoami`,
-    },
-  ],
-};
--- a/packages/cli/src/commands/whoami/index.ts
+++ b/packages/cli/src/commands/whoami/index.ts
@@ -1,29 +0,0 @@
-import { help } from '../help';
-import { whoamiCommand } from './command';
-
-import getScope from '../../util/get-scope';
-import getArgs from '../../util/get-args';
-import Client from '../../util/client';
-
-export default async function whoami(client: Client): Promise<number> {
-  const { output } = client;
-  const argv = getArgs(client.argv.slice(2), {});
-  argv._ = argv._.slice(1);
-
-  if (argv['--help'] || argv._[0] === 'help') {
-    output.print(help(whoamiCommand, { columns: client.stderr.columns }));
-    return 2;
-  }
-
-  const { contextName } = await getScope(client, { getTeam: false });
-
-  if (client.stdout.isTTY) {
-    output.log(contextName);
-  } else {
-    // If stdout is not a TTY, then only print the username
-    // to support piping the output to another file / exe
-    client.stdout.write(`${contextName}\n`);
-  }
-
-  return 0;
-}
--- a/packages/cli/src/util/client.ts
+++ b/packages/cli/src/util/client.ts
@@ -146,8 +146,7 @@ export default class Client extends EventEmitter implements Stdio {
      if (!res.ok) {
        const error = await responseError(res);

-        // we should force reauth only if error has a teamId
-        if (isSAMLError(error) && error.teamId) {
+        if (isSAMLError(error)) {
          try {
            // A SAML error means the token is expired, or is not
            // designated for the requested team, so the user needs
--- a/packages/cli/src/util/deploy/process-deployment.ts
+++ b/packages/cli/src/util/deploy/process-deployment.ts
@@ -234,10 +234,6 @@ export default async function processDeployment({
          return error;
        }

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

--- a/packages/cli/src/util/dev/server.ts
+++ b/packages/cli/src/util/dev/server.ts
@@ -32,7 +32,7 @@ import {
  Builder,
  cloneEnv,
  Env,
-  getNodeBinPaths,
+  getNodeBinPath,
  StartDevServerResult,
  FileFsRef,
  PackageJson,
@@ -124,7 +124,6 @@ function sortBuilders(buildA: Builder, buildB: Builder) {

 export default class DevServer {
  public cwd: string;
-  public repoRoot: string;
  public output: Output;
  public proxy: httpProxy;
  public envConfigs: EnvConfigs;
@@ -170,7 +169,6 @@ export default class DevServer {

  constructor(cwd: string, options: DevServerOptions) {
    this.cwd = cwd;
-    this.repoRoot = options.repoRoot ?? cwd;
    this.output = options.output;
    this.envConfigs = { buildEnv: {}, runEnv: {}, allEnv: {} };
    this.envValues = options.envValues || {};
@@ -1414,7 +1412,7 @@ export default class DevServer {
            files,
            entrypoint: middleware.entrypoint,
            workPath,
-            repoRootPath: this.repoRoot,
+            repoRootPath: this.cwd,
            config: middleware.config || {},
            meta: {
              isDev: true,
@@ -1851,7 +1849,7 @@ export default class DevServer {
          entrypoint: match.entrypoint,
          workPath,
          config: match.config || {},
-          repoRootPath: this.repoRoot,
+          repoRootPath: this.cwd,
          meta: {
            isDev: true,
            requestPath,
@@ -2239,8 +2237,7 @@ export default class DevServer {
    );

    // add the node_modules/.bin directory to the PATH
-    const nodeBinPaths = getNodeBinPaths({ base: this.repoRoot, start: cwd });
-    const nodeBinPath = nodeBinPaths.join(path.delimiter);
+    const nodeBinPath = await getNodeBinPath({ cwd });
    env.PATH = `${nodeBinPath}${path.delimiter}${env.PATH}`;

    // This is necesary so that the dev command in the Project
--- a/packages/cli/src/util/dev/types.ts
+++ b/packages/cli/src/util/dev/types.ts
@@ -25,7 +25,6 @@ export interface DevServerOptions {
  output: Output;
  projectSettings?: ProjectSettings;
  envValues?: Record<string, string>;
-  repoRoot?: string;
 }

 export interface EnvConfigs {
--- a/packages/cli/src/util/git/repo-info-to-url.ts
+++ b/packages/cli/src/util/git/repo-info-to-url.ts
@@ -1,5 +0,0 @@
-import type { RepoInfo } from './connect-git-provider';
-
-export function repoInfoToUrl(info: RepoInfo): string {
-  return `https://${info.provider}.com/${info.org}/${info.repo}`;
-}
--- a/packages/cli/src/util/index.ts
+++ b/packages/cli/src/util/index.ts
@@ -61,7 +61,6 @@ export interface ListOptions {
  version?: number;
  meta?: Dictionary<string>;
  nextTimestamp?: number;
-  target?: string;
 }

 export default class Now extends EventEmitter {
@@ -340,7 +339,7 @@ export default class Now extends EventEmitter {

  async list(
    app?: string,
-    { version = 4, meta = {}, nextTimestamp, target }: ListOptions = {},
+    { version = 4, meta = {}, nextTimestamp }: ListOptions = {},
    prod?: boolean
  ) {
    const fetchRetry = async (url: string, options: FetchOptions = {}) => {
@@ -406,8 +405,6 @@ export default class Now extends EventEmitter {
    }
    if (prod) {
      query.set('target', 'production');
-    } else if (target) {
-      query.set('target', target);
    }

    const response = await fetchRetry(`/v${version}/now/deployments?${query}`);
--- a/packages/cli/src/util/link/repo.ts
+++ b/packages/cli/src/util/link/repo.ts
@@ -1,9 +1,7 @@
 import chalk from 'chalk';
-import inquirer from 'inquirer';
 import pluralize from 'pluralize';
 import { homedir } from 'os';
-import slugify from '@sindresorhus/slugify';
-import { basename, join, normalize } from 'path';
+import { join, normalize } from 'path';
 import { normalizePath, traverseUpDirectories } from '@vercel/build-utils';
 import { lstat, readJSON, outputJSON } from 'fs-extra';
 import confirm from '../input/confirm';
@@ -15,12 +13,7 @@ import { emoji, prependEmoji } from '../emoji';
 import selectOrg from '../input/select-org';
 import { addToGitIgnore } from './add-to-gitignore';
 import type Client from '../client';
-import type { Framework } from '@vercel/frameworks';
 import type { Project } from '@vercel-internals/types';
-import createProject from '../projects/create-project';
-import { detectProjects } from '../projects/detect-projects';
-import { repoInfoToUrl } from '../git/repo-info-to-url';
-import { connectGitProvider, parseRepoUrl } from '../git/connect-git-provider';

 const home = homedir();

@@ -42,11 +35,6 @@ export interface RepoLink {
  repoConfig?: RepoProjectsConfig;
 }

-export interface EnsureRepoLinkOptions {
-  yes: boolean;
-  overwrite: boolean;
-}
-
 /**
 * Given a directory path `cwd`, finds the root of the Git repository
 * and returns the parsed `.vercel/repo.json` file if the repository
@@ -74,7 +62,7 @@ export async function getRepoLink(
 export async function ensureRepoLink(
  client: Client,
  cwd: string,
-  { yes, overwrite }: EnsureRepoLinkOptions
+  yes = false
 ): Promise<RepoLink | undefined> {
  const { output } = client;

@@ -86,14 +74,7 @@ export async function ensureRepoLink(
  }
  let { rootPath, repoConfig, repoConfigPath } = repoLink;

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

    if (projects.length === 0) {
      output.log(
-        `No Projects are linked to ${repoUrlLink} under ${chalk.bold(
+        `No Projects are linked to ${link(repoUrl)} under ${chalk.bold(
          org.slug
        )}.`
      );
-    } else {
-      output.log(
-        `Found ${pluralize(
-          'Project',
-          projects.length,
-          true
-        )} linked to ${repoUrlLink} under ${chalk.bold(org.slug)}`
-      );
+      // TODO: run detection logic to find potential projects.
+      // then prompt user to select valid projects.
+      // then create new Projects
    }

-    // For any projects that already exists on Vercel, remove them from the
-    // locally detected directories. Any remaining ones will be prompted to
-    // create new Projects for.
-    for (const project of projects) {
-      detectedProjects.delete(project.rootDirectory ?? '');
-    }
-
-    const detectedProjectsCount = Array.from(detectedProjects.values()).reduce(
-      (o, f) => o + f.length,
-      0
-    );
-    if (detectedProjectsCount > 0) {
-      output.log(
-        `Detected ${pluralize(
-          'new Project',
-          detectedProjectsCount,
-          true
-        )} that may be created.`
-      );
-    }
-
-    const addSeparators = projects.length > 0 && detectedProjectsCount > 0;
-    const { selected } = await client.prompt({
-      type: 'checkbox',
-      name: 'selected',
-      message: `Which Projects should be ${
-        projects.length ? 'linked to' : 'created'
-      }?`,
-      choices: [
-        ...(addSeparators
-          ? [new inquirer.Separator('----- Existing Projects -----')]
-          : []),
-        ...projects.map(project => {
-          return {
-            name: `${org.slug}/${project.name}`,
-            value: project,
-            checked: true,
-          };
-        }),
-        ...(addSeparators
-          ? [new inquirer.Separator('----- New Projects to be created -----')]
-          : []),
-        ...Array.from(detectedProjects.entries()).flatMap(
-          ([rootDirectory, frameworks]) =>
-            frameworks.map((framework, i) => {
-              const name = slugify(
-                [
-                  basename(rootPath),
-                  basename(rootDirectory),
-                  i > 0 ? framework.slug : '',
-                ]
-                  .filter(Boolean)
-                  .join('-')
-              );
-              return {
-                name: `${org.slug}/${name} (${framework.name})`,
-                value: {
-                  newProject: true,
-                  rootDirectory,
-                  name,
-                  framework,
-                },
-                // Checked by default when there are no other existing Projects
-                checked: projects.length === 0,
-              };
-            })
-        ),
-      ],
-    });
-
-    if (selected.length === 0) {
-      output.print(`No Projects were selected. Repository not linked.\n`);
-      return;
-    }
-
-    for (let i = 0; i < selected.length; i++) {
-      const selection = selected[i];
-      if (!selection.newProject) continue;
-      const orgAndName = `${org.slug}/${selection.name}`;
-      output.spinner(`Creating new Project: ${orgAndName}`);
-      delete selection.newProject;
-      if (!selection.rootDirectory) delete selection.rootDirectory;
-      selected[i] = await createProject(client, {
-        ...selection,
-        framework: selection.framework.slug,
-      });
-      await connectGitProvider(
+    shouldLink =
+      yes ||
+      (await confirm(
        client,
-        org,
-        selected[i].id,
-        parsedRepoUrl.provider,
-        `${parsedRepoUrl.org}/${parsedRepoUrl.repo}`
-      );
-      output.log(
-        `Created new Project: ${output.link(
-          orgAndName,
-          `https://vercel.com/${orgAndName}`,
-          { fallback: false }
-        )}`
-      );
+        `Link to ${
+          projects.length === 1
+            ? 'this Project'
+            : `these ${chalk.bold(projects.length)} Projects`
+        }?`,
+        true
+      ));
+
+    if (!shouldLink) {
+      output.print(`Canceled. Repository not linked.\n`);
+      return;
    }

    repoConfig = {
      orgId: org.id,
      remoteName,
-      projects: selected.map((project: Project) => {
+      projects: projects.map(project => {
        return {
          id: project.id,
          name: project.name,
@@ -303,11 +199,9 @@ export async function ensureRepoLink(

    output.print(
      prependEmoji(
-        `Linked to ${pluralize(
-          'Project',
-          selected.length,
-          true
-        )} under ${chalk.bold(org.slug)} (created ${VERCEL_DIR}${
+        `Linked to ${link(repoUrl)} under ${chalk.bold(
+          org.slug
+        )} (created ${VERCEL_DIR}${
          isGitIgnoreUpdated ? ' and added it to .gitignore' : ''
        })`,
        emoji('link')
--- a/packages/cli/src/util/projects/detect-projects.ts
+++ b/packages/cli/src/util/projects/detect-projects.ts
@@ -1,38 +0,0 @@
-import { join } from 'path';
-import frameworkList, { Framework } from '@vercel/frameworks';
-import {
-  detectFrameworks,
-  getWorkspacePackagePaths,
-  getWorkspaces,
-  LocalFileSystemDetector,
-} from '@vercel/fs-detectors';
-
-export async function detectProjects(cwd: string) {
-  const fs = new LocalFileSystemDetector(cwd);
-  const workspaces = await getWorkspaces({ fs });
-  const detectedProjects = new Map<string, Framework[]>();
-  const packagePaths = (
-    await Promise.all(
-      workspaces.map(workspace =>
-        getWorkspacePackagePaths({
-          fs,
-          workspace,
-        })
-      )
-    )
-  ).flat();
-  if (packagePaths.length === 0) {
-    packagePaths.push('/');
-  }
-  await Promise.all(
-    packagePaths.map(async p => {
-      const frameworks = await detectFrameworks({
-        fs: fs.chdir(join('.', p)),
-        frameworkList,
-      });
-      if (frameworks.length === 0) return;
-      detectedProjects.set(p.slice(1), frameworks);
-    })
-  );
-  return detectedProjects;
-}
--- a/packages/cli/test/dev/fixtures/43-compress-encoding/api/index.js
+++ b/packages/cli/test/dev/fixtures/43-compress-encoding/api/index.js
@@ -1,9 +0,0 @@
-const { createGzip } = require('zlib');
-
-module.exports = (_req, resp) => {
-  resp.setHeader('content-encoding', 'gzip');
-
-  const gzip = createGzip();
-  gzip.pipe(resp);
-  gzip.end('Hello World!');
-};
--- a/packages/cli/test/dev/integration-4.test.ts
+++ b/packages/cli/test/dev/integration-4.test.ts
@@ -143,13 +143,6 @@ test(
  })
 );

-test(
-  '[vercel dev] 43-compress-encoding',
-  testFixtureStdio('43-compress-encoding', async (testPath: any) => {
-    await testPath(200, '/api', 'Hello World!');
-  })
-);
-
 test(
  '[vercel dev] Middleware that returns a 200 response',
  testFixtureStdio('middleware-response', async (testPath: any) => {
--- a/packages/cli/test/fixtures/unit/commands/build/storybook-with-middleware/.vercel/project.json
+++ b/packages/cli/test/fixtures/unit/commands/build/storybook-with-middleware/.vercel/project.json
@@ -2,6 +2,8 @@
  "orgId": ".",
  "projectId": ".",
  "settings": {
-    "framework": "storybook"
+    "framework": "storybook",
+    "buildCommand": "npm run build-storybook",
+    "outputDirectory": "storybook-static"
  }
 }
--- a/packages/cli/test/unit/commands/snapshots/help.test.ts.snap
+++ b/packages/cli/test/unit/commands/snapshots/help.test.ts.snap
@@ -1,164 +1,106 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP

 exports[`help command help output snapshots column width 40 1`] = `
-"
-  ▲ [1mvercel[22m [1mdeploy[22m [project-path] [options]
+"▲ [1mvercel[22m [1mdeploy[22m [project-path] [options]

-  Deploy your project to Vercel. The \`deploy\` command is the default command for the Vercel CLI, and can be omitted (\`vc deploy my-app\` equals \`vc my-app\`).
+Deploy your project to Vercel. The \`deploy\` command is the default command for the Vercel CLI, and can be omitted (\`vc deploy my-app\` equals \`vc my-app\`).

-  [2mOptions[22m:
+[2mOptions:[22m

-      --archive                    
-                                   Compress
-                                   the
-                                   deployment
-                                   code
-                                   into
-                                   a
-                                   file
-                                   before
-                                   uploading
-                                   it
-      -b, --build-env <key=value>  
-                                   Specify
-                                   environment
-                                   variables
-                                   during
-                                   build-time
-                                   (e.g.
-                                   \`-b
-                                   KEY1=value1
-                                   -b
-                                   KEY2=value2\`)
-      -e, --env <key=value>        
-                                   Specify
-                                   environment
-                                   variables
-                                   during
-                                   run-time
-                                   (e.g.
-                                   \`-e
-                                   KEY1=value1
-                                   -e
-                                   KEY2=value2\`)
-      -f, --force                  
-                                   Force
-                                   a new
-                                   deployment
-                                   even
-                                   if
-                                   nothing
-                                   has
-                                   changed
-      -m, --meta <key=value>       
-                                   Specify
-                                   metadata
-                                   for
-                                   the
-                                   deployment
-                                   (e.g.
-                                   \`-m
-                                   KEY1=value1
-                                   -m
-                                   KEY2=value2\`)
-      --no-wait                    
-                                   Don't
-                                   wait
-                                   for
-                                   the
-                                   deployment
-                                   to
-                                   finish
-      --prebuilt                   Use
-                                   in
-                                   combination
-                                   with
-                                   \`vc
-                                   build\`.
-                                   Deploy
-                                   an
-                                   existing
-                                   build
-      --prod                       
-                                   Create
-                                   a
-                                   production
-                                   deployment
-      -p, --public                 
-                                   Deployment
-                                   is
-                                   public
-                                   (\`/_src\`)
-                                   is
-                                   exposed)
-      --regions                    Set
-                                   default
-                                   regions
-                                   to
-                                   enable
-                                   the
-                                   deployment
-                                   on
-      --with-cache                 
-                                   Retain
-                                   build
-                                   cache
-                                   when
-                                   using
-                                   "--force"
-      -y, --yes                    Use
-                                   default
-                                   options
-                                   to
-                                   skip
-                                   all
-                                   prompts
+  --archive                    Compress
+                               the
+                               deployment
+                               code into
+                               a file
+                               before
+                               uploading
+                               it

-  [2mGlobal Options[22m:
+  -b, --build-env <key=value>  Specify
+                               environment
+                               variables
+                               during
+                               build-time
+                               (e.g. \`-b
+                               KEY1=value1
+                               -b
+                               KEY2=value2\`)

-      --cwd <DIR>                Sets
-                                 the
-                                 current
-                                 working
-                                 directory
-                                 for a
-                                 single
-                                 run of
-                                 a
-                                 command
-      -d, --debug                Debug
-                                 mode
-                                 (default
-                                 off)
-      -Q, --global-config <DIR>  Path to
-                                 the
-                                 global
-                                 \`.vercel\`
-                                 directory
-      -h, --help                 Output
-                                 usage
-                                 information
-      -A, --local-config <FILE>  Path to
-                                 the
-                                 local
-                                 \`vercel.json\`
-                                 file
-      --no-color                 No
-                                 color
-                                 mode
-                                 (default
-                                 off)
-      -S, --scope                Set a
-                                 custom
-                                 scope
-      -t, --token <TOKEN>        Login
-                                 token
-      -v, --version              Output
-                                 the
-                                 version
-                                 number
+  -e, --env <key=value>        Specify
+                               environment
+                               variables
+                               during
+                               run-time
+                               (e.g. \`-e
+                               KEY1=value1
+                               -e
+                               KEY2=value2\`)

-  [2mExamples:[22m
+  -f, --force                  Force a
+                               new
+                               deployment
+                               even if
+                               nothing
+                               has
+                               changed
+
+  -m, --meta <key=value>       Specify
+                               metadata
+                               for the
+                               deployment
+                               (e.g. \`-m
+                               KEY1=value1
+                               -m
+                               KEY2=value2\`)
+
+  --no-wait                    Don't
+                               wait for
+                               the
+                               deployment
+                               to finish
+
+  --prebuilt                   Use in
+                               combination
+                               with \`vc
+                               build\`.
+                               Deploy an
+                               existing
+                               build
+
+  --prod                       Create a
+                               production
+                               deployment
+
+  -p, --public                 
+                               Deployment
+                               is public
+                               (\`/_src\`)
+                               is
+                               exposed)
+
+  --regions                    Set
+                               default
+                               regions
+                               to enable
+                               the
+                               deployment
+                               on
+
+  --with-cache                 Retain
+                               build
+                               cache
+                               when
+                               using
+                               "--force"
+
+  -y, --yes                    Use
+                               default
+                               options
+                               to skip
+                               all
+                               prompts
+
+[2mExamples:[22m

  [90m-[39m Deploy the current directory

@@ -180,53 +122,47 @@ exports[`help command help output snapshots column width 40 1`] = `
  [90m-[39m Write Deployment URL to a file

    [36m$ vercel > deployment-url.txt[39m
-
 "
 `;

 exports[`help command help output snapshots column width 80 1`] = `
-"
-  ▲ [1mvercel[22m [1mdeploy[22m [project-path] [options]
+"▲ [1mvercel[22m [1mdeploy[22m [project-path] [options]

-  Deploy your project to Vercel. The \`deploy\` command is the default command for the Vercel CLI, and can be omitted (\`vc deploy my-app\` equals \`vc my-app\`).
+Deploy your project to Vercel. The \`deploy\` command is the default command for the Vercel CLI, and can be omitted (\`vc deploy my-app\` equals \`vc my-app\`).

-  [2mOptions[22m:
+[2mOptions:[22m

-      --archive                    Compress the deployment code into a file
-                                   before uploading it
-      -b, --build-env <key=value>  Specify environment variables during
-                                   build-time (e.g. \`-b KEY1=value1 -b
-                                   KEY2=value2\`)
-      -e, --env <key=value>        Specify environment variables during run-time
-                                   (e.g. \`-e KEY1=value1 -e KEY2=value2\`)
-      -f, --force                  Force a new deployment even if nothing has
-                                   changed
-      -m, --meta <key=value>       Specify metadata for the deployment (e.g. \`-m
-                                   KEY1=value1 -m KEY2=value2\`)
-      --no-wait                    Don't wait for the deployment to finish
-      --prebuilt                   Use in combination with \`vc build\`. Deploy an
-                                   existing build
-      --prod                       Create a production deployment
-      -p, --public                 Deployment is public (\`/_src\`) is exposed)
-      --regions                    Set default regions to enable the deployment
-                                   on
-      --with-cache                 Retain build cache when using "--force"
-      -y, --yes                    Use default options to skip all prompts
+  --archive                    Compress the deployment code into a file before
+                               uploading it

-  [2mGlobal Options[22m:
+  -b, --build-env <key=value>  Specify environment variables during build-time
+                               (e.g. \`-b KEY1=value1 -b KEY2=value2\`)

-      --cwd <DIR>                Sets the current working directory for a single
-                                 run of a command
-      -d, --debug                Debug mode (default off)
-      -Q, --global-config <DIR>  Path to the global \`.vercel\` directory
-      -h, --help                 Output usage information
-      -A, --local-config <FILE>  Path to the local \`vercel.json\` file
-      --no-color                 No color mode (default off)
-      -S, --scope                Set a custom scope
-      -t, --token <TOKEN>        Login token
-      -v, --version              Output the version number
+  -e, --env <key=value>        Specify environment variables during run-time
+                               (e.g. \`-e KEY1=value1 -e KEY2=value2\`)

-  [2mExamples:[22m
+  -f, --force                  Force a new deployment even if nothing has
+                               changed
+
+  -m, --meta <key=value>       Specify metadata for the deployment (e.g. \`-m
+                               KEY1=value1 -m KEY2=value2\`)
+
+  --no-wait                    Don't wait for the deployment to finish
+
+  --prebuilt                   Use in combination with \`vc build\`. Deploy an
+                               existing build
+
+  --prod                       Create a production deployment
+
+  -p, --public                 Deployment is public (\`/_src\`) is exposed)
+
+  --regions                    Set default regions to enable the deployment on
+
+  --with-cache                 Retain build cache when using "--force"
+
+  -y, --yes                    Use default options to skip all prompts
+
+[2mExamples:[22m

  [90m-[39m Deploy the current directory

@@ -248,45 +184,41 @@ exports[`help command help output snapshots column width 80 1`] = `
  [90m-[39m Write Deployment URL to a file

    [36m$ vercel > deployment-url.txt[39m
-
 "
 `;

 exports[`help command help output snapshots column width 120 1`] = `
-"
-  ▲ [1mvercel[22m [1mdeploy[22m [project-path] [options]
+"▲ [1mvercel[22m [1mdeploy[22m [project-path] [options]

-  Deploy your project to Vercel. The \`deploy\` command is the default command for the Vercel CLI, and can be omitted (\`vc deploy my-app\` equals \`vc my-app\`).
+Deploy your project to Vercel. The \`deploy\` command is the default command for the Vercel CLI, and can be omitted (\`vc deploy my-app\` equals \`vc my-app\`).

-  [2mOptions[22m:
+[2mOptions:[22m

-      --archive                    Compress the deployment code into a file before uploading it
-      -b, --build-env <key=value>  Specify environment variables during build-time (e.g. \`-b KEY1=value1 -b
-                                   KEY2=value2\`)
-      -e, --env <key=value>        Specify environment variables during run-time (e.g. \`-e KEY1=value1 -e KEY2=value2\`)
-      -f, --force                  Force a new deployment even if nothing has changed
-      -m, --meta <key=value>       Specify metadata for the deployment (e.g. \`-m KEY1=value1 -m KEY2=value2\`)
-      --no-wait                    Don't wait for the deployment to finish
-      --prebuilt                   Use in combination with \`vc build\`. Deploy an existing build
-      --prod                       Create a production deployment
-      -p, --public                 Deployment is public (\`/_src\`) is exposed)
-      --regions                    Set default regions to enable the deployment on
-      --with-cache                 Retain build cache when using "--force"
-      -y, --yes                    Use default options to skip all prompts
+  --archive                    Compress the deployment code into a file before uploading it

-  [2mGlobal Options[22m:
+  -b, --build-env <key=value>  Specify environment variables during build-time (e.g. \`-b KEY1=value1 -b KEY2=value2\`)

-      --cwd <DIR>                Sets the current working directory for a single run of a command
-      -d, --debug                Debug mode (default off)
-      -Q, --global-config <DIR>  Path to the global \`.vercel\` directory
-      -h, --help                 Output usage information
-      -A, --local-config <FILE>  Path to the local \`vercel.json\` file
-      --no-color                 No color mode (default off)
-      -S, --scope                Set a custom scope
-      -t, --token <TOKEN>        Login token
-      -v, --version              Output the version number
+  -e, --env <key=value>        Specify environment variables during run-time (e.g. \`-e KEY1=value1 -e KEY2=value2\`)

-  [2mExamples:[22m
+  -f, --force                  Force a new deployment even if nothing has changed
+
+  -m, --meta <key=value>       Specify metadata for the deployment (e.g. \`-m KEY1=value1 -m KEY2=value2\`)
+
+  --no-wait                    Don't wait for the deployment to finish
+
+  --prebuilt                   Use in combination with \`vc build\`. Deploy an existing build
+
+  --prod                       Create a production deployment
+
+  -p, --public                 Deployment is public (\`/_src\`) is exposed)
+
+  --regions                    Set default regions to enable the deployment on
+
+  --with-cache                 Retain build cache when using "--force"
+
+  -y, --yes                    Use default options to skip all prompts
+
+[2mExamples:[22m

  [90m-[39m Deploy the current directory

@@ -308,6 +240,5 @@ exports[`help command help output snapshots column width 120 1`] = `
  [90m-[39m Write Deployment URL to a file

    [36m$ vercel > deployment-url.txt[39m
-
 "
 `;
--- a/packages/cli/test/unit/commands/list.test.ts
+++ b/packages/cli/test/unit/commands/list.test.ts
@@ -58,7 +58,6 @@ describe('list', () => {
      'Age',
      'Deployment',
      'Status',
-      'Environment',
      'Duration',
      'Username',
    ]);
@@ -69,7 +68,6 @@ describe('list', () => {
    expect(data).toEqual([
      `https://${deployment.url}`,
      stateString(deployment.state || ''),
-      deployment.target === 'production' ? 'Production' : 'Preview',
      getDeploymentDuration(deployment),
      user.username,
    ]);
@@ -109,13 +107,7 @@ describe('list', () => {

    line = await lines.next();
    const header = parseSpacedTableRow(line.value!);
-    expect(header).toEqual([
-      'Age',
-      'Deployment',
-      'Status',
-      'Environment',
-      'Duration',
-    ]);
+    expect(header).toEqual(['Age', 'Deployment', 'Status', 'Duration']);

    line = await lines.next();
    const data = parseSpacedTableRow(line.value!);
@@ -124,7 +116,6 @@ describe('list', () => {
    expect(data).toEqual([
      'https://' + deployment.url,
      stateString(deployment.state || ''),
-      deployment.target === 'production' ? 'Production' : 'Preview',
      getDeploymentDuration(deployment),
    ]);
  });
@@ -169,7 +160,6 @@ describe('list', () => {
      'Age',
      'Deployment',
      'Status',
-      'Environment',
      'Duration',
      'Username',
    ]);
@@ -180,50 +170,8 @@ describe('list', () => {
    expect(data).toEqual([
      `https://${deployment.url}`,
      stateString(deployment.state || ''),
-      deployment.target === 'production' ? 'Production' : 'Preview',
      getDeploymentDuration(deployment),
      user.username,
    ]);
  });
-
-  it('should output deployment URLs to stdout', async () => {
-    const user = useUser();
-    useProject({
-      ...defaultProject,
-      id: 'with-team',
-      name: 'with-team',
-    });
-    const prodDeployment = useDeployment({
-      creator: user,
-      createdAt: Date.now() - 1000,
-      target: 'production',
-    });
-    const previewDeployment = useDeployment({
-      creator: user,
-      createdAt: Date.now(),
-      target: undefined,
-    });
-
-    client.stdout.isTTY = false;
-    client.cwd = fixture('with-team');
-
-    // run with all deployments
-    let prom = list(client);
-    await expect(client.stdout).toOutput(
-      `https://${previewDeployment.url}\nhttps://${prodDeployment.url}`
-    );
-    await prom;
-
-    // run again with preview deployments only
-    client.setArgv('--environment', 'preview');
-    prom = list(client);
-    await expect(client.stdout).toOutput(`https://${previewDeployment.url}`);
-    await prom;
-
-    // run again with production deployments only
-    client.setArgv('--environment', 'production');
-    prom = list(client);
-    await expect(client.stdout).toOutput(`https://${prodDeployment.url}`);
-    await prom;
-  });
 });
--- a/packages/cli/test/unit/commands/redeploy.test.ts
+++ b/packages/cli/test/unit/commands/redeploy.test.ts
@@ -5,7 +5,6 @@ import { setupUnitFixture } from '../../helpers/setup-unit-fixture';
 import { useDeployment } from '../../mocks/deployment';
 import { useTeams } from '../../mocks/team';
 import { useUser } from '../../mocks/user';
-import { Deployment } from '@vercel-internals/types';

 describe('redeploy', () => {
  it('should error if missing deployment url', async () => {
@@ -78,20 +77,9 @@ describe('redeploy', () => {

    await expect(exitCodePromise).resolves.toEqual(0);
  });
-
-  it('should redeploy to preview', async () => {
-    const { fromDeployment } = initRedeployTest({ target: null });
-    client.setArgv('rollback', fromDeployment.id);
-    const exitCodePromise = redeploy(client);
-    await expect(client.stderr).toOutput(
-      `Fetching deployment "${fromDeployment.id}" in ${fromDeployment.creator?.username}`
-    );
-    await expect(client.stderr).toOutput('Preview');
-    await expect(exitCodePromise).resolves.toEqual(0);
-  });
 });

-function initRedeployTest({ target }: { target?: Deployment['target'] } = {}) {
+function initRedeployTest() {
  setupUnitFixture('commands/redeploy/simple-static');
  const user = useUser();
  useTeams('team_dummy');
@@ -100,18 +88,10 @@ function initRedeployTest({ target }: { target?: Deployment['target'] } = {}) {
    id: 'vercel-redeploy',
    name: 'vercel-redeploy',
  });
-  const fromDeployment = useDeployment({ creator: user, target });
-  const toDeployment = useDeployment({ creator: user, target });
+  const fromDeployment = useDeployment({ creator: user });
+  const toDeployment = useDeployment({ creator: user });

  client.scenario.post(`/v13/deployments`, (req, res) => {
-    const { target } = req.body;
-    if (target !== undefined && typeof target !== 'string') {
-      res.status(400).json({
-        message: 'Invalid request: `target` should be string',
-      });
-      return;
-    }
-
    res.json(toDeployment);
  });

--- a/packages/cli/test/unit/util/git/repo-info-to-url.test.ts
+++ b/packages/cli/test/unit/util/git/repo-info-to-url.test.ts
@@ -1,34 +0,0 @@
-import { repoInfoToUrl } from '../../../../src/util/git/repo-info-to-url';
-import type { RepoInfo } from '../../../../src/util/git/connect-git-provider';
-
-describe('repoInfoToUrl()', () => {
-  it('should support "github" URL', () => {
-    const info: RepoInfo = {
-      provider: 'github',
-      org: 'vercel',
-      repo: 'foo',
-      url: 'git@github.com:vercel/foo.git',
-    };
-    expect(repoInfoToUrl(info)).toEqual('https://github.com/vercel/foo');
-  });
-
-  it('should support "gitlab" URL', () => {
-    const info: RepoInfo = {
-      provider: 'gitlab',
-      org: 'vercel',
-      repo: 'foo',
-      url: 'git@gitlab.com:vercel/foo.git',
-    };
-    expect(repoInfoToUrl(info)).toEqual('https://gitlab.com/vercel/foo');
-  });
-
-  it('should support "bitbucket" URL', () => {
-    const info: RepoInfo = {
-      provider: 'bitbucket',
-      org: 'vercel',
-      repo: 'foo',
-      url: 'git@bitbucket.com:vercel/foo.git',
-    };
-    expect(repoInfoToUrl(info)).toEqual('https://bitbucket.com/vercel/foo');
-  });
-});
--- a/packages/cli/test/unit/util/projects/detect-projects.test.ts
+++ b/packages/cli/test/unit/util/projects/detect-projects.test.ts
@@ -1,43 +0,0 @@
-import { join } from 'path';
-import type { Framework } from '@vercel/frameworks';
-import { detectProjects } from '../../../../src/util/projects/detect-projects';
-
-const REPO_ROOT = join(__dirname, '../../../../../..');
-const EXAMPLES_DIR = join(REPO_ROOT, 'examples');
-const FS_DETECTORS_FIXTURES = join(
-  REPO_ROOT,
-  'packages/fs-detectors/test/fixtures'
-);
-
-function mapDetected(
-  detected: Map<string, Framework[]>
-): Array<[string, string[]]> {
-  return [...detected.entries()]
-    .sort((a, b) => a[0].localeCompare(b[0]))
-    .map(([dir, frameworks]) => [dir, frameworks.map(f => f.slug as string)]);
-}
-
-describe('detectProjects()', () => {
-  it('should match 1 Project in "nextjs" example', async () => {
-    const dir = join(EXAMPLES_DIR, 'nextjs');
-    const detected = await detectProjects(dir);
-    expect(mapDetected(detected)).toEqual([['', ['nextjs']]]);
-  });
-
-  it('should match 2 Projects in "storybook" example', async () => {
-    const dir = join(EXAMPLES_DIR, 'storybook');
-    const detected = await detectProjects(dir);
-    expect(mapDetected(detected)).toEqual([['', ['nextjs', 'storybook']]]);
-  });
-
-  it('should match "30-double-nested-workspaces"', async () => {
-    const dir = join(FS_DETECTORS_FIXTURES, '30-double-nested-workspaces');
-    const detected = await detectProjects(dir);
-    expect(mapDetected(detected)).toEqual([
-      ['packages/backend/c', ['remix']],
-      ['packages/backend/d', ['nextjs']],
-      ['packages/frontend/a', ['hexo']],
-      ['packages/frontend/b', ['ember']],
-    ]);
-  });
-});
--- a/packages/cli/types/supports-hyperlinks/index.d.ts
+++ b/packages/cli/types/supports-hyperlinks/index.d.ts
@@ -0,0 +1,4 @@
+declare module 'supports-hyperlinks' {
+  import { Writable } from 'stream';
+  export function supportsHyperlink(stream: Writable): boolean;
+}
--- a/packages/client/CHANGELOG.md
+++ b/packages/client/CHANGELOG.md
@@ -1,19 +1,5 @@
 # @vercel/client

-## 12.6.5
-
-### Patch Changes
-
- Updated dependencies [[`0750517af`](https://github.com/vercel/vercel/commit/0750517af99aea41410d4f1f772ce427699554e7)]:
-  - @vercel/build-utils@6.8.2
-
-## 12.6.4
-
-### Patch Changes
-
- Updated dependencies [[`7021279b2`](https://github.com/vercel/vercel/commit/7021279b284f314a4d1bdbb4306b4c22291efa08)]:
-  - @vercel/build-utils@6.8.1
-
 ## 12.6.3

 ### Patch Changes
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/client",
-  "version": "12.6.5",
+  "version": "12.6.3",
  "main": "dist/index.js",
  "typings": "dist/index.d.ts",
  "homepage": "https://vercel.com",
@@ -35,7 +35,7 @@
    "typescript": "4.9.5"
  },
  "dependencies": {
-    "@vercel/build-utils": "6.8.2",
+    "@vercel/build-utils": "6.8.0",
    "@vercel/routing-utils": "2.2.1",
    "@zeit/fetch": "5.2.0",
    "async-retry": "1.2.3",
--- a/packages/frameworks/CHANGELOG.md
+++ b/packages/frameworks/CHANGELOG.md
@@ -1,13 +1,5 @@
 # @vercel/frameworks

-## 1.5.0
-
-### Minor Changes
-
- Add `ignorePackageJsonScript` configuration for Framework command settings to ignore the `package.json` script. ([#10228](https://github.com/vercel/vercel/pull/10228))
-
-  Enable this mode for Storybook's `buildCommand`, since it should not invoke the "build" script, which is most likely designated for the frontend app build.
-
 ## 1.4.3

 ### Patch Changes
--- a/packages/frameworks/package.json
+++ b/packages/frameworks/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/frameworks",
-  "version": "1.5.0",
+  "version": "1.4.3",
  "main": "./dist/frameworks.js",
  "types": "./dist/frameworks.d.ts",
  "files": [
--- a/packages/frameworks/src/frameworks.ts
+++ b/packages/frameworks/src/frameworks.ts
@@ -1955,7 +1955,6 @@ export const frameworks = [
      },
      buildCommand: {
        value: 'storybook build',
-        ignorePackageJsonScript: true,
      },
      devCommand: {
        value: `storybook dev -p $PORT`,
--- a/packages/frameworks/src/types.ts
+++ b/packages/frameworks/src/types.ts
@@ -32,24 +32,11 @@ export interface SettingPlaceholder {

 export interface SettingValue {
  /**
-   * A predefined setting for the detected framework.
+   * A predefined setting for the detected framework
   * @example "next dev --port $PORT"
   */
  value: string | null;
-  /**
-   * Placeholder text that may be shown in the UI when
-   * the user is configuring this setting value.
-   * @example "`npm run build` or `next build`"
-   */
  placeholder?: string;
-  /**
-   * When set to `true`, then the builder will not
-   * invoke the equivalent script in `package.json`,
-   * and instead will invoke the command specified in
-   * configuration setting directly. When this
-   * configuration is enabled, `value` must be a string.
-   */
-  ignorePackageJsonScript?: boolean;
 }

 export type Setting = SettingValue | SettingPlaceholder;
--- a/packages/frameworks/test/frameworks.unit.test.ts
+++ b/packages/frameworks/test/frameworks.unit.test.ts
@@ -49,22 +49,6 @@ const SchemaSettings = {
        },
      },
    },
-    {
-      type: 'object',
-      required: ['value', 'ignorePackageJsonScript'],
-      additionalProperties: false,
-      properties: {
-        value: {
-          type: 'string',
-        },
-        placeholder: {
-          type: 'string',
-        },
-        ignorePackageJsonScript: {
-          type: 'boolean',
-        },
-      },
-    },
    {
      type: 'object',
      required: ['placeholder'],
--- a/packages/fs-detectors/CHANGELOG.md
+++ b/packages/fs-detectors/CHANGELOG.md
@@ -1,18 +1,5 @@
 # @vercel/fs-detectors

-## 4.1.1
-
-### Patch Changes
-
- Updated dependencies [[`ce4633fe4`](https://github.com/vercel/vercel/commit/ce4633fe4d00cb5c251cdabbfab08f39ec3f3b5f)]:
-  - @vercel/frameworks@1.5.0
-
-## 4.1.0
-
-### Minor Changes
-
- Add `detectFrameworks()` function ([#10195](https://github.com/vercel/vercel/pull/10195))
-
 ## 4.0.1

 ### Patch Changes
--- a/packages/fs-detectors/package.json
+++ b/packages/fs-detectors/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/fs-detectors",
-  "version": "4.1.1",
+  "version": "4.0.1",
  "description": "Vercel filesystem detectors",
  "main": "./dist/index.js",
  "types": "./dist/index.d.ts",
@@ -21,7 +21,7 @@
  },
  "dependencies": {
    "@vercel/error-utils": "1.0.10",
-    "@vercel/frameworks": "1.5.0",
+    "@vercel/frameworks": "1.4.3",
    "@vercel/routing-utils": "2.2.1",
    "glob": "8.0.3",
    "js-yaml": "4.1.0",
@@ -36,7 +36,7 @@
    "@types/minimatch": "3.0.5",
    "@types/node": "14.18.33",
    "@types/semver": "7.3.10",
-    "@vercel/build-utils": "6.8.2",
+    "@vercel/build-utils": "6.8.0",
    "typescript": "4.9.5"
  }
 }
--- a/packages/fs-detectors/src/detect-framework.ts
+++ b/packages/fs-detectors/src/detect-framework.ts
@@ -151,24 +151,6 @@ export async function detectFramework({
  return result.find(res => res !== null) ?? null;
 }

-/**
- * Detects all matching Frameworks based on the given virtual filesystem.
- */
-export async function detectFrameworks({
-  fs,
-  frameworkList,
-}: DetectFrameworkRecordOptions): Promise<Framework[]> {
-  const result = await Promise.all(
-    frameworkList.map(async frameworkMatch => {
-      if (await matches(fs, frameworkMatch)) {
-        return frameworkMatch;
-      }
-      return null;
-    })
-  );
-  return result.filter(res => res !== null) as Framework[];
-}
-
 /**
 * Framework with a `detectedVersion` specifying the version
 * or version range of the relevant package
--- a/packages/fs-detectors/src/index.ts
+++ b/packages/fs-detectors/src/index.ts
@@ -7,7 +7,6 @@ export {
 export { detectFileSystemAPI } from './detect-file-system-api';
 export {
  detectFramework,
-  detectFrameworks,
  detectFrameworkRecord,
  detectFrameworkVersion,
 } from './detect-framework';
--- a/packages/fs-detectors/test/fixtures/30-double-nested-workspaces/packages/backend/c/package.json
+++ b/packages/fs-detectors/test/fixtures/30-double-nested-workspaces/packages/backend/c/package.json
@@ -1,5 +1,4 @@
 {
-  "private": true,
  "name": "backend-c30",
  "license": "MIT",
  "version": "0.1.0"
--- a/packages/fs-detectors/test/fixtures/30-double-nested-workspaces/packages/backend/c/remix.config.js
+++ b/packages/fs-detectors/test/fixtures/30-double-nested-workspaces/packages/backend/c/remix.config.js
--- a/packages/fs-detectors/test/fixtures/30-double-nested-workspaces/packages/backend/d/package.json
+++ b/packages/fs-detectors/test/fixtures/30-double-nested-workspaces/packages/backend/d/package.json
@@ -1,10 +1,8 @@
 {
-  "private": true,
  "name": "backend-d30",
  "license": "MIT",
  "version": "0.1.0",
  "devDependencies": {
-    "next": "*",
    "once": "1.4.0"
  }
 }
--- a/packages/fs-detectors/test/fixtures/30-double-nested-workspaces/packages/frontend/a/package.json
+++ b/packages/fs-detectors/test/fixtures/30-double-nested-workspaces/packages/frontend/a/package.json
@@ -1,5 +1,4 @@
 {
-  "private": true,
  "name": "frontend-a30",
  "version": "1.0.0",
  "description": "",
@@ -11,7 +10,6 @@
  "author": "",
  "license": "ISC",
  "dependencies": {
-    "debug": "^4.3.2",
-    "hexo": "*"
+    "debug": "^4.3.2"
  }
 }
--- a/packages/fs-detectors/test/fixtures/30-double-nested-workspaces/packages/frontend/b/package.json
+++ b/packages/fs-detectors/test/fixtures/30-double-nested-workspaces/packages/frontend/b/package.json
@@ -1,5 +1,4 @@
 {
-  "private": true,
  "name": "frontend-b30",
  "version": "1.0.0",
  "description": "",
@@ -11,7 +10,6 @@
  "author": "",
  "license": "ISC",
  "dependencies": {
-    "cowsay": "^1.5.0",
-    "ember-cli": "*"
+    "cowsay": "^1.5.0"
  }
 }
--- a/packages/fs-detectors/test/unit.framework-detector.test.ts
+++ b/packages/fs-detectors/test/unit.framework-detector.test.ts
@@ -1,6 +1,6 @@
 import frameworkList from '@vercel/frameworks';
 import workspaceManagers from '../src/workspaces/workspace-managers';
-import { detectFramework, detectFrameworks } from '../src';
+import { detectFramework } from '../src';
 import VirtualFilesystem from './virtual-file-system';

 describe('DetectorFilesystem', () => {
@@ -114,12 +114,12 @@ describe('DetectorFilesystem', () => {
    expect(await packagesFs.isFile('app2')).toBe(false);
    expect(await packagesFs.isFile('app1/package.json')).toBe(true);
    expect(await packagesFs.isFile('app2/package.json')).toBe(true);
-    expect((await packagesFs.readFile('app1/package.json')).toString()).toEqual(
-      nextPackageJson
-    );
-    expect((await packagesFs.readFile('app2/package.json')).toString()).toEqual(
-      gatsbyPackageJson
-    );
+    expect(
+      await (await packagesFs.readFile('app1/package.json')).toString()
+    ).toEqual(nextPackageJson);
+    expect(
+      await (await packagesFs.readFile('app2/package.json')).toString()
+    ).toEqual(gatsbyPackageJson);

    expect(await detectFramework({ fs: packagesFs, frameworkList })).toBe(null);

@@ -143,294 +143,266 @@ describe('DetectorFilesystem', () => {
      { name: 'package.json', path: 'package.json', type: 'file' },
    ]);

-    expect((await gatsbyAppFs.readFile('package.json')).toString()).toEqual(
-      gatsbyPackageJson
-    );
+    expect(
+      await (await gatsbyAppFs.readFile('package.json')).toString()
+    ).toEqual(gatsbyPackageJson);

    expect(await detectFramework({ fs: gatsbyAppFs, frameworkList })).toBe(
      'gatsby'
    );
  });
-});

-describe('detectFramework()', () => {
-  it('Do not detect anything', async () => {
-    const fs = new VirtualFilesystem({
-      'README.md': '# hi',
-      'api/cheese.js': 'export default (req, res) => res.end("cheese");',
+  describe('#detectFramework', () => {
+    it('Do not detect anything', async () => {
+      const fs = new VirtualFilesystem({
+        'README.md': '# hi',
+        'api/cheese.js': 'export default (req, res) => res.end("cheese");',
+      });
+
+      expect(await detectFramework({ fs, frameworkList })).toBe(null);
    });

-    expect(await detectFramework({ fs, frameworkList })).toBe(null);
-  });
+    it('Detect nx', async () => {
+      const fs = new VirtualFilesystem({
+        'workspace.json': JSON.stringify({
+          projects: { 'app-one': 'apps/app-one' },
+        }),
+      });

-  it('Detect nx', async () => {
-    const fs = new VirtualFilesystem({
-      'workspace.json': JSON.stringify({
-        projects: { 'app-one': 'apps/app-one' },
-      }),
+      expect(
+        await detectFramework({ fs, frameworkList: workspaceManagers })
+      ).toBe('nx');
    });

-    expect(
-      await detectFramework({ fs, frameworkList: workspaceManagers })
-    ).toBe('nx');
-  });
+    it('Do not detect anything', async () => {
+      const fs = new VirtualFilesystem({
+        'workspace.json': JSON.stringify({ projects: {} }),
+      });

-  it('Do not detect anything', async () => {
-    const fs = new VirtualFilesystem({
-      'workspace.json': JSON.stringify({ projects: {} }),
+      expect(
+        await detectFramework({ fs, frameworkList: workspaceManagers })
+      ).toBe(null);
    });

-    expect(
-      await detectFramework({ fs, frameworkList: workspaceManagers })
-    ).toBe(null);
-  });
+    it('Detect Next.js', async () => {
+      const fs = new VirtualFilesystem({
+        'package.json': JSON.stringify({
+          dependencies: {
+            next: '9.0.0',
+          },
+        }),
+      });

-  it('Detect Next.js', async () => {
-    const fs = new VirtualFilesystem({
-      'package.json': JSON.stringify({
-        dependencies: {
-          next: '9.0.0',
-        },
-      }),
+      expect(await detectFramework({ fs, frameworkList })).toBe('nextjs');
    });

-    expect(await detectFramework({ fs, frameworkList })).toBe('nextjs');
-  });
+    it('Detect frameworks based on ascending order in framework list', async () => {
+      const fs = new VirtualFilesystem({
+        'package.json': JSON.stringify({
+          dependencies: {
+            next: '9.0.0',
+            gatsby: '4.18.0',
+          },
+        }),
+      });

-  it('Detect frameworks based on ascending order in framework list', async () => {
-    const fs = new VirtualFilesystem({
-      'package.json': JSON.stringify({
-        dependencies: {
-          next: '9.0.0',
-          gatsby: '4.18.0',
-        },
-      }),
+      expect(await detectFramework({ fs, frameworkList })).toBe('nextjs');
    });

-    expect(await detectFramework({ fs, frameworkList })).toBe('nextjs');
-  });
+    it('Detect Nuxt.js', async () => {
+      const fs = new VirtualFilesystem({
+        'package.json': JSON.stringify({
+          dependencies: {
+            nuxt: '1.0.0',
+          },
+        }),
+      });

-  it('Detect Nuxt.js', async () => {
-    const fs = new VirtualFilesystem({
-      'package.json': JSON.stringify({
-        dependencies: {
-          nuxt: '1.0.0',
-        },
-      }),
+      expect(await detectFramework({ fs, frameworkList })).toBe('nuxtjs');
    });

-    expect(await detectFramework({ fs, frameworkList })).toBe('nuxtjs');
-  });
+    it('Detect Nuxt.js Edge', async () => {
+      const fs = new VirtualFilesystem({
+        'package.json': JSON.stringify({
+          dependencies: {
+            'nuxt-edge': '1.0.0',
+          },
+        }),
+      });

-  it('Detect Nuxt.js Edge', async () => {
-    const fs = new VirtualFilesystem({
-      'package.json': JSON.stringify({
-        dependencies: {
-          'nuxt-edge': '1.0.0',
-        },
-      }),
+      expect(await detectFramework({ fs, frameworkList })).toBe('nuxtjs');
    });

-    expect(await detectFramework({ fs, frameworkList })).toBe('nuxtjs');
-  });
+    it('Detect Nuxt.js 3', async () => {
+      const fs = new VirtualFilesystem({
+        'package.json': JSON.stringify({
+          dependencies: {
+            nuxt3: '1.0.0',
+          },
+        }),
+      });

-  it('Detect Nuxt.js 3', async () => {
-    const fs = new VirtualFilesystem({
-      'package.json': JSON.stringify({
-        dependencies: {
-          nuxt3: '1.0.0',
-        },
-      }),
+      expect(await detectFramework({ fs, frameworkList })).toBe('nuxtjs');
    });

-    expect(await detectFramework({ fs, frameworkList })).toBe('nuxtjs');
-  });
+    it('Detect Gatsby', async () => {
+      const fs = new VirtualFilesystem({
+        'package.json': JSON.stringify({
+          dependencies: {
+            gatsby: '1.0.0',
+          },
+        }),
+      });

-  it('Detect Gatsby', async () => {
-    const fs = new VirtualFilesystem({
-      'package.json': JSON.stringify({
-        dependencies: {
-          gatsby: '1.0.0',
-        },
-      }),
+      expect(await detectFramework({ fs, frameworkList })).toBe('gatsby');
    });

-    expect(await detectFramework({ fs, frameworkList })).toBe('gatsby');
-  });
+    it('Detect Hugo #1', async () => {
+      const fs = new VirtualFilesystem({
+        'config.yaml': 'baseURL: http://example.org/',
+        'content/post.md': '# hello world',
+      });

-  it('Detect Hugo #1', async () => {
-    const fs = new VirtualFilesystem({
-      'config.yaml': 'baseURL: http://example.org/',
-      'content/post.md': '# hello world',
+      expect(await detectFramework({ fs, frameworkList })).toBe('hugo');
    });

-    expect(await detectFramework({ fs, frameworkList })).toBe('hugo');
-  });
+    it('Detect Hugo #2', async () => {
+      const fs = new VirtualFilesystem({
+        'config.json': '{ "baseURL": "http://example.org/" }',
+        'content/post.md': '# hello world',
+      });

-  it('Detect Hugo #2', async () => {
-    const fs = new VirtualFilesystem({
-      'config.json': '{ "baseURL": "http://example.org/" }',
-      'content/post.md': '# hello world',
+      expect(await detectFramework({ fs, frameworkList })).toBe('hugo');
    });

-    expect(await detectFramework({ fs, frameworkList })).toBe('hugo');
-  });
+    it('Detect Hugo #3', async () => {
+      const fs = new VirtualFilesystem({
+        'config.toml': 'baseURL = "http://example.org/"',
+        'content/post.md': '# hello world',
+      });

-  it('Detect Hugo #3', async () => {
-    const fs = new VirtualFilesystem({
-      'config.toml': 'baseURL = "http://example.org/"',
-      'content/post.md': '# hello world',
+      expect(await detectFramework({ fs, frameworkList })).toBe('hugo');
    });

-    expect(await detectFramework({ fs, frameworkList })).toBe('hugo');
-  });
+    it('Detect Jekyll', async () => {
+      const fs = new VirtualFilesystem({
+        '_config.yml': 'config',
+      });

-  it('Detect Jekyll', async () => {
-    const fs = new VirtualFilesystem({
-      '_config.yml': 'config',
+      expect(await detectFramework({ fs, frameworkList })).toBe('jekyll');
    });

-    expect(await detectFramework({ fs, frameworkList })).toBe('jekyll');
-  });
+    it('Detect Middleman', async () => {
+      const fs = new VirtualFilesystem({
+        'config.rb': 'config',
+      });

-  it('Detect Middleman', async () => {
-    const fs = new VirtualFilesystem({
-      'config.rb': 'config',
+      expect(await detectFramework({ fs, frameworkList })).toBe('middleman');
    });

-    expect(await detectFramework({ fs, frameworkList })).toBe('middleman');
-  });
+    it('Detect Scully', async () => {
+      const fs = new VirtualFilesystem({
+        'package.json': JSON.stringify({
+          dependencies: {
+            '@angular/cli': 'latest',
+            '@scullyio/init': 'latest',
+          },
+        }),
+      });

-  it('Detect Scully', async () => {
-    const fs = new VirtualFilesystem({
-      'package.json': JSON.stringify({
-        dependencies: {
-          '@angular/cli': 'latest',
-          '@scullyio/init': 'latest',
-        },
-      }),
+      expect(await detectFramework({ fs, frameworkList })).toBe('scully');
    });

-    expect(await detectFramework({ fs, frameworkList })).toBe('scully');
-  });
+    it('Detect Zola', async () => {
+      const fs = new VirtualFilesystem({
+        'config.toml': 'base_url = "/"',
+      });

-  it('Detect Zola', async () => {
-    const fs = new VirtualFilesystem({
-      'config.toml': 'base_url = "/"',
+      expect(await detectFramework({ fs, frameworkList })).toBe('zola');
    });

-    expect(await detectFramework({ fs, frameworkList })).toBe('zola');
-  });
+    it('Detect Blitz.js (Legacy)', async () => {
+      const fs = new VirtualFilesystem({
+        'blitz.config.js': '// some config',
+      });

-  it('Detect Blitz.js (Legacy)', async () => {
-    const fs = new VirtualFilesystem({
-      'blitz.config.js': '// some config',
+      expect(await detectFramework({ fs, frameworkList })).toBe('blitzjs');
    });

-    expect(await detectFramework({ fs, frameworkList })).toBe('blitzjs');
-  });
+    it('Detect Ember via `ember-source`', async () => {
+      const fs = new VirtualFilesystem({
+        'package.json': JSON.stringify({
+          dependencies: {
+            'ember-source': 'latest',
+          },
+        }),
+      });

-  it('Detect Ember via `ember-source`', async () => {
-    const fs = new VirtualFilesystem({
-      'package.json': JSON.stringify({
-        dependencies: {
-          'ember-source': 'latest',
-        },
-      }),
+      expect(await detectFramework({ fs, frameworkList })).toBe('ember');
    });

-    expect(await detectFramework({ fs, frameworkList })).toBe('ember');
-  });
+    it('Detect Ember via `ember-cli`', async () => {
+      const fs = new VirtualFilesystem({
+        'package.json': JSON.stringify({
+          dependencies: {
+            'ember-cli': 'latest',
+          },
+        }),
+      });

-  it('Detect Ember via `ember-cli`', async () => {
-    const fs = new VirtualFilesystem({
-      'package.json': JSON.stringify({
-        dependencies: {
-          'ember-cli': 'latest',
-        },
-      }),
+      expect(await detectFramework({ fs, frameworkList })).toBe('ember');
    });

-    expect(await detectFramework({ fs, frameworkList })).toBe('ember');
-  });
+    it('Detect Brunch via `brunch`', async () => {
+      const fs = new VirtualFilesystem({
+        'package.json': JSON.stringify({
+          dependencies: {
+            brunch: 'latest',
+          },
+        }),
+      });

-  it('Detect Brunch via `brunch`', async () => {
-    const fs = new VirtualFilesystem({
-      'package.json': JSON.stringify({
-        dependencies: {
-          brunch: 'latest',
-        },
-      }),
+      expect(await detectFramework({ fs, frameworkList })).toBe('brunch');
    });

-    expect(await detectFramework({ fs, frameworkList })).toBe('brunch');
-  });
+    it('Detect Brunch via `brunch-config.js`', async () => {
+      const fs = new VirtualFilesystem({
+        'brunch-config.js': '// some config',
+      });

-  it('Detect Brunch via `brunch-config.js`', async () => {
-    const fs = new VirtualFilesystem({
-      'brunch-config.js': '// some config',
+      expect(await detectFramework({ fs, frameworkList })).toBe('brunch');
    });

-    expect(await detectFramework({ fs, frameworkList })).toBe('brunch');
-  });
+    it('Detect Hydrogen via `hydrogen.config.js`', async () => {
+      const fs = new VirtualFilesystem({
+        'hydrogen.config.js': '// some config',
+      });

-  it('Detect Hydrogen via `hydrogen.config.js`', async () => {
-    const fs = new VirtualFilesystem({
-      'hydrogen.config.js': '// some config',
+      expect(await detectFramework({ fs, frameworkList })).toBe('hydrogen');
    });

-    expect(await detectFramework({ fs, frameworkList })).toBe('hydrogen');
-  });
+    it('Detect Hydrogen via `@shopify/hydrogen`', async () => {
+      const fs = new VirtualFilesystem({
+        'package.json': JSON.stringify({
+          dependencies: {
+            '@shopify/hydrogen': 'latest',
+          },
+        }),
+      });

-  it('Detect Hydrogen via `@shopify/hydrogen`', async () => {
-    const fs = new VirtualFilesystem({
-      'package.json': JSON.stringify({
-        dependencies: {
-          '@shopify/hydrogen': 'latest',
-        },
-      }),
+      expect(await detectFramework({ fs, frameworkList })).toBe('hydrogen');
    });

-    expect(await detectFramework({ fs, frameworkList })).toBe('hydrogen');
-  });
+    it('Detect Storybook via `storybook`', async () => {
+      const fs = new VirtualFilesystem({
+        'package.json': JSON.stringify({
+          dependencies: {
+            storybook: 'latest',
+          },
+        }),
+      });

-  it('Detect Storybook via `storybook`', async () => {
-    const fs = new VirtualFilesystem({
-      'package.json': JSON.stringify({
-        dependencies: {
-          storybook: 'latest',
-        },
-      }),
+      expect(await detectFramework({ fs, frameworkList })).toBe('storybook');
    });
-
-    expect(await detectFramework({ fs, frameworkList })).toBe('storybook');
-  });
-});
-
-describe('detectFrameworks()', () => {
-  it('Return empty array when there are no matches', async () => {
-    const fs = new VirtualFilesystem({
-      'package.json': JSON.stringify({
-        dependencies: {},
-      }),
-    });
-
-    expect(await detectFrameworks({ fs, frameworkList })).toEqual([]);
-  });
-
-  it('Detect `nextjs` and `storybook`', async () => {
-    const fs = new VirtualFilesystem({
-      'package.json': JSON.stringify({
-        dependencies: {
-          next: 'latest',
-          storybook: 'latest',
-        },
-      }),
-    });
-
-    const slugs = (await detectFrameworks({ fs, frameworkList })).map(
-      f => f.slug
-    );
-    expect(slugs).toEqual(['nextjs', 'storybook']);
  });
 });
--- a/packages/gatsby-plugin-vercel-builder/CHANGELOG.md
+++ b/packages/gatsby-plugin-vercel-builder/CHANGELOG.md
@@ -1,42 +1,5 @@
 # @vercel/gatsby-plugin-vercel-builder

-## 1.3.16
-
-### Patch Changes
-
- Updated dependencies [[`4af242af8`](https://github.com/vercel/vercel/commit/4af242af8633e58b6a9bf920564416da3ef22ad4), [`85dd66778`](https://github.com/vercel/vercel/commit/85dd667781693539d753d587566e53964bbe189d)]:
-  - @vercel/node@2.15.8
-
-## 1.3.15
-
-### Patch Changes
-
- Updated dependencies [[`fc413707d`](https://github.com/vercel/vercel/commit/fc413707d017e234d5013b761d885f65f9b981bc)]:
-  - @vercel/node@2.15.7
-
-## 1.3.14
-
-### Patch Changes
-
- Updated dependencies [[`b56639b62`](https://github.com/vercel/vercel/commit/b56639b624e9ad1df048a4c85083e26888696060)]:
-  - @vercel/node@2.15.6
-
-## 1.3.13
-
-### Patch Changes
-
- Updated dependencies [[`0750517af`](https://github.com/vercel/vercel/commit/0750517af99aea41410d4f1f772ce427699554e7)]:
-  - @vercel/build-utils@6.8.2
-  - @vercel/node@2.15.5
-
-## 1.3.12
-
-### Patch Changes
-
- Updated dependencies [[`7021279b2`](https://github.com/vercel/vercel/commit/7021279b284f314a4d1bdbb4306b4c22291efa08), [`5e5332fbc`](https://github.com/vercel/vercel/commit/5e5332fbc9317a8f3cc4ed0b72ec1a2c76020891)]:
-  - @vercel/build-utils@6.8.1
-  - @vercel/node@2.15.4
-
 ## 1.3.11

 ### Patch Changes
--- a/packages/gatsby-plugin-vercel-builder/package.json
+++ b/packages/gatsby-plugin-vercel-builder/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/gatsby-plugin-vercel-builder",
-  "version": "1.3.16",
+  "version": "1.3.11",
  "main": "dist/index.js",
  "files": [
    "dist",
@@ -20,8 +20,8 @@
  },
  "dependencies": {
    "@sinclair/typebox": "0.25.24",
-    "@vercel/build-utils": "6.8.2",
-    "@vercel/node": "2.15.8",
+    "@vercel/build-utils": "6.8.0",
+    "@vercel/node": "2.15.3",
    "@vercel/routing-utils": "2.2.1",
    "esbuild": "0.14.47",
    "etag": "1.8.1",
--- a/packages/go/package.json
+++ b/packages/go/package.json
@@ -27,7 +27,7 @@
    "@types/node-fetch": "^2.3.0",
    "@types/tar": "^4.0.0",
    "@types/yauzl-promise": "2.1.0",
-    "@vercel/build-utils": "6.8.2",
+    "@vercel/build-utils": "6.8.0",
    "@vercel/ncc": "0.24.0",
    "async-retry": "1.3.1",
    "execa": "^1.0.0",
--- a/packages/hydrogen/package.json
+++ b/packages/hydrogen/package.json
@@ -21,7 +21,7 @@
  "devDependencies": {
    "@types/jest": "27.5.1",
    "@types/node": "14.18.33",
-    "@vercel/build-utils": "6.8.2",
+    "@vercel/build-utils": "6.8.0",
    "@vercel/static-config": "2.0.17",
    "execa": "3.2.0",
    "fs-extra": "11.1.0",
--- a/packages/next/CHANGELOG.md
+++ b/packages/next/CHANGELOG.md
@@ -1,33 +1,5 @@
 # @vercel/next

-## 3.9.3
-
-### Patch Changes
-
- fix dynamic not found pages ([#10262](https://github.com/vercel/vercel/pull/10262))
-
-## 3.9.2
-
-### Patch Changes
-
- Fix pages/404 gsp + i18n case ([#10258](https://github.com/vercel/vercel/pull/10258))
-
-## 3.9.1
-
-### Patch Changes
-
- Fix pages and app router i18n handling ([#10243](https://github.com/vercel/vercel/pull/10243))
-
-## 3.9.0
-
-### Minor Changes
-
- Support maxDuration in Next.js deployments ([#10069](https://github.com/vercel/vercel/pull/10069))
-
-### Patch Changes
-
- Fix 404 page in edge runtime ([#10223](https://github.com/vercel/vercel/pull/10223))
-
 ## 3.8.8

 ### Patch Changes
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/next",
-  "version": "3.9.3",
+  "version": "3.8.8",
  "license": "Apache-2.0",
  "main": "./dist/index",
  "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",
@@ -35,7 +35,7 @@
    "@types/semver": "6.0.0",
    "@types/text-table": "0.2.1",
    "@types/webpack-sources": "3.2.0",
-    "@vercel/build-utils": "6.8.2",
+    "@vercel/build-utils": "6.8.0",
    "@vercel/nft": "0.22.5",
    "@vercel/routing-utils": "2.2.1",
    "async-sema": "3.0.1",
--- a/packages/next/src/index.ts
+++ b/packages/next/src/index.ts
@@ -90,7 +90,6 @@ import {
  validateEntrypoint,
  getOperationType,
  isApiPage,
-  getFunctionsConfigManifest,
 } from './utils';

 export const version = 2;
@@ -273,7 +272,7 @@ export const build: BuildV2 = async ({
  });

  let hasLegacyRoutes = false;
-  const hasFunctionsConfig = Boolean(config.functions);
+  const hasFunctionsConfig = !!config.functions;

  if (await pathExists(dotNextStatic)) {
    console.warn('WARNING: You should not upload the `.next` directory.');
@@ -488,12 +487,7 @@ export const build: BuildV2 = async ({
    ? await getRequiredServerFilesManifest(entryPath, outputDirectory)
    : false;

-  isServerMode = Boolean(requiredServerFilesManifest);
-
-  const functionsConfigManifest = await getFunctionsConfigManifest(
-    entryPath,
-    outputDirectory
-  );
+  isServerMode = !!requiredServerFilesManifest;

  const routesManifest = await getRoutesManifest(
    entryPath,
@@ -1139,9 +1133,8 @@ export const build: BuildV2 = async ({
    const canUsePreviewMode = Object.keys(pages).some(page =>
      isApiPage(pages[page].fsPath)
    );
-    const originalStaticPages = await glob('**/*.html', pagesDir);
-    staticPages = filterStaticPages(
-      originalStaticPages,
+    staticPages = await filterStaticPages(
+      await glob('**/*.html', pagesDir),
      dynamicPages,
      entryDirectory,
      htmlContentType,
@@ -1317,27 +1310,14 @@ export const build: BuildV2 = async ({
        );
      }

-      const localePrefixed404 = !!(
-        routesManifest.i18n &&
-        originalStaticPages[
-          path.posix.join(
-            entryDirectory,
-            routesManifest.i18n.defaultLocale,
-            '404.html'
-          )
-        ]
-      );
-
      return serverBuild({
        config,
-        functionsConfigManifest,
        nextVersion,
        trailingSlash,
        appPathRoutesManifest,
        dynamicPages,
        canUsePreviewMode,
        staticPages,
-        localePrefixed404,
        lambdaPages: pages,
        lambdaAppPaths,
        omittedPrerenderRoutes,
@@ -1590,7 +1570,6 @@ export const build: BuildV2 = async ({
      const initialPageLambdaGroups = await getPageLambdaGroups({
        entryPath,
        config,
-        functionsConfigManifest,
        pages: nonApiPages,
        prerenderRoutes: new Set(),
        pageTraces,
@@ -1607,7 +1586,6 @@ export const build: BuildV2 = async ({
      const initialApiLambdaGroups = await getPageLambdaGroups({
        entryPath,
        config,
-        functionsConfigManifest,
        pages: apiPages,
        prerenderRoutes: new Set(),
        pageTraces,
@@ -2692,7 +2670,6 @@ async function getServerlessPages(params: {
      ? Promise.all([
          glob('**/page.js', path.join(params.pagesDir, '../app')),
          glob('**/route.js', path.join(params.pagesDir, '../app')),
-          glob('**/_not-found.js', path.join(params.pagesDir, '../app')),
        ]).then(items => Object.assign(...items))
      : Promise.resolve({}),
    getMiddlewareManifest(params.entryPath, params.outputDirectory),
--- a/packages/next/src/server-build.ts
+++ b/packages/next/src/server-build.ts
@@ -44,7 +44,6 @@ import {
  getFilesMapFromReasons,
  UnwrapPromise,
  getOperationType,
-  FunctionsConfigManifestV1,
 } from './utils';
 import {
  nodeFileTrace,
@@ -67,7 +66,6 @@ export async function serverBuild({
  dynamicPages,
  pagesDir,
  config = {},
-  functionsConfigManifest,
  privateOutputs,
  baseDir,
  workPath,
@@ -91,7 +89,6 @@ export async function serverBuild({
  routesManifest,
  staticPages,
  lambdaPages,
-  localePrefixed404,
  nextVersion,
  lambdaAppPaths,
  canUsePreviewMode,
@@ -108,12 +105,10 @@ export async function serverBuild({
  dynamicPages: string[];
  trailingSlash: boolean;
  config: Config;
-  functionsConfigManifest?: FunctionsConfigManifestV1;
  pagesDir: string;
  baseDir: string;
  canUsePreviewMode: boolean;
  omittedPrerenderRoutes: Set<string>;
-  localePrefixed404: boolean;
  staticPages: { [key: string]: FileFsRef };
  lambdaAppPaths: { [key: string]: FileFsRef };
  lambdaPages: { [key: string]: FileFsRef };
@@ -217,12 +212,12 @@ export async function serverBuild({
      ? path.posix.join(entryDirectory, '_errors/404')
      : undefined;

-  if (
-    !static404Page &&
-    i18n &&
-    staticPages[path.posix.join(entryDirectory, i18n.defaultLocale, '404')]
-  ) {
-    static404Page = path.posix.join(entryDirectory, i18n.defaultLocale, '404');
+  if (!static404Page && i18n) {
+    static404Page = staticPages[
+      path.posix.join(entryDirectory, i18n.defaultLocale, '404')
+    ]
+      ? path.posix.join(entryDirectory, i18n.defaultLocale, '404')
+      : undefined;
  }

  if (!hasStatic500 && i18n) {
@@ -757,7 +752,6 @@ export async function serverBuild({
    const pageLambdaGroups = await getPageLambdaGroups({
      entryPath: projectDir,
      config,
-      functionsConfigManifest,
      pages: nonApiPages,
      prerenderRoutes,
      pageTraces,
@@ -773,7 +767,6 @@ export async function serverBuild({
    const appRouterLambdaGroups = await getPageLambdaGroups({
      entryPath: projectDir,
      config,
-      functionsConfigManifest,
      pages: appRouterPages,
      prerenderRoutes,
      pageTraces,
@@ -796,7 +789,6 @@ export async function serverBuild({
    const apiLambdaGroups = await getPageLambdaGroups({
      entryPath: projectDir,
      config,
-      functionsConfigManifest,
      pages: apiPages,
      prerenderRoutes,
      pageTraces,
@@ -969,7 +961,6 @@ export async function serverBuild({
        if (
          i18n &&
          !isPrerender &&
-          !group.isAppRouter &&
          (!isCorrectLocaleAPIRoutes ||
            !(pageNoExt === 'api' || pageNoExt.startsWith('api/')))
        ) {
@@ -1007,7 +998,6 @@ export async function serverBuild({
    isSharedLambdas: false,
    canUsePreviewMode,
    static404Page,
-    localePrefixed404,
    hasPages404: routesManifest.pages404,
    isCorrectNotFoundRoutes,
    isEmptyAllowQueryForPrendered,
@@ -1074,8 +1064,7 @@ export async function serverBuild({
      prerenderManifest,
      routesManifest,
      true,
-      isCorrectLocaleAPIRoutes,
-      inversedAppPathManifest
+      isCorrectLocaleAPIRoutes
    )
  );

@@ -1228,7 +1217,6 @@ export async function serverBuild({
  const rscVaryHeader =
    routesManifest?.rsc?.varyHeader ||
    'RSC, Next-Router-State-Tree, Next-Router-Prefetch';
-  const appNotFoundPath = path.posix.join('.', entryDirectory, '_not-found');

  return {
    wildcard: wildcardConfig,
@@ -1761,7 +1749,6 @@ export async function serverBuild({
      { handle: 'error' } as RouteWithHandle,

      // Custom Next.js 404 page
-
      ...(i18n && (static404Page || hasIsr404Page || lambdaPages['404.js'])
        ? [
            {
@@ -1796,10 +1783,6 @@ export async function serverBuild({
                  hasIsr404Page ||
                  lambdas[path.posix.join(entryDirectory, '404')]
                  ? '/404'
-                  : appPathRoutesManifest &&
-                    (middleware.edgeFunctions[appNotFoundPath] ||
-                      lambdas[appNotFoundPath])
-                  ? '/_not-found'
                  : '/_error'
              ),
              status: 404,
--- a/packages/next/src/utils.ts
+++ b/packages/next/src/utils.ts
@@ -479,8 +479,7 @@ export function localizeDynamicRoutes(
  prerenderManifest: NextPrerenderedRoutes,
  routesManifest?: RoutesManifest,
  isServerMode?: boolean,
-  isCorrectLocaleAPIRoutes?: boolean,
-  inversedAppPathRoutesManifest?: Record<string, string>
+  isCorrectLocaleAPIRoutes?: boolean
 ): RouteWithSrc[] {
  return dynamicRoutes.map((route: RouteWithSrc) => {
    // i18n is already handled for middleware
@@ -499,9 +498,6 @@ export function localizeDynamicRoutes(
      const isAutoExport =
        staticPages[addLocaleOrDefault(pathname!, routesManifest).substring(1)];

-      const isAppRoute =
-        inversedAppPathRoutesManifest?.[pathnameNoPrefix || ''];
-
      const isLocalePrefixed =
        isFallback || isBlocking || isAutoExport || isServerMode;

@@ -512,11 +508,7 @@ export function localizeDynamicRoutes(
        }${i18n.locales.map(locale => escapeStringRegexp(locale)).join('|')})?`
      );

-      if (
-        isLocalePrefixed &&
-        !(isCorrectLocaleAPIRoutes && isApiRoute) &&
-        !isAppRoute
-      ) {
+      if (isLocalePrefixed && !(isCorrectLocaleAPIRoutes && isApiRoute)) {
        // ensure destination has locale prefix to match prerender output
        // path so that the prerender object is used
        route.dest = route.dest!.replace(
@@ -1405,7 +1397,6 @@ const LAMBDA_RESERVED_COMPRESSED_SIZE = 250 * KIB;
 export async function getPageLambdaGroups({
  entryPath,
  config,
-  functionsConfigManifest,
  pages,
  prerenderRoutes,
  pageTraces,
@@ -1419,7 +1410,6 @@ export async function getPageLambdaGroups({
 }: {
  entryPath: string;
  config: Config;
-  functionsConfigManifest?: FunctionsConfigManifestV1;
  pages: string[];
  prerenderRoutes: Set<string>;
  pageTraces: {
@@ -1446,26 +1436,16 @@ export async function getPageLambdaGroups({

    let opts: { memory?: number; maxDuration?: number } = {};

-    if (
-      functionsConfigManifest &&
-      functionsConfigManifest.functions[routeName]
-    ) {
-      opts = functionsConfigManifest.functions[routeName];
-    }
-
    if (config && config.functions) {
      const sourceFile = await getSourceFilePathFromPage({
        workPath: entryPath,
        page,
        pageExtensions,
      });
-
-      const vercelConfigOpts = await getLambdaOptionsFromFunction({
+      opts = await getLambdaOptionsFromFunction({
        sourceFile,
        config,
      });
-
-      opts = { ...vercelConfigOpts, ...opts };
    }

    let matchingGroup = groups.find(group => {
@@ -1799,7 +1779,6 @@ export const onPrerenderRouteInitial = (
 type OnPrerenderRouteArgs = {
  appDir: string | null;
  pagesDir: string;
-  localePrefixed404?: boolean;
  static404Page?: string;
  hasPages404: boolean;
  entryDirectory: string;
@@ -1837,7 +1816,6 @@ export const onPrerenderRoute =
      appDir,
      pagesDir,
      static404Page,
-      localePrefixed404,
      entryDirectory,
      prerenderManifest,
      isSharedLambdas,
@@ -1973,9 +1951,7 @@ export const onPrerenderRoute =
                    // file.
                    `${
                      isOmittedOrNotFound
-                        ? localePrefixed404
-                          ? addLocaleOrDefault('/404', routesManifest, locale)
-                          : '/404'
+                        ? addLocaleOrDefault('/404', routesManifest, locale)
                        : routeFileNoExt
                    }.html`
              ),
@@ -1992,9 +1968,7 @@ export const onPrerenderRoute =
                : pagesDir,
              `${
                isOmittedOrNotFound
-                  ? localePrefixed404
-                    ? addLocaleOrDefault('/404.html', routesManifest, locale)
-                    : '/404.html'
+                  ? addLocaleOrDefault('/404.html', routesManifest, locale)
                  : isAppPathRoute
                  ? dataRoute
                  : routeFileNoExt + '.json'
@@ -2414,16 +2388,6 @@ export {
  getSourceFilePathFromPage,
 };

-export type FunctionsConfigManifestV1 = {
-  version: 1;
-  functions: Record<
-    string,
-    {
-      maxDuration?: number;
-    }
-  >;
-};
-
 type MiddlewareManifest = MiddlewareManifestV1 | MiddlewareManifestV2;

 interface MiddlewareManifestV1 {
@@ -2699,9 +2663,7 @@ export async function getMiddlewareBundle({
        shortPath = shortPath.replace(/^pages\//, '');
      } else if (
        shortPath.startsWith('app/') &&
-        (shortPath.endsWith('/page') ||
-          shortPath.endsWith('/route') ||
-          shortPath === 'app/_not-found')
+        (shortPath.endsWith('/page') || shortPath.endsWith('/route'))
      ) {
        const ogRoute = shortPath.replace(/^app\//, '/');
        shortPath = (
@@ -2769,37 +2731,6 @@ export async function getMiddlewareBundle({
  };
 }

-/**
- * Attempts to read the functions config manifest from the pre-defined
- * location. If the manifest can't be found it will resolve to
- * undefined.
- */
-export async function getFunctionsConfigManifest(
-  entryPath: string,
-  outputDirectory: string
-): Promise<FunctionsConfigManifestV1 | undefined> {
-  const functionConfigManifestPath = path.join(
-    entryPath,
-    outputDirectory,
-    './server/functions-config-manifest.json'
-  );
-
-  const hasManifest = await fs
-    .access(functionConfigManifestPath)
-    .then(() => true)
-    .catch(() => false);
-
-  if (!hasManifest) {
-    return;
-  }
-
-  const manifest: FunctionsConfigManifestV1 = await fs.readJSON(
-    functionConfigManifestPath
-  );
-
-  return manifest.version === 1 ? manifest : undefined;
-}
-
 /**
 * Attempts to read the middleware manifest from the pre-defined
 * location. If the manifest can't be found it will resolve to
--- a/packages/next/test/fixtures/00-app-dir-base-path/vercel.json
+++ b/packages/next/test/fixtures/00-app-dir-base-path/vercel.json
@@ -42,14 +42,14 @@
      "status": 200,
      "mustContain": "hello from /ssg",
      "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
      }
    },
    {
      "path": "/hello/world/ssg",
      "status": 200,
      "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
      },
      "headers": {
        "RSC": "1"
@@ -82,14 +82,14 @@
      "status": 200,
      "mustContain": "hello from app/dashboard/deployments/[id]/settings",
      "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
      }
    },
    {
      "path": "/hello/world/dashboard/deployments/123/settings",
      "status": 200,
      "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
      },
      "headers": {
        "RSC": "1"
@@ -102,14 +102,14 @@
      "status": 200,
      "mustContain": "catchall",
      "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
      }
    },
    {
      "path": "/hello/world/dashboard/deployments/catchall/something",
      "status": 200,
      "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
      },
      "headers": {
        "RSC": "1"
@@ -122,7 +122,7 @@
      "status": 200,
      "mustContain": "hello from app/dashboard",
      "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
      }
    },
    {
@@ -142,7 +142,7 @@
      },
      "responseHeaders": {
        "content-type": "text/x-component",
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
      }
    },
    {
--- a/packages/next/test/fixtures/00-app-dir-dynamic-404/app/layout.js
+++ b/packages/next/test/fixtures/00-app-dir-dynamic-404/app/layout.js
@@ -1,10 +0,0 @@
-export default function Layout({ children }) {
-  return (
-    <html>
-      <head>
-        <title>Hello World</title>
-      </head>
-      <body>{children}</body>
-    </html>
-  )
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Justin Ridgewell	56c732a7f4	Patch into undici to disable body decompression	2023-07-06 16:59:23 -04:00
Kiko Beats	59905cd787	WIP	2023-07-06 22:06:30 +02:00