Merge branch 'main' into codespace-crispy-acorn-g59xgxvw4r3p64q

I did some pruning of old projects on my personal account last night, and accidentally broke CI. I've created a new tarball on the `curated-tests` team so that it doesn't happen again.

.changeset/blue-kangaroos-sparkle.md

@@ -0,0 +1,2 @@
+---
+---

.changeset/curvy-garlics-design.md

@@ -0,0 +1,5 @@
+---
+'vercel': patch
+---
+
+fix flickering during interactive UI rerendering

.changeset/metal-rabbits-move.md

@@ -0,0 +1,2 @@
+---
+---

.changeset/real-tomatoes-kick.md

@@ -0,0 +1,2 @@
+---
+---

.changeset/swift-apples-count.md

@@ -0,0 +1,5 @@
+---
+"vercel": patch
+---
+
+Update `@vercel/fun` to v1.1.1

.changeset/tidy-eagles-drum.md

@@ -0,0 +1,4 @@
+---
+---
+
+Fix name for integration test

.eslintignore

@@ -10,6 +10,7 @@ packages/*/test/fixtures
 packages/cli/@types
 packages/cli/download
 packages/cli/dist
+packages/cli/test/fixtures
 packages/cli/test/dev/fixtures
 packages/cli/bin
 packages/cli/link

.github/CODEOWNERS

@@ -2,17 +2,17 @@
 # https://help.github.com/en/articles/about-code-owners
 
 # Restricted Paths
-*                                        @TooTallNate @EndangeredMassa @trek
-/.github/workflows                       @TooTallNate @EndangeredMassa @trek @ijjk
-/packages/fs-detectors                   @TooTallNate @EndangeredMassa @trek @agadzik @chloetedder
-/packages/next                           @TooTallNate @EndangeredMassa @Ethan-Arrowood @trek @ijjk @ztanner
-/packages/routing-utils                  @TooTallNate @EndangeredMassa @trek @ijjk
-/packages/static-build                   @TooTallNate @EndangeredMassa @trek
-/packages/edge                           @vercel/compute @TooTallNate @EndangeredMassa @trek
-/examples                                @leerob
-/examples/create-react-app               @Timer
-/examples/nextjs                         @timneutkens @ijjk @ztanner @huozhi
-/packages/node                           @TooTallNate @EndangeredMassa @trek @Kikobeats
+*                                        @TooTallNate @EndangeredMassa @trek @onsclom @jeffsee55 @erikareads
+/.github/workflows                       @TooTallNate @EndangeredMassa @trek @onsclom @jeffsee55 @erikareads @ijjk
+/packages/fs-detectors                   @TooTallNate @EndangeredMassa @trek @onsclom @jeffsee55 @erikareads @agadzik @chloetedder
+/packages/next                           @TooTallNate @EndangeredMassa @trek @onsclom @jeffsee55 @erikareads @timneutkens @ijjk @ztanner @huozhi @Ethan-Arrowood @styfle
+/packages/routing-utils                  @TooTallNate @EndangeredMassa @trek @onsclom @jeffsee55 @erikareads @ijjk
+/packages/static-build                   @TooTallNate @EndangeredMassa @trek @onsclom @jeffsee55 @erikareads
+/packages/edge                           @TooTallNate @EndangeredMassa @trek @onsclom @jeffsee55 @erikareads @vercel/compute
+/examples                                @TooTallNate @EndangeredMassa @trek @onsclom @jeffsee55 @erikareads @leerob
+/examples/create-react-app               @TooTallNate @EndangeredMassa @trek @onsclom @jeffsee55 @erikareads @Timer
+/examples/nextjs                         @TooTallNate @EndangeredMassa @trek @onsclom @jeffsee55 @erikareads @timneutkens @ijjk @ztanner @huozhi @Ethan-Arrowood @styfle
+/packages/node                           @TooTallNate @EndangeredMassa @trek @onsclom @jeffsee55 @erikareads @Kikobeats
 
 # Unrestricted Paths
 .changeset/

.github/CONTRIBUTING.md

@@ -1,108 +1,3 @@
-# Contributing
+## Contributing
 
-When contributing to this repository, please first discuss the change you wish to make via [GitHub Discussions](https://github.com/vercel/vercel/discussions/new) with the owners of this repository before submitting a Pull Request.
-
-Please read our [Code of Conduct](CODE_OF_CONDUCT.md) and follow it in all your interactions with the project.
-
-## Local development
-
-This project is configured in a monorepo, where one repository contains multiple npm packages. Dependencies are installed and managed with `pnpm`, not `npm` CLI.
-
-To get started, execute the following:
-
-```
-git clone https://github.com/vercel/vercel
-cd vercel
-corepack enable
-pnpm install
-pnpm build
-pnpm lint
-pnpm test-unit
-```
-
-Make sure all the tests pass before making changes.
-
-### Running Vercel CLI Changes
-
-You can use `pnpm dev` from the `cli` package to invoke Vercel CLI with local changes:
-
-```
-cd ./packages/cli
-pnpm dev <cli-commands...>
-```
-
-See [CLI Local Development](../packages/cli#local-development) for more details.
-
-## Verifying your change
-
-Once you are done with your changes (we even suggest doing it along the way), make sure all the tests still pass by running:
-
-```
-pnpm test-unit
-```
-
-from the root of the project.
-
-If any test fails, make sure to fix it along with your changes. See [Interpreting test errors](#Interpreting-test-errors) for more information about how the tests are executed, especially the integration tests.
-
-## Pull Request Process
-
-Once you are confident that your changes work properly, open a pull request on the main repository.
-
-The pull request will be reviewed by the maintainers and the tests will be checked by our continuous integration platform.
-
-## Interpreting test errors
-
-There are 2 kinds of tests in this repository – Unit tests and Integration tests.
-
-Unit tests are run locally with `jest` and execute quickly because they are testing the smallest units of code.
-
-### Integration tests
-
-Integration tests create deployments to your Vercel account using the `test` project name. After each test is deployed, the `probes` key is used to check if the response is the expected value. If the value doesn't match, you'll see a message explaining the difference. If the deployment failed to build, you'll see a more generic message like the following:
-
-```
-[Error: Fetched page https://test-8ashcdlew.vercel.app/root.js does not contain hello Root!. Instead it contains An error occurred with this application.
-
-    NO_STATUS_CODE_FRO Response headers:
-       cache-control=s-maxage=0
-      connection=close
-      content-type=text/plain; charset=utf-8
-      date=Wed, 19 Jun 2019 18:01:37 GMT
-      server=now
-      strict-transport-security=max-age=63072000
-      transfer-encoding=chunked
-      x-now-id=iad1:hgtzj-1560967297876-44ae12559f95
-      x-now-trace=iad1]
-```
-
-In such cases, you can visit the URL of the failed deployment and append `/_logs` to see the build error. In the case above, that would be https://test-8ashcdlew.vercel.app/_logs
-
-The logs of this deployment will contain the actual error which may help you to understand what went wrong.
-
-### @vercel/nft
-
-Some of the Builders use `@vercel/nft` to tree-shake files before deployment. If you suspect an error with this tree-shaking mechanism, you can create the following script in your project:
-
-```js
-const { nodeFileTrace } = require('@vercel/nft');
-nodeFileTrace(['path/to/entrypoint.js'], {
-  ts: true,
-  mixedModules: true,
-})
-  .then(o => console.log(o.fileList))
-  .then(e => console.error(e));
-```
-
-When you run this script, you'll see all the imported files. If anything file is missing, the bug is in [@vercel/nft](https://github.com/vercel/nft) and not the Builder.
-
-## Deploy a Builder with existing project
-
-Sometimes you want to test changes to a Builder against an existing project, maybe with `vercel dev` or actual deployment. You can avoid publishing every Builder change to npm by uploading the Builder as a tarball.
-
-1. Change directory to the desired Builder `cd ./packages/node`
-2. Run `pnpm build` to compile typescript and other build steps
-3. Run `npm pack` to create a tarball file
-4. Run `vercel *.tgz` to upload the tarball file and get a URL
-5. Edit any existing `vercel.json` project and replace `use` with the URL
-6. Run `vercel` or `vercel dev` to deploy with the experimental Builder
+See the [Contributing Guidelines](../README.md#contributing) for more details.

.github/dependabot.yml

@@ -1,7 +1,8 @@
 version: 2
 
 updates:
-  - schedule:
+  - directory: /packages/static-build/test/fixtures/angular-v17
+    schedule:
       interval: 'daily'
     open-pull-requests-limit: 1
     reviewers:
@@ -11,7 +12,6 @@ updates:
     commit-message:
       prefix: '[framework-fixtures]'
     package-ecosystem: 'npm'
-    directory: /packages/static-build/test/fixtures/angular-v17
     allow:
       - dependency-name: '@angular*'
     ignore:
@@ -25,8 +25,9 @@ updates:
         update-types:
           - 'minor'
 
-  - schedule:
-    interval: 'daily'
+  - directory: /packages/static-build/test/fixtures/astro-v4
+    schedule:
+      interval: 'daily'
     open-pull-requests-limit: 1
     reviewers:
       - 'trek'
@@ -35,7 +36,6 @@ updates:
     commit-message:
       prefix: '[framework-fixtures]'
     package-ecosystem: 'npm'
-    directory: /packages/static-build/test/fixtures/astro-v4
     allow:
       - dependency-name: 'astro*'
     ignore:
@@ -49,7 +49,8 @@ updates:
         update-types:
           - 'minor'
 
-  - schedule:
+  - directory: /packages/static-build/test/fixtures/hydrogen-v2023
+    schedule:
       interval: 'daily'
     open-pull-requests-limit: 1
     reviewers:
@@ -59,7 +60,6 @@ updates:
     commit-message:
       prefix: '[framework-fixtures]'
     package-ecosystem: 'npm'
-    directory: /packages/static-build/test/fixtures/hydrogen-v2023
     allow:
       - dependency-name: '@remix-run*'
       - dependency-name: '@shopify*'
@@ -77,3 +77,148 @@ updates:
           - '@shopify*'
         update-types:
           - 'minor'
+
+  - directory: /packages/static-build/test/fixtures/ionic-angular-v7
+    schedule:
+      interval: 'daily'
+    open-pull-requests-limit: 1
+    reviewers:
+      - 'trek'
+      - 'TooTallNate'
+      - 'EndangeredMassa'
+    commit-message:
+      prefix: '[framework-fixtures]'
+    package-ecosystem: 'npm'
+    allow:
+      - dependency-name: '@ionic*'
+      - dependency-name: '@angular*'
+    ignore:
+      - dependency-name: '@ionic*'
+        update-types:
+          ['version-update:semver-major', 'version-update:semver-patch']
+      - dependency-name: '@angular*'
+        update-types:
+          ['version-update:semver-major', 'version-update:semver-patch']
+    groups:
+      core:
+        patterns:
+          - '@angular*'
+          - '@ionic*'
+        update-types:
+          - 'minor'
+
+  - directory: /packages/static-build/test/fixtures/ionic-react-v7
+    schedule:
+      interval: 'daily'
+    open-pull-requests-limit: 1
+    reviewers:
+      - 'trek'
+      - 'TooTallNate'
+      - 'EndangeredMassa'
+    commit-message:
+      prefix: '[framework-fixtures]'
+    package-ecosystem: 'npm'
+    allow:
+      - dependency-name: '@ionic*'
+      - dependency-name: 'react*'
+    ignore:
+      - dependency-name: '@ionic*'
+        update-types:
+          ['version-update:semver-major', 'version-update:semver-patch']
+      - dependency-name: 'react*'
+        update-types:
+          ['version-update:semver-major', 'version-update:semver-patch']
+    groups:
+      core:
+        patterns:
+          - '@ionic*'
+          - 'react*'
+        update-types:
+          - 'minor'
+
+  - directory: /packages/static-build/test/fixtures/nuxt-v3
+    schedule:
+      interval: 'daily'
+    open-pull-requests-limit: 1
+    reviewers:
+      - 'trek'
+      - 'TooTallNate'
+      - 'EndangeredMassa'
+    commit-message:
+      prefix: '[framework-fixtures]'
+    package-ecosystem: 'npm'
+    allow:
+      - dependency-name: 'nuxt'
+      - dependency-name: 'vue'
+      - dependency-name: 'vue-router'
+      - dependency-name: '@nuxt-devtools'
+    ignore:
+      - dependency-name: 'nuxt'
+        update-types:
+          ['version-update:semver-major', 'version-update:semver-patch']
+      - dependency-name: 'vue'
+        update-types:
+          ['version-update:semver-major', 'version-update:semver-patch']
+      - dependency-name: 'vue-router'
+        update-types:
+          ['version-update:semver-major', 'version-update:semver-patch']
+      - dependency-name: '@nuxt-devtools'
+        update-types:
+          ['version-update:semver-major', 'version-update:semver-patch']
+    groups:
+      core:
+        patterns:
+          - 'nuxt'
+          - 'vue'
+          - 'vue-router'
+          - '@nuxt-devtools'
+        update-types:
+          - 'minor'
+
+  - directory: /packages/static-build/test/fixtures/preact-v10
+    schedule:
+      interval: 'daily'
+    open-pull-requests-limit: 1
+    reviewers:
+      - 'trek'
+      - 'TooTallNate'
+      - 'EndangeredMassa'
+    commit-message:
+      prefix: '[framework-fixtures]'
+    package-ecosystem: 'npm'
+    allow:
+      - dependency-name: 'preact*'
+    ignore:
+      - dependency-name: 'preact*'
+        update-types:
+          ['version-update:semver-major', 'version-update:semver-patch']
+    groups:
+      core:
+        patterns:
+          - 'preact*'
+        update-types:
+          - 'minor'
+
+  - directory: /packages/static-build/test/fixtures/stencil-v4
+    schedule:
+      interval: 'daily'
+    open-pull-requests-limit: 1
+    reviewers:
+      - 'trek'
+      - 'TooTallNate'
+      - 'EndangeredMassa'
+    commit-message:
+      prefix: '[framework-fixtures]'
+    package-ecosystem: 'npm'
+    allow:
+      - dependency-name: '@stencil/core'
+    ignore:
+      - dependency-name: '@stencil/core'
+        update-types:
+          ['version-update:semver-major', 'version-update:semver-patch']
+    groups:
+      core:
+        patterns:
+          - '@stencil/core'
+        update-types:
+          - 'minor'

.github/workflows/test.yml

@@ -79,9 +79,6 @@ jobs:
         run: npm i -g pnpm@8.3.1
 
       - run: pnpm install
-      - name: fetch ssl certificate before build (linux, os x)
-        if: matrix.runner != 'windows-latest'
-        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" --log-order=stream --scope=${{matrix.packageName}} --include-dependencies --no-deps
@@ -104,9 +101,6 @@ jobs:
           TURBO_MISS_COUNT=`node utils/determine-turbo-hit-or-miss.js`
           echo "MISS COUNT: $TURBO_MISS_COUNT"
           echo "misses=$TURBO_MISS_COUNT" >> $GITHUB_OUTPUT
-      - name: fetch ssl certificate after tests (linux, os x)
-        if: matrix.runner != 'windows-latest'
-        run: echo | openssl s_client -showcerts -servername 'api.vercel.com' -connect 76.76.21.21:443
       - name: 'Upload Test Report to Datadog'
         if: ${{ steps['turbo-summary'].outputs.misses != '0' && !cancelled() }}
         run: 'npx @datadog/datadog-ci@2.18.1 junit upload --service vercel-cli .junit-reports'

README.md

@@ -13,7 +13,7 @@
   <a href="https://vercel.com/docs"><strong>Documentation</strong></a> ·
   <a href="https://vercel.com/changelog"><strong>Changelog</strong></a> ·
   <a href="https://vercel.com/templates"><strong>Templates</strong></a> ·
-  <a href="https://vercel.com/cli"><strong>CLI</strong></a>
+  <a href="https://vercel.com/docs/cli"><strong>CLI</strong></a>
 </p>
 <br/>
 
@@ -23,7 +23,7 @@ Vercel’s Frontend Cloud provides the developer experience and infrastructure t
 
 ## Deploy
 
-Get started by [importing a project](https://vercel.com/new) or using the [Vercel CLI](https://vercel.com/cli). Then, `git push` to deploy.
+Get started by [importing a project](https://vercel.com/new) or using the [Vercel CLI](https://vercel.com/docs/cli). Then, `git push` to deploy.
 
 ## Documentation
 
@@ -35,7 +35,134 @@ This project uses [pnpm](https://pnpm.io/) to install dependencies and run scrip
 
 You can use the `dev` script to run local changes as if you were invoking Vercel CLI. For example, `vercel deploy --cwd=/path/to/project` could be run with local changes with `pnpm dev deploy --cwd=/path/to/project`.
 
-See the [Contributing Guidelines](./.github/CONTRIBUTING.md) for more details.
+When contributing to this repository, please first discuss the change you wish to make via [GitHub Discussions](https://github.com/vercel/vercel/discussions/new) with the owners of this repository before submitting a Pull Request.
+
+Please read our [Code of Conduct](CODE_OF_CONDUCT.md) and follow it in all your interactions with the project.
+
+### Local development
+
+This project is configured in a monorepo, where one repository contains multiple npm packages. Dependencies are installed and managed with `pnpm`, not `npm` CLI.
+
+To get started, execute the following:
+
+```
+git clone https://github.com/vercel/vercel
+cd vercel
+corepack enable
+pnpm install
+pnpm build
+pnpm lint
+pnpm test-unit
+```
+
+Make sure all the tests pass before making changes.
+
+#### Running Vercel CLI Changes
+
+You can use `pnpm dev` from the `cli` package to invoke Vercel CLI with local changes:
+
+```
+cd ./packages/cli
+pnpm dev <cli-commands...>
+```
+
+See [CLI Local Development](../packages/cli#local-development) for more details.
+
+### Verifying your change
+
+Once you are done with your changes (we even suggest doing it along the way), make sure all the tests still pass by running:
+
+```
+pnpm test-unit
+```
+
+from the root of the project.
+
+If any test fails, make sure to fix it along with your changes. See [Interpreting test errors](#Interpreting-test-errors) for more information about how the tests are executed, especially the integration tests.
+
+### Pull Request Process
+
+Once you are confident that your changes work properly, open a pull request on the main repository.
+
+The pull request will be reviewed by the maintainers and the tests will be checked by our continuous integration platform.
+
+### Interpreting test errors
+
+There are 2 kinds of tests in this repository – Unit tests and Integration tests.
+
+Unit tests are run locally with `jest` and execute quickly because they are testing the smallest units of code.
+
+#### Integration tests
+
+Integration tests create deployments to your Vercel account using the `test` project name. After each test is deployed, the `probes` key is used to check if the response is the expected value. If the value doesn't match, you'll see a message explaining the difference. If the deployment failed to build, you'll see a more generic message like the following:
+
+```
+[Error: Fetched page https://test-8ashcdlew.vercel.app/root.js does not contain hello Root!. Instead it contains An error occurred with this application.
+
+    NO_STATUS_CODE_FRO Response headers:
+       cache-control=s-maxage=0
+      connection=close
+      content-type=text/plain; charset=utf-8
+      date=Wed, 19 Jun 2019 18:01:37 GMT
+      server=now
+      strict-transport-security=max-age=63072000
+      transfer-encoding=chunked
+      x-now-id=iad1:hgtzj-1560967297876-44ae12559f95
+      x-now-trace=iad1]
+```
+
+In such cases, you can visit the URL of the failed deployment and append `/_logs` to see the build error. In the case above, that would be https://test-8ashcdlew.vercel.app/_logs
+
+The logs of this deployment will contain the actual error which may help you to understand what went wrong.
+
+##### Running integration tests locally
+
+While running the full integration suite locally is not recommended, it's sometimes useful to isolate a failing test by running it on your machine. To do so, you'll need to ensure you have the appropriate credentials sourced in your shell:
+
+1. Create an access token. Follow the insructions here https://vercel.com/docs/rest-api#creating-an-access-token. Ensure the token scope is for your personal
+   account.
+2. Grab the team ID from the Vercel dashboard at `https://vercel.com/<MY-TEAM>/~/settings`.
+3. Source these into your shell rc file: `echo 'export VERCEL_TOKEN=<MY-TOKEN> VERCEL_TEAM_ID=<MY-TEAM-ID>' >> ~/.zshrc`
+
+From there, you should be able to trigger an integration test. Choose one
+that's already isolated to check that things work:
+
+```
+cd packages/next
+```
+
+Run the test:
+
+```
+pnpm test test/fixtures/00-server-build/index.test.js
+```
+
+#### @vercel/nft
+
+Some of the Builders use `@vercel/nft` to tree-shake files before deployment. If you suspect an error with this tree-shaking mechanism, you can create the following script in your project:
+
+```js
+const { nodeFileTrace } = require('@vercel/nft');
+nodeFileTrace(['path/to/entrypoint.js'], {
+  ts: true,
+  mixedModules: true,
+})
+  .then(o => console.log(o.fileList))
+  .then(e => console.error(e));
+```
+
+When you run this script, you'll see all the imported files. If anything file is missing, the bug is in [@vercel/nft](https://github.com/vercel/nft) and not the Builder.
+
+### Deploy a Builder with existing project
+
+Sometimes you want to test changes to a Builder against an existing project, maybe with `vercel dev` or actual deployment. You can avoid publishing every Builder change to npm by uploading the Builder as a tarball.
+
+1. Change directory to the desired Builder `cd ./packages/node`
+2. Run `pnpm build` to compile typescript and other build steps
+3. Run `npm pack` to create a tarball file
+4. Run `vercel *.tgz` to upload the tarball file and get a URL
+5. Edit any existing `vercel.json` project and replace `use` with the URL
+6. Run `vercel` or `vercel dev` to deploy with the experimental Builder
 
 ## Reference
 

errors/invalid-route-source.md

@@ -50,4 +50,4 @@ Ensure any segments used in the `destination` property are also used in the `sou
 
 - [path-to-regexp](https://github.com/pillarjs/path-to-regexp/tree/v6.1.0)
 - [named parameters](https://github.com/pillarjs/path-to-regexp/blob/v6.1.0/Readme.md#named-parameters)
-- [un-named paramters](https://github.com/pillarjs/path-to-regexp/blob/v6.1.0/Readme.md#unnamed-parameters)
+- [un-named parameters](https://github.com/pillarjs/path-to-regexp/blob/v6.1.0/Readme.md#unnamed-parameters)

examples/README.md

@@ -1,6 +1,6 @@
 # Vercel Examples
 
-To get started using any of these examples as your own project, [install Vercel](https://vercel.com/cli) and use either of the following commands in your terminal:
+To get started using any of these examples as your own project, [install Vercel](https://vercel.com/docs/cli) and use either of the following commands in your terminal:
 
 ```sh
 vercel init                    # Pick an example in the CLI

examples/__tests__/test-utils.ts

@@ -4,7 +4,7 @@ import { lstatSync, readdirSync } from 'fs';
 export async function deployExample(filename: string) {
   const { testDeployment } = require('../../test/lib/deployment/test-deployment.js');
   const example = basename(filename).replace(/\.test\.ts$/, '');
-  await testDeployment(join(filename, '..', '..', '..', example));
+  await testDeployment(join(process.cwd(), example));
 }
 
 export function getExamples() {

examples/hugo/package.json

@@ -0,0 +1,5 @@
+{
+  "engines": {
+    "node": "18.x"
+  }
+}

examples/hugo/themes/ananke/exampleSite/content/contact.md

@@ -8,6 +8,6 @@ menu:
   main: {}
 ---
 
-This is an example of a custom shortcode that you can put right into your content. You will need to add a form action to the the shortcode to make it work. Check out [Formspree](https://formspree.io/) for a simple, free form service.
+This is an example of a custom shortcode that you can put right into your content. You will need to add a form action to the shortcode to make it work. Check out [Formspree](https://formspree.io/) for a simple, free form service.
 
 {{< form-contact action="https://example.com"  >}}

examples/hydrogen-2/README.md

@@ -8,7 +8,7 @@ This directory is a brief example of a [Hydrogen v2](https://shopify.dev/custom-
 
 _Live Example: https://hydrogen-v2-template.vercel.app_
 
-You can also deploy using the [Vercel CLI](https://vercel.com/cli):
+You can also deploy using the [Vercel CLI](https://vercel.com/docs/cli):
 
 ```sh
 npm i -g vercel

examples/jekyll/package.json

@@ -0,0 +1,5 @@
+{
+  "engines": {
+    "node": "18.x"
+  }
+}

examples/middleman/package.json

@@ -0,0 +1,5 @@
+{
+  "engines": {
+    "node": "18.x"
+  }
+}

examples/nextjs/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "react": "^18",
     "react-dom": "^18",
-    "next": "14.1.2"
+    "next": "14.1.4"
   },
   "devDependencies": {
     "typescript": "^5",
@@ -22,6 +22,6 @@
     "postcss": "^8",
     "tailwindcss": "^3.3.0",
     "eslint": "^8",
-    "eslint-config-next": "14.1.2"
+    "eslint-config-next": "14.1.4"
   }
 }

examples/package.json

@@ -9,7 +9,8 @@
   },
   "devDependencies": {
     "@types/jest": "27.4.1",
-    "@vercel/frameworks": "3.0.0"
+    "@vercel/build-utils": "7.11.0",
+    "@vercel/frameworks": "3.0.1"
   },
   "version": null
 }

examples/remix/README.md

@@ -14,7 +14,7 @@ npx create-remix@latest --template vercel/vercel/examples/remix
 
 _Live Example: https://remix-run-template.vercel.app_
 
-You can also deploy using the [Vercel CLI](https://vercel.com/cli):
+You can also deploy using the [Vercel CLI](https://vercel.com/docs/cli):
 
 ```sh
 npm i -g vercel
@@ -35,4 +35,4 @@ Afterwards, start the Remix development server like so:
 npm run dev
 ```
 
-Open up [http://localhost:3000](http://localhost:3000) and you should be ready to go!
+Open up [http://localhost:5173](http://localhost:5173) and you should be ready to go!

examples/sanity/README.md

@@ -18,7 +18,7 @@ Install dependencies:
 npx @sanity/cli install
 ```
 
-Pull down environment variables from your Vercel project (requires the [Vercel CLI](https://vercel.com/cli)):
+Pull down environment variables from your Vercel project (requires the [Vercel CLI](https://vercel.com/docs/cli)):
 
 ```sh
 vercel env pull

examples/zola/package.json

@@ -0,0 +1,5 @@
+{
+  "engines": {
+    "node": "18.x"
+  }
+}

internals/types/CHANGELOG.md

@@ -1,5 +1,40 @@
 # @vercel-internals/types
 
+## 1.0.29
+
+### Patch Changes
+
+- Updated dependencies [[`73b112b1f`](https://github.com/vercel/vercel/commit/73b112b1f74480e1bb941e1b754105fc7dace401)]:
+  - @vercel/build-utils@7.11.0
+
+## 1.0.28
+
+### Patch Changes
+
+- Updated dependencies [[`1825b58df`](https://github.com/vercel/vercel/commit/1825b58df8d783e79f0addf262618f422246f4b3)]:
+  - @vercel/build-utils@7.10.0
+
+## 1.0.27
+
+### Patch Changes
+
+- Updated dependencies [[`11218a179`](https://github.com/vercel/vercel/commit/11218a179870a5420c5a6ff720cd4aec4f7e1c5e)]:
+  - @vercel/build-utils@7.9.1
+
+## 1.0.26
+
+### Patch Changes
+
+- Updated dependencies [[`8ea93839c`](https://github.com/vercel/vercel/commit/8ea93839ccc70816f3ece9d7cfdb857aa7a4b015)]:
+  - @vercel/build-utils@7.9.0
+
+## 1.0.25
+
+### Patch Changes
+
+- Updated dependencies [[`908e7837d`](https://github.com/vercel/vercel/commit/908e7837d55bc02e708f402c700e00208415e954), [`5e3656ec1`](https://github.com/vercel/vercel/commit/5e3656ec1b3f0561091636582715ba09ddd8cb2d)]:
+  - @vercel/build-utils@7.8.0
+
 ## 1.0.24
 
 ### Patch Changes

internals/types/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "@vercel-internals/types",
-  "version": "1.0.24",
+  "version": "1.0.29",
   "types": "index.d.ts",
   "main": "index.d.ts",
   "files": [
@@ -10,7 +10,7 @@
   "dependencies": {
     "@types/node": "14.14.31",
     "@vercel-internals/constants": "1.0.4",
-    "@vercel/build-utils": "7.7.1",
+    "@vercel/build-utils": "7.11.0",
     "@vercel/routing-utils": "3.1.0"
   },
   "devDependencies": {

package.json

@@ -33,7 +33,7 @@
     "source-map-support": "0.5.12",
     "ts-eager": "2.0.2",
     "ts-jest": "29.1.0",
-    "turbo": "1.12.4",
+    "turbo": "1.13.0",
     "typescript": "4.9.5"
   },
   "scripts": {

packages/build-utils/CHANGELOG.md

@@ -1,5 +1,39 @@
 # @vercel/build-utils
 
+## 7.11.0
+
+### Minor Changes
+
+- Add `getOsRelease()` and `getProvidedRuntime()` functions ([#11370](https://github.com/vercel/vercel/pull/11370))
+
+## 7.10.0
+
+### Minor Changes
+
+- Allow environment variables to be specified for `EdgeFunction` ([#11029](https://github.com/vercel/vercel/pull/11029))
+
+## 7.9.1
+
+### Patch Changes
+
+- Export `getSupportedNodeVersion` ([#11277](https://github.com/vercel/vercel/pull/11277))
+
+## 7.9.0
+
+### Minor Changes
+
+- Add `base` parameter to `scanParentDirs()` ([#11261](https://github.com/vercel/vercel/pull/11261))
+
+## 7.8.0
+
+### Minor Changes
+
+- Remove `VERCEL_ENABLE_NPM_DEFAULT` env var check ([#11242](https://github.com/vercel/vercel/pull/11242))
+
+### Patch Changes
+
+- Rename variants to flags and remove legacy flags ([#11121](https://github.com/vercel/vercel/pull/11121))
+
 ## 7.7.1
 
 ### Patch Changes

packages/build-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "7.7.1",
+  "version": "7.11.0",
   "license": "Apache-2.0",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",

packages/build-utils/src/edge-function.ts

@@ -1,4 +1,4 @@
-import type { Files, FunctionFramework } from './types';
+import type { Env, Files, FunctionFramework } from './types';
 
 /**
  * An Edge Functions output
@@ -23,6 +23,11 @@ export class EdgeFunction {
    */
   entrypoint: string;
 
