Version Packages (#10302 )

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
[remix] Add initial support for Hydrogen v2 (#10305 )
2025-12-11 04:22:13 +00:00 · 2023-08-08 17:10:58 -05:00 · 2023-08-08 21:39:57 +00:00 · 2023-08-08 14:43:20 -04:00 · 2023-08-07 16:36:40 -04:00 · 2023-08-07 15:33:26 -05:00
209 changed files with 32368 additions and 4641 deletions
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -2,11 +2,11 @@
 # https://help.github.com/en/articles/about-code-owners

 # Restricted Paths
-*                                        @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood
-/.github/workflows                       @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood @ijjk
-/packages/fs-detectors                   @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood @agadzik @chloetedder
-/packages/next                           @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood @ijjk
-/packages/routing-utils                  @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood @ijjk
+*                                        @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
 /examples                                @leerob
 /examples/create-react-app               @Timer
@@ -14,7 +14,7 @@
 /examples/hugo                           @styfle
 /examples/jekyll                         @styfle
 /examples/zola                           @styfle
-/packages/node                           @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood @Kikobeats
+/packages/node                           @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood @trek @Kikobeats

 # Unrestricted Paths
 .changeset/
--- a/.github/DISCUSSION_TEMPLATE/general.yml
+++ b/.github/DISCUSSION_TEMPLATE/general.yml
@@ -2,7 +2,9 @@ body:
  - type: markdown
    attributes:
      value: |
-        > **Note**: For discussions not related to Vercel CLI or Runtimes, please visit the [Vercel Community](https://github.com/orgs/vercel/discussions)
+        **Note**: This category is intended for discussions related to Vercel CLI or Runtimes. 
+
+        If you post in this repository seeking help with other Vercel tools and features, it may be missed by our support team. For help with topics other than the CLI and Runtimes, please visit the [Vercel Community](https://github.com/orgs/vercel/discussions).
  - type: textarea
    attributes:
      label: Description
--- a/.github/DISCUSSION_TEMPLATE/help.yml
+++ b/.github/DISCUSSION_TEMPLATE/help.yml
@@ -2,9 +2,11 @@ body:
  - type: markdown
    attributes:
      value: |
-        > **Note**: For discussions not related to Vercel CLI or Runtimes, please visit the [Vercel Community](https://github.com/orgs/vercel/discussions/categories/help)
+        **Note**: This category is intended for discussions related to Vercel CLI or Runtimes. 
+
+        If you post in this repository seeking help with other Vercel tools and features, it may be missed by our support team. For help with topics other than the CLI and Runtimes, please visit the [Vercel Community](https://github.com/orgs/vercel/discussions).
  - type: textarea
    attributes:
-      label: Problem Description
+      label: Question
    validations:
      required: true
--- a/.github/DISCUSSION_TEMPLATE/ideas.yml
+++ b/.github/DISCUSSION_TEMPLATE/ideas.yml
@@ -2,7 +2,9 @@ body:
  - type: markdown
    attributes:
      value: |
-        > **Note**: For discussions not related to Vercel CLI or Runtimes, please visit the [Vercel Community](https://github.com/orgs/vercel/discussions/categories/ideas)
+        **Note**: This category is intended for sharing ideas related to Vercel CLI or Runtimes. 
+
+        Please visit the [Vercel Community](https://github.com/orgs/vercel/discussions) to share ideas for other Vercel tools and features.
  - type: textarea
    attributes:
      label: Idea
--- a/.github/DISCUSSION_TEMPLATE/polls.yml
+++ b/.github/DISCUSSION_TEMPLATE/polls.yml
@@ -1,10 +0,0 @@
-body:
-  - type: markdown
-    attributes:
-      value: |
-        > **Note**: For discussions not related to Vercel CLI or Runtimes, please visit the [Vercel Community](https://github.com/orgs/vercel/discussions)
-  - type: textarea
-    attributes:
-      label: Description
-    validations:
-      required: true
--- a/.github/DISCUSSION_TEMPLATE/show-and-tell.yml
+++ b/.github/DISCUSSION_TEMPLATE/show-and-tell.yml
@@ -2,7 +2,9 @@ body:
  - type: markdown
    attributes:
      value: |
-        > **Note**: For discussions not related to Vercel CLI or Runtimes, please visit the [Vercel Community](https://github.com/orgs/vercel/discussions)
+        **Note**: This category is intended for discussions related to Vercel CLI or Runtimes. 
+
+        For topics related to other Vercel features, please visit the [Vercel Community](https://github.com/orgs/vercel/discussions).
  - type: textarea
    attributes:
      label: Description
--- a/.github/DISCUSSION_TEMPLATE/temporary.yml
+++ b/.github/DISCUSSION_TEMPLATE/temporary.yml
@@ -1,5 +0,0 @@
-body:
-  - type: markdown
-    attributes:
-      value: |
-        > **Note**: This category should not be used for new discussions. Please visit the [Vercel Community](https://github.com/orgs/vercel/discussions)
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -81,11 +81,11 @@ jobs:
        run: echo | openssl s_client -showcerts -servername 'api.vercel.com' -connect 76.76.21.21:443

      - name: Build ${{matrix.packageName}} and all its dependencies
-        run: node utils/gen.js && node_modules/.bin/turbo run build --cache-dir=".turbo" --scope=${{matrix.packageName}} --include-dependencies --no-deps
+        run: node utils/gen.js && node_modules/.bin/turbo run build --cache-dir=".turbo" --log-order=stream --scope=${{matrix.packageName}} --include-dependencies --no-deps
        env:
          FORCE_COLOR: '1'
      - name: Test ${{matrix.packageName}}
-        run: node utils/gen.js && node_modules/.bin/turbo run test --cache-dir=".turbo" --scope=${{matrix.packageName}} --no-deps -- ${{ join(matrix.testPaths, ' ') }}
+        run: node utils/gen.js && node_modules/.bin/turbo run test --cache-dir=".turbo" --log-order=stream --scope=${{matrix.packageName}} --no-deps -- ${{ join(matrix.testPaths, ' ') }}
        shell: bash
        env:
          VERCEL_CLI_VERSION: ${{ needs.setup.outputs.dplUrl }}/tarballs/vercel.tgz
--- a/examples/hydrogen/package.json
+++ b/examples/hydrogen/package.json
@@ -44,6 +44,5 @@
    "react-use": "^17.4.0",
    "title": "^3.4.4",
    "typographic-base": "^1.0.4"
-  },
-  "author": "nrajlich"
+  }
 }
--- a/examples/nextjs/app/page.module.css
+++ b/examples/nextjs/app/page.module.css
@@ -42,8 +42,8 @@
 .grid {
  display: grid;
  grid-template-columns: repeat(4, minmax(25%, auto));
-  width: var(--max-width);
  max-width: 100%;
+  width: var(--max-width);
 }

 .card {
--- 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.46.0",
+        "eslint-config-next": "13.4.13",
+        "next": "13.4.13",
        "react": "18.2.0",
        "react-dom": "18.2.0"
      }
@@ -49,17 +49,17 @@
      }
    },
    "node_modules/@eslint-community/regexpp": {
-      "version": "4.5.1",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.5.1.tgz",
-      "integrity": "sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ==",
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.6.2.tgz",
+      "integrity": "sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==",
      "engines": {
        "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
      }
    },
    "node_modules/@eslint/eslintrc": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.0.tgz",
-      "integrity": "sha512-Lj7DECXqIVCqnqjjHMPna4vn6GJcMgul/wuS0je9OZ9gsL0zzDpKPVtcG1HaDVc+9y+qgXneTeUMbCqXJNpH1A==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.1.tgz",
+      "integrity": "sha512-9t7ZA7NGGK8ckelF0PQCfcxIUzs1Md5rrO6U/c+FIQNanea5UZC0wqKXH4vHBccmu4ZJgZ2idtPeW7+Q2npOEA==",
      "dependencies": {
        "ajv": "^6.12.4",
        "debug": "^4.3.2",
@@ -79,9 +79,9 @@
      }
    },
    "node_modules/@eslint/js": {
-      "version": "8.44.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.44.0.tgz",
-      "integrity": "sha512-Ag+9YM4ocKQx9AarydN0KY2j0ErMHNIocPDrVo8zAE44xLTjEtz81OdR68/cydGtk6m6jDb5Za3r2useMzYmSw==",
+      "version": "8.46.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.46.0.tgz",
+      "integrity": "sha512-a8TLtmPi8xzPkCbp/OGFUo5yhRkHM2Ko9kOWP4znJr0WAhWyThaw3PnwX4vOTWOAMsV2uRt32PPDcEz63esSaA==",
      "engines": {
        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
      }
@@ -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.13",
+      "resolved": "https://registry.npmjs.org/@next/env/-/env-13.4.13.tgz",
+      "integrity": "sha512-fwz2QgVg08v7ZL7KmbQBLF2PubR/6zQdKBgmHEl3BCyWTEDsAQEijjw2gbFhI1tcKfLdOOJUXntz5vZ4S0Polg=="
    },
    "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.13",
+      "resolved": "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-13.4.13.tgz",
+      "integrity": "sha512-RpZeXlPxQ9FLeYN84XHDqRN20XxmVNclYCraLYdifRsmibtcWUWdwE/ANp2C8kgesFRsvwfsw6eOkYNl9sLJ3A==",
      "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.13",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.4.13.tgz",
+      "integrity": "sha512-ZptVhHjzUuivnXMNCJ6lER33HN7lC+rZ01z+PM10Ows21NHFYMvGhi5iXkGtBDk6VmtzsbqnAjnx4Oz5um0FjA==",
      "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.13",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-13.4.13.tgz",
+      "integrity": "sha512-t9nTiWCLApw8W4G1kqJyYP7y6/7lyal3PftmRturIxAIBlZss9wrtVN8nci50StDHmIlIDxfguYIEGVr9DbFTg==",
      "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.13",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.4.13.tgz",
+      "integrity": "sha512-xEHUqC8eqR5DHe8SOmMnDU1K3ggrJ28uIKltrQAwqFSSSmzjnN/XMocZkcVhuncuxYrpbri0iMQstRyRVdQVWg==",
      "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.13",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.4.13.tgz",
+      "integrity": "sha512-sNf3MnLAm8rquSSAoeD9nVcdaDeRYOeey4stOWOyWIgbBDtP+C93amSgH/LPTDoUV7gNiU6f+ghepTjTjRgIUQ==",
      "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.13",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.4.13.tgz",
+      "integrity": "sha512-WhcRaJJSHyx9OWmKjjz+OWHumiPZWRqmM/09Bt7Up4UqUJFFhGExeztR4trtv3rflvULatu9IH/nTV8fUUgaMA==",
      "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.13",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.4.13.tgz",
+      "integrity": "sha512-+Y4LLhOWWZQIDKVwr2R17lq2KSN0F1c30QVgGIWfnjjHpH8nrIWHEndhqYU+iFuW8It78CiJjQKTw4f51HD7jA==",
      "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.13",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.4.13.tgz",
+      "integrity": "sha512-rWurdOR20uxjfqd1X9vDAgv0Jb26KjyL8akF9CBeFqX8rVaBAnW/Wf6A2gYEwyYY4Bai3T7p1kro6DFrsvBAAw==",
      "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.13",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.4.13.tgz",
+      "integrity": "sha512-E8bSPwRuY5ibJ3CzLQmJEt8qaWrPYuUTwnrwygPUEWoLzD5YRx9SD37oXRdU81TgGwDzCxpl7z5Nqlfk50xAog==",
      "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.13",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.4.13.tgz",
+      "integrity": "sha512-4KlyC6jWRubPnppgfYsNTPeWfGCxtWLh5vaOAW/kdzAk9widqho8Qb5S4K2vHmal1tsURi7Onk2MMCV1phvyqA==",
      "cpu": [
        "x64"
      ],
@@ -334,24 +334,25 @@
      "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": "6.2.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.2.1.tgz",
+      "integrity": "sha512-Ld+uL1kYFU8e6btqBFpsHkwQ35rw30IWpdQxgOqOh4NfxSDH6uCkah1ks8R/RgQqI5hHPXMaLy9fbFseIe+dIg==",
      "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": "6.2.1",
+        "@typescript-eslint/types": "6.2.1",
+        "@typescript-eslint/typescript-estree": "6.2.1",
+        "@typescript-eslint/visitor-keys": "6.2.1",
        "debug": "^4.3.4"
      },
      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^16.0.0 || >=18.0.0"
      },
      "funding": {
        "type": "opencollective",
        "url": "https://opencollective.com/typescript-eslint"
      },
      "peerDependencies": {
-        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+        "eslint": "^7.0.0 || ^8.0.0"
      },
      "peerDependenciesMeta": {
        "typescript": {
@@ -360,15 +361,15 @@
      }
    },
    "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": "6.2.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.2.1.tgz",
+      "integrity": "sha512-UCqBF9WFqv64xNsIEPfBtenbfodPXsJ3nPAr55mGPkQIkiQvgoWNo+astj9ZUfJfVKiYgAZDMnM6dIpsxUMp3Q==",
      "dependencies": {
-        "@typescript-eslint/types": "5.62.0",
-        "@typescript-eslint/visitor-keys": "5.62.0"
+        "@typescript-eslint/types": "6.2.1",
+        "@typescript-eslint/visitor-keys": "6.2.1"
      },
      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^16.0.0 || >=18.0.0"
      },
      "funding": {
        "type": "opencollective",
@@ -376,11 +377,11 @@
      }
    },
    "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": "6.2.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.2.1.tgz",
+      "integrity": "sha512-528bGcoelrpw+sETlyM91k51Arl2ajbNT9L4JwoXE2dvRe1yd8Q64E4OL7vHYw31mlnVsf+BeeLyAZUEQtqahQ==",
      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^16.0.0 || >=18.0.0"
      },
      "funding": {
        "type": "opencollective",
@@ -388,20 +389,20 @@
      }
    },
    "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": "6.2.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.2.1.tgz",