+  /**
+   * Environment variables for the edge function to use at runtime.
+   */
+  environment?: Env;
+
   /**
    * The list of files to be included in the edge function bundle.
    */
@@ -48,5 +53,6 @@ export class EdgeFunction {
     this.assets = params.assets;
     this.regions = params.regions;
     this.framework = params.framework;
+    this.environment = params.environment;
   }
 }

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

@@ -276,12 +276,13 @@ export async function getNodeVersion(
 
 export async function scanParentDirs(
   destPath: string,
-  readPackageJson = false
+  readPackageJson = false,
+  base = '/'
 ): Promise<ScanParentDirsResult> {
   assert(path.isAbsolute(destPath));
 
   const pkgJsonPath = await walkParentDirs({
-    base: '/',
+    base,
     start: destPath,
     filename: 'package.json',
   });
@@ -291,7 +292,7 @@ export async function scanParentDirs(
       : undefined;
   const [yarnLockPath, npmLockPath, pnpmLockPath, bunLockPath] =
     await walkParentDirsMulti({
-      base: '/',
+      base,
       start: destPath,
       filenames: [
         'yarn.lock',
@@ -339,11 +340,7 @@ export async function scanParentDirs(
     // TODO: read "bun-lockfile-format-v0"
     lockfileVersion = 0;
   } else {
-    if (process.env.VERCEL_ENABLE_NPM_DEFAULT === '1') {
-      cliType = 'npm';
-    } else {
-      cliType = 'yarn';
-    }
+    cliType = 'npm';
   }
 
   const packageJsonPath = pkgJsonPath || undefined;

packages/build-utils/src/index.ts

@@ -38,6 +38,7 @@ import {
 import {
   getLatestNodeVersion,
   getDiscontinuedNodeVersions,
+  getSupportedNodeVersion,
 } from './fs/node-version';
 import streamToBuffer from './fs/stream-to-buffer';
 import debug from './debug';
@@ -72,6 +73,7 @@ export {
   walkParentDirs,
   getNodeBinPath,
   getNodeBinPaths,
+  getSupportedNodeVersion,
   runNpmInstall,
   runBundleInstall,
   runPipInstall,
@@ -101,6 +103,7 @@ export {
 export { EdgeFunction } from './edge-function';
 export { readConfigFile } from './fs/read-config-file';
 export { normalizePath } from './fs/normalize-path';
+export { getOsRelease, getProvidedRuntime } from './os';
 
 export * from './should-serve';
 export * from './schemas';

packages/build-utils/src/lambda.ts

@@ -5,11 +5,7 @@ import minimatch from 'minimatch';
 import { readlink } from 'fs-extra';
 import { isSymbolicLink, isDirectory } from './fs/download';
 import streamToBuffer from './fs/stream-to-buffer';
-import type { Files, Config, FunctionFramework } from './types';
-
-interface Environment {
-  [key: string]: string;
-}
+import type { Config, Env, Files, FunctionFramework } from './types';
 
 export type LambdaOptions = LambdaOptionsWithFiles | LambdaOptionsWithZipBuffer;
 
@@ -21,7 +17,7 @@ export interface LambdaOptionsBase {
   architecture?: LambdaArchitecture;
   memory?: number;
   maxDuration?: number;
-  environment?: Environment;
+  environment?: Env;
   allowQuery?: string[];
   regions?: string[];
   supportsMultiPayloads?: boolean;
@@ -69,7 +65,7 @@ export class Lambda {
   architecture?: LambdaArchitecture;
   memory?: number;
   maxDuration?: number;
-  environment: Environment;
+  environment: Env;
   allowQuery?: string[];
   regions?: string[];
   /**

packages/build-utils/src/os.ts

@@ -0,0 +1,42 @@
+import { readFile } from 'fs-extra';
+import { isErrnoException } from '@vercel/error-utils';
+
+export async function getOsRelease() {
+  try {
+    const data = await readFile('/etc/os-release', 'utf8');
+    return await parseOsRelease(data);
+  } catch (err) {
+    if (isErrnoException(err) && err.code === 'ENOENT') {
+      return null;
+    }
+    throw err;
+  }
+}
+
+export async function parseOsRelease(data: string) {
+  const obj: Record<string, string> = {};
+  // Example file contents:
+  //   NAME="Amazon Linux"
+  //   VERSION="2023"
+  //   ID="amzn"
+  //   ID_LIKE="fedora"
+  for (const line of data.trim().split('\n')) {
+    const m = /(?<key>.*)="(?<value>.*)"/.exec(line);
+    if (!m?.groups) {
+      continue;
+    }
+    obj[m.groups.key] = m.groups.value;
+  }
+  return obj;
+}
+
+export async function getProvidedRuntime() {
+  const os = await getOsRelease();
+  if (!os) {
+    return 'provided.al2023';
+  }
+
+  return os.PRETTY_NAME === 'Amazon Linux 2'
+    ? 'provided.al2'
+    : 'provided.al2023';
+}

packages/build-utils/src/types.ts

@@ -440,15 +440,6 @@ export interface Cron {
   schedule: string;
 }
 
-/**
- * @deprecated Replaced by Variants. Remove once fully replaced.
- */
-export interface Flag {
-  key: string;
-  defaultValue?: unknown;
-  metadata: Record<string, unknown>;
-}
-
 /** The framework which created the function */
 export interface FunctionFramework {
   slug: string;
@@ -473,9 +464,7 @@ export interface BuildResultV2Typical {
   framework?: {
     version: string;
   };
-  /** @deprecated Replaced by Variants. Remove once fully replaced. */
-  flags?: Flag[];
-  variants?: Record<string, VariantDefinition>;
+  flags?: { definitions: FlagDefinitions };
 }
 
 export type BuildResultV2 = BuildResultV2Typical | BuildResultBuildOutput;
@@ -500,23 +489,25 @@ export type StartDevServer = (
  * TODO: The following types will eventually be exported by a more
  *       relevant package.
  */
-type VariantJSONArray = ReadonlyArray<VariantJSONValue>;
+type FlagJSONArray = ReadonlyArray<FlagJSONValue>;
 
-type VariantJSONValue =
+type FlagJSONValue =
   | string
   | boolean
   | number
   | null
-  | VariantJSONArray
-  | { [key: string]: VariantJSONValue };
+  | FlagJSONArray
+  | { [key: string]: FlagJSONValue };
 
-type VariantOption = {
-  value: VariantJSONValue;
+type FlagOption = {
+  value: FlagJSONValue;
   label?: string;
 };
 
-export interface VariantDefinition {
-  options?: VariantOption[];
+export interface FlagDefinition {
+  options?: FlagOption[];
   origin?: string;
   description?: string;
 }
+
+export type FlagDefinitions = Record<string, FlagDefinition>;

packages/build-utils/test/fixtures/20-npm-7/package.json

@@ -3,5 +3,8 @@
   "version": "1.0.0",
   "scripts": {
     "build": "mkdir -p public && (printf \"npm version: \" && npm -v) > public/index.txt"
+  },
+  "engines": {
+    "node": "16.x"
   }
 }

packages/build-utils/test/fixtures/22-pnpm/package.json

@@ -5,5 +5,8 @@
   },
   "dependencies": {
     "once": "^1.4.0"
+  },
+  "engines": {
+    "node": "16.x"
   }
 }

packages/build-utils/test/fixtures/24-pnpm-hoisted/package.json

@@ -6,5 +6,8 @@
   "dependencies": {
     "exeggcute": "^1.0.0",
     "once": "^1.4.0"
+  },
+  "engines": {
+    "node": "16.x"
   }
 }

packages/build-utils/test/fixtures/40-no-lockfile/package.json

@@ -5,5 +5,8 @@
   },
   "dependencies": {
     "sharp": "0.33.2"
+  },
+  "engines": {
+    "node": "16.x"
   }
 }

packages/build-utils/test/fixtures/40-no-lockfile/vercel.json

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

packages/build-utils/test/unit.get-os-release.test.ts

@@ -0,0 +1,89 @@
+import { parseOsRelease } from '../src/os';
+
+describe('getOsRelease()', () => {
+  it('should parse `amazonlinux:2`', async () => {
+    const data = `NAME="Amazon Linux"
+VERSION="2"
+ID="amzn"
+ID_LIKE="centos rhel fedora"
+VERSION_ID="2"
+PRETTY_NAME="Amazon Linux 2"
+ANSI_COLOR="0;33"
+CPE_NAME="cpe:2.3:o:amazon:amazon_linux:2"
+HOME_URL="https://amazonlinux.com/"
+SUPPORT_END="2025-06-30"
+`;
+    const parsed = await parseOsRelease(data);
+    expect(parsed).toMatchObject({
+      ANSI_COLOR: '0;33',
+      CPE_NAME: 'cpe:2.3:o:amazon:amazon_linux:2',
+      HOME_URL: 'https://amazonlinux.com/',
+      ID: 'amzn',
+      ID_LIKE: 'centos rhel fedora',
+      NAME: 'Amazon Linux',
+      PRETTY_NAME: 'Amazon Linux 2',
+      SUPPORT_END: '2025-06-30',
+      VERSION: '2',
+      VERSION_ID: '2',
+    });
+  });
+
+  it('should parse `amazonlinux:2023`', async () => {
+    const data = `NAME="Amazon Linux"
+VERSION="2023"
+ID="amzn"
+ID_LIKE="fedora"
+VERSION_ID="2023"
+PLATFORM_ID="platform:al2023"
+PRETTY_NAME="Amazon Linux 2023"
+ANSI_COLOR="0;33"
+CPE_NAME="cpe:2.3:o:amazon:amazon_linux:2023"
+HOME_URL="https://aws.amazon.com/linux/"
+BUG_REPORT_URL="https://github.com/amazonlinux/amazon-linux-2023"
+SUPPORT_END="2028-03-01"
+`;
+    const parsed = await parseOsRelease(data);
+    expect(parsed).toMatchObject({
+      NAME: 'Amazon Linux',
+      VERSION: '2023',
+      ID: 'amzn',
+      ID_LIKE: 'fedora',
+      VERSION_ID: '2023',
+      PLATFORM_ID: 'platform:al2023',
+      PRETTY_NAME: 'Amazon Linux 2023',
+      ANSI_COLOR: '0;33',
+      CPE_NAME: 'cpe:2.3:o:amazon:amazon_linux:2023',
+      HOME_URL: 'https://aws.amazon.com/linux/',
+      BUG_REPORT_URL: 'https://github.com/amazonlinux/amazon-linux-2023',
+      SUPPORT_END: '2028-03-01',
+    });
+  });
+
+  it('should parse `ubuntu:jammy`', async () => {
+    const data = `PRETTY_NAME="Ubuntu 22.04.3 LTS"
+NAME="Ubuntu"
+VERSION_ID="22.04"
+VERSION="22.04.3 LTS (Jammy Jellyfish)"
+VERSION_CODENAME=jammy
+ID=ubuntu
+ID_LIKE=debian
+HOME_URL="https://www.ubuntu.com/"
+SUPPORT_URL="https://help.ubuntu.com/"
+BUG_REPORT_URL="https://bugs.launchpad.net/ubuntu/"
+PRIVACY_POLICY_URL="https://www.ubuntu.com/legal/terms-and-policies/privacy-policy"
+UBUNTU_CODENAME=jammy
+`;
+    const parsed = await parseOsRelease(data);
+    expect(parsed).toMatchObject({
+      PRETTY_NAME: 'Ubuntu 22.04.3 LTS',
+      NAME: 'Ubuntu',
+      VERSION_ID: '22.04',
+      VERSION: '22.04.3 LTS (Jammy Jellyfish)',
+      HOME_URL: 'https://www.ubuntu.com/',
+      SUPPORT_URL: 'https://help.ubuntu.com/',
+      BUG_REPORT_URL: 'https://bugs.launchpad.net/ubuntu/',
+      PRIVACY_POLICY_URL:
+        'https://www.ubuntu.com/legal/terms-and-policies/privacy-policy',
+    });
+  });
+});

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

@@ -576,7 +576,7 @@ it(
   ms('1m')
 );
 
-it('should return cliType npm when no lockfile is present and VERCEL_ENABLE_NPM_DEFAULT is set', async () => {
+it('should return cliType "npm" when no lockfile is present', async () => {
   const originalRepoLockfilePath = path.join(
     __dirname,
     '..',
@@ -587,36 +587,12 @@ it('should return cliType npm when no lockfile is present and VERCEL_ENABLE_NPM_
   const originalRepoLockfileData = await fs.readFile(originalRepoLockfilePath);
   await fs.remove(originalRepoLockfilePath);
   try {
-    process.env.VERCEL_ENABLE_NPM_DEFAULT = '1';
     const fixture = path.join(__dirname, 'fixtures', '40-no-lockfile');
     const result = await scanParentDirs(fixture);
     expect(result.cliType).toEqual('npm');
     expect(result.lockfileVersion).toEqual(undefined);
     expect(result.lockfilePath).toEqual(undefined);
     expect(result.packageJsonPath).toEqual(path.join(fixture, 'package.json'));
-  } finally {
-    delete process.env.VERCEL_ENABLE_NPM_DEFAULT;
-    await fs.writeFile(originalRepoLockfilePath, originalRepoLockfileData);
-  }
-});
-
-it('should return cliType yarn when no lockfile is present and VERCEL_ENABLE_NPM_DEFAULT is not set', async () => {
-  const originalRepoLockfilePath = path.join(
-    __dirname,
-    '..',
-    '..',
-    '..',
-    'pnpm-lock.yaml'
-  );
-  const originalRepoLockfileData = await fs.readFile(originalRepoLockfilePath);
-  await fs.remove(originalRepoLockfilePath);
-  try {
-    const fixture = path.join(__dirname, 'fixtures', '40-no-lockfile');
-    const result = await scanParentDirs(fixture);
-    expect(result.cliType).toEqual('yarn');
-    expect(result.lockfileVersion).toEqual(undefined);
-    expect(result.lockfilePath).toEqual(undefined);
-    expect(result.packageJsonPath).toEqual(path.join(fixture, 'package.json'));
   } finally {
     await fs.writeFile(originalRepoLockfilePath, originalRepoLockfileData);
   }

packages/cli/CHANGELOG.md

@@ -1,5 +1,100 @@
 # vercel
 
+## 33.7.0
+
+### Minor Changes
+
+- improve UX for text input validation ([#11388](https://github.com/vercel/vercel/pull/11388))
+
+- Replace the implementation of the yes/no prompt in several areas to be consistent with the rest of the CLI. ([#11279](https://github.com/vercel/vercel/pull/11279))
+
+### Patch Changes
+
+- [cli] Fix how we determine the GIT_CONFIG_PATH to support git worktrees and git submodules ([#11283](https://github.com/vercel/vercel/pull/11283))
+
+- avoid printing errors when user does ctrl+c ([#11377](https://github.com/vercel/vercel/pull/11377))
+
+- Warn that promoting preview deploys is deprecated ([#11376](https://github.com/vercel/vercel/pull/11376))
+
+- Updated dependencies [[`a3fb7e6ab`](https://github.com/vercel/vercel/commit/a3fb7e6abe9bb619a653850decd739728b1af225)]:
+  - @vercel/go@3.1.1
+
+## 33.6.3
+
+### Patch Changes
+
+- Handle `--repo` linked in `vc deploy --prebuilt` ([#11309](https://github.com/vercel/vercel/pull/11309))
+
+- Revert "[cli] extract `isZeroConfigBuild` into utility function (#11316)" ([#11350](https://github.com/vercel/vercel/pull/11350))
+
+- Replace `inquirer` with `@inquirer/prompts` ([#11321](https://github.com/vercel/vercel/pull/11321))
+
+- Updated dependencies [[`73b112b1f`](https://github.com/vercel/vercel/commit/73b112b1f74480e1bb941e1b754105fc7dace401), [`346e665bb`](https://github.com/vercel/vercel/commit/346e665bb021e6034bc70c82ef336485622595fe), [`73b112b1f`](https://github.com/vercel/vercel/commit/73b112b1f74480e1bb941e1b754105fc7dace401), [`548afd371`](https://github.com/vercel/vercel/commit/548afd371aa7a9dd3a7f4c60f7f94a7084d8023e)]:
+  - @vercel/go@3.1.0
+  - @vercel/node@3.0.26
+  - @vercel/build-utils@7.11.0
+  - @vercel/static-build@2.4.6
+
+## 33.6.2
+
+### Patch Changes
+
+- Added sunset warning to secrets command. ([#11333](https://github.com/vercel/vercel/pull/11333))
+
+- Swap jest for vitest in CLI unit tests ([#11302](https://github.com/vercel/vercel/pull/11302))
+
+- Updated dependencies [[`988f7b75a`](https://github.com/vercel/vercel/commit/988f7b75a27387e84fce541b844f984d2c151980), [`1825b58df`](https://github.com/vercel/vercel/commit/1825b58df8d783e79f0addf262618f422246f4b3)]:
+  - @vercel/remix-builder@2.1.5
+  - @vercel/build-utils@7.10.0
+  - @vercel/node@3.0.25
+  - @vercel/static-build@2.4.5
+
+## 33.6.1
+
+### Patch Changes
+
+- Don't send `projectSettings.nodeVersion` for unsupported versions ([#11277](https://github.com/vercel/vercel/pull/11277))
+
+- Updated dependencies [[`4bca0c6d0`](https://github.com/vercel/vercel/commit/4bca0c6d0bc25052b95bd02b12a0b891c86c4b49), [`a67ad4b5a`](https://github.com/vercel/vercel/commit/a67ad4b5a130bf0e56e18111b3f9ddad69cec0e1), [`11218a179`](https://github.com/vercel/vercel/commit/11218a179870a5420c5a6ff720cd4aec4f7e1c5e), [`64b97bf4b`](https://github.com/vercel/vercel/commit/64b97bf4b5203ecf9a95f63ce26a5c3360208966)]:
+  - @vercel/next@4.1.6
+  - @vercel/remix-builder@2.1.4
+  - @vercel/build-utils@7.9.1
+  - @vercel/static-build@2.4.4
+  - @vercel/node@3.0.24
+
+## 33.6.0
+
+### Minor Changes
+
+- Set `projectSettings.nodeVersion` in `vc deploy` based on "engines.node" field ([#11261](https://github.com/vercel/vercel/pull/11261))
+
+### Patch Changes
+
+- Stops warning about legacy Speed Insights for Next.js apps ([#11268](https://github.com/vercel/vercel/pull/11268))
+
+- Fix framework version detection in monorepos ([#11212](https://github.com/vercel/vercel/pull/11212))
+
+- Updated dependencies [[`8ea93839c`](https://github.com/vercel/vercel/commit/8ea93839ccc70816f3ece9d7cfdb857aa7a4b015), [`58ef91bfe`](https://github.com/vercel/vercel/commit/58ef91bfe8c2e7176e8783cc4eb91ee8580c70dc)]:
+  - @vercel/build-utils@7.9.0
+  - @vercel/remix-builder@2.1.3
+  - @vercel/node@3.0.23
+  - @vercel/static-build@2.4.3
+
+## 33.5.5
+
+### Patch Changes
+
+- Rename variants to flags and remove legacy flags ([#11121](https://github.com/vercel/vercel/pull/11121))
+
+- fix vc with root dir issues ([#11243](https://github.com/vercel/vercel/pull/11243))
+
+- Updated dependencies [[`908e7837d`](https://github.com/vercel/vercel/commit/908e7837d55bc02e708f402c700e00208415e954), [`5e3656ec1`](https://github.com/vercel/vercel/commit/5e3656ec1b3f0561091636582715ba09ddd8cb2d), [`a53d1b0d3`](https://github.com/vercel/vercel/commit/a53d1b0d38efa9637f8b8f81a70898add87530e3)]:
+  - @vercel/build-utils@7.8.0
+  - @vercel/next@4.1.5
+  - @vercel/remix-builder@2.1.2
+  - @vercel/node@3.0.22
+  - @vercel/static-build@2.4.2
+
 ## 33.5.4
 
 ### Patch Changes

packages/cli/jest.config.js

@@ -7,6 +7,7 @@ module.exports = {
       {
         diagnostics: true,
         isolatedModules: true,
+        tsconfig: 'test/tsconfig.json',
       },
     ],
   },

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vercel",
-  "version": "33.5.4",
+  "version": "33.7.0",
   "preferGlobal": true,
   "license": "Apache-2.0",
   "description": "The command-line interface for Vercel",
@@ -12,7 +12,7 @@
   },
   "scripts": {
     "test": "jest --reporters=default --reporters=jest-junit --env node --verbose --bail",
-    "test-unit": "pnpm test test/unit/",
+    "test-unit": "pnpm vitest test/unit/",
     "test-e2e": "rimraf test/fixtures/integration && pnpm test test/integration-1.test.ts test/integration-2.test.ts test/integration-3.test.ts",
     "test-dev": "pnpm test test/dev/",
     "coverage": "codecov",
@@ -31,22 +31,27 @@
     "node": ">= 16"
   },
   "dependencies": {
-    "@vercel/build-utils": "7.7.1",
-    "@vercel/fun": "1.1.0",
-    "@vercel/go": "3.0.5",
+    "@vercel/build-utils": "7.11.0",
+    "@vercel/fun": "1.1.1",
+    "@vercel/go": "3.1.1",
     "@vercel/hydrogen": "1.0.2",
-    "@vercel/next": "4.1.4",
-    "@vercel/node": "3.0.21",
+    "@vercel/next": "4.1.6",
+    "@vercel/node": "3.0.26",
     "@vercel/python": "4.1.1",
     "@vercel/redwood": "2.0.8",
-    "@vercel/remix-builder": "2.1.1",
+    "@vercel/remix-builder": "2.1.5",
     "@vercel/ruby": "2.0.5",
-    "@vercel/static-build": "2.4.1",
+    "@vercel/static-build": "2.4.6",
     "chokidar": "3.3.1"
   },
   "devDependencies": {
     "@alex_neo/jest-expect-message": "1.0.5",
     "@edge-runtime/node-utils": "2.3.0",
+    "@inquirer/checkbox": "2.2.2",
+    "@inquirer/confirm": "3.1.2",
+    "@inquirer/expand": "2.1.2",
+    "@inquirer/input": "2.1.2",
+    "@inquirer/select": "2.2.2",
     "@next/env": "11.1.2",
     "@sentry/node": "5.5.0",
     "@sindresorhus/slugify": "0.11.0",
@@ -63,7 +68,6 @@
     "@types/glob": "7.1.1",
     "@types/http-proxy": "1.16.2",
     "@types/ini": "1.3.31",
-    "@types/inquirer": "7.3.1",
     "@types/jest": "27.4.1",
     "@types/jest-expect-message": "1.0.3",
     "@types/json-parse-better-errors": "1.0.0",
@@ -79,7 +83,6 @@
     "@types/qs": "6.9.7",
     "@types/semver": "6.0.1",
     "@types/tar-fs": "1.16.1",
-    "@types/text-table": "0.2.0",
     "@types/title": "3.4.1",
     "@types/universal-analytics": "0.4.2",
     "@types/update-notifier": "5.1.0",
@@ -88,12 +91,13 @@
     "@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.24",
-    "@vercel/client": "13.1.4",
+    "@vercel-internals/types": "1.0.29",
+    "@vercel/client": "13.1.9",
     "@vercel/error-utils": "2.0.2",
-    "@vercel/frameworks": "3.0.0",
-    "@vercel/fs-detectors": "5.2.1",
+    "@vercel/frameworks": "3.0.1",
+    "@vercel/fs-detectors": "5.2.2",
     "@vercel/routing-utils": "3.1.0",
+    "@vitest/expect": "1.4.0",
     "ajv": "6.12.2",
     "alpha-sort": "2.0.1",
     "ansi-escapes": "4.3.2",
@@ -126,7 +130,6 @@
     "glob": "7.1.2",
     "http-proxy": "1.18.1",
     "ini": "3.0.0",
-    "inquirer": "7.0.4",
     "is-docker": "2.2.1",
     "is-port-reachable": "3.1.0",
     "is-url": "1.2.2",
@@ -158,13 +161,14 @@
     "strip-ansi": "6.0.1",
     "supports-hyperlinks": "3.0.0",
     "tar-fs": "1.16.3",
-    "text-table": "0.2.0",
     "title": "3.4.1",
     "tmp-promise": "1.0.3",
     "tree-kill": "1.2.2",
     "ts-node": "10.9.1",
     "universal-analytics": "0.4.20",
     "utility-types": "2.1.0",
+    "vite": "5.1.6",
+    "vitest": "1.3.1",
     "which": "3.0.0",
     "write-json-file": "2.2.0",
     "xdg-app-paths": "5.1.0",

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

@@ -1,6 +1,6 @@
 import chalk from 'chalk';
 import ms from 'ms';
-import table from 'text-table';
+import table from '../../util/output/table';
 import Client from '../../util/client';
 import getAliases from '../../util/alias/get-aliases';
 import getScope from '../../util/get-scope';
@@ -9,7 +9,6 @@ import {
   getPaginationOpts,
 } from '../../util/get-pagination-opts';
 import stamp from '../../util/output/stamp';
-import strlen from '../../util/strlen';
 import getCommandFlags from '../../util/get-command-flags';
 import { getCommandName } from '../../util/pkg-name';
 import type { Alias } from '@vercel-internals/types';
@@ -78,10 +77,6 @@ function printAliasTable(aliases: Alias[]) {
         ms(Date.now() - a.createdAt),
       ]),
     ],
-    {
-      align: ['l', 'l', 'r'],
-      hsep: ' '.repeat(4),
-      stringLength: strlen,
-    }
+    { align: ['l', 'l', 'r'], hsep: 4 }
   ).replace(/^/gm, '  ')}\n\n`;
 }

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

@@ -1,11 +1,10 @@
 import chalk from 'chalk';
 import ms from 'ms';
-import table from 'text-table';
+import table from '../../util/output/table';
 import Client from '../../util/client';
 import getScope from '../../util/get-scope';
 import removeAliasById from '../../util/alias/remove-alias-by-id';
 import stamp from '../../util/output/stamp';
-import strlen from '../../util/strlen';
 import confirm from '../../util/input/confirm';
 import findAliasByAliasOrId from '../../util/alias/find-alias-by-alias-or-id';
 
@@ -84,11 +83,7 @@ async function confirmAliasRemove(client: Client, alias: Alias) {
         chalk.gray(`${ms(Date.now() - alias.createdAt)} ago`),
       ],
     ],
-    {
-      align: ['l', 'l', 'r'],
-      hsep: ' '.repeat(4),
-      stringLength: strlen,
-    }
+    { hsep: 4 }
   );
 
   client.output.log(`The following alias will be removed permanently`);

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

@@ -45,10 +45,16 @@ export default async function bisect(client: Client): Promise<number> {
 
   let bad =
     argv['--bad'] ||
-    (await prompt(client, `Specify a URL where the bug occurs:`));
+    (await client.input.text({
+      message: `Specify a URL where the bug occurs:`,
+      validate: val => (val ? true : 'A URL must be provided'),
+    }));
   let good =
     argv['--good'] ||
-    (await prompt(client, `Specify a URL where the bug does not occur:`));
+    (await client.input.text({
+      message: `Specify a URL where the bug does not occur:`,
+      validate: val => (val ? true : 'A URL must be provided'),
+    }));
   let subpath = argv['--path'] || '';
   let run = argv['--run'] || '';
   const openEnabled = argv['--open'] || false;
@@ -97,10 +103,10 @@ export default async function bisect(client: Client): Promise<number> {
   }
 
   if (!subpath) {
-    subpath = await prompt(
-      client,
-      `Specify the URL subpath where the bug occurs:`
-    );
+    subpath = await client.input.text({
+      message: `Specify the URL subpath where the bug occurs:`,
+      validate: val => (val ? true : 'A subpath must be provided'),
+    });
   }
 
   output.spinner('Retrieving deployments…');
@@ -278,9 +284,7 @@ export default async function bisect(client: Client): Promise<number> {
       if (openEnabled) {
         await open(testUrl);
       }
-      const answer = await client.prompt({
-        type: 'expand',
-        name: 'action',
+      action = await client.input.expand({
         message: 'Select an action:',
         choices: [
           { key: 'g', name: 'Good', value: 'good' },
@@ -288,7 +292,6 @@ export default async function bisect(client: Client): Promise<number> {
           { key: 's', name: 'Skip', value: 'skip' },
         ],
       });
-      action = answer.action;
     }
 
     if (action === 'good') {
@@ -338,19 +341,3 @@ function getCommit(deployment: Deployment) {
     deployment.meta?.bitbucketCommitMessage;
   return { sha, message };
 }
-
-async function prompt(client: Client, message: string): Promise<string> {
-  // eslint-disable-next-line no-constant-condition
-  while (true) {
-    const { val } = await client.prompt({
-      type: 'input',
-      name: 'val',
-      message,
-    });
-    if (val) {
-      return val;
-    } else {
-      client.output.error('A value must be specified');
-    }
-  }
-}

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

@@ -4,7 +4,7 @@ import dotenv from 'dotenv';
 import semver from 'semver';
 import minimatch from 'minimatch';
 import { join, normalize, relative, resolve, sep } from 'path';
-import frameworks from '@vercel/frameworks';
+import { frameworkList } from '@vercel/frameworks';
 import {
   getDiscontinuedNodeVersions,
   normalizePath,
@@ -21,8 +21,7 @@ import {
   NowBuildError,
   Cron,
   validateNpmrc,
-  Flag,
-  VariantDefinition,
+  type FlagDefinitions,
 } from '@vercel/build-utils';
 import {
   detectBuilders,
@@ -96,9 +95,6 @@ interface BuildOutputConfig {
     version: string;
   };
   crons?: Cron[];
-  /** @deprecated Replaced by Variants. Remove once fully replaced. */
-  flags?: Flag[];
-  variants?: Record<string, VariantDefinition>;
 }
 
 /**
@@ -261,9 +257,6 @@ export default async function main(client: Client): Promise<number> {
     if (project.settings.analyticsId) {
       envToUnset.add('VERCEL_ANALYTICS_ID');
       process.env.VERCEL_ANALYTICS_ID = project.settings.analyticsId;
-      output.warn(
-        'Vercel Speed Insights auto-injection is deprecated in favor of @vercel/speed-insights package. Learn more: https://vercel.link/upgrate-to-speed-insights-package'
-      );
     }
 
     // Some build processes use these env vars to platform detect Vercel
@@ -667,9 +660,8 @@ async function doBuild(
   const mergedWildcard = mergeWildcard(buildResults.values());
   const mergedOverrides: Record<string, PathOverride> =
     overrides.length > 0 ? Object.assign({}, ...overrides) : undefined;
-  const mergedFlags = mergeFlags(buildResults.values());
 
-  const framework = await getFramework(cwd, buildResults);
+  const framework = await getFramework(workPath, buildResults);
 
   // Write out the final `config.json` file based on the
   // user configuration and Builder build results
@@ -681,12 +673,10 @@ async function doBuild(
     overrides: mergedOverrides,
     framework,
     crons: mergedCrons,
-    /** @deprecated Replaced by Variants. Remove once fully replaced. */
-    flags: mergedFlags,
   };
   await fs.writeJSON(join(outputDir, 'config.json'), config, { spaces: 2 });
 
-  await writeVariantsJson(client, buildResults.values(), outputDir);
+  await writeFlagsJSON(client, buildResults.values(), outputDir);
 
   const relOutputDir = relative(cwd, outputDir);
   output.print(
@@ -705,7 +695,7 @@ async function getFramework(
 ): Promise<{ version: string } | undefined> {
   const detectedFramework = await detectFrameworkRecord({
     fs: new LocalFileSystemDetector(cwd),
-    frameworkList: frameworks,
+    frameworkList,
   });
 
   if (!detectedFramework) {
@@ -820,60 +810,51 @@ function mergeWildcard(
   return wildcard;
 }
 
-function mergeFlags(
-  buildResults: Iterable<BuildResult | BuildOutputConfig>
-): BuildResultV2Typical['flags'] {
-  return Array.from(buildResults).flatMap(result => {
-    if ('flags' in result) {
-      return result.flags ?? [];
-    }
-
-    return [];
-  });
-}
-
 /**
- * Takes the build output and writes all the variants into the `variants.json`
- * file. It'll skip variants that already exist.
+ * Takes the build output and writes all the flags into the `flags.json`
+ * file. It'll skip flags that already exist.
  */
-async function writeVariantsJson(
+async function writeFlagsJSON(
   { output }: Client,
   buildResults: Iterable<BuildResult | BuildOutputConfig>,
   outputDir: string
 ): Promise<void> {
-  const variantsFilePath = join(outputDir, 'variants.json');
+  const flagsFilePath = join(outputDir, 'flags.json');
 
-  let hasVariants = true;
+  let hasFlags = true;
 
-  const variants = (await fs.readJSON(variantsFilePath).catch(error => {
+  const flags = (await fs.readJSON(flagsFilePath).catch(error => {
     if (error.code === 'ENOENT') {
-      hasVariants = false;
+      hasFlags = false;
       return { definitions: {} };
     }
 
     throw error;
-  })) as { definitions: Record<string, VariantDefinition> };
+  })) as { definitions: FlagDefinitions };
 
   for (const result of buildResults) {
-    if (!('variants' in result) || !result.variants) continue;
+    if (!('flags' in result) || !result.flags || !result.flags.definitions)
+      continue;
 
-    for (const [key, defintion] of Object.entries(result.variants)) {
-      if (result.variants[key]) {
+    for (const [key, definition] of Object.entries(result.flags.definitions)) {
+      if (result.flags.definitions[key]) {
         output.warn(
-          `The variant "${key}" was found multiple times. Only its first occurrence will be considered.`
+          `The flag "${key}" was found multiple times. Only its first occurrence will be considered.`
         );
         continue;
       }
 
-      hasVariants = true;
-      variants.definitions[key] = defintion;
+      hasFlags = true;
+      flags.definitions[key] = definition;
     }
   }
 
-  // Only create the file when there are variants to write,
+  // Only create the file when there are flags to write,
   // or when the file already exists.
-  if (hasVariants) {
-    await fs.writeJSON(variantsFilePath, variants, { spaces: 2 });
+  // Checking `definitions` alone won't be enough in case there
+  // are other properties set.
+  if (hasFlags) {
+    await fs.writeJSON(flagsFilePath, flags, { spaces: 2 });
   }
 }
 

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

@@ -1,6 +1,6 @@
 import chalk from 'chalk';
 import ms from 'ms';
-import table from 'text-table';
+import table from '../../util/output/table';
 import Client from '../../util/client';
 import getScope from '../../util/get-scope';
 import {
@@ -9,7 +9,6 @@ import {
 } from '../../util/get-pagination-opts';
 import stamp from '../../util/output/stamp';
 import getCerts from '../../util/certs/get-certs';
-import strlen from '../../util/strlen';
 import type { Cert } from '@vercel-internals/types';
 import getCommandFlags from '../../util/get-command-flags';
 import { getCommandName } from '../../util/pkg-name';
@@ -70,11 +69,7 @@ async function ls(
 function formatCertsTable(certsList: Cert[]) {
   return `${table(
     [formatCertsTableHead(), ...formatCertsTableBody(certsList)],
-    {
-      align: ['l', 'l', 'r', 'c', 'r'],
-      hsep: ' '.repeat(2),
-      stringLength: strlen,
-    }
+    { align: ['l', 'l', 'r', 'c', 'r'], hsep: 2 }
   ).replace(/^(.*)/gm, '  $1')}\n`;
 }
 

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

@@ -1,7 +1,7 @@
 import chalk from 'chalk';
 import ms from 'ms';
 import plural from 'pluralize';
-import table from 'text-table';
+import table from '../../util/output/table';
 import type { Cert } from '@vercel-internals/types';
 import * as ERRORS from '../../util/errors-ts';
 import { Output } from '../../util/output';
@@ -98,11 +98,11 @@ function readConfirmation(output: Output, msg: string, certs: Cert[]) {
     output.print(
       `${table(certs.map(formatCertRow), {
         align: ['l', 'r', 'l'],
-        hsep: ' '.repeat(6),
+        hsep: 6,
       }).replace(/^(.*)/gm, '  $1')}\n`
     );
     output.print(
-      `${chalk.bold.red('> Are you sure?')} ${chalk.gray('[y/N] ')}`
+      `${chalk.bold.red('> Are you sure?')} ${chalk.gray('(y/N) ')}`
     );
     process.stdin
       .on('data', d => {

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

@@ -1,73 +1,77 @@
-import ms from 'ms';
-import fs from 'fs-extra';
-import bytes from 'bytes';
-import chalk from 'chalk';
-import { join, resolve } from 'path';
+import {
+  getPrettyError,
+  getSupportedNodeVersion,
+  scanParentDirs,
+} from '@vercel/build-utils';
 import {
   fileNameSymbol,
   VALID_ARCHIVE_FORMATS,
   VercelConfig,
 } from '@vercel/client';
-import code from '../../util/output/code';
-import highlight from '../../util/output/highlight';
-import { readLocalConfig } from '../../util/config/files';
-import getArgs from '../../util/get-args';
-import { handleError } from '../../util/error';
-import Client from '../../util/client';
-import { getPrettyError } from '@vercel/build-utils';
-import toHumanPath from '../../util/humanize-path';
+import { errorToString, isErrnoException, isError } from '@vercel/error-utils';
+import bytes from 'bytes';
+import chalk from 'chalk';
+import fs from 'fs-extra';
+import ms from 'ms';
+import { join, resolve } from 'path';
 import Now, { CreateOptions } from '../../util';
-import stamp from '../../util/output/stamp';
+import Client from '../../util/client';
+import { readLocalConfig } from '../../util/config/files';
+import { createGitMeta } from '../../util/create-git-meta';
 import createDeploy from '../../util/deploy/create-deploy';
-import getDeployment from '../../util/get-deployment';
-import parseMeta from '../../util/parse-meta';
-import param from '../../util/output/param';
+import { getDeploymentChecks } from '../../util/deploy/get-deployment-checks';
+import getPrebuiltJson from '../../util/deploy/get-prebuilt-json';
+import parseTarget from '../../util/deploy/parse-target';
+import { printDeploymentStatus } from '../../util/deploy/print-deployment-status';
+import { isValidArchive } from '../../util/deploy/validate-archive-format';
+import purchaseDomainIfAvailable from '../../util/domains/purchase-domain-if-available';
+import { emoji, prependEmoji } from '../../util/emoji';
+import { handleError } from '../../util/error';
+import { SchemaValidationFailed } from '../../util/errors';
 import {
+  AliasDomainConfigured,
+  BuildError,
   BuildsRateLimited,
+  ConflictingFilePath,
+  ConflictingPathSegment,
   DeploymentNotFound,
+  DeploymentsRateLimited,
   DomainNotFound,
   DomainNotVerified,
   DomainPermissionDenied,
   DomainVerificationFailed,
   InvalidDomain,
+  isAPIError,
+  MissingBuildScript,
+  NotDomainOwner,
   TooManyRequests,
   UserAborted,
-  DeploymentsRateLimited,
-  AliasDomainConfigured,
-  MissingBuildScript,
-  ConflictingFilePath,
-  ConflictingPathSegment,
-  BuildError,
-  NotDomainOwner,
-  isAPIError,
 } from '../../util/errors-ts';
-import { SchemaValidationFailed } from '../../util/errors';
-import purchaseDomainIfAvailable from '../../util/domains/purchase-domain-if-available';
+import getArgs from '../../util/get-args';
+import getDeployment from '../../util/get-deployment';
+import getProjectName from '../../util/get-project-name';
+import toHumanPath from '../../util/humanize-path';
 import confirm from '../../util/input/confirm';
 import editProjectSettings from '../../util/input/edit-project-settings';
+import inputProject from '../../util/input/input-project';
+import { inputRootDirectory } from '../../util/input/input-root-directory';
+import selectOrg from '../../util/input/select-org';
+import { Output } from '../../util/output';
+import code from '../../util/output/code';
+import highlight from '../../util/output/highlight';
+import param from '../../util/output/param';
+import stamp from '../../util/output/stamp';
+import { parseEnv } from '../../util/parse-env';
+import parseMeta from '../../util/parse-meta';
+import { getCommandName } from '../../util/pkg-name';
 import {
   getLinkedProject,
   linkFolderToProject,
 } from '../../util/projects/link';
-import getProjectName from '../../util/get-project-name';
-import selectOrg from '../../util/input/select-org';
-import inputProject from '../../util/input/input-project';
-import { prependEmoji, emoji } from '../../util/emoji';
-import { inputRootDirectory } from '../../util/input/input-root-directory';
+import { pickOverrides } from '../../util/projects/project-settings';
 import validatePaths, {
   validateRootDirectory,
 } from '../../util/validate-paths';
-import { getCommandName } from '../../util/pkg-name';
-import { Output } from '../../util/output';
-import { getDeploymentChecks } from '../../util/deploy/get-deployment-checks';
-import parseTarget from '../../util/deploy/parse-target';
-import getPrebuiltJson from '../../util/deploy/get-prebuilt-json';
-import { createGitMeta } from '../../util/create-git-meta';
-import { isValidArchive } from '../../util/deploy/validate-archive-format';
-import { parseEnv } from '../../util/parse-env';
-import { errorToString, isErrnoException, isError } from '@vercel/error-utils';
-import { pickOverrides } from '../../util/projects/project-settings';
-import { printDeploymentStatus } from '../../util/deploy/print-deployment-status';
 import { help } from '../help';
 import { deployCommand } from './command';
 
@@ -299,7 +303,10 @@ export default async (client: Client): Promise<number> => {
   }
 
   // build `--prebuilt`
+  let vercelOutputDir: string | undefined;
   if (argv['--prebuilt']) {
+    vercelOutputDir = join(cwd, '.vercel/output');
+
     // For repo-style linking, update `cwd` to be the Project
     // subdirectory when `rootDirectory` setting is defined
     if (
@@ -307,10 +314,10 @@ export default async (client: Client): Promise<number> => {
       link.repoRoot &&
       link.project.rootDirectory
     ) {
-      cwd = join(cwd, link.project.rootDirectory);
+      vercelOutputDir = join(cwd, link.project.rootDirectory, '.vercel/output');
     }
 
-    const prebuiltExists = await fs.pathExists(join(cwd, '.vercel/output'));
+    const prebuiltExists = await fs.pathExists(vercelOutputDir);
     if (!prebuiltExists) {
       error(
         `The ${param(
@@ -322,7 +329,7 @@ export default async (client: Client): Promise<number> => {
       return 1;
     }
 
-    const prebuiltBuild = await getPrebuiltJson(cwd);
+    const prebuiltBuild = await getPrebuiltJson(vercelOutputDir);
 
     // Ensure that there was not a build error
     const prebuiltError =
@@ -513,6 +520,23 @@ export default async (client: Client): Promise<number> => {
     );
   }
 
+  const { packageJson } = await scanParentDirs(
+    join(cwd, project?.rootDirectory ?? ''),
+    true,
+    cwd
+  );
+  let nodeVersion: string | undefined;
+  if (packageJson?.engines?.node) {
+    try {
+      const { range } = await getSupportedNodeVersion(packageJson.engines.node);
+      nodeVersion = range;
+    } catch (error) {
+      if (error instanceof Error) {
+        output.warn(error.message);
+      }
+    }
+  }
+
   try {
     // if this flag is not set, use `undefined` to allow the project setting to be used
     const autoAssignCustomDomains = argv['--skip-domain'] ? false : undefined;
@@ -524,6 +548,7 @@ export default async (client: Client): Promise<number> => {
       forceNew: argv['--force'],
       withCache: argv['--with-cache'],
       prebuilt: argv['--prebuilt'],
+      vercelOutputDir,
       rootDirectory,
       quiet,
       wantsPublic: Boolean(argv['--public'] || localConfig.public),
@@ -545,12 +570,18 @@ export default async (client: Client): Promise<number> => {
 
     if (!localConfig.builds || localConfig.builds.length === 0) {
       // Only add projectSettings for zero config deployments
-      createArgs.projectSettings =
-        status === 'not_linked'
-          ? {
-              sourceFilesOutsideRootDirectory,
-            }
-          : { ...localConfigurationOverrides, sourceFilesOutsideRootDirectory };
+      createArgs.projectSettings = {
+        sourceFilesOutsideRootDirectory,
+        rootDirectory,
+        nodeVersion,
+      };
+
+      if (status === 'linked') {
+        createArgs.projectSettings = {
+          ...createArgs.projectSettings,
+          ...localConfigurationOverrides,
+        };
+      }
     }
 
     deployment = await createDeploy(

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

@@ -1,6 +1,6 @@
 import chalk from 'chalk';
 import ms from 'ms';
-import table from 'text-table';
+import table from '../../util/output/table';
 import type { DNSRecord } from '@vercel-internals/types';
 import { Output } from '../../util/output';
 import Client from '../../util/client';
@@ -71,11 +71,11 @@ function readConfirmation(
     output.print(
       `${table([getDeleteTableRow(domainName, record)], {
         align: ['l', 'r', 'l'],
-        hsep: ' '.repeat(6),
+        hsep: 6,
       }).replace(/^(.*)/gm, '  $1')}\n`
     );
     output.print(
-      `${chalk.bold.red('> Are you sure?')} ${chalk.gray('[y/N] ')}`
+      `${chalk.bold.red('> Are you sure?')} ${chalk.gray('(y/N) ')}`
     );
     process.stdin
       .on('data', d => {

packages/cli/src/commands/domains/buy.ts

@@ -7,7 +7,7 @@ import getDomainPrice from '../../util/domains/get-domain-price';
 import getDomainStatus from '../../util/domains/get-domain-status';
 import getScope from '../../util/get-scope';
 import param from '../../util/output/param';
-import promptBool from '../../util/input/prompt-bool';
+import confirm from '../../util/input/confirm';
 import purchaseDomain from '../../util/domains/purchase-domain';
 import stamp from '../../util/output/stamp';
 import { getCommandName } from '../../util/pkg-name';
@@ -86,23 +86,25 @@ export default async function buy(
     autoRenew = true;
   } else {
     if (
-      !(await promptBool(
+      !(await confirm(
+        client,
         `Buy now for ${chalk.bold(`$${price}`)} (${`${period}yr${
           period > 1 ? 's' : ''
         }`})?`,
-        client
+        false
       ))
     ) {
       return 0;
     }
 
-    autoRenew = await promptBool(
+    autoRenew = await confirm(
+      client,
       renewalPrice.period === 1
         ? `Auto renew yearly for ${chalk.bold(`$${price}`)}?`
         : `Auto renew every ${renewalPrice.period} years for ${chalk.bold(
             `$${price}`
           )}?`,
-      { ...client, defaultValue: true }
+      true
     );
   }
 

packages/cli/src/commands/domains/move.ts

@@ -11,7 +11,7 @@ import textInput from '../../util/input/text';
 import param from '../../util/output/param';
 import getDomainAliases from '../../util/alias/get-domain-aliases';
 import getDomainByName from '../../util/domains/get-domain-by-name';
-import promptBool from '../../util/input/prompt-bool';
+import confirm from '../../util/input/confirm';
 import getTeams from '../../util/teams/get-teams';
 import { getCommandName } from '../../util/pkg-name';
 
@@ -67,11 +67,12 @@ export default async function move(
         )} will have 24 hours to accept your move request before it expires.`
     );
     if (
-      !(await promptBool(
+      !(await confirm(
+        client,
         `Are you sure you want to move ${param(domainName)} to ${param(
           destination
         )}?`,
-        client
+        false
       ))
     ) {
       output.log('Canceled');
@@ -88,9 +89,10 @@ export default async function move(
         )} will be removed. Run ${getCommandName(`alias ls`)} to list them.`
       );
       if (
-        !(await promptBool(
+        !(await confirm(
+          client,
           `Are you sure you want to move ${param(domainName)}?`,
-          client
+          false
         ))
       ) {
         output.log('Canceled');

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

@@ -13,7 +13,7 @@ import removeDomainByName from '../../util/domains/remove-domain-by-name';
 import stamp from '../../util/output/stamp';
 import * as ERRORS from '../../util/errors-ts';
 import param from '../../util/output/param';
-import promptBool from '../../util/input/prompt-bool';
+import confirm from '../../util/input/confirm';
 import setCustomSuffix from '../../util/domains/set-custom-suffix';
 import { findProjectsForDomain } from '../../util/projects/find-projects-for-domain';
 import { getCommandName } from '../../util/pkg-name';
@@ -81,9 +81,10 @@ export default async function rm(
   const skipConfirmation = opts['--yes'] || false;
   if (
     !skipConfirmation &&
-    !(await promptBool(
+    !(await confirm(
+      client,
       `Are you sure you want to remove ${param(domainName)}?`,
-      client
+      false
     ))
   ) {
     output.log('Canceled');
@@ -222,7 +223,11 @@ async function removeDomain(
 
     if (
       !skipConfirmation &&
-      !(await promptBool(`Remove conflicts associated with domain?`, client))
+      !(await confirm(
+        client,
+        `Remove conflicts associated with domain?`,
+        false
+      ))
     ) {
       output.log('Canceled');
       return 0;

packages/cli/src/commands/domains/transfer-in.ts

@@ -9,7 +9,7 @@ import stamp from '../../util/output/stamp';
 import getAuthCode from '../../util/domains/get-auth-code';
 import getDomainPrice from '../../util/domains/get-domain-price';
 import checkTransfer from '../../util/domains/check-transfer';
-import promptBool from '../../util/input/prompt-bool';
+import confirm from '../../util/input/confirm';
 import isRootDomain from '../../util/is-root-domain';
 import { getCommandName } from '../../util/pkg-name';
 
@@ -67,11 +67,12 @@ export default async function transferIn(
 
   const authCode = await getAuthCode(opts['--code']);
 
-  const shouldTransfer = await promptBool(
+  const shouldTransfer = await confirm(
+    client,
     transferPolicy === 'no-change'
       ? `Transfer now for ${chalk.bold(`$${price}`)}?`
       : `Transfer now with 1yr renewal for ${chalk.bold(`$${price}`)}?`,
-    client
+    false
   );
   if (!shouldTransfer) {
     return 0;

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

@@ -29,9 +29,6 @@ export default async function add(
   args: string[],
   output: Output
 ) {
-  // improve the way we show inquirer prompts
-  require('../../util/input/patch-inquirer');
-
   const stdInput = await readStandardInput(client.stdin);
   let [envName, envTargetArg, envGitBranch] = args;
 
@@ -66,18 +63,11 @@ export default async function add(
     envTargets.push(envTargetArg);
   }
 
-  while (!envName) {
-    const { inputName } = await client.prompt({
-      type: 'input',
-      name: 'inputName',
+  if (!envName) {
+    envName = await client.input.text({
       message: `What’s the name of the variable?`,
+      validate: val => (val ? true : 'Name cannot be empty'),
     });
-
-    envName = inputName;
-
-    if (!inputName) {
-      output.error('Name cannot be empty');
-    }
   }
 
   const { envs } = await getEnvRecords(
@@ -107,26 +97,18 @@ export default async function add(
   if (stdInput) {
     envValue = stdInput;
   } else {
-    const { inputValue } = await client.prompt({
-      type: 'input',
-      name: 'inputValue',
+    envValue = await client.input.text({
       message: `What’s the value of ${envName}?`,
     });
-
-    envValue = inputValue || '';
   }
 
   while (envTargets.length === 0) {
-    const { inputTargets } = await client.prompt({
-      name: 'inputTargets',
-      type: 'checkbox',
+    envTargets = await client.input.checkbox({
       message: `Add ${envName} to which Environments (select multiple)?`,
       choices,
     });
 
-    envTargets = inputTargets;
-
-    if (inputTargets.length === 0) {
+    if (envTargets.length === 0) {
       output.error('Please select at least one Environment');
     }
   }
@@ -137,12 +119,9 @@ export default async function add(
     envTargets.length === 1 &&
     envTargets[0] === 'preview'
   ) {
-    const { inputValue } = await client.prompt({
-      type: 'input',
-      name: 'inputValue',
+    envGitBranch = await client.input.text({
       message: `Add ${envName} to which Git branch? (leave empty for all Preview branches)?`,
     });
-    envGitBranch = inputValue || '';
   }
 
   const type = opts['--sensitive'] ? 'sensitive' : 'encrypted';

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

@@ -29,9 +29,6 @@ export default async function rm(
   args: string[],
   output: Output
 ) {
-  // improve the way we show inquirer prompts
-  require('../../util/input/patch-inquirer');
-
   if (args.length > 3) {
     output.error(
       `Invalid number of arguments. Usage: ${getCommandName(
@@ -43,19 +40,11 @@ export default async function rm(
 
   let [envName, envTarget, envGitBranch] = args;
 
-  while (!envName) {
-    const { inputName } = await client.prompt({
-      type: 'input',
-      name: 'inputName',
+  if (!envName) {
+    envName = await client.input.text({
       message: `What’s the name of the variable?`,
+      validate: val => (val ? true : 'Name cannot be empty'),
     });
-
-    if (!inputName) {
-      output.error(`Name cannot be empty`);
-      continue;
-    }
-
-    envName = inputName;
   }
 
   if (!isValidEnvTarget(envTarget)) {
@@ -86,9 +75,7 @@ export default async function rm(
   }
 
   while (envs.length > 1) {
-    const { id } = await client.prompt({
-      name: 'id',
-      type: 'list',
+    const id = await client.input.select({
       message: `Remove ${envName} from which Environments?`,
       choices: envs.map(env => ({ value: env.id, name: formatEnvTarget(env) })),
     });

packages/cli/src/commands/help.ts

@@ -1,6 +1,7 @@
 import chalk from 'chalk';
 import { LOGO, NAME } from '@vercel-internals/constants';
 import Table, { CellOptions } from 'cli-table3';
+import { noBorderChars } from '../util/output/table';
 
 const INDENT = ' '.repeat(2);
 const NEWLINE = '\n';
@@ -39,23 +40,7 @@ type _CellOptions = CellOptions & {
 };
 
 const tableOptions = {
-  chars: {
-    top: '',
-    'top-mid': '',
-    'top-left': '',
-    'top-right': '',
-    bottom: '',
-    'bottom-mid': '',
-    'bottom-left': '',
-    'bottom-right': '',
-    left: '',
-    'left-mid': '',
-    mid: '',
-    'mid-mid': '',
-    right: '',
-    'right-mid': '',
-    middle: '',
-  },
+  chars: noBorderChars,
   style: {
     'padding-left': 0,
     'padding-right': 0,

packages/cli/src/commands/init/init.ts

@@ -6,7 +6,7 @@ import chalk from 'chalk';
 // @ts-ignore
 import listInput from '../../util/input/list';
 import listItem from '../../util/output/list-item';
-import promptBool from '../../util/input/prompt-bool';
+import confirm from '../../util/input/confirm';
 import toHumanPath from '../../util/humanize-path';
 import Client from '../../util/client';
 import info from '../../util/output/info';
@@ -46,6 +46,10 @@ export default async function init(
   const exampleList = examples.filter(x => x.visible).map(x => x.name);
 
   if (!name) {
+    if (client.stdin.isTTY !== true) {
+      client.output.print(`No framework provided`);
+      return 0;
+    }
     const chosen = await chooseFromDropdown(
       client,
       'Select example:',
@@ -122,7 +126,7 @@ async function extractExample(
   ver: string = 'v2'
 ) {
   const { output } = client;
-  const folder = prepareFolder(process.cwd(), dir || name, force);
+  const folder = prepareFolder(client.cwd, dir || name, force);
   output.spinner(`Fetching ${name}`);
 
   const url = `${EXAMPLE_API}/${ver}/download/${name}.tar.gz`;
@@ -147,7 +151,7 @@ async function extractExample(
       const successLog = `Initialized "${chalk.bold(
         name
       )}" example in ${chalk.bold(toHumanPath(folder))}.`;
-      const folderRel = path.relative(process.cwd(), folder);
+      const folderRel = path.relative(client.cwd, folder);
       const deployHint =
         folderRel === ''
           ? listItem(`To deploy, run ${getCommandName()}.`)
@@ -209,14 +213,14 @@ async function guess(client: Client, exampleList: string[], name: string) {
     )} to see the list of available examples.`
   );
 
-  if (process.stdout.isTTY !== true) {
+  if (client.stdin.isTTY !== true) {
     throw GuessError;
   }
 
   const found = didYouMean(name, exampleList, 0.7);
 
   if (typeof found === 'string') {
-    if (await promptBool(`Did you mean ${chalk.bold(found)}?`, client)) {
+    if (await confirm(client, `Did you mean ${chalk.bold(found)}?`, false)) {
       return found;
     }
   } else {

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

@@ -1,12 +1,11 @@
 import chalk from 'chalk';
 import ms from 'ms';
-import table from 'text-table';
+import table from '../../util/output/table';
 import title from 'title';
 import Now from '../../util';
 import getArgs from '../../util/get-args';
 import { handleError } from '../../util/error';
 import elapsed from '../../util/output/elapsed';
-import strlen from '../../util/strlen';
 import toHost from '../../util/to-host';
 import parseMeta from '../../util/parse-meta';
 import { isValidName } from '../../util/is-valid-name';
@@ -275,11 +274,7 @@ export default async function list(client: Client) {
             app === null ? filterUniqueApps() : () => true
           ),
       ],
-      {
-        align: ['l', 'l', 'l', 'l', 'l'],
-        hsep: ' '.repeat(5),
-        stringLength: strlen,
-      }
+      { hsep: 5 }
     ).replace(/^/gm, '  ')}\n\n`
   );
 

packages/cli/src/commands/project/list.ts

@@ -1,11 +1,10 @@
 import chalk from 'chalk';
 import ms from 'ms';
-import table from 'text-table';
+import table from '../../util/output/table';
 import type { Project } from '@vercel-internals/types';
 import Client from '../../util/client';
 import getCommandFlags from '../../util/get-command-flags';
 import { getCommandName } from '../../util/pkg-name';
-import strlen from '../../util/strlen';
 import { NODE_VERSIONS } from '@vercel/build-utils';
 
 export default async function list(
@@ -100,11 +99,7 @@ export default async function list(
           ])
           .flat(),
       ],
-      {
-        align: ['l', 'l', 'l'],
-        hsep: ' '.repeat(3),
-        stringLength: strlen,
-      }
+      { hsep: 3 }
     ).replace(/^/gm, '  ');
     output.print(`\n${tablePrint}\n\n`);
 

packages/cli/src/commands/promote/request-promote.ts

@@ -32,6 +32,12 @@ export default async function requestPromote({
     output: client.output,
   });
 
+  if (deployment.target !== 'production') {
+    output.warn(
+      'Promoting a preview deployment to production is deprecated and will be removed in the next major release. This behavior will be removed entirely on 2024-05-03.'
+    );
+  }
+
   if (deployment.target !== 'production' && !yes) {
     const question =
       'This deployment does not target production, therefore promotion will not apply production environment variables. Are you sure you want to continue?';

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

@@ -1,7 +1,7 @@
 import chalk from 'chalk';
 import ms from 'ms';
 import plural from 'pluralize';
-import table from 'text-table';
+import table from '../../util/output/table';
 import Now from '../../util';
 import getAliases from '../../util/alias/get-aliases';
 import elapsed from '../../util/output/elapsed';
@@ -245,7 +245,7 @@ function readConfirmation(
           const url = depl.url ? chalk.underline(`https://${depl.url}`) : '';
           return [`  ${depl.id}`, url, time];
         }),
-        { align: ['l', 'r', 'l'], hsep: ' '.repeat(6) }
+        { align: ['l', 'r', 'l'], hsep: 6 }
       );
       output.print(`${deploymentTable}\n`);
     }
@@ -277,7 +277,7 @@ function readConfirmation(
     }
 
     output.print(
-      `${chalk.bold.red('> Are you sure?')} ${chalk.gray('[y/N] ')}`
+      `${chalk.bold.red('> Are you sure?')} ${chalk.gray('(y/N) ')}`
     );
 
     process.stdin

packages/cli/src/commands/secrets/command.js

@@ -2,9 +2,14 @@ import { packageName, getCommandName } from '../../util/pkg-name';
 
 export const secretsCommand = {
   name: 'secrets',
-  description: `NOTE: The ${getCommandName(
-    'env'
-  )} command is recommended instead of ${getCommandName('secrets')}`,
+  description:
+    'WARNING: On May 1st, 2024 secrets will be automatically converted to sensitive Environment Variables for Preview and Production environments. Secrets attached to Development environments will not be migrated.\n' +
+    `The ${getCommandName(
+      'secrets'
+    )} command will be deprecated at this time, please use the ${getCommandName(
+      'env'
+    )} command instead.\n` +
+    'See https://vercel.com/changelog/legacy-environment-variable-secrets-are-being-sunset for more information.',
   arguments: [
     {
       name: 'command',

packages/cli/src/commands/secrets/index.js

@@ -1,8 +1,7 @@
 import isErrnoException from '@vercel/error-utils';
 import chalk from 'chalk';
-import table from 'text-table';
+import table from '../../util/output/table';
 import ms from 'ms';
-import strlen from '../../util/strlen';
 import { handleError, error } from '../../util/error';
 import NowSecrets from '../../util/secrets';
 import getScope from '../../util/get-scope';
@@ -78,6 +77,12 @@ async function run({ output, contextName, currentTeam, client }) {
 
   const commandName = getCommandName('secret ' + subcommand);
 
+  output.warn(
+    'On May 1st, 2024 secrets will be automatically converted to sensitive Environment Variables for Preview and Production environments.\n' +
+      'Secrets attached to Development environments will not be migrated.' +
+      'See https://vercel.com/changelog/legacy-environment-variable-secrets-are-being-sunset for more information.'
+  );
+
   if (subcommand === 'ls' || subcommand === 'list') {
     output.note(
       `The ${getCommandName(
@@ -118,11 +123,7 @@ async function run({ output, contextName, currentTeam, client }) {
             chalk.gray(`${ms(cur - new Date(secret.created))} ago`),
           ])
         ),
-        {
-          align: ['l', 'l', 'l'],
-          hsep: ' '.repeat(2),
-          stringLength: strlen,
-        }
+        { hsep: 2 }
       );
 
       if (out) {
@@ -279,7 +280,7 @@ async function readConfirmation(client, output, secret, contextName) {
   const time = chalk.gray(`${ms(new Date() - new Date(secret.created))} ago`);
   const tbl = table([[chalk.bold(secret.name), time]], {
     align: ['r', 'l'],
-    hsep: ' '.repeat(6),
+    hsep: 6,
   });
 
   output.print(

packages/cli/src/commands/teams/list.ts

@@ -1,5 +1,6 @@
 import chars from '../../util/output/chars';
 import table from '../../util/output/table';
+import { gray } from 'chalk';
 import getUser from '../../util/get-user';
 import getTeams from '../../util/teams/get-teams';
 import { packageName } from '../../util/pkg-name';
@@ -53,7 +54,7 @@ export default async function list(client: Client): Promise<number> {
     id,
     name,
     value: slug,
-    current: id === currentTeam ? chars.tick : '',
+    prefix: id === currentTeam ? chars.tick : ' ',
   }));
 
   if (user.version !== 'northstar') {
@@ -61,7 +62,7 @@ export default async function list(client: Client): Promise<number> {
       id: user.id,
       name: user.email,
       value: user.username || user.email,
-      current: accountIsCurrent ? chars.tick : '',
+      prefix: accountIsCurrent ? chars.tick : ' ',
     });
   }
 
@@ -76,14 +77,22 @@ export default async function list(client: Client): Promise<number> {
   output.stopSpinner();
   client.stdout.write('\n'); // empty line
 
-  table(
-    ['', 'id', 'email / name'],
-    teamList.map(team => [team.current, team.value, team.name]),
-    [1, 5],
-    (str: string) => {
-      client.stdout.write(str);
-    }
+  const teamTable = table(
+    [
+      ['id', 'email / name'].map(str => gray(str)),
+      ...teamList.map(team => [team.value, team.name]),
+    ],
+    { hsep: 5 }
   );
+  client.stderr.write(
+    currentTeam
+      ? teamTable
+          .split('\n')
+          .map((line, i) => `${i > 0 ? teamList[i - 1].prefix : ' '} ${line}`)
+          .join('\n')
+      : teamTable
+  );
+  client.stderr.write('\n');
 
   if (pagination?.count === 20) {
     const flags = getCommandFlags(argv, ['_', '--next', '-N', '-d']);

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

@@ -1,11 +1,10 @@
-import frameworkList from '@vercel/frameworks';
+import { frameworkList } from '@vercel/frameworks';
 
 export function sortBuilders<B extends { use: string }>(builds: B[]): B[] {
   const frontendRuntimeSet = new Set(
     frameworkList.map(f => f.useRuntime?.use || '@vercel/static-build')
   );
   const toNumber = (build: B) => (frontendRuntimeSet.has(build.use) ? 0 : 1);
-
   return builds.sort((build1, build2) => {
     return toNumber(build1) - toNumber(build2);
   });

packages/cli/src/util/client.ts

@@ -1,5 +1,9 @@
-import { bold } from 'chalk';
-import inquirer from 'inquirer';
+import { bold, gray } from 'chalk';
+import checkbox from '@inquirer/checkbox';
+import confirm from '@inquirer/confirm';
+import expand from '@inquirer/expand';
+import input from '@inquirer/input';
+import select from '@inquirer/select';
 import { EventEmitter } from 'events';
 import { URL } from 'url';
 import { VercelConfig } from '@vercel/client';
@@ -66,8 +70,8 @@ export default class Client extends EventEmitter implements Stdio {
   agent?: Agent;
   localConfig?: VercelConfig;
   localConfigPath?: string;
-  prompt!: inquirer.PromptModule;
   requestIdCounter: number;
+  input;
 
   constructor(opts: ClientOptions) {
     super();
@@ -83,7 +87,29 @@ export default class Client extends EventEmitter implements Stdio {
     this.localConfig = opts.localConfig;
     this.localConfigPath = opts.localConfigPath;
     this.requestIdCounter = 1;
-    this._createPromptModule();
+
+    const theme = {
+      prefix: gray('?'),
+      style: { answer: gray },
+    };
+    this.input = {
+      text: (opts: Parameters<typeof input>[0]) =>
+        input({ theme, ...opts }, { input: this.stdin, output: this.stderr }),
+      checkbox: <T>(opts: Parameters<typeof checkbox<T>>[0]) =>
+        checkbox<T>(
+          { theme, ...opts },
+          { input: this.stdin, output: this.stderr }
+        ),
+      expand: (opts: Parameters<typeof expand>[0]) =>
+        expand({ theme, ...opts }, { input: this.stdin, output: this.stderr }),
+      confirm: (opts: Parameters<typeof confirm>[0]) =>
+        confirm({ theme, ...opts }, { input: this.stdin, output: this.stderr }),
+      select: <T>(opts: Parameters<typeof select<T>>[0]) =>
+        select<T>(
+          { theme, ...opts },
+          { input: this.stdin, output: this.stderr }
+        ),
+    };
   }
 
   retry<T>(fn: RetryFunction<T>, { retries = 3, maxTimeout = Infinity } = {}) {
@@ -229,13 +255,6 @@ export default class Client extends EventEmitter implements Stdio {
     this.output.debug(`Retrying: ${error}\n${error.stack}`);
   };
 
-  _createPromptModule() {
-    this.prompt = inquirer.createPromptModule({
-      input: this.stdin as NodeJS.ReadStream,
-      output: this.stderr as NodeJS.WriteStream,
-    });
-  }
-
   get cwd(): string {
     return process.cwd();
   }

packages/cli/src/util/config/global-path.ts

@@ -30,7 +30,7 @@ const getGlobalPathConfig = (): string => {
   ];
 
   // The customPath flag is the preferred location,
-  // followed by the the vercel directory,
+  // followed by the vercel directory,
   // followed by the now directory.
   // If none of those exist, use the vercel directory.
   return (

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

@@ -6,7 +6,7 @@ export default async function getPrebuiltJson(
   directory: string
 ): Promise<BuildsManifest | null> {
   try {
-    return await fs.readJSON(join(directory, '.vercel/output/builds.json'));
+    return await fs.readJSON(join(directory, 'builds.json'));
   } catch (error) {
     // ignoring error
   }

packages/cli/src/util/deploy/process-deployment.ts

@@ -53,6 +53,7 @@ export default async function processDeployment({
   withCache?: boolean;
   org: Org;
   prebuilt: boolean;
+  vercelOutputDir?: string;
   projectName: string;
   isSettingUpProject: boolean;
   archive?: ArchiveFormat;
@@ -71,6 +72,7 @@ export default async function processDeployment({
     withCache,
     quiet,
     prebuilt,
+    vercelOutputDir,
     rootDirectory,
   } = args;
 
@@ -92,6 +94,7 @@ export default async function processDeployment({
     force,
     withCache,
     prebuilt,
+    vercelOutputDir,
     rootDirectory,
     skipAutoDetectionConfirmation,
     archive,

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

@@ -45,7 +45,7 @@ import {
   detectApiExtensions,
   isOfficialRuntime,
 } from '@vercel/fs-detectors';
-import frameworkList from '@vercel/frameworks';
+import { frameworkList } from '@vercel/frameworks';
 
 import cmd from '../output/cmd';
 import link from '../output/link';

packages/cli/src/util/dns/get-dns-data.ts

@@ -1,7 +1,7 @@
 import chalk from 'chalk';
 import type { DNSRecordData } from '@vercel-internals/types';
 import textInput from '../input/text';
-import promptBool from '../input/prompt-bool';
+import confirm from '../input/confirm';
 import Client from '../client';
 
 const RECORD_TYPES = ['A', 'AAAA', 'ALIAS', 'CAA', 'CNAME', 'MX', 'SRV', 'TXT'];
@@ -89,7 +89,7 @@ export default async function getDNSData(
 }
 
 async function verifyData(client: Client) {
-  return promptBool('Is this correct?', client);
+  return confirm(client, 'Is this correct?', false);
 }
 
 async function getRecordName(type: string) {

packages/cli/src/util/domains/purchase-domain-if-available.ts

@@ -6,7 +6,7 @@ import Client from '../client';
 import eraseLines from '../output/erase-lines';
 import getDomainPrice from './get-domain-price';
 import getDomainStatus from './get-domain-status';
-import promptBool from '../input/prompt-bool';
+import confirm from '../input/confirm';
 import purchaseDomain from './purchase-domain';
 import stamp from '../output/stamp';
 import * as ERRORS from '../errors-ts';
@@ -51,11 +51,12 @@ export default async function purchaseDomainIfAvailable(
     );
 
     if (
-      !(await promptBool(
+      !(await confirm(
+        client,
         `Buy ${chalk.underline(domain)} for ${chalk.bold(
           `$${price}`
         )} (${plural('yr', period, true)})?`,
-        client
+        false
       ))
     ) {
       output.print(eraseLines(1));

packages/cli/src/util/format-dns-table.ts

@@ -1,16 +1,8 @@
-import chalk from 'chalk';
-import table from 'text-table';
-import strlen from './strlen';
+import table from './output/table';
+import { gray } from 'chalk';
 
-const HEADER = ['name', 'type', 'value'].map(v => chalk.gray(v));
+const HEADER = ['name', 'type', 'value'].map(v => gray(v));
 
-export default function formatDNSTable(
-  rows: string[][],
-  { extraSpace = '' } = {}
-) {
-  return table([HEADER, ...rows], {
-    align: ['l', 'l', 'l'],
-    hsep: ' '.repeat(8),
-    stringLength: strlen,
-  }).replace(/^(.*)/gm, `${extraSpace}$1`);
+export default function formatDNSTable(rows: string[][]) {
+  return table([HEADER, ...rows], { hsep: 8 });
 }

packages/cli/src/util/format-ns-table.ts

@@ -1,6 +1,5 @@
 import chalk from 'chalk';
-import table from 'text-table';
-import strlen from './strlen';
+import table from './output/table';
 import chars from './output/chars';
 
 export default function formatNSTable(
@@ -35,10 +34,6 @@ export default function formatNSTable(
       ],
       ...rows,
     ],
-    {
-      align: ['l', 'l', 'l', 'l'],
-      hsep: ' '.repeat(4),
-      stringLength: strlen,
-    }
+    { hsep: 4 }
   ).replace(/^(.*)/gm, `${extraSpace}$1`);
 }

packages/cli/src/util/format-table.ts

@@ -1,5 +1,5 @@
 import chalk from 'chalk';
-import table from 'text-table';
+import table from './output/table';
 import strlen from './strlen';
 
 // header:
@@ -19,9 +19,8 @@ import strlen from './strlen';
 // ]
 export default function formatTable(
   header: string[],
-  align: Array<'l' | 'r' | 'c' | '.'>,
-  blocks: { name?: string; rows: string[][] }[],
-  hsep = '    '
+  align: Array<'l' | 'r' | 'c'>,
+  blocks: { name?: string; rows: string[][] }[]
 ) {
   const nrCols = header.length;
   const padding = [];
@@ -57,7 +56,7 @@ export default function formatTable(
           rows[i][j] = al === 'l' ? col + pad : pad + col;
         }
       }
-      out += table(rows, { align, hsep, stringLength: strlen });
+      out += table(rows, { align, hsep: 4 });
     }
     out += '\n\n';
   }

packages/cli/src/util/get-update-command.ts

@@ -35,7 +35,7 @@ async function getConfigPrefix() {
   return null;
 }
 
-async function isGlobal() {
+export async function isGlobal() {
   try {
     // This is true for e.g. nvm, node path will be equal to now path
     if (dirname(process.argv[0]) === dirname(process.argv[1])) {

packages/cli/src/util/git-helpers.ts

@@ -0,0 +1,86 @@
+import { execSync } from 'node:child_process';
+
+/** Defines the options for executing Git commands */
+export type GitExecOptions = Readonly<{
+  /** If set to true, the function will throw
+   * an error if any occurs during the execution of the Git command. By default,
+   * it is set to false, meaning errors are caught and handled gracefully.*/
+  unsafe?: boolean;
+  /** Specifies the current working directory
+   * from which the Git command should be executed.
+   */
+  cwd: string;
+}>;
+
+const DEFAULT_GIT_EXEC_OPTS = {
+  unsafe: false,
+};
+
+/**
+ * Attempts to retrieve the Git directory for the specified working directory.
+ *
+ * This function runs the Git command to find the `.git` directory associated
+ * with the current or specified working directory. This is useful for
+ * determining if the current working environment is within a Git repository.
+ *
+ * @param {GitExecOptions} opts - The options for executing the Git command.
+ * @returns {string | null} The path to the Git directory if found; otherwise, null.
+ * If `opts.unsafe` is set to true and an error occurs, the function will throw
+ * an error instead of returning null.
+ *
+ * @throws {Error} Can throw an error if `opts.unsafe` is set to `true`
+ */
+export function getGitDirectory(opts: GitExecOptions): string | null {
+  const { cwd, unsafe } = { ...DEFAULT_GIT_EXEC_OPTS, ...opts };
+
+  try {
+    const gitConfigPath = execSync('git rev-parse --git-dir', {
+      cwd,
+      encoding: 'utf8',
+    });
+
+    return gitConfigPath;
+  } catch (error) {
+    if (unsafe) {
+      throw error;
+    }
+
+    return null;
+  }
+}
+
+/**
+ * Checks if a given directory is a Git worktree or Git submodule.
+ *
+ * A Git worktree is a linked working tree, which allows you to have multiple
+ * working trees attached to the same repository. This function checks if the
+ * specified directory (or the current working directory if none is specified)
+ * is a Git worktree by looking for the '.git/worktrees/' path in the Git
+ * configuration.
+ *
+ * A Git submodule is a repository embedded inside another repository. This
+ * function checks if the current working directory or the specified directory
+ * is part of a Git submodule by looking for the '.git/modules/' path in the
+ * Git configuration.
+ *
+ * @param {GitExecOptions} [opts={}] The options to use. Options include:
+ *        - `cwd`: The directory to check. Defaults to `process.cwd()`.
+ *        - `unsafe`: If true, throws if an error occurs during execution.
+ *        Defaults to `false`.
+ * @returns {boolean} Returns `true` if the directory is a Git worktree or Git
+ * Submodule, otherwise `false`.
+ *
+ * @throws {Error} Can throw an error if `opts.unsafe` is set to `true`
+ */
+export function isGitWorktreeOrSubmodule(opts: GitExecOptions): boolean {
+  const gitDir = getGitDirectory(opts);
+
+  if (gitDir === null) {
+    return false;
+  }
+
+  const isGitWorktree = gitDir.includes('.git/worktrees/');
+  const isGitSubmodule = gitDir.includes('.git/modules/');
+
+  return isGitWorktree || isGitSubmodule;
+}

packages/cli/src/util/handle-error.ts

@@ -17,6 +17,10 @@ export default function handleError(error: unknown, { debug = false } = {}) {
     console.log(`> [debug] handling error: ${stack}`);
   }
 
+  if (message === 'User force closed the prompt with 0 null') {
+    return;
+  }
+
   if (status === 403) {
     console.error(
       errorOutput(

packages/cli/src/util/index.ts

@@ -36,6 +36,7 @@ export interface CreateOptions {
   project?: string;
   wantsPublic: boolean;
   prebuilt?: boolean;
+  vercelOutputDir?: string;
   rootDirectory?: string | null;
   meta: Dictionary<string>;
   gitMetadata?: GitMetadata;
@@ -117,6 +118,7 @@ export default class Now extends EventEmitter {
       name,
       project,
       prebuilt = false,
+      vercelOutputDir,
       rootDirectory,
       wantsPublic,
       meta,
@@ -179,6 +181,7 @@ export default class Now extends EventEmitter {
       skipAutoDetectionConfirmation,
       cwd,
       prebuilt,
+      vercelOutputDir,
       rootDirectory,
       noWait,
     });

packages/cli/src/util/input/confirm.ts

@@ -5,14 +5,8 @@ export default async function confirm(
   message: string,
   preferred: boolean
 ): Promise<boolean> {
-  require('./patch-inquirer');
-
-  const answers = await client.prompt({
-    type: 'confirm',
-    name: 'value',
+  return client.input.confirm({
     message,
     default: preferred,
   });
-
-  return answers.value;
 }

packages/cli/src/util/input/edit-project-settings.ts

@@ -1,7 +1,6 @@
-import inquirer from 'inquirer';
 import confirm from './confirm';
 import chalk from 'chalk';
-import frameworkList, { Framework } from '@vercel/frameworks';
+import { frameworkList, Framework } from '@vercel/frameworks';
 import Client from '../client';
 import { isSettingValue } from '../is-setting-value';
 import type { ProjectSettings } from '@vercel-internals/types';
@@ -125,48 +124,26 @@ export default async function editProjectSettings(
     return settings;
   }
 
-  const choices = settingKeys.reduce<Array<{ name: string; value: string }>>(
-    (acc, setting) => {
-      const skip =
-        setting === 'framework' ||
-        setting === 'commandForIgnoringBuildStep' ||
-        setting === 'installCommand' ||
-        localConfigurationOverrides?.[setting];
-      if (!skip) {
-        acc.push({ name: settingMap[setting], value: setting });
-      }
-      return acc;
-    },
-    []
-  );
+  const choices = settingKeys.reduce((acc, setting) => {
+    const skip =
+      setting === 'framework' ||
+      setting === 'commandForIgnoringBuildStep' ||
+      setting === 'installCommand' ||
+      localConfigurationOverrides?.[setting];
+    if (skip) return acc;
+    return [...acc, { name: settingMap[setting], value: setting }];
+  }, [] as { name: string; value: ConfigKeys }[]);
 
-  const { settingFields } = await inquirer.prompt<{
-    settingFields: Array<
-      Exclude<
-        ConfigKeys,
-        'framework' | 'commandForIgnoringBuildStep' | 'installCommand'
-      >
-    >;
-  }>({
-    name: 'settingFields',
-    type: 'checkbox',
+  const settingFields = await client.input.checkbox({
     message: 'Which settings would you like to overwrite (select multiple)?',
     choices,
   });
 
   for (let setting of settingFields) {
     const field = settingMap[setting];
-    const answers = await inquirer.prompt<{
-      [k in Exclude<
-        ConfigKeys,
-        'framework' | 'commandForIgnoringBuildStep' | 'installCommand'
-      >]: string;
-    }>({
-      type: 'input',
-      name: setting,
+    settings[setting] = await client.input.text({
       message: `What's your ${chalk.bold(field)}?`,
     });
-    settings[setting] = answers[setting];
   }
   return settings;
 }

packages/cli/src/util/input/input-project.ts

@@ -75,70 +75,37 @@ export default async function inputProject(
 
   if (shouldLinkProject) {
     // user wants to link a project
-    let project: Project | ProjectNotFound | null = null;
-
-    while (!project || project instanceof ProjectNotFound) {
-      const answers = await client.prompt({
-        type: 'input',
-        name: 'existingProjectName',
-        message: `What’s the name of your existing project?`,
-      });
-      const projectName = answers.existingProjectName as string;
-
-      if (!projectName) {
-        output.error(`Project name cannot be empty`);
-        continue;
-      }
-
-      output.spinner('Verifying project name…', 1000);
-      try {
-        project = await getProjectByIdOrName(client, projectName, org.id);
-      } finally {
-        output.stopSpinner();
-      }
-
-      if (project instanceof ProjectNotFound) {
-        output.error(`Project not found`);
-      }
-    }
-
-    return project;
+    let toLink: Project;
+    await client.input.text({
+      message: 'What’s the name of your existing project?',
+      validate: async val => {
+        if (!val) {
+          return 'Project name cannot be empty';
+        }
+        const project = await getProjectByIdOrName(client, val, org.id);
+        if (project instanceof ProjectNotFound) {
+          return 'Project not found';
+        }
+        toLink = project;
+        return true;
+      },
+    });
+    return toLink!;
   }
 
   // user wants to create a new project
-  let newProjectName: string | null = null;
-
-  while (!newProjectName) {
-    const answers = await client.prompt({
-      type: 'input',
-      name: 'newProjectName',
-      message: `What’s your project’s name?`,
-      default: !detectedProject ? slugifiedName : undefined,
-    });
-    newProjectName = answers.newProjectName as string;
-
-    if (!newProjectName) {
-      output.error(`Project name cannot be empty`);
-      continue;
-    }
-
-    output.spinner('Verifying project name…', 1000);
-    let existingProject: Project | ProjectNotFound;
-    try {
-      existingProject = await getProjectByIdOrName(
-        client,
-        newProjectName,
-        org.id
-      );
-    } finally {
-      output.stopSpinner();
-    }
-
-    if (existingProject && !(existingProject instanceof ProjectNotFound)) {
-      output.print(`Project already exists`);
-      newProjectName = null;
-    }
-  }
-
-  return newProjectName;
+  return await client.input.text({
+    message: `What’s your project’s name?`,
+    default: !detectedProject ? slugifiedName : undefined,
+    validate: async val => {
+      if (!val) {
+        return 'Project name cannot be empty';
+      }
+      const project = await getProjectByIdOrName(client, val, org.id);
+      if (!(project instanceof ProjectNotFound)) {
+        return 'Project already exists';
+      }
+      return true;
+    },
+  });
 }

packages/cli/src/util/input/input-root-directory.ts

@@ -14,9 +14,7 @@ export async function inputRootDirectory(
 
   // eslint-disable-next-line no-constant-condition
   while (true) {
-    const { rootDirectory } = await client.prompt({
-      type: 'input',
-      name: 'rootDirectory',
+    const rootDirectory = await client.input.text({
       message: `In which directory is your code located?`,
       transformer: (input: string) => {
         return `${chalk.dim(`./`)}${input}`;

packages/cli/src/util/input/list.ts

@@ -1,4 +1,4 @@
-import inquirer from 'inquirer';
+import { Separator } from '@inquirer/select';
 import stripAnsi from 'strip-ansi';
 import Client from '../client';
 import eraseLines from '../output/erase-lines';
@@ -14,7 +14,7 @@ interface ListSeparator {
   separator: string;
 }
 
-export type ListChoice = ListEntry | ListSeparator | typeof inquirer.Separator;
+export type ListChoice = ListEntry | ListSeparator | typeof Separator;
 
 interface ListOptions {
   message: string;
@@ -54,8 +54,6 @@ export default async function list(
     eraseFinalAnswer = false, // If true, the line with the final answer that inquirer prints will be erased before returning
   }: ListOptions
 ): Promise<string> {
-  require('./patch-inquirer');
-
   let biggestLength = 0;
   let selected: string | undefined;
 
@@ -70,14 +68,14 @@ export default async function list(
   }
 
   const choices = _choices.map(choice => {
-    if (choice instanceof inquirer.Separator) {
+    if (choice instanceof Separator) {
       return choice;
     }
 
     if ('separator' in choice) {
       const prefix = `── ${choice.separator} `;
       const suffix = '─'.repeat(biggestLength - getLength(prefix));
-      return new inquirer.Separator(`${prefix}${suffix}`);
+      return new Separator(`${prefix}${suffix}`);
     }
 
     if ('short' in choice) {
@@ -93,11 +91,11 @@ export default async function list(
 
   if (separator) {
     for (let i = 0; i < choices.length; i += 2) {
-      choices.splice(i, 0, new inquirer.Separator(' '));
+      choices.splice(i, 0, new Separator(' '));
     }
   }
 
-  const cancelSeparator = new inquirer.Separator('─'.repeat(biggestLength));
+  const cancelSeparator = new Separator('─'.repeat(biggestLength));
   const _cancel = {
     name: 'Cancel',
     value: '',
@@ -110,18 +108,16 @@ export default async function list(
     choices.push(cancelSeparator, _cancel);
   }
 
-  const answer = await client.prompt({
-    name: 'value',
-    type: 'list',
-    default: selected,
+  const answer = await client.input.select({
     message,
     choices,
     pageSize,
+    default: selected,
   });
 
   if (eraseFinalAnswer === true) {
     process.stdout.write(eraseLines(2));
   }
 
-  return answer.value;
+  return answer;
 }

packages/cli/src/util/input/patch-inquirer.ts

@@ -1,210 +0,0 @@
-import chalk from 'chalk';
-import inquirer from 'inquirer';
-import Prompt from 'inquirer/lib/prompts/base';
-import Choice from 'inquirer/lib/objects/choice';
-import Separator from 'inquirer/lib/objects/separator';
-
-/**
- * Here we patch inquirer with some tweaks:
- * - update "list" to use ● and ○ and hide tips
- * - update "checkbox" to use ◻︎ and ◼︎ and hide tips
- * - use '?' before questions
- * - do not apply color to question's answer
- */
-
-// adjusted from https://github.com/SBoudrias/Inquirer.js/blob/942908f17319343d1acc7b876f990797c5695918/packages/inquirer/lib/prompts/base.js#L126
-const getQuestion = function (this: Prompt) {
-  let message = `${chalk.gray('?')} ${this.opt.message} `;
-
-  if (this.opt.type === 'confirm') {
-    if (this.opt.default === 'y/N') {
-      message += `[y/${chalk.bold('N')}] `;
-    } else {
-      message += `[${chalk.bold('Y')}/n] `;
-    }
-  }
-
-  // Append the default if available, and if question isn't answered
-  else if (this.opt.default != null && this.status !== 'answered') {
-    message += chalk.dim(`(${this.opt.default}) `);
-  }
-
-  return message;
-};
-
-inquirer.prompt.prompts.list.prototype.getQuestion = getQuestion;
-inquirer.prompt.prompts.checkbox.prototype.getQuestion = getQuestion;
-inquirer.prompt.prompts.input.prototype.getQuestion = getQuestion;
-inquirer.prompt.prompts.confirm.prototype.getQuestion = getQuestion;
-
-// adjusted from https://github.com/SBoudrias/Inquirer.js/blob/942908f17319343d1acc7b876f990797c5695918/packages/inquirer/lib/prompts/list.js#L80
-inquirer.prompt.prompts.list.prototype.render = function () {
-  // Render question
-  let message = this.getQuestion();
-
-  // Render choices or answer depending on the state
-  if (this.status === 'answered') {
-    message += this.opt.choices.getChoice(this.selected).short;
-  } else {
-    let choicesStr = listRender(this.opt.choices, this.selected);
-    let indexPosition = this.opt.choices.indexOf(
-      this.opt.choices.getChoice(this.selected)
-    );
-    message +=
-      '\n' +
-      this.paginator.paginate(choicesStr, indexPosition, this.opt.pageSize);
-  }
-
-  this.firstRender = false;
-
-  this.screen.render(message);
-};
-
-function listRender(choices: (Choice | Separator)[], pointer: number) {
-  let output = '';
-  let separatorOffset = 0;
-
-  choices.forEach((choice, i) => {
-    if (choice.type === 'separator') {
-      separatorOffset++;
-      output += '  ' + choice + '\n';
-      return;
-    }
-
-    if (choice.disabled) {
-      separatorOffset++;
-      output += '  - ' + choice.name;
-      output +=
-        ' (' +
-        (typeof choice.disabled === 'string' ? choice.disabled : 'Disabled') +
-        ')';
-      output += '\n';
-      return;
-    }
-
-    let isSelected = i - separatorOffset === pointer;
-    let line = (isSelected ? '● ' : '○ ') + choice.name;
-
-    if (isSelected) {
-      line = chalk.cyan(line);
-    }
-    output += line + ' \n';
-  });
-
-  return output.replace(/\n$/, '');
-}
-
-// adjusted from https://github.com/SBoudrias/Inquirer.js/blob/942908f17319343d1acc7b876f990797c5695918/packages/inquirer/lib/prompts/checkbox.js#L84
-inquirer.prompt.prompts.checkbox.prototype.render = function (error?: string) {
-  // Render question
-  let message = this.getQuestion();
-  let bottomContent = '';
-
-  if (!this.spaceKeyPressed) {
-    message +=
-      '(Press ' +
-      chalk.cyan.bold('<space>') +
-      ' to select, ' +
-      chalk.cyan.bold('<a>') +
-      ' to toggle all, ' +
-      chalk.cyan.bold('<i>') +
-      ' to invert selection)';
-  }
-
-  // Render choices or answer depending on the state
-  if (this.status === 'answered') {
-    message += this.selection.length > 0 ? this.selection.join(', ') : 'None';
-  } else {
-    let choicesStr = renderChoices(this.opt.choices, this.pointer);
-    let indexPosition = this.opt.choices.indexOf(
-      this.opt.choices.getChoice(this.pointer)
-    );
-    message +=
-      '\n' +
-      this.paginator.paginate(choicesStr, indexPosition, this.opt.pageSize);
-  }
-
-  if (error) {
-    bottomContent = chalk.red('>> ') + error;
-  }
-
-  this.screen.render(message, bottomContent);
-};
-
-function renderChoices(choices: (Choice | Separator)[], pointer: number) {
-  let output = '';
-  let separatorOffset = 0;
-
-  choices.forEach(function (choice, i) {
-    if (choice.type === 'separator') {
-      separatorOffset++;
-      output += '' + choice + '\n';
-      return;
-    }
-
-    if (choice.disabled) {
-      separatorOffset++;
-      output += '- ' + choice.name;
-      output +=
-        ' (' +
-        (typeof choice.disabled === 'string' ? choice.disabled : 'Disabled') +
-        ')';
-    } else {
-      if (i - separatorOffset === pointer) {
-        output += chalk.cyan(
-          (choice.checked ? '› ▪︎' : '› ▫︎') + ' ' + choice.name
-        );
-      } else {
-        output += chalk.cyan(
-          (choice.checked ? '  ▪︎' : '  ▫︎') + ' ' + choice.name
-        );
-      }
-    }
-
-    output += '\n';
-  });
-
-  return output.replace(/\n$/, '');
-}
-
-// adjusted from https://github.com/SBoudrias/Inquirer.js/blob/942908f17319343d1acc7b876f990797c5695918/packages/inquirer/lib/prompts/input.js#L44
-inquirer.prompt.prompts.input.prototype.render = function (error?: string) {
-  let bottomContent = '';
-  let appendContent = '';
-  let message = this.getQuestion();
-  let transformer = this.opt.transformer;
-  let isFinal = this.status === 'answered';
-
-  if (isFinal) {
-    appendContent = this.answer;
-  } else {
-    appendContent = this.rl.line;
-  }
-
-  if (transformer) {
-    message += transformer(appendContent, this.answers, { isFinal });
-  } else {
-    message += appendContent;
-  }
-
-  if (error) {
-    bottomContent = chalk.red('>> ') + error;
-  }
-
-  this.screen.render(message, bottomContent);
-};
-
-// adjusted from https://github.com/SBoudrias/Inquirer.js/blob/942908f17319343d1acc7b876f990797c5695918/packages/inquirer/lib/prompts/confirm.js#L64
-inquirer.prompt.prompts.confirm.prototype.render = function (answer?: boolean) {
-  let message = this.getQuestion();
-
-  if (this.status === 'answered') {
-    message += answer ? 'y' : 'n';
-  } else {
-    message += this.rl.line;
-  }
-
-  this.screen.render(message);
-
-  return this;
-};

packages/cli/src/util/input/prompt-bool.ts

@@ -1,86 +0,0 @@
-import chalk from 'chalk';
-import type { ReadableTTY, WritableTTY } from '@vercel-internals/types';
-
-type Options = {
-  abortSequences?: Set<string>;
-  defaultValue?: boolean;
-  noChar?: string;
-  resolveChars?: Set<string>;
-  stdin: ReadableTTY;
-  stdout: WritableTTY;
-  trailing?: string;
-  yesChar?: string;
-};
-
-export default async function promptBool(label: string, options: Options) {
-  const {
-    stdin,
-    stdout,
-    defaultValue = false,
-    abortSequences = new Set(['\u0003']),
-    resolveChars = new Set(['\r']),
-    yesChar = 'y',
-    noChar = 'n',
-    trailing = '',
-  } = options;
-
-  return new Promise<boolean>(resolve => {
-    const isRaw = Boolean(stdin && stdin.isRaw);
-
-    if (stdin) {
-      if (stdin.setRawMode) {
-        stdin.setRawMode(true);
-      }
-
-      stdin.resume();
-    }
-
-    function restore() {
-      stdout.write(trailing);
-
-      if (stdin) {
-        if (stdin.setRawMode) {
-          stdin.setRawMode(isRaw);
-        }
-
-        stdin.pause();
-        stdin.removeListener('data', onData);
-      }
-    }
-
-    function onData(buffer: Buffer) {
-      const data = buffer.toString();
-      if (data[0].toLowerCase() === yesChar) {
-        restore();
-        stdout.write(`\n`);
-        resolve(true);
-      } else if (data[0].toLowerCase() === noChar) {
-        stdout.write(`\n`);
-        restore();
-        resolve(false);
-      } else if (abortSequences.has(data)) {
-        stdout.write(`\n`);
-        restore();
-        resolve(false);
-      } else if (resolveChars.has(data[0])) {
-        stdout.write(`\n`);
-        restore();
-        resolve(defaultValue);
-      } else {
-        // ignore extraneous input
-      }
-    }
-
-    const defaultText =
-      defaultValue === null
-        ? `[${yesChar}|${noChar}]`
-        : defaultValue
-        ? `[${chalk.bold(yesChar.toUpperCase())}|${noChar}]`
-        : `[${yesChar}|${chalk.bold(noChar.toUpperCase())}]`;
-    stdout.write(`${chalk.gray('>')} ${label} ${chalk.gray(defaultText)} `);
-
-    if (stdin) {
-      stdin.on('data', onData);
-    }
-  });
-}

packages/cli/src/util/input/select-org.ts

@@ -10,7 +10,6 @@ export default async function selectOrg(
   question: string,
   autoConfirm?: boolean
 ): Promise<Org> {
-  require('./patch-inquirer');
   const {
     output,
     config: { currentTeam },
@@ -52,14 +51,9 @@ export default async function selectOrg(
     return choices[defaultChoiceIndex].value;
   }
 
-  const answers = await client.prompt({
-    type: 'list',
-    name: 'org',
+  return await client.input.select({
     message: question,
     choices,
-    default: defaultChoiceIndex,
+    default: choices[defaultChoiceIndex].value,
   });
-
-  const org = answers.org;
-  return org;
 }

packages/cli/src/util/input/text.ts

@@ -77,7 +77,7 @@ export default function text({
   // Tab
   // Right arrow
   autoCompleteChars = new Set(['\t', '\x1b[C']),
-  // If true, converts everything the user types to to lowercase
+  // If true, converts everything the user types to lowercase
   forceLowerCase = false,
 }: TextParams = {}): Promise<string> {
   return new Promise((resolve, reject) => {

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

@@ -1,5 +1,5 @@
 import chalk from 'chalk';
-import inquirer from 'inquirer';
+import { Separator } from '@inquirer/checkbox';
 import pluralize from 'pluralize';
 import { homedir } from 'os';
 import slugify from '@sindresorhus/slugify';
@@ -22,6 +22,7 @@ import { detectProjects } from '../projects/detect-projects';
 import { repoInfoToUrl } from '../git/repo-info-to-url';
 import { connectGitProvider, parseRepoUrl } from '../git/connect-git-provider';
 import { isAPIError } from '../errors-ts';
+import { isGitWorktreeOrSubmodule } from '../git-helpers';
 
 const home = homedir();
 
@@ -144,16 +145,13 @@ export async function ensureRepoLink(
       if (yes) {
         remoteName = defaultRemote;
       } else {
-        const answer = await client.prompt({
-          type: 'list',
-          name: 'value',
+        remoteName = await client.input.select({
           message: 'Which Git remote should be used?',
           choices: remoteNames.map(name => {
             return { name: name, value: name };
           }),
           default: defaultRemote,
         });
-        remoteName = answer.value;
       }
     }
     const repoUrl = remoteUrls[remoteName];
@@ -222,15 +220,13 @@ export async function ensureRepoLink(
       selected = projects;
     } else {
       const addSeparators = projects.length > 0 && detectedProjectsCount > 0;
-      const answer = await client.prompt({
-        type: 'checkbox',
-        name: 'selected',
+      selected = await client.input.checkbox<Project | NewProject>({
         message: `Which Projects should be ${
           projects.length ? 'linked to' : 'created'
         }?`,
         choices: [
           ...(addSeparators
-            ? [new inquirer.Separator('----- Existing Projects -----')]
+            ? [new Separator('----- Existing Projects -----')]
             : []),
           ...projects.map(project => {
             return {
@@ -240,7 +236,7 @@ export async function ensureRepoLink(
             };
           }),
           ...(addSeparators
-            ? [new inquirer.Separator('----- New Projects to be created -----')]
+            ? [new Separator('----- New Projects to be created -----')]
             : []),
           ...Array.from(detectedProjects.entries()).flatMap(
             ([rootDirectory, frameworks]) =>
@@ -264,12 +260,11 @@ export async function ensureRepoLink(
                   },
                   // Checked by default when there are no other existing Projects
                   checked: projects.length === 0,
-                };
+                } as const;
               })
           ),
         ],
       });
-      selected = answer.selected;
     }
 
     if (selected.length === 0) {
@@ -365,7 +360,13 @@ export async function findRepoRoot(
 ): Promise<string | undefined> {
   const { debug } = client.output;
   const REPO_JSON_PATH = join(VERCEL_DIR, VERCEL_DIR_REPO);
-  const GIT_CONFIG_PATH = normalize('.git/config');
+  /**
+   * If the current repo is a git submodule or git worktree '.git' is a file
+   * with a pointer to the "parent" git repository instead of a directory.
+   */
+  const GIT_PATH = isGitWorktreeOrSubmodule({ cwd: client.cwd })
+    ? normalize('.git')
+    : normalize('.git/config');
 
   for (const current of traverseUpDirectories({ start })) {
     if (current === home) {
@@ -389,12 +390,12 @@ export async function findRepoRoot(
 
     // if `.git/config` exists (unlinked),
     // then consider this the repo root
-    const gitConfigPath = join(current, GIT_CONFIG_PATH);
+    const gitConfigPath = join(current, GIT_PATH);
     stat = await lstat(gitConfigPath).catch(err => {
       if (err.code !== 'ENOENT') throw err;
     });
     if (stat) {
-      debug(`Found "${GIT_CONFIG_PATH}" - detected "${current}" as repo root`);
+      debug(`Found "${GIT_PATH}" - detected "${current}" as repo root`);
       return current;
     }
   }

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

@@ -198,6 +198,7 @@ export default async function setupAndLink(
         projectSettings: {
           ...localConfigurationOverrides,
           sourceFilesOutsideRootDirectory,
+          rootDirectory,
         },
         autoAssignCustomDomains: true,
       };

packages/cli/src/util/login/prompt.ts

@@ -62,12 +62,7 @@ export async function readInput(
 
   while (!input) {
     try {
-      const { val } = await client.prompt({
-        type: 'input',
-        name: 'val',
-        message,
-      });
-      input = val;
+      input = await client.input.text({ message });
     } catch (err: any) {
       console.log(); // \n
 

packages/cli/src/util/output/table.ts

@@ -1,38 +1,52 @@
-import chalk from 'chalk';
+import Table from 'cli-table3';
 
-const printLine = (data: string[], sizes: number[]) =>
-  data.reduce((line, col, i) => line + col.padEnd(sizes[i]), '');
+const defaultStyle = {
+  'padding-left': 0,
+  'padding-right': 2,
+};
+
+export const noBorderChars = {
+  top: '',
+  'top-mid': '',
+  'top-left': '',
+  'top-right': '',
+  bottom: '',
+  'bottom-mid': '',
+  'bottom-left': '',
+  'bottom-right': '',
+  left: '',
+  'left-mid': '',
+  mid: '',
+  'mid-mid': '',
+  right: '',
+  'right-mid': '',
+  middle: '',
+};
+
+const alignMap = {
+  l: 'left',
+  c: 'center',
+  r: 'right',
+} as const;
 
-/**
- * Print a table.
- */
 export default function table(
-  fieldNames: string[] = [],
-  data: string[][] = [],
-  margins: number[] = [],
-  print: (str: string) => void
+  rows: string[][],
+  opts?: { hsep?: number; align?: ('l' | 'c' | 'r')[] }
 ) {
-  // Compute size of each column
-  const sizes = data
-    .reduce(
-      (acc, row) =>
-        row.map((col, i) => {
-          const currentMaxColSize = acc[i] || 0;
-          const colSize = (col && col.length) || 0;
-          return Math.max(currentMaxColSize, colSize);
-        }),
-      fieldNames.map(col => col.length)
+  const table = new Table({
+    style: {
+      ...defaultStyle,
+      'padding-right': opts?.hsep ?? defaultStyle['padding-right'],
+    },
+    chars: noBorderChars,
+  });
+  table.push(
+    ...rows.map(row =>
+      row.map((cell, i) => ({
+        content: cell,
+        hAlign: alignMap[opts?.align?.[i] ?? 'l'],
+      }))
     )
-    // Add margin to all columns except the last
-    .map((size, i) => (i < margins.length && size + margins[i]) || size);
-
-  // Print header
-  print(chalk.grey(printLine(fieldNames, sizes)));
-  print('\n');
-
-  // Print content
-  for (const row of data) {
-    print(printLine(row, sizes));
-    print('\n');
-  }
+  );
+  return table.toString();
 }

packages/cli/src/util/projects/detect-projects.ts

@@ -1,5 +1,5 @@
 import { join } from 'path';
-import frameworkList, { Framework } from '@vercel/frameworks';
+import { frameworkList, Framework } from '@vercel/frameworks';
 import {
   detectFrameworks,
   getWorkspacePackagePaths,

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

@@ -97,16 +97,13 @@ async function getProjectLinkFromRepoLink(
   } else {
     const selectableProjects =
       projects.length > 0 ? projects : repoLink.repoConfig.projects;
-    const { p } = await client.prompt({
-      name: 'p',
-      type: 'list',
+    project = await client.input.select({
       message: `Please select a Project:`,
       choices: selectableProjects.map(p => ({
         value: p,
         name: p.name,
       })),
     });
-    project = p;
   }
   if (project) {
     return {