+      "integrity": "sha512-G+UJeQx9AKBHRQBpmvr8T/3K5bJa485eu+4tQBxFq0KoT22+jJyzo1B50JDT9QdC1DEmWQfdKsa8ybiNWYsi0Q==",
      "dependencies": {
-        "@typescript-eslint/types": "5.62.0",
-        "@typescript-eslint/visitor-keys": "5.62.0",
+        "@typescript-eslint/types": "6.2.1",
+        "@typescript-eslint/visitor-keys": "6.2.1",
        "debug": "^4.3.4",
        "globby": "^11.1.0",
        "is-glob": "^4.0.3",
-        "semver": "^7.3.7",
-        "tsutils": "^3.21.0"
+        "semver": "^7.5.4",
+        "ts-api-utils": "^1.0.1"
      },
      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^16.0.0 || >=18.0.0"
      },
      "funding": {
        "type": "opencollective",
@@ -414,15 +415,15 @@
      }
    },
    "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": "6.2.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.2.1.tgz",
+      "integrity": "sha512-iTN6w3k2JEZ7cyVdZJTVJx2Lv7t6zFA8DCrJEHD2mwfc16AEvvBWVhbFh34XyG2NORCd0viIgQY1+u7kPI0WpA==",
      "dependencies": {
-        "@typescript-eslint/types": "5.62.0",
-        "eslint-visitor-keys": "^3.3.0"
+        "@typescript-eslint/types": "6.2.1",
+        "eslint-visitor-keys": "^3.4.1"
      },
      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^16.0.0 || >=18.0.0"
      },
      "funding": {
        "type": "opencollective",
@@ -536,6 +537,24 @@
        "node": ">=8"
      }
    },
+    "node_modules/array.prototype.findlastindex": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.2.tgz",
+      "integrity": "sha512-tb5thFFlUcp7NdNF6/MpDk/1r/4awWG1FIz3YqDf+/zJSTezBb+/5WViH41obXULHVpDzoiCLpJ/ZO9YbJMsdw==",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "es-shim-unscopables": "^1.0.0",
+        "get-intrinsic": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
    "node_modules/array.prototype.flat": {
      "version": "1.3.1",
      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz",
@@ -723,9 +742,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.30001519",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001519.tgz",
+      "integrity": "sha512-0QHgqR+Jv4bxHMp8kZ1Kn8CH55OikjKJ6JmKkZYP1F3D7w+lnFXF70nG5eNfsZS89jadi5Ywy5UCSKLAglIRkg==",
      "funding": [
        {
          "type": "opencollective",
@@ -1027,26 +1046,26 @@
      }
    },
    "node_modules/eslint": {
-      "version": "8.45.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.45.0.tgz",
-      "integrity": "sha512-pd8KSxiQpdYRfYa9Wufvdoct3ZPQQuVuU5O6scNgMuOMYuxvH0IGaYK0wUFjo4UYYQQCUndlXiMbnxopwvvTiw==",
+      "version": "8.46.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.46.0.tgz",
+      "integrity": "sha512-cIO74PvbW0qU8e0mIvk5IV3ToWdCq5FYG6gWPHHkx6gNdjlbAYvtfHmlCMXxjcoVaIdwy/IAt3+mDkZkfvb2Dg==",
      "dependencies": {
        "@eslint-community/eslint-utils": "^4.2.0",
-        "@eslint-community/regexpp": "^4.4.0",
-        "@eslint/eslintrc": "^2.1.0",
-        "@eslint/js": "8.44.0",
+        "@eslint-community/regexpp": "^4.6.1",
+        "@eslint/eslintrc": "^2.1.1",
+        "@eslint/js": "^8.46.0",
        "@humanwhocodes/config-array": "^0.11.10",
        "@humanwhocodes/module-importer": "^1.0.1",
        "@nodelib/fs.walk": "^1.2.8",
-        "ajv": "^6.10.0",
+        "ajv": "^6.12.4",
        "chalk": "^4.0.0",
        "cross-spawn": "^7.0.2",
        "debug": "^4.3.2",
        "doctrine": "^3.0.0",
        "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.2.0",
-        "eslint-visitor-keys": "^3.4.1",
-        "espree": "^9.6.0",
+        "eslint-scope": "^7.2.2",
+        "eslint-visitor-keys": "^3.4.2",
+        "espree": "^9.6.1",
        "esquery": "^1.4.2",
        "esutils": "^2.0.2",
        "fast-deep-equal": "^3.1.3",
@@ -1080,13 +1099,13 @@
      }
    },
    "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.13",
+      "resolved": "https://registry.npmjs.org/eslint-config-next/-/eslint-config-next-13.4.13.tgz",
+      "integrity": "sha512-EXAh5h1yG/YTNa5YdskzaSZncBjKjvFe2zclMCi2KXyTsXha22wB6MPs/U7idB6a2qjpBdbZcruQY1TWjfNMZw==",
      "dependencies": {
-        "@next/eslint-plugin-next": "13.4.12",
+        "@next/eslint-plugin-next": "13.4.13",
        "@rushstack/eslint-patch": "^1.1.3",
-        "@typescript-eslint/parser": "^5.42.0",
+        "@typescript-eslint/parser": "^5.4.2 || ^6.0.0",
        "eslint-import-resolver-node": "^0.3.6",
        "eslint-import-resolver-typescript": "^3.5.2",
        "eslint-plugin-import": "^2.26.0",
@@ -1105,13 +1124,13 @@
      }
    },
    "node_modules/eslint-import-resolver-node": {
-      "version": "0.3.7",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz",
-      "integrity": "sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==",
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.8.tgz",
+      "integrity": "sha512-tEe+Pok22qIGaK3KoMP+N96GVDS66B/zreoVVmiavLvRUEmGRtvb4B8wO9jwnb8d2lvHtrkhZ7UD73dWBVnf/Q==",
      "dependencies": {
        "debug": "^3.2.7",
-        "is-core-module": "^2.11.0",
-        "resolve": "^1.22.1"
+        "is-core-module": "^2.13.0",
+        "resolve": "^1.22.4"
      }
    },
    "node_modules/eslint-import-resolver-node/node_modules/debug": {
@@ -1201,25 +1220,28 @@
      }
    },
    "node_modules/eslint-plugin-import": {
-      "version": "2.27.5",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz",
-      "integrity": "sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==",
+      "version": "2.28.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.28.0.tgz",
+      "integrity": "sha512-B8s/n+ZluN7sxj9eUf7/pRFERX0r5bnFA2dCaLHy2ZeaQEAz0k+ZZkFWRFHJAqxfxQDx6KLv9LeIki7cFdwW+Q==",
      "dependencies": {
        "array-includes": "^3.1.6",
+        "array.prototype.findlastindex": "^1.2.2",
        "array.prototype.flat": "^1.3.1",
        "array.prototype.flatmap": "^1.3.1",
        "debug": "^3.2.7",
        "doctrine": "^2.1.0",
        "eslint-import-resolver-node": "^0.3.7",
-        "eslint-module-utils": "^2.7.4",
+        "eslint-module-utils": "^2.8.0",
        "has": "^1.0.3",
-        "is-core-module": "^2.11.0",
+        "is-core-module": "^2.12.1",
        "is-glob": "^4.0.3",
        "minimatch": "^3.1.2",
+        "object.fromentries": "^2.0.6",
+        "object.groupby": "^1.0.0",
        "object.values": "^1.1.6",
-        "resolve": "^1.22.1",
-        "semver": "^6.3.0",
-        "tsconfig-paths": "^3.14.1"
+        "resolve": "^1.22.3",
+        "semver": "^6.3.1",
+        "tsconfig-paths": "^3.14.2"
      },
      "engines": {
        "node": ">=4"
@@ -1293,9 +1315,9 @@
      }
    },
    "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.33.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.33.1.tgz",
+      "integrity": "sha512-L093k0WAMvr6VhNwReB8VgOq5s2LesZmrpPdKz/kZElQDzqS7G7+DnKoqT+w4JwuiGeAhAvHO0fvy0Eyk4ejDA==",
      "dependencies": {
        "array-includes": "^3.1.6",
        "array.prototype.flatmap": "^1.3.1",
@@ -1367,9 +1389,9 @@
      }
    },
    "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.2",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
+      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
      "dependencies": {
        "esrecurse": "^4.3.0",
        "estraverse": "^5.2.0"
@@ -1382,9 +1404,9 @@
      }
    },
    "node_modules/eslint-visitor-keys": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
-      "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==",
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz",
+      "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==",
      "engines": {
        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
      },
@@ -1447,9 +1469,9 @@
      }
    },
    "node_modules/execa": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-7.1.1.tgz",
-      "integrity": "sha512-wH0eMf/UXckdUYnO21+HDztteVv05rq2GXksxT4fCGeHkBhw1DROXh40wcjMcRqDOWE7iPJ4n3M7e2+YFP+76Q==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-7.2.0.tgz",
+      "integrity": "sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==",
      "dependencies": {
        "cross-spawn": "^7.0.3",
        "get-stream": "^6.0.1",
@@ -1474,9 +1496,9 @@
      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
    },
    "node_modules/fast-glob": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.0.tgz",
-      "integrity": "sha512-ChDuvbOypPuNjO8yIDf36x7BlZX1smcUMTTcyoIjycexOxd6DFsKsg21qVBzEmr3G7fUKIRy2/psii+CIUt7FA==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz",
+      "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==",
      "dependencies": {
        "@nodelib/fs.stat": "^2.0.2",
        "@nodelib/fs.walk": "^1.2.3",
@@ -1959,9 +1981,9 @@
      }
    },
    "node_modules/is-core-module": {
-      "version": "2.12.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz",
-      "integrity": "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==",
+      "version": "2.13.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz",
+      "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==",
      "dependencies": {
        "has": "^1.0.3"
      },
@@ -2237,9 +2259,9 @@
      }
    },
    "node_modules/jsx-ast-utils": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.4.tgz",
-      "integrity": "sha512-fX2TVdCViod6HwKEtSWGHs57oFhVfCMwieb9PuRDgjDPh5XeqJiHFFFJCHxU5cnTc3Bu/GRL+kPiFmw8XWOfKw==",
+      "version": "3.3.5",
+      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz",
+      "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==",
      "dependencies": {
        "array-includes": "^3.1.6",
        "array.prototype.flat": "^1.3.1",
@@ -2399,11 +2421,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.13",
+      "resolved": "https://registry.npmjs.org/next/-/next-13.4.13.tgz",
+      "integrity": "sha512-A3YVbVDNeXLhWsZ8Nf6IkxmNlmTNz0yVg186NJ97tGZqPDdPzTrHotJ+A1cuJm2XfuWPrKOUZILl5iBQkIf8Jw==",
      "dependencies": {
-        "@next/env": "13.4.12",
+        "@next/env": "13.4.13",
        "@swc/helpers": "0.5.1",
        "busboy": "1.6.0",
        "caniuse-lite": "^1.0.30001406",
@@ -2419,19 +2441,18 @@
        "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.13",
+        "@next/swc-darwin-x64": "13.4.13",
+        "@next/swc-linux-arm64-gnu": "13.4.13",
+        "@next/swc-linux-arm64-musl": "13.4.13",
+        "@next/swc-linux-x64-gnu": "13.4.13",
+        "@next/swc-linux-x64-musl": "13.4.13",
+        "@next/swc-win32-arm64-msvc": "13.4.13",
+        "@next/swc-win32-ia32-msvc": "13.4.13",
+        "@next/swc-win32-x64-msvc": "13.4.13"
      },
      "peerDependencies": {
        "@opentelemetry/api": "^1.1.0",
-        "fibers": ">= 3.1.0",
        "react": "^18.2.0",
        "react-dom": "^18.2.0",
        "sass": "^1.3.0"
@@ -2440,9 +2461,6 @@
        "@opentelemetry/api": {
          "optional": true
        },
-        "fibers": {
-          "optional": true
-        },
        "sass": {
          "optional": true
        }
@@ -2543,6 +2561,17 @@
        "url": "https://github.com/sponsors/ljharb"
      }
    },
+    "node_modules/object.groupby": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.0.tgz",
+      "integrity": "sha512-70MWG6NfRH9GnbZOikuhPPYzpUpof9iW2J9E4dW7FXTqPNb6rllE6u39SKwwiNh8lCwX3DDb5OgcKGiEBrTTyw==",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.21.2",
+        "get-intrinsic": "^1.2.1"
+      }
+    },
    "node_modules/object.hasown": {
      "version": "1.1.2",
      "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.2.tgz",
@@ -2836,11 +2865,11 @@
      }
    },
    "node_modules/resolve": {
-      "version": "1.22.2",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz",
-      "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==",
+      "version": "1.22.4",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.4.tgz",
+      "integrity": "sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==",
      "dependencies": {
-        "is-core-module": "^2.11.0",
+        "is-core-module": "^2.13.0",
        "path-parse": "^1.0.7",
        "supports-preserve-symlinks-flag": "^1.0.0"
      },
@@ -3316,6 +3345,17 @@
        "node": ">=8.0"
      }
    },
+    "node_modules/ts-api-utils": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.0.1.tgz",
+      "integrity": "sha512-lC/RGlPmwdrIBFTX59wwNzqh7aR2otPNPR/5brHZm/XKFYKsfqxihXUe9pU3JI+3vGkl+vyCoNNnPhJn3aLK1A==",
+      "engines": {
+        "node": ">=16.13.0"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.2.0"
+      }
+    },
    "node_modules/tsconfig-paths": {
      "version": "3.14.2",
      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz",
@@ -3328,28 +3368,9 @@
      }
    },
    "node_modules/tslib": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.0.tgz",
-      "integrity": "sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA=="
-    },
-    "node_modules/tsutils": {
-      "version": "3.21.0",
-      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
-      "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
-      "dependencies": {
-        "tslib": "^1.8.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      },
-      "peerDependencies": {
-        "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
-      }
-    },
-    "node_modules/tsutils/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz",
+      "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig=="
    },
    "node_modules/type-check": {
      "version": "0.4.0",
--- 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.46.0",
+    "eslint-config-next": "13.4.13",
+    "next": "13.4.13",
    "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://v3.nuxtjs.org/guide/deploy/presets) for more information.
+Checkout the [deployment documentation](https://nuxt.com/docs/getting-started/deployment#presets) for more information.
--- a/internals/types/CHANGELOG.md
+++ b/internals/types/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @vercel-internals/types

+## 1.0.6
+
+### Patch Changes
+
+- Updated dependencies [[`a8ecf40d6`](https://github.com/vercel/vercel/commit/a8ecf40d6f50e2fc8b13b02c8ef50b3dcafad3a6)]:
+  - @vercel/build-utils@6.8.3
+
 ## 1.0.5

 ### 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.6",
  "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/build-utils": "6.8.3",
    "@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.9",
+    "turbo": "1.10.12",
    "typescript": "4.9.5"
  },
  "scripts": {
--- a/packages/build-utils/CHANGELOG.md
+++ b/packages/build-utils/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @vercel/build-utils

+## 6.8.3
+
+### Patch Changes
+
+- Fix `getPrefixedEnvVars()` to handle `VERCEL_BRANCH_URL` ([#10315](https://github.com/vercel/vercel/pull/10315))
+
 ## 6.8.2

 ### Patch 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.3",
  "license": "Apache-2.0",
  "main": "./dist/index.js",
  "types": "./dist/index.d.js",
--- a/packages/build-utils/src/get-prefixed-env-vars.ts
+++ b/packages/build-utils/src/get-prefixed-env-vars.ts
@@ -14,7 +14,12 @@ export function getPrefixedEnvVars({
  envs: Envs;
 }): Envs {
  const vercelSystemEnvPrefix = 'VERCEL_';
-  const allowed = ['VERCEL_URL', 'VERCEL_ENV', 'VERCEL_REGION'];
+  const allowed = [
+    'VERCEL_URL',
+    'VERCEL_ENV',
+    'VERCEL_REGION',
+    'VERCEL_BRANCH_URL',
+  ];
  const newEnvs: Envs = {};
  if (envPrefix && envs.VERCEL_URL) {
    Object.keys(envs)
--- a/packages/build-utils/test/unit.get-prefixed-env-vars.test.ts
+++ b/packages/build-utils/test/unit.get-prefixed-env-vars.test.ts
@@ -13,6 +13,8 @@ describe('Test `getPrefixedEnvVars()`', () => {
        envs: {
          VERCEL: '1',
          VERCEL_URL: 'example.vercel.sh',
+          VERCEL_ENV: 'production',
+          VERCEL_BRANCH_URL: 'example-git-main-acme.vercel.app',
          USER_ENV_VAR_NOT_VERCEL: 'example.com',
          VERCEL_ARTIFACTS_TOKEN: 'abc123',
          FOO: 'bar',
@@ -20,6 +22,8 @@ describe('Test `getPrefixedEnvVars()`', () => {
      },
      want: {
        NEXT_PUBLIC_VERCEL_URL: 'example.vercel.sh',
+        NEXT_PUBLIC_VERCEL_ENV: 'production',
+        NEXT_PUBLIC_VERCEL_BRANCH_URL: 'example-git-main-acme.vercel.app',
        TURBO_CI_VENDOR_ENV_KEY: 'NEXT_PUBLIC_VERCEL_',
      },
    },
--- a/packages/cli/CHANGELOG.md
+++ b/packages/cli/CHANGELOG.md
@@ -1,5 +1,84 @@
 # vercel

+## 31.2.3
+
+### Patch Changes
+
+- Be looser in tests with mock server urls ([#10300](https://github.com/vercel/vercel/pull/10300))
+
+- Handle calls for deployment aliases when mocking deployments ([#10303](https://github.com/vercel/vercel/pull/10303))
+
+- Remove unused code ([#10309](https://github.com/vercel/vercel/pull/10309))
+
+- Updated dependencies [[`5bf1fe4c7`](https://github.com/vercel/vercel/commit/5bf1fe4c743f6be3f7d5a24447ea5b083a68dc67), [`a8ecf40d6`](https://github.com/vercel/vercel/commit/a8ecf40d6f50e2fc8b13b02c8ef50b3dcafad3a6), [`08da4b9c9`](https://github.com/vercel/vercel/commit/08da4b9c923501d9d28eb6e3f26f4605fee83042), [`0945d24cb`](https://github.com/vercel/vercel/commit/0945d24cbe901ca3f0eedd011251ad499c72d472)]:
+  - @vercel/next@3.9.4
+  - @vercel/build-utils@6.8.3
+  - @vercel/remix-builder@1.10.0
+  - @vercel/node@2.15.9
+  - @vercel/static-build@1.3.45
+
+## 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
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
  "name": "vercel",
-  "version": "31.1.0",
+  "version": "31.2.3",
  "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.3",
    "@vercel/go": "2.5.1",
    "@vercel/hydrogen": "0.0.64",
-    "@vercel/next": "3.9.1",
-    "@vercel/node": "2.15.6",
+    "@vercel/next": "3.9.4",
+    "@vercel/node": "2.15.9",
    "@vercel/python": "3.1.60",
    "@vercel/redwood": "1.1.15",
-    "@vercel/remix-builder": "1.8.18",
+    "@vercel/remix-builder": "1.10.0",
    "@vercel/ruby": "1.3.76",
-    "@vercel/static-build": "1.3.42"
+    "@vercel/static-build": "1.3.45"
  },
  "devDependencies": {
    "@alex_neo/jest-expect-message": "1.0.5",
@@ -86,8 +86,8 @@
    "@types/yauzl-promise": "2.1.0",
    "@vercel-internals/constants": "1.0.4",
    "@vercel-internals/get-package-json": "1.0.0",
-    "@vercel-internals/types": "1.0.5",
-    "@vercel/client": "12.6.5",
+    "@vercel-internals/types": "1.0.6",
+    "@vercel/client": "12.6.6",
    "@vercel/error-utils": "1.0.10",
    "@vercel/frameworks": "1.5.0",
    "@vercel/fs-detectors": "4.1.1",
@@ -157,7 +157,6 @@
    "semver": "5.5.0",
    "serve-handler": "6.1.1",
    "strip-ansi": "6.0.1",
-    "stripe": "5.1.0",
    "supports-hyperlinks": "3.0.0",
    "tar-fs": "1.16.3",
    "test-listen": "1.1.0",
--- a/packages/cli/src/commands/bisect/command.ts
+++ b/packages/cli/src/commands/bisect/command.ts
@@ -0,0 +1,69 @@
+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,53 +8,19 @@ 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[];
 }
-
-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> {
+export default async function bisect(client: Client): Promise<number> {
  const { output } = client;
  const scope = await getScope(client);
  const { contextName } = scope;
@@ -73,7 +39,7 @@ export default async function main(client: Client): Promise<number> {
  });

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

--- a/packages/cli/src/commands/build/command.ts
+++ b/packages/cli/src/commands/build/command.ts
@@ -0,0 +1,46 @@
+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/build/index.ts
+++ b/packages/cli/src/commands/build/index.ts
@@ -38,35 +38,37 @@ 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';
+} 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';

 type BuildResult = BuildResultV2 | BuildResultV3;

@@ -103,35 +105,6 @@ 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;
@@ -162,7 +135,7 @@ export default async function main(client: Client): Promise<number> {
  });

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

--- a/packages/cli/src/commands/help.ts
+++ b/packages/cli/src/commands/help.ts
@@ -30,6 +30,86 @@ 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;
 }
@@ -52,8 +132,8 @@ export function lineToString(line: string[]) {
  return string;
 }

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

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

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

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

  // Start building option lines
  const optionLines: string[][] = [];
  // Sort command options alphabetically
-  command.options.sort((a, b) =>
+  commandOptions.sort((a, b) =>
    a.name < b.name ? -1 : a.name > b.name ? 1 : 0
  );
  // Keep track of longest "start" of an option line to determine description spacing
  let maxLineStartLength = 0;
  // Iterate over options and create the "start" of each option (e.g. `  -b, --build-env <key=value>`)
-  for (const option of command.options) {
-    const startLine: string[] = [INDENT];
+  for (const option of commandOptions) {
+    const startLine: string[] = [INDENT, INDENT, INDENT];
    if (option.shorthand) {
      startLine.push(`-${option.shorthand},`);
    }
@@ -135,7 +227,7 @@ export function buildCommandOptionLines(
   */
  for (let i = 0; i < optionLines.length; i++) {
    const optionLine = optionLines[i];
-    const option = command.options[i];
+    const option = commandOptions[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)))
@@ -162,16 +254,13 @@ 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 the entire list of options as a single string after delete the last '\n' added to the option list
-  return outputArrayToString(outputArray);
+  return `${outputArrayToString(outputArray)}${NEWLINE}`;
 }

 export function buildCommandExampleLines(command: Command) {
-  const outputArray: string[] = [chalk.dim(`Examples:`), ''];
+  const outputArray: string[] = [`${INDENT}${chalk.dim('Examples:')}`, ''];
  for (const example of command.examples) {
    const nameLine: string[] = [INDENT];
    nameLine.push(chalk.gray('-'));
@@ -190,12 +279,15 @@ 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;
 }
@@ -204,13 +296,12 @@ export function buildHelpOutput(
  command: Command,
  options: BuildHelpOutputOptions
 ) {
-  const outputArray: string[] = [
+  const outputArray: (string | null)[] = [
+    '',
    buildCommandSynopsisLine(command),
-    '',
-    command.description,
-    '',
-    buildCommandOptionLines(command, options),
-    '',
+    buildDescriptionLine(command),
+    buildCommandOptionLines(command.options, options, 'Options'),
+    buildCommandOptionLines(globalCommandOptions, options, 'Global Options'),
    buildCommandExampleLines(command),
    '',
  ];
--- a/packages/cli/src/commands/inspect/command.ts
+++ b/packages/cli/src/commands/inspect/command.ts
@@ -0,0 +1,50 @@
+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/inspect/index.ts
+++ b/packages/cli/src/commands/inspect/index.ts
@@ -1,71 +1,27 @@
 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 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 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 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 { isDeploying } from '../../util/deploy/is-deploying';
+import { help } from '../help';
+import { inspectCommand } from './command';

-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) {
+export default async function inspect(client: Client) {
+  const { output } = client;
  let argv;

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

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

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

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

--- a/packages/cli/src/commands/link/command.ts
+++ b/packages/cli/src/commands/link/command.ts
@@ -0,0 +1,54 @@
+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,62 +1,12 @@
-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';

-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) {
+export default async function link(client: Client) {
  const argv = getArgs(client.argv.slice(2), {
    '--yes': Boolean,
    '-y': '--yes',
@@ -71,7 +21,7 @@ export default async function main(client: Client) {
  });

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

--- a/packages/cli/src/commands/list/command.ts
+++ b/packages/cli/src/commands/list/command.ts
@@ -0,0 +1,61 @@
+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/list/index.ts
+++ b/packages/cli/src/commands/list/index.ts
@@ -2,78 +2,27 @@ 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 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 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 { 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';

-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.
-    --environment=${chalk.bold.underline(
-      'ENVIRONMENT'
-    )}      Filter by environment (production|preview)
-    -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) {
+export default async function list(client: Client) {
  let argv;

  try {
@@ -111,7 +60,7 @@ export default async function main(client: Client) {
  }

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

--- a/packages/cli/src/commands/login/command.ts
+++ b/packages/cli/src/commands/login/command.ts
@@ -0,0 +1,49 @@
+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/login/index.ts
+++ b/packages/cli/src/commands/login/index.ts
@@ -1,55 +1,24 @@
 import { validate as validateEmail } from 'email-validator';
 import chalk from 'chalk';
-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`)}
-`);
-};
+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';

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

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

--- a/packages/cli/src/commands/logout/command.ts
+++ b/packages/cli/src/commands/logout/command.ts
@@ -0,0 +1,15 @@
+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/logout/index.ts
+++ b/packages/cli/src/commands/logout/index.ts
@@ -1,37 +1,19 @@
-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 { 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 { errorToString } from '@vercel/error-utils';
-
-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`)}
-`);
-};
+import { help } from '../help';
+import { logoutCommand } from './command';

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

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

  if (argv['--help']) {
-    help();
+    output.print(help(logoutCommand, { columns: client.stderr.columns }));
    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/logs/command.ts
+++ b/packages/cli/src/commands/logs/command.ts
@@ -0,0 +1,66 @@
+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/logs/index.ts
+++ b/packages/cli/src/commands/logs/index.ts
@@ -1,60 +1,15 @@
 import chalk from 'chalk';
-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';
+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';

-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) {
+export default async function logs(client: Client) {
  let head;
  let limit;
  let follow;
@@ -76,14 +31,13 @@ export default async function main(client: Client) {

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

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

-  const { output } = client;
-
  try {
    since = argv['--since'] ? toTimestamp(argv['--since']) : 0;
  } catch (err) {
--- a/packages/cli/src/commands/pull/command.ts
+++ b/packages/cli/src/commands/pull/command.ts
@@ -0,0 +1,53 @@
+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/pull/index.ts
+++ b/packages/cli/src/commands/pull/index.ts
@@ -1,66 +1,26 @@
 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 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 { 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 {
  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';

-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]
-    --git-branch                   Specify the Git branch to pull specific Environment Variables for
-    --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.'
-  )}
-`);
-};
+import { help } from '../help';
+import { pullCommand } from './command';

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

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

--- a/packages/cli/src/commands/redeploy/command.ts
+++ b/packages/cli/src/commands/redeploy/command.ts
@@ -0,0 +1,33 @@
+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/redeploy/index.ts
+++ b/packages/cli/src/commands/redeploy/index.ts
@@ -1,66 +1,29 @@
 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, 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 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 { isErrnoException } from '@vercel/error-utils';
-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 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';
-
-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`
-    )}
-`);
-};
+import { help } from '../help';
+import { redeployCommand } from './command';

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

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

-  const { output } = client;
  const deployIdOrUrl = argv._[1];
  if (!deployIdOrUrl) {
    output.error(
@@ -201,4 +163,4 @@ export default async (client: Client): Promise<number> => {
    }
    return 1;
  }
-};
+}
--- a/packages/cli/src/commands/remove/command.ts
+++ b/packages/cli/src/commands/remove/command.ts
@@ -0,0 +1,45 @@
+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/remove/index.ts
+++ b/packages/cli/src/commands/remove/index.ts
@@ -2,74 +2,31 @@ 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 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 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 { Alias, Deployment, Project } from '@vercel-internals/types';
-import { NowError } from '../util/now-error';
+import { NowError } from '../../util/now-error';
+import { help } from '../help';
+import { removeCommand } from './command';

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

-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) {
+export default async function remove(client: Client) {
  let argv;

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

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

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

--- a/packages/cli/src/commands/whoami.ts
+++ b/packages/cli/src/commands/whoami.ts
@@ -1,56 +0,0 @@
-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
@@ -0,0 +1,15 @@
+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
@@ -0,0 +1,29 @@
+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/credit-cards.js
+++ b/packages/cli/src/util/credit-cards.js
@@ -1,82 +0,0 @@
-import stripeFactory from 'stripe';
-import Now from '.';
-
-const stripe = stripeFactory('pk_live_alyEi3lN0kSwbdevK0nrGwTw');
-
-export default class CreditCards extends Now {
-  async ls() {
-    const res = await this._fetch('/stripe/sources/');
-    const body = await res.json();
-
-    if (res.status !== 200) {
-      const e = new Error(body.error.message);
-      e.code = body.error.code;
-      throw e;
-    }
-
-    return body;
-  }
-
-  async setDefault(source) {
-    await this._fetch('/stripe/sources/', {
-      method: 'POST',
-      body: {
-        source,
-        makeDefault: true,
-      },
-    });
-
-    return true;
-  }
-
-  async rm(source) {
-    await this._fetch(`/stripe/sources/`, {
-      method: 'DELETE',
-      body: { source },
-    });
-
-    return true;
-  }
-
-  async add(card) {
-    if (!card.expDate) {
-      throw new Error(`Please define an expiration date for your card`);
-    }
-
-    const expDateParts = card.expDate.split(' / ');
-
-    card = {
-      name: card.name,
-      number: card.cardNumber,
-      cvc: card.ccv,
-    };
-
-    card.exp_month = expDateParts[0];
-    card.exp_year = expDateParts[1];
-
-    try {
-      const token = (await stripe.tokens.create({ card })).id;
-
-      const res = await this._fetch('/stripe/sources/', {
-        method: 'POST',
-        body: {
-          source: token,
-        },
-      });
-
-      const { source, error } = await res.json();
-
-      if (source && source.id) {
-        return {
-          last4: source.last4,
-        };
-      } else if (error && error.message) {
-        throw new Error(error.message);
-      } else {
-        throw new Error('Unknown error');
-      }
-    } catch (err) {
-      throw new Error(err.message || 'Unknown error');
-    }
-  }
-}
--- a/packages/cli/test/dev/fixtures/43-compress-encoding/api/index.js
+++ b/packages/cli/test/dev/fixtures/43-compress-encoding/api/index.js
@@ -0,0 +1,9 @@
+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,6 +143,13 @@ 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/mocks/deployment.ts
+++ b/packages/cli/test/mocks/deployment.ts
@@ -170,6 +170,14 @@ function setupDeploymentEndpoints(): void {
    res.json({ builds });
  });

+  client.scenario.get('/:version/deployments/:id/aliases', (req, res) => {
+    const limit = parseInt(req.query.limit);
+    res.json({
+      aliases: [],
+      pagination: { count: limit, total: limit, page: 1, pages: 1 },
+    });
+  });
+
  function handleGetDeployments(req: Request, res: Response) {
    const currentDeployments = Array.from(deployments.values()).sort(
      (a: Deployment, b: Deployment) => {
--- a/packages/cli/test/mocks/project.ts
+++ b/packages/cli/test/mocks/project.ts
@@ -144,7 +144,7 @@ export const defaultProject: Project = {
 */
 export function useUnknownProject() {
  let project: Project;
-  client.scenario.get(`/v8/projects/:projectNameOrId`, (_req, res) => {
+  client.scenario.get(`/:version/projects/:projectNameOrId`, (_req, res) => {
    res.status(404).send();
  });
  client.scenario.post(`/:version/projects`, (req, res) => {
--- a/packages/cli/test/unit/commands/snapshots/help.test.ts.snap
+++ b/packages/cli/test/unit/commands/snapshots/help.test.ts.snap
@@ -1,106 +1,164 @@
 // 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
+      --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

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

-  -e, --env <key=value>        Specify
-                               environment
-                               variables
-                               during
-                               run-time
-                               (e.g. \`-e
-                               KEY1=value1
-                               -e
-                               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

-  -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
+  [2mExamples:[22m

  [90m-[39m Deploy the current directory

@@ -122,47 +180,53 @@ Deploy your project to Vercel. The \`deploy\` command is the default command for
  [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
+      --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

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

-  -e, --env <key=value>        Specify environment variables during run-time
-                               (e.g. \`-e KEY1=value1 -e 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

-  -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
+  [2mExamples:[22m

  [90m-[39m Deploy the current directory

@@ -184,41 +248,45 @@ Deploy your project to Vercel. The \`deploy\` command is the default command for
  [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
+      --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

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

-  -e, --env <key=value>        Specify environment variables during run-time (e.g. \`-e KEY1=value1 -e 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

-  -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
+  [2mExamples:[22m

  [90m-[39m Deploy the current directory

@@ -240,5 +308,6 @@ Deploy your project to Vercel. The \`deploy\` command is the default command for
  [90m-[39m Write Deployment URL to a file

    [36m$ vercel > deployment-url.txt[39m
+
 "
 `;
--- a/packages/cli/test/unit/commands/remove.test.ts
+++ b/packages/cli/test/unit/commands/remove.test.ts
@@ -0,0 +1,59 @@
+import { client } from '../../mocks/client';
+import {
+  defaultProject,
+  useProject,
+  useUnknownProject,
+} from '../../mocks/project';
+import remove from '../../../src/commands/remove';
+import { useDeployment } from '../../mocks/deployment';
+import { useUser } from '../../mocks/user';
+
+describe('remove', () => {
+  it('should error if missing deployment url', async () => {
+    client.setArgv('remove');
+    const exitCodePromise = remove(client);
+
+    await expect(client.stderr).toOutput(
+      'Error: `vercel rm` expects at least one argument'
+    );
+    await expect(exitCodePromise).resolves.toEqual(1);
+  });
+
+  it('should error without calling API for invalid names', async () => {
+    const badDeployName = '/#';
+    client.setArgv('remove', badDeployName);
+    const exitCodePromise = remove(client);
+
+    await expect(client.stderr).toOutput(
+      `Error: The provided argument "${badDeployName}" is not a valid deployment or project`
+    );
+    await expect(exitCodePromise).resolves.toEqual(1);
+  });
+
+  it('calls API to delete a project ', async () => {
+    let deleteAPIWasCalled = false;
+    const user = useUser();
+
+    const project = useProject({
+      ...defaultProject,
+      id: '123',
+    });
+
+    useUnknownProject();
+
+    const deployment = useDeployment({
+      creator: user,
+      project,
+    });
+
+    client.scenario.delete('/now/deployments/:id', (req, res) => {
+      deleteAPIWasCalled = true;
+      res.json({});
+    });
+
+    client.setArgv('remove', deployment.url, '--yes');
+    await remove(client);
+
+    expect(deleteAPIWasCalled);
+  });
+});
--- a/packages/client/CHANGELOG.md
+++ b/packages/client/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @vercel/client

+## 12.6.6
+
+### Patch Changes
+
+- Updated dependencies [[`a8ecf40d6`](https://github.com/vercel/vercel/commit/a8ecf40d6f50e2fc8b13b02c8ef50b3dcafad3a6)]:
+  - @vercel/build-utils@6.8.3
+
 ## 12.6.5

 ### 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.6",
  "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.3",
    "@vercel/routing-utils": "2.2.1",
    "@zeit/fetch": "5.2.0",
    "async-retry": "1.2.3",
--- a/packages/fs-detectors/package.json
+++ b/packages/fs-detectors/package.json
@@ -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.3",
    "typescript": "4.9.5"
  }
 }
--- a/packages/gatsby-plugin-vercel-builder/CHANGELOG.md
+++ b/packages/gatsby-plugin-vercel-builder/CHANGELOG.md
@@ -1,5 +1,27 @@
 # @vercel/gatsby-plugin-vercel-builder

+## 1.3.17
+
+### Patch Changes
+
+- Updated dependencies [[`a8ecf40d6`](https://github.com/vercel/vercel/commit/a8ecf40d6f50e2fc8b13b02c8ef50b3dcafad3a6)]:
+  - @vercel/build-utils@6.8.3
+  - @vercel/node@2.15.9
+
+## 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
--- 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.14",
+  "version": "1.3.17",
  "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.6",
+    "@vercel/build-utils": "6.8.3",
+    "@vercel/node": "2.15.9",
    "@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.3",
    "@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.3",
    "@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,5 +1,23 @@
 # @vercel/next

+## 3.9.4
+
+### Patch Changes
+
+- Preserve sourceMappingURL comments in template literals ([#10275](https://github.com/vercel/vercel/pull/10275))
+
+## 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
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/next",
-  "version": "3.9.1",
+  "version": "3.9.4",
  "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.3",
    "@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
@@ -1139,8 +1139,9 @@ export const build: BuildV2 = async ({
    const canUsePreviewMode = Object.keys(pages).some(page =>
      isApiPage(pages[page].fsPath)
    );
-    staticPages = await filterStaticPages(
-      await glob('**/*.html', pagesDir),
+    const originalStaticPages = await glob('**/*.html', pagesDir);
+    staticPages = filterStaticPages(
+      originalStaticPages,
      dynamicPages,
      entryDirectory,
      htmlContentType,
@@ -1316,6 +1317,17 @@ export const build: BuildV2 = async ({
        );
      }

+      const localePrefixed404 = !!(
+        routesManifest.i18n &&
+        originalStaticPages[
+          path.posix.join(
+            entryDirectory,
+            routesManifest.i18n.defaultLocale,
+            '404.html'
+          )
+        ]
+      );
+
      return serverBuild({
        config,
        functionsConfigManifest,
@@ -1325,6 +1337,7 @@ export const build: BuildV2 = async ({
        dynamicPages,
        canUsePreviewMode,
        staticPages,
+        localePrefixed404,
        lambdaPages: pages,
        lambdaAppPaths,
        omittedPrerenderRoutes,
@@ -2679,6 +2692,7 @@ 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
@@ -91,6 +91,7 @@ export async function serverBuild({
  routesManifest,
  staticPages,
  lambdaPages,
+  localePrefixed404,
  nextVersion,
  lambdaAppPaths,
  canUsePreviewMode,
@@ -112,6 +113,7 @@ export async function serverBuild({
  baseDir: string;
  canUsePreviewMode: boolean;
  omittedPrerenderRoutes: Set<string>;
+  localePrefixed404: boolean;
  staticPages: { [key: string]: FileFsRef };
  lambdaAppPaths: { [key: string]: FileFsRef };
  lambdaPages: { [key: string]: FileFsRef };
@@ -207,7 +209,6 @@ export async function serverBuild({

  const { i18n } = routesManifest;
  const hasPages404 = routesManifest.pages404;
-  let localePrefixed404 = false;

  let static404Page =
    staticPages[path.posix.join(entryDirectory, '404')] && hasPages404
@@ -216,17 +217,12 @@ export async function serverBuild({
      ? path.posix.join(entryDirectory, '_errors/404')
      : undefined;

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

  if (!hasStatic500 && i18n) {
--- a/packages/next/src/sourcemapped.ts
+++ b/packages/next/src/sourcemapped.ts
@@ -58,7 +58,7 @@ export async function fileToSource(
  fullFilePath?: string
 ): Promise<Source> {
  const sourcemap = await getSourceMap(content, fullFilePath);
-  const cleanContent = convertSourceMap.removeComments(content);
+  const cleanContent = removeInlinedSourceMap(content);
  return sourcemap
    ? new SourceMapSource(cleanContent, sourceName, sourcemap)
    : new OriginalSource(cleanContent, sourceName);
@@ -99,3 +99,42 @@ export function stringifySourceMap(
  delete obj.sourcesContent;
  return JSON.stringify(obj);
 }
+
+// Based on https://github.com/thlorenz/convert-source-map/blob/f1ed815b4edacfa9c3c5552dd342e71a3cffbb0a/index.js#L4 (MIT license)
+// Groups: 1: media type, 2: MIME type, 3: charset, 4: encoding, 5: data.
+const SOURCE_MAP_COMMENT_REGEX =
+  /^\s*?\/[/*][@#]\s+?sourceMappingURL=data:(((?:application|text)\/json)(?:;charset=([^;,]+?)?)?)?(?:;(base64))?,(.*?)$/gm;
+
+function isValidSourceMapData(encoding: string, data: string): boolean {
+  if (encoding !== 'base64') {
+    // Unknown encoding. I think the comment is short (e.g. URL) if it's not
+    // base64 encoded, so let's keep it to be safe.
+    return false;
+  }
+
+  // Remove any spaces and "*/" of the source map comment. They should not be
+  // considered as a part of the source map data.
+  data = data.replace(/\s/g, '').replace(/\*\//g, '');
+
+  // If it's an invalid base64 string, it must be a sourceMappingURL
+  // inside a template literal like the follwoing.
+  // https://github.com/webpack-contrib/style-loader/blob/16e401b17a39544d5c8ca47c9032f02e2b60d8f5/src/runtime/styleDomAPI.js#L35C1-L40C1
+  return /^[a-zA-Z0-9+=/]+$/.test(data);
+}
+
+/*
+ * Removes sourceMappingURL comments from a string.
+ */
+export function removeInlinedSourceMap(source: string): string {
+  for (const m of source.matchAll(SOURCE_MAP_COMMENT_REGEX)) {
+    // Check if it's certainly a sourceMappingURL in a comment, not a part
+    // of JavaScript code (e.g. template literal).
+    if (!isValidSourceMapData(m[4], m[5])) {
+      continue;
+    }
+
+    source = source.replace(m[0], '');
+  }
+
+  return source;
+}
--- 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"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
      }
    },
    {
      "path": "/hello/world/ssg",
      "status": 200,
      "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
      },
      "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"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
      }
    },
    {
      "path": "/hello/world/dashboard/deployments/123/settings",
      "status": 200,
      "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
      },
      "headers": {
        "RSC": "1"
@@ -102,14 +102,14 @@
      "status": 200,
      "mustContain": "catchall",
      "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
      }
    },
    {
      "path": "/hello/world/dashboard/deployments/catchall/something",
      "status": 200,
      "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
      },
      "headers": {
        "RSC": "1"
@@ -122,7 +122,7 @@
      "status": 200,
      "mustContain": "hello from app/dashboard",
      "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
      }
    },
    {
@@ -142,7 +142,7 @@
      },
      "responseHeaders": {
        "content-type": "text/x-component",
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
      }
    },
    {
--- 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
@@ -0,0 +1,10 @@
+export default function Layout({ children }) {
+  return (
+    <html>
+      <head>
+        <title>Hello World</title>
+      </head>
+      <body>{children}</body>
+    </html>
+  )
+}
--- a/packages/next/test/fixtures/00-app-dir-dynamic-404/app/not-found.js
+++ b/packages/next/test/fixtures/00-app-dir-dynamic-404/app/not-found.js
@@ -0,0 +1,13 @@
+import { cookies } from 'next/headers';
+
+export default function Page() {
+  cookies(); // dynamic
+
+  return (
+    <>
+      <h1>This Is The Not Found Page</h1>
+
+      <div id="timestamp">{Date.now()}</div>
+    </>
+  )
+}
--- a/packages/next/test/fixtures/00-app-dir-dynamic-404/app/page.js
+++ b/packages/next/test/fixtures/00-app-dir-dynamic-404/app/page.js
@@ -0,0 +1,3 @@
+export default function Page() {
+  return <h1>My page TEST</h1>
+}
--- a/packages/next/test/fixtures/00-app-dir-dynamic-404/index.test.js
+++ b/packages/next/test/fixtures/00-app-dir-dynamic-404/index.test.js
@@ -0,0 +1,12 @@
+/* eslint-env jest */
+const path = require('path');
+const { deployAndTest } = require('../../utils');
+
+const ctx = {};
+
+describe(`${__dirname.split(path.sep).pop()}`, () => {
+  it('should deploy and pass probe checks', async () => {
+    const info = await deployAndTest(__dirname);
+    Object.assign(ctx, info);
+  });
+});
--- a/packages/next/test/fixtures/00-app-dir-dynamic-404/next.config.js
+++ b/packages/next/test/fixtures/00-app-dir-dynamic-404/next.config.js
@@ -0,0 +1 @@
+module.exports = {};
--- a/packages/next/test/fixtures/00-app-dir-dynamic-404/package.json
+++ b/packages/next/test/fixtures/00-app-dir-dynamic-404/package.json
@@ -0,0 +1,11 @@
+{
+  "dependencies": {
+    "next": "canary",
+    "react": "experimental",
+    "react-dom": "experimental"
+  },
+  "ignoreNextjsUpdates": true,
+  "scripts": {
+    "vercel-build": "next build"
+  }
+}
--- a/packages/next/test/fixtures/00-app-dir-dynamic-404/probes.json
+++ b/packages/next/test/fixtures/00-app-dir-dynamic-404/probes.json
@@ -0,0 +1,12 @@
+{ "probes": [
+  {
+    "path": "/",
+    "status": 200,
+    "mustContain": "My page"
+  },
+  {
+    "path": "/not-found-page",
+    "status": 404,
+    "mustContain": "This Is The Not Found Page"
+  }
+]}
--- a/packages/next/test/fixtures/00-app-dir-dynamic-404/vercel.json
+++ b/packages/next/test/fixtures/00-app-dir-dynamic-404/vercel.json
@@ -0,0 +1,8 @@
+{
+  "builds": [
+    {
+      "src": "package.json",
+      "use": "@vercel/next"
+    }
+  ]
+}
--- a/packages/next/test/fixtures/00-app-dir-middleware/vercel.json
+++ b/packages/next/test/fixtures/00-app-dir-middleware/vercel.json
@@ -22,7 +22,7 @@
        "redirect": "manual"
      },
      "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
      },
      "headers": {
        "RSC": "1"
@@ -46,7 +46,7 @@
        "redirect": "manual"
      },
      "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
      },
      "headers": {
        "RSC": "1"
@@ -70,7 +70,7 @@
        "redirect": "manual"
      },
      "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
      },
      "headers": {
        "RSC": "1"
--- a/packages/next/test/fixtures/00-app-dir-static/vercel.json
+++ b/packages/next/test/fixtures/00-app-dir-static/vercel.json
@@ -11,7 +11,7 @@
      "status": 200,
      "mustContain": "hello from app/dashboard",
      "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
      }
    },
    {
@@ -31,7 +31,7 @@
      },
      "responseHeaders": {
        "content-type": "text/x-component",
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
      }
    },
    {
--- a/packages/next/test/fixtures/00-app-dir-trailing-slash/vercel.json
+++ b/packages/next/test/fixtures/00-app-dir-trailing-slash/vercel.json
@@ -23,14 +23,14 @@
      "status": 200,
      "mustContain": "hello from /ssg",
      "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
      }
    },
    {
      "path": "/ssg/",
      "status": 200,
      "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
      },
      "headers": {
        "RSC": "1"
@@ -63,14 +63,14 @@
      "status": 200,
      "mustContain": "hello from app/dashboard/deployments/[id]/settings",
      "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
      }
    },
    {
      "path": "/dashboard/deployments/123/settings/",
      "status": 200,
      "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
      },
      "headers": {
        "RSC": "1"
@@ -83,14 +83,14 @@
      "status": 200,
      "mustContain": "catchall",
      "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
      }
    },
    {
      "path": "/dashboard/deployments/catchall/something/",
      "status": 200,
      "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
      },
      "headers": {
        "RSC": "1"
@@ -103,7 +103,7 @@
      "status": 200,
      "mustContain": "hello from app/dashboard",
      "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
      }
    },
    {
@@ -123,7 +123,7 @@
      },
      "responseHeaders": {
        "content-type": "text/x-component",
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
      }
    },
    {
--- a/packages/next/test/fixtures/00-app-dir/vercel.json
+++ b/packages/next/test/fixtures/00-app-dir/vercel.json
@@ -42,14 +42,14 @@
      "status": 200,
      "mustContain": "hello from /ssg",
      "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
      }
    },
    {
      "path": "/ssg",
      "status": 200,
      "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
      },
      "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"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
      }
    },
    {
      "path": "/dashboard/deployments/123/settings",
      "status": 200,
      "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
      },
      "headers": {
        "RSC": "1"
@@ -102,14 +102,14 @@
      "status": 200,
      "mustContain": "catchall",
      "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
      }
    },
    {
      "path": "/dashboard/deployments/catchall/something",
      "status": 200,
      "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
      },
      "headers": {
        "RSC": "1"
@@ -122,7 +122,7 @@
      "status": 200,
      "mustContain": "hello from app/dashboard",
      "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
      }
    },
    {
@@ -142,7 +142,7 @@
      },
      "responseHeaders": {
        "content-type": "text/x-component",
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
      }
    },
    {
--- a/packages/next/test/fixtures/00-i18n-404-revalidate/pages/blog/[slug].js
+++ b/packages/next/test/fixtures/00-i18n-404-revalidate/pages/blog/[slug].js
@@ -0,0 +1,38 @@
+import { useRouter } from "next/router"
+
+export default function Page(props) {
+  const router = useRouter()
+  
+  return (
+    <>
+      <p>/blog/[slug]</p>
+      <p>{JSON.stringify(router.query)}</p>
+      <p>{JSON.stringify(props)}</p>
+    </>
+  )
+}
+
+export function getStaticProps({ params }) {
+  if (params.slug === 'second') {
+    return {
+      notFound: true
+    }
+  }
+  
+  return {
+    props: {
+      now: Date.now(),
+      params
+    }
+  }
+}
+
+export function getStaticPaths() {
+  return {
+    paths: [
+      { params: { slug: 'first' } },
+      { params: { slug: 'second' } },
+    ],
+    fallback: 'blocking'
+  }
+}
--- a/packages/next/test/fixtures/01-app-dir-static/vercel.json
+++ b/packages/next/test/fixtures/01-app-dir-static/vercel.json
@@ -11,7 +11,7 @@
      "status": 200,
      "mustContain": "about",
      "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
      }
    },
    {
--- a/packages/next/test/unit/sourcemapped.test.ts
+++ b/packages/next/test/unit/sourcemapped.test.ts
@@ -0,0 +1,104 @@
+import { removeInlinedSourceMap } from '../../src/sourcemapped';
+
+describe('removeInlinedSourceMap', () => {
+  it('removes inlined source map', () => {
+    expect(
+      removeInlinedSourceMap(`
+function foo() {
+  return 1;
+}
+/*# sourceMappingURL=data:application/json;base64,abcdabcd12341234 */
+`)
+    ).toEqual(`
+function foo() {
+  return 1;
+}
+
+`);
+  });
+
+  it('removes multiple inlined source maps', () => {
+    expect(
+      removeInlinedSourceMap(`
+function foo() {
+  return 1;
+}
+
+/*# sourceMappingURL=data:application/json;base64,abcdabcd12341234 */
+/*# sourceMappingURL=data:application/json;base64,cdefAB+/== */
+`)
+    ).toEqual(`
+function foo() {
+  return 1;
+}
+
+
+`);
+  });
+
+  it('preserves non-base64 source map comments', () => {
+    expect(
+      removeInlinedSourceMap(`
+function foo() {
+  return 1;
+}
+
+//# sourceMappingURL=script.min.js.map
+`)
+    ).toEqual(`
+function foo() {
+  return 1;
+}
+
+//# sourceMappingURL=script.min.js.map
+`);
+  });
+
+  it('preserves source map comments in the middle', () => {
+    expect(
+      removeInlinedSourceMap(`
+function foo() {
+  console.log('/*# sourceMappingURL=data:application/json;base64,abcdabcd12341234 */')
+}
+`)
+    ).toEqual(`
+function foo() {
+  console.log('/*# sourceMappingURL=data:application/json;base64,abcdabcd12341234 */')
+}
+`);
+  });
+
+  it(`doesn't remove sourceMappingURL inside string literal`, () => {
+    expect(
+      removeInlinedSourceMap(`
+  css += \`
+/*# sourceMappingURL=data:application/json;base64,\${btoa(
+    unescape(encodeURIComponent(JSON.stringify(sourceMap)))
+  )} */\`
+`)
+    ).toEqual(`
+  css += \`
+/*# sourceMappingURL=data:application/json;base64,\${btoa(
+    unescape(encodeURIComponent(JSON.stringify(sourceMap)))
+  )} */\`
+`);
+  });
+
+  // Assuming that our bundler doesn't generate source maps like this, multiple comments
+  // may indicate that it's part of the original source code, not generated by the bundler.
+  it(`doesn't remove if there's another comment in the same line`, () => {
+    expect(
+      removeInlinedSourceMap(`
+function foo() {
+  return 1;
+}
+/*# sourceMappingURL=data:application/json;base64,abcdabcd12341234 */ /* second comment */
+`)
+    ).toEqual(`
+function foo() {
+  return 1;
+}
+/*# sourceMappingURL=data:application/json;base64,abcdabcd12341234 */ /* second comment */
+`);
+  });
+});
--- a/packages/node/CHANGELOG.md
+++ b/packages/node/CHANGELOG.md
@@ -1,5 +1,26 @@
 # @vercel/node

+## 2.15.9
+
+### Patch Changes
+
+- Updated dependencies [[`a8ecf40d6`](https://github.com/vercel/vercel/commit/a8ecf40d6f50e2fc8b13b02c8ef50b3dcafad3a6)]:
+  - @vercel/build-utils@6.8.3
+
+## 2.15.8
+
+### Patch Changes
+
+- Move `@types/content-type` to dev dependency ([#10292](https://github.com/vercel/vercel/pull/10292))
+
+- fix: compress condition ([#10288](https://github.com/vercel/vercel/pull/10288))
+
+## 2.15.7
+
+### Patch Changes
+
+- fix: move content-type as dependency ([#10274](https://github.com/vercel/vercel/pull/10274))
+
 ## 2.15.6

 ### Patch Changes
--- a/packages/node/package.json
+++ b/packages/node/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/node",
-  "version": "2.15.6",
+  "version": "2.15.9",
  "license": "Apache-2.0",
  "main": "./dist/index",
  "homepage": "https://vercel.com/docs/runtimes#official-runtimes/node-js",
@@ -24,10 +24,11 @@
    "@edge-runtime/vm": "3.0.1",
    "@types/node": "14.18.33",
    "@types/node-fetch": "2.6.3",
-    "@vercel/build-utils": "6.8.2",
+    "@vercel/build-utils": "6.8.3",
    "@vercel/error-utils": "1.0.10",
    "@vercel/static-config": "2.0.17",
    "async-listen": "3.0.0",
+    "content-type": "1.0.5",
    "edge-runtime": "2.4.3",
    "esbuild": "0.14.47",
    "exit-hook": "2.2.1",
@@ -42,14 +43,13 @@
    "@babel/plugin-transform-modules-commonjs": "7.5.0",
    "@tootallnate/once": "1.1.2",
    "@types/aws-lambda": "8.10.19",
-    "@types/content-type": "1.1.3",
+    "@types/content-type": "1.1.5",
    "@types/cookie": "0.3.3",
    "@types/etag": "1.8.0",
    "@types/jest": "29.5.0",
    "@types/test-listen": "1.1.0",
    "@vercel/ncc": "0.24.0",
    "@vercel/nft": "0.22.5",
-    "content-type": "1.0.4",
    "cookie": "0.4.0",
    "cross-env": "7.0.3",
    "etag": "1.8.1",
--- a/packages/node/src/serverless-functions/serverless-handler.mts
+++ b/packages/node/src/serverless-functions/serverless-handler.mts
@@ -107,7 +107,7 @@ export async function createServerlessEventHandler(
    // @ts-expect-error
    const response = await fetch(url, {
      body: await serializeBody(request),
-      compress: isStreaming,
+      compress: !isStreaming,
      headers: {
        ...request.headers,
        host: request.headers['x-forwarded-host'],
--- a/packages/python/package.json
+++ b/packages/python/package.json
@@ -23,7 +23,7 @@
    "@types/execa": "^0.9.0",
    "@types/jest": "27.4.1",
    "@types/node": "14.18.33",
-    "@vercel/build-utils": "6.8.2",
+    "@vercel/build-utils": "6.8.3",
    "@vercel/ncc": "0.24.0",
    "execa": "^1.0.0"
  }
--- a/packages/redwood/package.json
+++ b/packages/redwood/package.json
@@ -27,7 +27,7 @@
    "@types/aws-lambda": "8.10.19",
    "@types/node": "14.18.33",
    "@types/semver": "6.0.0",
-    "@vercel/build-utils": "6.8.2",
+    "@vercel/build-utils": "6.8.3",
    "execa": "3.2.0",
    "fs-extra": "11.1.0"
  }
--- a/packages/remix/CHANGELOG.md
+++ b/packages/remix/CHANGELOG.md
@@ -1,5 +1,34 @@
 # @vercel/remix-builder

+## 1.10.0
+
+### Minor Changes
+
+- Add initial support for Hydrogen v2 ([#10305](https://github.com/vercel/vercel/pull/10305))
+
+### Patch Changes
+
+- Update `@remix-run/dev` fork to v1.19.2 ([#10299](https://github.com/vercel/vercel/pull/10299))
+
+- Updated dependencies [[`a8ecf40d6`](https://github.com/vercel/vercel/commit/a8ecf40d6f50e2fc8b13b02c8ef50b3dcafad3a6)]:
+  - @vercel/build-utils@6.8.3
+
+## 1.9.1
+
+### Patch Changes
+
+- Disable root workspace check in pnpm and yarn when adding deps ([#10291](https://github.com/vercel/vercel/pull/10291))
+
+## 1.9.0
+
+### Minor Changes
+
+- Install `@vercel/remix-run-dev` at build-time instead of using symlink ([#9784](https://github.com/vercel/vercel/pull/9784))
+
+### Patch Changes
+
+- Update `@remix-run/dev` fork to v1.19.1 ([#10246](https://github.com/vercel/vercel/pull/10246))
+
 ## 1.8.18

 ### Patch Changes
--- a/packages/remix/package.json
+++ b/packages/remix/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/remix-builder",
-  "version": "1.8.18",
+  "version": "1.10.0",
  "license": "Apache-2.0",
  "main": "./dist/index.js",
  "homepage": "https://vercel.com/docs",
@@ -20,8 +20,7 @@
    "defaults"
  ],
  "dependencies": {
-    "@remix-run/dev": "npm:@vercel/remix-run-dev@1.18.1",
-    "@vercel/build-utils": "6.8.2",
+    "@vercel/build-utils": "6.8.3",
    "@vercel/nft": "0.22.5",
    "@vercel/static-config": "2.0.17",
    "path-to-regexp": "6.2.1",
@@ -29,6 +28,7 @@
    "ts-morph": "12.0.0"
  },
  "devDependencies": {
+    "@remix-run/dev": "npm:@vercel/remix-run-dev@1.19.2",
    "@types/jest": "27.5.1",
    "@types/node": "14.18.33",
    "@types/semver": "7.3.13"
--- a/packages/remix/src/build.ts
+++ b/packages/remix/src/build.ts
@@ -1,5 +1,5 @@
 import { Project } from 'ts-morph';
-import { promises as fs } from 'fs';
+import { readFileSync, promises as fs } from 'fs';
 import { basename, dirname, extname, join, relative, sep } from 'path';
 import {
  debug,
@@ -26,7 +26,6 @@ import type {
  PackageJson,
  BuildResultV2Typical,
 } from '@vercel/build-utils';
-import type { AppConfig } from '@remix-run/dev/dist/config';
 import type { ConfigRoute } from '@remix-run/dev/dist/config/routes';
 import type { BaseFunctionConfig } from '@vercel/static-config';
 import {
@@ -41,16 +40,23 @@ import {
  ResolvedEdgeRouteConfig,
  findEntry,
  chdirAndReadConfig,
-  addDependency,
+  addDependencies,
+  resolveSemverMinMax,
  ensureResolvable,
+  isESM,
 } from './utils';
-import semver from 'semver';
+import { patchHydrogenServer } from './hydrogen';

-const _require: typeof require = eval('require');
+interface ServerBundle {
+  serverBuildPath: string;
+  routes: string[];
+}

-const REMIX_RUN_DEV_PATH = dirname(
-  _require.resolve('@remix-run/dev/package.json')
+const remixBuilderPkg = JSON.parse(
+  readFileSync(join(__dirname, '../package.json'), 'utf8')
 );
+const remixRunDevForkVersion =
+  remixBuilderPkg.devDependencies['@remix-run/dev'];

 const DEFAULTS_PATH = join(__dirname, '../defaults');

@@ -63,8 +69,17 @@ const nodeServerSrcPromise = fs.readFile(
  'utf-8'
 );

-// This value is the minimum supported version for our fork of Remix
-const minimumSupportRemixVersion = '1.10.0';
+// Minimum supported version of the `@vercel/remix` package
+const VERCEL_REMIX_MIN_VERSION = '1.10.0';
+
+// Minimum supported version of the `@vercel/remix-run-dev` forked compiler
+const REMIX_RUN_DEV_MIN_VERSION = '1.15.0';
+
+// Maximum version of `@vercel/remix-run-dev` fork
+// (and also `@vercel/remix` since they get published at the same time)
+const REMIX_RUN_DEV_MAX_VERSION = remixRunDevForkVersion.slice(
+  remixRunDevForkVersion.lastIndexOf('@') + 1
+);

 export const build: BuildV2 = async ({
  entrypoint,
@@ -126,6 +141,10 @@ export const build: BuildV2 = async ({
    await runNpmInstall(entrypointFsDirname, [], spawnOpts, meta, nodeVersion);
  }

+  const isHydrogen2 =
+    pkg.dependencies?.['@shopify/remix-oxygen'] ||
+    pkg.devDependencies?.['@shopify/remix-oxygen'];
+
  // Determine the version of Remix based on the `@remix-run/dev`
  // package version.
  const remixRunDevPath = await ensureResolvable(
@@ -133,18 +152,34 @@ export const build: BuildV2 = async ({
    repoRootPath,
    '@remix-run/dev'
  );
-
-  const remixVersion = JSON.parse(
-    await fs.readFile(join(remixRunDevPath, 'package.json'), 'utf8')
-  ).version;
+  const remixRunDevPkg = JSON.parse(
+    readFileSync(join(remixRunDevPath, 'package.json'), 'utf8')
+  );
+  const remixVersion = remixRunDevPkg.version;

  const remixConfig = await chdirAndReadConfig(
+    remixRunDevPath,
    entrypointFsDirname,
    packageJsonPath
  );
  const { serverEntryPoint, appDirectory } = remixConfig;
  const remixRoutes = Object.values(remixConfig.routes);

+  const depsToAdd: string[] = [];
+
+  // Override the official `@remix-run/dev` package with the
+  // Vercel fork, which supports the `serverBundles` config
+  if (!isHydrogen2 && remixRunDevPkg.name !== '@vercel/remix-run-dev') {
+    const remixDevForkVersion = resolveSemverMinMax(
+      REMIX_RUN_DEV_MIN_VERSION,
+      REMIX_RUN_DEV_MAX_VERSION,
+      remixVersion
+    );
+    depsToAdd.push(
+      `@remix-run/dev@npm:@vercel/remix-run-dev@${remixDevForkVersion}`
+    );
+  }
+
  // `app/entry.server.tsx` and `app/entry.client.tsx` are optional in Remix,
  // so if either of those files are missing then add our own versions.
  const userEntryServerFile = findEntry(appDirectory, 'entry.server');
@@ -155,44 +190,27 @@ export const build: BuildV2 = async ({
    );
    if (!pkg.dependencies['@vercel/remix']) {
      // Dependency version resolution logic
-      // 1. Users app is on 1.9.0 -> we install the 1.10.0 (minimum) version of our fork (`@vercel/remix`)
-      // 2. Users app is on 1.11.0 (a version greater than 1.10.0 and less than the latest version of the fork) -> we install the (matching) 1.11.0 version of `@vercel/remix`
-      // 3. Users app is on something greater than our latest version of the fork -> we install the latest version of our fork
-
-      // remixVersion is the version of the `@remix-run/dev` package in the *users' app*
-      const usersRemixVersion = semver.gt(
-        remixVersion,
-        minimumSupportRemixVersion
-      )
-        ? remixVersion
-        : minimumSupportRemixVersion;
-
-      // Prevent frozen lockfile rejections
-      const envForAddDep = { ...spawnOpts.env };
-      delete envForAddDep.CI;
-      delete envForAddDep.VERCEL;
-      delete envForAddDep.NOW_BUILDER;
-      await addDependency(
-        cliType,
-        [
-          `@vercel/remix@${
-            semver.gt(
-              usersRemixVersion,
-              require('@remix-run/dev/package.json').version
-            )
-              ? 'latest'
-              : usersRemixVersion
-          }`,
-        ],
-        {
-          ...spawnOpts,
-          env: envForAddDep,
-          cwd: entrypointFsDirname,
-        }
+      // 1. Users app is on 1.9.0 -> we install the 1.10.0 (minimum) version of `@vercel/remix`.
+      // 2. Users app is on 1.11.0 (a version greater than 1.10.0 and less than the known max
+      //    published version) -> we install the (matching) 1.11.0 version of `@vercel/remix`.
+      // 3. Users app is on something greater than our latest version of the fork -> we install
+      //    the latest known published version of `@vercel/remix`.
+      const vercelRemixVersion = resolveSemverMinMax(
+        VERCEL_REMIX_MIN_VERSION,
+        REMIX_RUN_DEV_MAX_VERSION,
+        remixVersion
      );
+      depsToAdd.push(`@vercel/remix@${vercelRemixVersion}`);
    }
  }

+  if (depsToAdd.length) {
+    await addDependencies(cliType, depsToAdd, {
+      ...spawnOpts,
+      cwd: entrypointFsDirname,
+    });
+  }
+
  const userEntryClientFile = findEntry(
    remixConfig.appDirectory,
    'entry.client'
@@ -205,17 +223,15 @@ export const build: BuildV2 = async ({
  }

  let remixConfigWrapped = false;
+  let serverEntryPointAbs: string | undefined;
+  let originalServerEntryPoint: string | undefined;
  const remixConfigPath = findConfig(entrypointFsDirname, 'remix.config');
  const renamedRemixConfigPath = remixConfigPath
    ? `${remixConfigPath}.original${extname(remixConfigPath)}`
    : undefined;

-  const backupRemixRunDevPath = `${remixRunDevPath}.__vercel_backup`;
-  await fs.rename(remixRunDevPath, backupRemixRunDevPath);
-  await fs.symlink(REMIX_RUN_DEV_PATH, remixRunDevPath);
-
  // These get populated inside the try/catch below
-  let serverBundles: AppConfig['serverBundles'];
+  let serverBundles: ServerBundle[];
  const serverBundlesMap = new Map<string, ConfigRoute[]>();
  const resolvedConfigsMap = new Map<ConfigRoute, ResolvedRouteConfig>();

@@ -225,7 +241,13 @@ export const build: BuildV2 = async ({
    const staticConfigsMap = new Map<ConfigRoute, BaseFunctionConfig | null>();
    for (const route of remixRoutes) {
      const routePath = join(remixConfig.appDirectory, route.file);
-      const staticConfig = getConfig(project, routePath);
+      let staticConfig = getConfig(project, routePath);
+      if (staticConfig && isHydrogen2) {
+        console.log(
+          'WARN: `export const config` is currently not supported for Hydrogen v2 apps'
+        );
+        staticConfig = null;
+      }
      staticConfigsMap.set(route, staticConfig);
    }

@@ -233,7 +255,8 @@ export const build: BuildV2 = async ({
      const config = getResolvedRouteConfig(
        route,
        remixConfig.routes,
-        staticConfigsMap
+        staticConfigsMap,
+        isHydrogen2
      );
      resolvedConfigsMap.set(route, config);
    }
@@ -262,7 +285,12 @@ export const build: BuildV2 = async ({
      ([hash, routes]) => {
        const runtime = resolvedConfigsMap.get(routes[0])?.runtime ?? 'nodejs';
        return {
-          serverBuildPath: `build/build-${runtime}-${hash}.js`,
+          serverBuildPath: isHydrogen2
+            ? relative(entrypointFsDirname, remixConfig.serverBuildPath)
+            : `${relative(
+                entrypointFsDirname,
+                dirname(remixConfig.serverBuildPath)
+              )}/build-${runtime}-${hash}.js`,
          routes: routes.map(r => r.id),
        };
      }
@@ -270,19 +298,12 @@ export const build: BuildV2 = async ({

    // We need to patch the `remix.config.js` file to force some values necessary
    // for a build that works on either Node.js or the Edge runtime
-    if (remixConfigPath && renamedRemixConfigPath) {
+    if (!isHydrogen2 && remixConfigPath && renamedRemixConfigPath) {
      await fs.rename(remixConfigPath, renamedRemixConfigPath);

-      // Figure out if the `remix.config` file is using ESM syntax
-      let isESM = false;
-      try {
-        _require(renamedRemixConfigPath);
-      } catch (err: any) {
-        isESM = err.code === 'ERR_REQUIRE_ESM';
-      }
-
      let patchedConfig: string;
-      if (isESM) {
+      // Figure out if the `remix.config` file is using ESM syntax
+      if (isESM(renamedRemixConfigPath)) {
        patchedConfig = `import config from './${basename(
          renamedRemixConfigPath
        )}';
@@ -307,6 +328,32 @@ module.exports = config;`;
      remixConfigWrapped = true;
    }

+    // For Hydrogen v2, patch the `server.ts` file to be Vercel-compatible
+    if (isHydrogen2) {
+      if (remixConfig.serverEntryPoint) {
+        serverEntryPointAbs = join(
+          entrypointFsDirname,
+          remixConfig.serverEntryPoint
+        );
+        originalServerEntryPoint = await fs.readFile(
+          serverEntryPointAbs,
+          'utf8'
+        );
+        const patchedServerEntryPoint = patchHydrogenServer(
+          project,
+          serverEntryPointAbs
+        );
+        if (patchedServerEntryPoint) {
+          debug(
+            `Patched Hydrogen server file: ${remixConfig.serverEntryPoint}`
+          );
+          await fs.writeFile(serverEntryPointAbs, patchedServerEntryPoint);
+        }
+      } else {
+        console.log('WARN: No "server" field found in Remix config');
+      }
+    }
+
    // Make `remix build` output production mode
    spawnOpts.env.NODE_ENV = 'production';

@@ -336,14 +383,28 @@ module.exports = config;`;
      }
    }
  } finally {
+    const cleanupOps: Promise<void>[] = [];
    // Clean up our patched `remix.config.js` to be polite
    if (remixConfigWrapped && remixConfigPath && renamedRemixConfigPath) {
-      await fs.rename(renamedRemixConfigPath, remixConfigPath);
+      cleanupOps.push(
+        fs
+          .rename(renamedRemixConfigPath, remixConfigPath)
+          .then(() =>
+            debug(`Restored original "${basename(remixConfigPath)}" file`)
+          )
+      );
    }
-
-    // Remove `@remix-run/dev` symlink
-    await fs.unlink(remixRunDevPath);
-    await fs.rename(backupRemixRunDevPath, remixRunDevPath);
+    // Restore original server entrypoint if it was modified (for Hydrogen v2)
+    if (serverEntryPointAbs && originalServerEntryPoint) {
+      cleanupOps.push(
+        fs
+          .writeFile(serverEntryPointAbs, originalServerEntryPoint)
+          .then(() =>
+            debug(`Restored original "${basename(serverEntryPointAbs!)}" file`)
+          )
+      );
+    }
+    await Promise.all(cleanupOps);
  }

  // This needs to happen before we run NFT to create the Node/Edge functions
@@ -353,11 +414,21 @@ module.exports = config;`;
      repoRootPath,
      '@remix-run/server-runtime'
    ),
-    ensureResolvable(entrypointFsDirname, repoRootPath, '@remix-run/node'),
+    !isHydrogen2
+      ? ensureResolvable(entrypointFsDirname, repoRootPath, '@remix-run/node')
+      : null,
  ]);

+  const staticDir = join(
+    remixConfig.assetsBuildDirectory,
+    ...remixConfig.publicPath
+      .replace(/^\/|\/$/g, '')
+      .split('/')
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
+      .map(_ => '..')
+  );
  const [staticFiles, ...functions] = await Promise.all([
-    glob('**', join(entrypointFsDirname, 'public')),
+    glob('**', staticDir),
    ...serverBundles.map(bundle => {
      const firstRoute = remixConfig.routes[bundle.routes[0]];
      const config = resolvedConfigsMap.get(firstRoute) ?? {
--- a/packages/remix/src/hydrogen.ts
+++ b/packages/remix/src/hydrogen.ts
@@ -0,0 +1,106 @@
+import { basename } from 'path';
+import { Node, Project, SyntaxKind } from 'ts-morph';
+
+/**
+ * For Hydrogen v2, the `server.ts` file exports a signature like:
+ *
+ * ```
+ * export default {
+ *   async fetch(
+ *     request: Request,
+ *     env: Env,
+ *     executionContext: ExecutionContext,
+ *   ): Promise<Response>;
+ * }
+ * ```
+ *
+ * Here we parse the AST of that file so that we can:
+ *
+ *  1. Convert the signature to be compatible with Vercel Edge functions
+ *     (i.e. `export default (res: Response): Promise<Response>`).
+ *
+ *  2. Track usages of the `env` parameter which (which gets removed),
+ *     so that we can create that object based on `process.env`.
+ */
+export function patchHydrogenServer(
+  project: Project,
+  serverEntryPoint: string
+) {
+  const sourceFile = project.addSourceFileAtPath(serverEntryPoint);
+  const defaultExportSymbol = sourceFile.getDescendantsOfKind(
+    SyntaxKind.ExportAssignment
+  )[0];
+  const envProperties: string[] = [];
+
+  if (!defaultExportSymbol) {
+    console.log(
+      `WARN: No default export found in "${basename(serverEntryPoint)}"`
+    );
+    return;
+  }
+
+  const objectLiteral = defaultExportSymbol.getFirstChildByKind(
+    SyntaxKind.ObjectLiteralExpression
+  );
+  if (!Node.isObjectLiteralExpression(objectLiteral)) {
+    console.log(
+      `WARN: Default export in "${basename(
+        serverEntryPoint
+      )}" does not conform to Oxygen syntax`
+    );
+    return;
+  }
+
+  const fetchMethod = objectLiteral.getProperty('fetch');
+  if (!fetchMethod || !Node.isMethodDeclaration(fetchMethod)) {
+    console.log(
+      `WARN: Default export in "${basename(
+        serverEntryPoint
+      )}" does not conform to Oxygen syntax`
+    );
+    return;
+  }
+
+  const parameters = fetchMethod.getParameters();
+
+  // Find usages of the env object within the fetch method
+  const envParam = parameters[1];
+  const envParamName = envParam.getName();
+  if (envParam) {
+    fetchMethod.forEachDescendant(node => {
+      if (
+        Node.isPropertyAccessExpression(node) &&
+        node.getExpression().getText() === envParamName
+      ) {
+        envProperties.push(node.getName());
+      }
+    });
+  }
+
+  // Vercel does not support the Web Cache API, so find
+  // and replace `caches.open()` calls with `undefined`
+  fetchMethod.forEachDescendant(node => {
+    if (
+      Node.isCallExpression(node) &&
+      node.getExpression().getText() === 'caches.open'
+    ) {
+      node.replaceWithText(`undefined /* ${node.getText()} */`);
+    }
+  });
+
+  // Remove the 'env' parameter to match Vercel's Edge signature
+  parameters.splice(1, 1);
+
+  // Construct the new function with the parameters and body of the original fetch method
+  const newFunction = `export default async function(${parameters
+    .map(p => p.getText())
+    .join(', ')}) ${fetchMethod.getBody()!.getText()}`;
+  defaultExportSymbol.replaceWithText(newFunction);
+
+  const envCode = `const env = { ${envProperties
+    .map(name => `${name}: process.env.${name}`)
+    .join(', ')} };`;
+
+  const updatedCodeString = sourceFile.getFullText();
+  return `${envCode}\n${updatedCodeString}`;
+}
--- a/packages/remix/src/prepare-cache.ts
+++ b/packages/remix/src/prepare-cache.ts
@@ -1,6 +1,6 @@
 import { glob } from '@vercel/build-utils';
 import { dirname, join, relative } from 'path';
-import { chdirAndReadConfig } from './utils';
+import { _require, chdirAndReadConfig } from './utils';
 import type { PrepareCache } from '@vercel/build-utils';

 export const prepareCache: PrepareCache = async ({
@@ -12,7 +12,13 @@ export const prepareCache: PrepareCache = async ({
  const mountpoint = dirname(entrypoint);
  const entrypointFsDirname = join(workPath, mountpoint);
  const packageJsonPath = join(entrypointFsDirname, 'package.json');
+  const remixRunDevPath = dirname(
+    _require.resolve('@remix-run/dev/package.json', {
+      paths: [entrypointFsDirname],
+    })
+  );
  const remixConfig = await chdirAndReadConfig(
+    remixRunDevPath,
    entrypointFsDirname,
    packageJsonPath
  );
--- a/packages/remix/src/utils.ts
+++ b/packages/remix/src/utils.ts
@@ -1,8 +1,8 @@
+import semver from 'semver';
 import { existsSync, promises as fs } from 'fs';
 import { basename, dirname, join, relative, resolve, sep } from 'path';
 import { pathToRegexp, Key } from 'path-to-regexp';
 import { debug, spawnAsync } from '@vercel/build-utils';
-import { readConfig } from '@remix-run/dev/dist/config';
 import { walkParentDirs } from '@vercel/build-utils';
 import type {
  ConfigRoute,
@@ -15,12 +15,15 @@ import type {
  SpawnOptionsExtended,
 } from '@vercel/build-utils/dist/fs/run-user-scripts';

+export const _require: typeof require = eval('require');
+
 export interface ResolvedNodeRouteConfig {
  runtime: 'nodejs';
  regions?: string[];
  maxDuration?: number;
  memory?: number;
 }
+
 export interface ResolvedEdgeRouteConfig {
  runtime: 'edge';
  regions?: BaseFunctionConfig['regions'];
@@ -43,8 +46,6 @@ export interface ResolvedRoutePaths {
  rePath: string;
 }

-const _require: typeof require = eval('require');
-
 const SPLAT_PATH = '/:params*';

 const entryExts = ['.js', '.jsx', '.ts', '.tsx'];
@@ -77,7 +78,8 @@ function isEdgeRuntime(runtime: string): boolean {
 export function getResolvedRouteConfig(
  route: ConfigRoute,
  routes: RouteManifest,
-  configs: Map<ConfigRoute, BaseFunctionConfig | null>
+  configs: Map<ConfigRoute, BaseFunctionConfig | null>,
+  isHydrogen2: boolean
 ): ResolvedRouteConfig {
  let runtime: ResolvedRouteConfig['runtime'] | undefined;
  let regions: ResolvedRouteConfig['regions'];
@@ -106,8 +108,8 @@ export function getResolvedRouteConfig(
    regions = Array.from(new Set(regions)).sort();
  }

-  if (runtime === 'edge') {
-    return { runtime, regions };
+  if (isHydrogen2 || runtime === 'edge') {
+    return { runtime: 'edge', regions };
  }

  if (regions && !Array.isArray(regions)) {
@@ -212,7 +214,14 @@ export function syncEnv(source: NodeJS.ProcessEnv, dest: NodeJS.ProcessEnv) {
  return () => syncEnv(originalDest, dest);
 }

-export async function chdirAndReadConfig(dir: string, packageJsonPath: string) {
+export async function chdirAndReadConfig(
+  remixRunDevPath: string,
+  dir: string,
+  packageJsonPath: string
+) {
+  const { readConfig }: typeof import('@remix-run/dev/dist/config') =
+    await import(join(remixRunDevPath, 'dist/config.js'));
+
  const originalCwd = process.cwd();

  // As of Remix v1.14.0, reading the config may trigger adding
@@ -249,19 +258,24 @@ export async function chdirAndReadConfig(dir: string, packageJsonPath: string) {
  return remixConfig;
 }

-export interface AddDependencyOptions extends SpawnOptionsExtended {
+export interface AddDependenciesOptions extends SpawnOptionsExtended {
  saveDev?: boolean;
 }

 /**
 * Runs `npm i ${name}` / `pnpm i ${name}` / `yarn add ${name}`.
 */
-export function addDependency(
+export function addDependencies(
  cliType: CliType,
  names: string[],
-  opts: AddDependencyOptions = {}
+  opts: AddDependenciesOptions = {}
 ) {
+  debug('Installing additional dependencies:');
+  for (const name of names) {
+    debug(` - ${name}`);
+  }
  const args: string[] = [];
+
  if (cliType === 'npm' || cliType === 'pnpm') {
    args.push('install');
    if (opts.saveDev) {
@@ -269,14 +283,31 @@ export function addDependency(
    }
  } else {
    // 'yarn'
-    args.push('add');
+    args.push('add', '--ignore-workspace-root-check');
    if (opts.saveDev) {
      args.push('--dev');
    }
  }
+
+  // Don't fail if pnpm is being run at the workspace root
+  if (cliType === 'pnpm' && opts.cwd) {
+    if (existsSync(join(opts.cwd, 'pnpm-workspace.yaml'))) {
+      args.push('--workspace-root');
+    }
+  }
+
  return spawnAsync(cliType, args.concat(names), opts);
 }

+export function resolveSemverMinMax(
+  min: string,
+  max: string,
+  version: string
+): string {
+  const floored = semver.intersects(version, `>= ${min}`) ? version : min;
+  return semver.intersects(floored, `<= ${max}`) ? floored : max;
+}
+
 export async function ensureResolvable(
  start: string,
  base: string,
@@ -369,3 +400,14 @@ async function ensureSymlink(
  await fs.symlink(relativeTarget, symlinkPath);
  debug(`Created symlink for "${pkgName}"`);
 }
+
+export function isESM(path: string): boolean {
+  // Figure out if the `remix.config` file is using ESM syntax
+  let isESM = false;
+  try {
+    _require(path);
+  } catch (err: any) {
+    isESM = err.code === 'ERR_REQUIRE_ESM';
+  }
+  return isESM;
+}
--- a/packages/remix/test/fixtures/01-remix-basics/package.json
+++ b/packages/remix/test/fixtures/01-remix-basics/package.json
@@ -10,14 +10,14 @@
    "start": "remix-serve build"
  },
  "dependencies": {
-    "@remix-run/node": "^1.7.4",
-    "@remix-run/react": "^1.7.4",
-    "@remix-run/serve": "^1.7.4",
+    "@remix-run/node": "1.15.0",
+    "@remix-run/react": "1.15.0",
+    "@remix-run/serve": "1.15.0",
    "react": "18.2.0",
    "react-dom": "18.2.0"
  },
  "devDependencies": {
-    "@remix-run/dev": "^1.7.4",
+    "@remix-run/dev": "1.15.0",
    "@types/react": "^17.0.45",
    "@types/react-dom": "^17.0.17",
    "typescript": "^4.6.4"
--- a/packages/remix/test/fixtures/01-remix-basics/yarn.lock
+++ b/packages/remix/test/fixtures/01-remix-basics/yarn.lock
--- a/packages/remix/test/fixtures/03-with-pnpm/package.json
+++ b/packages/remix/test/fixtures/03-with-pnpm/package.json
@@ -10,13 +10,13 @@
    "start": "remix-serve build"
  },
  "dependencies": {
-    "@remix-run/react": "1.5.0",
-    "@remix-run/serve": "1.5.0",
+    "@remix-run/react": "1.10.0",
+    "@remix-run/serve": "1.10.0",
    "react": "18.2.0",
    "react-dom": "18.2.0"
  },
  "devDependencies": {
-    "@remix-run/dev": "1.5.0",
+    "@remix-run/dev": "1.10.0",
    "@types/react": "^17.0.45",
    "@types/react-dom": "^17.0.17",
    "typescript": "^4.6.4"
--- a/packages/remix/test/fixtures/03-with-pnpm/pnpm-lock.yaml
+++ b/packages/remix/test/fixtures/03-with-pnpm/pnpm-lock.yaml
--- a/packages/remix/test/fixtures/10-hydrogen-2/.gitignore
+++ b/packages/remix/test/fixtures/10-hydrogen-2/.gitignore
@@ -0,0 +1,9 @@
+node_modules
+/.cache
+/build
+/dist
+/public/build
+/.mf
+.env
+.shopify
+.vercel
--- a/packages/remix/test/fixtures/10-hydrogen-2/.graphqlrc.yml
+++ b/packages/remix/test/fixtures/10-hydrogen-2/.graphqlrc.yml
@@ -0,0 +1 @@
+schema: node_modules/@shopify/hydrogen-react/storefront.schema.json
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`schema: node_modules/@shopify/hydrogen-react/storefront.schema.json`