fix merge conflict

The previous type signature of `CommandOption` did not cover all of the actual uses of option types throughout the codebase. This one may not cover all possible types, but comes much closer and allows us to literally state the type constructor used by `arg` to parse options.

This will allow for direct use of `command.ts` data structures so that Help output matches the actually parsed options used by every subcommand.

`deploy/index.ts` already shows an example of this, and a future pull request can build on that example by extracting that logic into a utility function.

.changeset/brave-dogs-reflect.md

@@ -0,0 +1,5 @@
+---
+'vercel': patch
+---
+
+Replace console.log that communicates to user with client.output methods

.changeset/hip-colts-repair.md

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

.changeset/kind-penguins-add.md

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

.changeset/next-14-2-0.md

@@ -0,0 +1,3 @@
+---
+---
+

.changeset/swift-apples-count.md

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

.changeset/twelve-buses-bow.md

@@ -0,0 +1,4 @@
+---
+---
+
+Introduce snapshot testing utilities

.changeset/yellow-ties-grin.md

@@ -0,0 +1,5 @@
+---
+"@vercel/frameworks": patch
+---
+
+Update framework detection to support SolidStart v1

.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

@@ -67,7 +67,7 @@ jobs:
           node-version: ${{ matrix.nodeVersion || env.NODE_VERSION }}
 
       - name: Install Hugo
-        if: matrix.runner == 'macos-latest'
+        if: matrix.runner == 'macos-14'
         run: curl -L -O https://github.com/gohugoio/hugo/releases/download/v0.56.0/hugo_0.56.0_macOS-64bit.tar.gz && tar -xzf hugo_0.56.0_macOS-64bit.tar.gz && mv ./hugo packages/cli/test/dev/fixtures/08-hugo/
 
       # yarn 1.22.21 introduced a Corepack bug when running tests.
@@ -79,16 +79,13 @@ 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
         env:
           FORCE_COLOR: '1'
       - name: Test ${{matrix.packageName}}
-        run: node utils/gen.js && node_modules/.bin/turbo run test --summarize --cache-dir=".turbo" --log-order=stream --scope=${{matrix.packageName}} --no-deps -- ${{ join(matrix.testPaths, ' ') }}
+        run: node utils/gen.js && node_modules/.bin/turbo run ${{matrix.testScript}} --summarize --cache-dir=".turbo" --log-order=stream --scope=${{matrix.packageName}} --no-deps -- ${{ join(matrix.testPaths, ' ') }}
         shell: bash
         env:
           JEST_JUNIT_OUTPUT_FILE: ${{github.workspace}}/.junit-reports/${{matrix.scriptName}}-${{matrix.packageName}}-${{matrix.chunkNumber}}-${{ matrix.runner }}.xml
@@ -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__/integration/solidstart-1.test.ts

@@ -0,0 +1,4 @@
+import { deployExample } from '../test-utils';
+it('[examples] should deploy solidstart-1', async () => {
+  await deployExample('solidstart-1');
+});

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/app/page.tsx

@@ -3,12 +3,12 @@ import Image from "next/image";
 export default function Home() {
   return (
     <main className="flex min-h-screen flex-col items-center justify-between p-24">
-      <div className="z-10 max-w-5xl w-full items-center justify-between font-mono text-sm lg:flex">
+      <div className="z-10 w-full max-w-5xl items-center justify-between font-mono text-sm lg:flex">
         <p className="fixed left-0 top-0 flex w-full justify-center border-b border-gray-300 bg-gradient-to-b from-zinc-200 pb-6 pt-8 backdrop-blur-2xl dark:border-neutral-800 dark:bg-zinc-800/30 dark:from-inherit lg:static lg:w-auto  lg:rounded-xl lg:border lg:bg-gray-200 lg:p-4 lg:dark:bg-zinc-800/30">
           Get started by editing&nbsp;
           <code className="font-mono font-bold">app/page.tsx</code>
         </p>
-        <div className="fixed bottom-0 left-0 flex h-48 w-full items-end justify-center bg-gradient-to-t from-white via-white dark:from-black dark:via-black lg:static lg:h-auto lg:w-auto lg:bg-none">
+        <div className="fixed bottom-0 left-0 flex h-48 w-full items-end justify-center bg-gradient-to-t from-white via-white dark:from-black dark:via-black lg:static lg:size-auto lg:bg-none">
           <a
             className="pointer-events-none flex place-items-center gap-2 p-8 lg:pointer-events-auto lg:p-0"
             href="https://vercel.com?utm_source=create-next-app&utm_medium=appdir-template&utm_campaign=create-next-app"
@@ -28,7 +28,7 @@ export default function Home() {
         </div>
       </div>
 
-      <div className="relative flex place-items-center before:absolute before:h-[300px] before:w-full sm:before:w-[480px] before:-translate-x-1/2 before:rounded-full before:bg-gradient-radial before:from-white before:to-transparent before:blur-2xl before:content-[''] after:absolute after:-z-20 after:h-[180px] after:w-full sm:after:w-[240px] after:translate-x-1/3 after:bg-gradient-conic after:from-sky-200 after:via-blue-200 after:blur-2xl after:content-[''] before:dark:bg-gradient-to-br before:dark:from-transparent before:dark:to-blue-700 before:dark:opacity-10 after:dark:from-sky-900 after:dark:via-[#0141ff] after:dark:opacity-40 before:lg:h-[360px] z-[-1]">
+      <div className="relative z-[-1] flex place-items-center before:absolute before:h-[300px] before:w-full before:-translate-x-1/2 before:rounded-full before:bg-gradient-radial before:from-white before:to-transparent before:blur-2xl before:content-[''] after:absolute after:-z-20 after:h-[180px] after:w-full after:translate-x-1/3 after:bg-gradient-conic after:from-sky-200 after:via-blue-200 after:blur-2xl after:content-[''] before:dark:bg-gradient-to-br before:dark:from-transparent before:dark:to-blue-700 before:dark:opacity-10 after:dark:from-sky-900 after:dark:via-[#0141ff] after:dark:opacity-40 sm:before:w-[480px] sm:after:w-[240px] before:lg:h-[360px]">
         <Image
           className="relative dark:drop-shadow-[0_0_0.3rem_#ffffff70] dark:invert"
           src="/next.svg"
@@ -39,20 +39,20 @@ export default function Home() {
         />
       </div>
 
-      <div className="mb-32 grid text-center lg:max-w-5xl lg:w-full lg:mb-0 lg:grid-cols-4 lg:text-left">
+      <div className="mb-32 grid text-center lg:mb-0 lg:w-full lg:max-w-5xl lg:grid-cols-4 lg:text-left">
         <a
           href="https://nextjs.org/docs?utm_source=create-next-app&utm_medium=appdir-template&utm_campaign=create-next-app"
           className="group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30"
           target="_blank"
           rel="noopener noreferrer"
         >
-          <h2 className={`mb-3 text-2xl font-semibold`}>
+          <h2 className="mb-3 text-2xl font-semibold">
             Docs{" "}
             <span className="inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none">
               -&gt;
             </span>
           </h2>
-          <p className={`m-0 max-w-[30ch] text-sm opacity-50`}>
+          <p className="m-0 max-w-[30ch] text-sm opacity-50">
             Find in-depth information about Next.js features and API.
           </p>
         </a>
@@ -63,13 +63,13 @@ export default function Home() {
           target="_blank"
           rel="noopener noreferrer"
         >
-          <h2 className={`mb-3 text-2xl font-semibold`}>
+          <h2 className="mb-3 text-2xl font-semibold">
             Learn{" "}
             <span className="inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none">
               -&gt;
             </span>
           </h2>
-          <p className={`m-0 max-w-[30ch] text-sm opacity-50`}>
+          <p className="m-0 max-w-[30ch] text-sm opacity-50">
             Learn about Next.js in an interactive course with&nbsp;quizzes!
           </p>
         </a>
@@ -80,13 +80,13 @@ export default function Home() {
           target="_blank"
           rel="noopener noreferrer"
         >
-          <h2 className={`mb-3 text-2xl font-semibold`}>
+          <h2 className="mb-3 text-2xl font-semibold">
             Templates{" "}
             <span className="inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none">
               -&gt;
             </span>
           </h2>
-          <p className={`m-0 max-w-[30ch] text-sm opacity-50`}>
+          <p className="m-0 max-w-[30ch] text-sm opacity-50">
             Explore starter templates for Next.js.
           </p>
         </a>
@@ -97,13 +97,13 @@ export default function Home() {
           target="_blank"
           rel="noopener noreferrer"
         >
-          <h2 className={`mb-3 text-2xl font-semibold`}>
+          <h2 className="mb-3 text-2xl font-semibold">
             Deploy{" "}
             <span className="inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none">
               -&gt;
             </span>
           </h2>
-          <p className={`m-0 max-w-[30ch] text-sm opacity-50 text-balance`}>
+          <p className="m-0 max-w-[30ch] text-balance text-sm opacity-50">
             Instantly deploy your Next.js site to a shareable URL with Vercel.
           </p>
         </a>

examples/nextjs/package.json

@@ -11,17 +11,16 @@
   "dependencies": {
     "react": "^18",
     "react-dom": "^18",
-    "next": "14.1.2"
+    "next": "14.2.0"
   },
   "devDependencies": {
     "typescript": "^5",
     "@types/node": "^20",
     "@types/react": "^18",
     "@types/react-dom": "^18",
-    "autoprefixer": "^10.0.1",
     "postcss": "^8",
-    "tailwindcss": "^3.3.0",
+    "tailwindcss": "^3.4.1",
     "eslint": "^8",
-    "eslint-config-next": "14.1.2"
+    "eslint-config-next": "14.2.0"
   }
 }

examples/nextjs/postcss.config.js

@@ -1,6 +0,0 @@
-module.exports = {
-  plugins: {
-    tailwindcss: {},
-    autoprefixer: {},
-  },
-};

examples/nextjs/postcss.config.mjs

@@ -0,0 +1,8 @@
+/** @type {import('postcss-load-config').Config} */
+const config = {
+  plugins: {
+    tailwindcss: {},
+  },
+};
+
+export default config;

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/solidstart-1/.gitignore

@@ -0,0 +1,23 @@
+dist
+worker
+.solid
+.vercel
+.vinxi
+.output
+
+# dependencies
+/node_modules
+
+# IDEs and editors
+/.idea
+.project
+.classpath
+*.launch
+.settings/
+
+# Temp
+gitignore
+
+# System Files
+.DS_Store
+Thumbs.db

examples/solidstart-1/README.md

@@ -0,0 +1,27 @@
+# SolidStart
+
+This directory is a brief example of a [SolidStart](https://github.com/ryansolid/solid-start) site that can be deployed to Vercel with zero configuration.
+
+## Deploy Your Own
+
+Deploy your own SolidStart project with Vercel.
+
+[![Deploy with Vercel](https://vercel.com/button)](https://vercel.com/new/clone?repository-url=https://github.com/vercel/vercel/tree/main/examples/solidstart&template=solidstart)
+
+_Live Example: https://solid-start-template.vercel.app_
+
+## Developing
+
+Once you've created a project and installed dependencies with `npm install` (or `pnpm install` or `yarn`), start a development server:
+
+```bash
+npm run dev
+```
+
+## Building
+
+This uses the [Vercel Adapter](https://github.com/solidjs/solid-start/tree/main/packages/start-vercel) for SolidStart.
+
+```bash
+npm run build
+```

examples/solidstart-1/app.config.ts

@@ -0,0 +1,7 @@
+import { defineConfig } from "@solidjs/start/config";
+
+export default defineConfig({
+  server: {
+    preset: "vercel"
+  }
+});

examples/solidstart-1/package.json

@@ -0,0 +1,20 @@
+{
+  "scripts": {
+    "dev": "vinxi dev",
+    "build": "vinxi build",
+    "start": "vinxi start",
+    "version": "vinxi version"
+  },
+  "type": "module",
+  "private": true,
+  "dependencies": {
+    "@solidjs/meta": "^0.29.2",
+    "@solidjs/router": "^0.13.1",
+    "@solidjs/start": "^1.0.0-rc.0",
+    "solid-js": "^1.8.16",
+    "vinxi": "^0.3.10"
+  },
+  "engines": {
+    "node": ">=18"
+  }
+}

examples/solidstart-1/src/app.css

@@ -0,0 +1,39 @@
+body {
+  font-family: Gordita, Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif;
+}
+
+a {
+  margin-right: 1rem;
+}
+
+main {
+  text-align: center;
+  padding: 1em;
+  margin: 0 auto;
+}
+
+h1 {
+  color: #335d92;
+  text-transform: uppercase;
+  font-size: 4rem;
+  font-weight: 100;
+  line-height: 1.1;
+  margin: 4rem auto;
+  max-width: 14rem;
+}
+
+p {
+  max-width: 14rem;
+  margin: 2rem auto;
+  line-height: 1.35;
+}
+
+@media (min-width: 480px) {
+  h1 {
+    max-width: none;
+  }
+
+  p {
+    max-width: none;
+  }
+}

examples/solidstart-1/src/app.tsx

@@ -0,0 +1,22 @@
+import { MetaProvider, Title } from "@solidjs/meta";
+import { Router } from "@solidjs/router";
+import { FileRoutes } from "@solidjs/start/router";
+import { Suspense } from "solid-js";
+import "./app.css";
+
+export default function App() {
+  return (
+    <Router
+      root={props => (
+        <MetaProvider>
+          <Title>SolidStart - Basic</Title>
+          <a href="/">Index</a>
+          <a href="/about">About</a>
+          <Suspense>{props.children}</Suspense>
+        </MetaProvider>
+      )}
+    >
+      <FileRoutes />
+    </Router>
+  );
+}

examples/solidstart-1/src/components/Counter.css

@@ -0,0 +1,20 @@
+.increment {
+  font-family: inherit;
+  font-size: inherit;
+  padding: 1em 2em;
+  color: #335d92;
+  background-color: rgba(68, 107, 158, 0.1);
+  border-radius: 2em;
+  border: 2px solid rgba(68, 107, 158, 0);
+  outline: none;
+  width: 200px;
+  font-variant-numeric: tabular-nums;
+}
+
+.increment:focus {
+  border: 2px solid #335d92;
+}
+
+.increment:active {
+  background-color: rgba(68, 107, 158, 0.2);
+}

examples/solidstart-1/src/components/Counter.tsx

@@ -0,0 +1,12 @@
+"use client";
+import { createSignal } from "solid-js";
+import "./Counter.css";
+
+export default function Counter() {
+  const [count, setCount] = createSignal(0);
+  return (
+    <button class="increment" onClick={() => setCount(count() + 1)}>
+      Clicks: {count()}
+    </button>
+  );
+}

examples/solidstart-1/src/entry-client.tsx

@@ -0,0 +1,4 @@
+// @refresh reload
+import { mount, StartClient } from "@solidjs/start/client";
+
+mount(() => <StartClient />, document.getElementById("app")!);

examples/solidstart-1/src/entry-server.tsx

@@ -0,0 +1,21 @@
+// @refresh reload
+import { createHandler, StartServer } from "@solidjs/start/server";
+
+export default createHandler(() => (
+  <StartServer
+    document={({ assets, children, scripts }) => (
+      <html lang="en">
+        <head>
+          <meta charset="utf-8" />
+          <meta name="viewport" content="width=device-width, initial-scale=1" />
+          <link rel="icon" href="/favicon.ico" />
+          {assets}
+        </head>
+        <body>
+          <div id="app">{children}</div>
+          {scripts}
+        </body>
+      </html>
+    )}
+  />
+));

examples/solidstart-1/src/global.d.ts

@@ -0,0 +1 @@
+/// <reference types="@solidjs/start/env" />

examples/solidstart-1/src/routes/[...404].tsx

@@ -0,0 +1,19 @@
+import { Title } from "@solidjs/meta";
+import { HttpStatusCode } from "@solidjs/start";
+
+export default function NotFound() {
+  return (
+    <main>
+      <Title>Not Found</Title>
+      <HttpStatusCode code={404} />
+      <h1>Page Not Found</h1>
+      <p>
+        Visit{" "}
+        <a href="https://start.solidjs.com" target="_blank">
+          start.solidjs.com
+        </a>{" "}
+        to learn how to build SolidStart apps.
+      </p>
+    </main>
+  );
+}

examples/solidstart-1/src/routes/index.tsx

@@ -0,0 +1,19 @@
+import { Title } from "@solidjs/meta";
+import Counter from "~/components/Counter";
+
+export default function Home() {
+  return (
+    <main>
+      <Title>Hello World</Title>
+      <h1>Hello world!</h1>
+      <Counter />
+      <p>
+        Visit{" "}
+        <a href="https://start.solidjs.com" target="_blank">
+          start.solidjs.com
+        </a>{" "}
+        to learn how to build SolidStart apps.
+      </p>
+    </main>
+  );
+}

examples/solidstart-1/tsconfig.json

@@ -0,0 +1,19 @@
+{
+	"compilerOptions": {
+		"target": "ESNext",
+		"module": "ESNext",
+		"moduleResolution": "node",
+		"allowSyntheticDefaultImports": true,
+		"esModuleInterop": true,
+		"jsx": "preserve",
+		"jsxImportSource": "solid-js",
+		"allowJs": true,
+		"strict": true,
+		"noEmit": true,
+		"types": ["vinxi/client"],
+		"isolatedModules": true,
+		"paths": {
+      "~/*": ["./src/*"]
+    }
+	}
+}

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.2",
     "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,123 @@
 # vercel
 
+## 34.0.0
+
+### Major Changes
+
+- Disables promotion of preview deployments ([#11411](https://github.com/vercel/vercel/pull/11411))
+
+### Patch Changes
+
+- Always set `projectSettings.nodeVersion` in `vc deploy` ([#11351](https://github.com/vercel/vercel/pull/11351))
+
+- [cli] optional override of existing environment variables with --force ([#11348](https://github.com/vercel/vercel/pull/11348))
+
+## 33.7.1
+
+### Patch Changes
+
+- fix flickering during interactive UI rerendering ([#11392](https://github.com/vercel/vercel/pull/11392))
+
+- fix `vc ls` message to be `vc projects ls` ([#11400](https://github.com/vercel/vercel/pull/11400))
+
+- Updated dependencies [[`2461b571a`](https://github.com/vercel/vercel/commit/2461b571af037fbfdf92299a272010a5a8f4898b)]:
+  - @vercel/next@4.2.0
+
+## 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": "34.0.0",
   "preferGlobal": true,
   "license": "Apache-2.0",
   "description": "The command-line interface for Vercel",
@@ -12,7 +12,8 @@
   },
   "scripts": {
     "test": "jest --reporters=default --reporters=jest-junit --env node --verbose --bail",
-    "test-unit": "pnpm test test/unit/",
+    "vitest-unit-run": "pnpm vitest",
+    "vitest-unit": "pnpm jest test/unit/ --listTests",
     "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 +32,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.2.0",
+    "@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 +69,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 +84,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 +92,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.2.0",
     "@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 +131,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 +162,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/command.ts

@@ -53,17 +53,15 @@ export const aliasCommand: Command = {
       description: 'Show next page of results',
       argument: 'MS',
       shorthand: 'n',
-      type: 'string',
+      type: String,
       deprecated: false,
-      multi: false,
     },
     {
       name: 'yes',
       description: 'Skip the confirmation prompt when removing an alias',
       shorthand: 'y',
-      type: 'boolean',
+      type: Boolean,
       deprecated: false,
-      multi: false,
     },
     {
       name: 'limit',
@@ -71,9 +69,8 @@ export const aliasCommand: Command = {
       description:
         'Number of results to return per page (default: 20, max: 100)',
       argument: 'NUMBER',
-      type: 'string',
+      type: String,
       deprecated: false,
-      multi: false,
     },
   ],
   examples: [

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';
 
@@ -64,11 +63,7 @@ export default async function rm(
   }
 
   await removeAliasById(client, alias.uid);
-  console.log(
-    `${chalk.cyan('> Success!')} Alias ${chalk.bold(
-      alias.alias
-    )} removed ${removeStamp()}`
-  );
+  output.success(`Alias ${chalk.bold(alias.alias)} removed ${removeStamp()}`);
   return 0;
 }
 
@@ -84,11 +79,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/alias/set.ts

@@ -123,8 +123,8 @@ export default async function set(
         return 1;
       }
 
-      console.log(
-        `${chalk.cyan('> Success!')} ${chalk.bold(
+      output.success(
+        `${chalk.bold(
           `${isWildcardAlias(target) ? '' : 'https://'}${handleResult.alias}`
         )} now points to https://${deployment.url} ${setStamp()}`
       );
@@ -170,10 +170,10 @@ export default async function set(
 
   const prefix = isWildcard ? '' : 'https://';
 
-  console.log(
-    `${chalk.cyan('> Success!')} ${chalk.bold(
-      `${prefix}${handleResult.alias}`
-    )} now points to https://${deployment.url} ${setStamp()}`
+  output.success(
+    `${chalk.bold(`${prefix}${handleResult.alias}`)} now points to https://${
+      deployment.url
+    } ${setStamp()}`
   );
 
   return 0;

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

@@ -11,45 +11,40 @@ export const bisectCommand: Command = {
       description: 'Known bad URL',
       argument: 'URL',
       shorthand: 'b',
-      type: 'string',
+      type: String,
       deprecated: false,
-      multi: false,
     },
     {
       name: 'good',
       description: 'Known good URL',
       argument: 'URL',
       shorthand: 'g',
-      type: 'string',
+      type: String,
       deprecated: false,
-      multi: false,
     },
     {
       name: 'open',
       description: 'Automatically open each URL in the browser',
       argument: 'URL',
       shorthand: 'o',
-      type: 'string',
+      type: String,
       deprecated: false,
-      multi: false,
     },
     {
       name: 'path',
       description: 'Subpath of the deployment URL to test',
       argument: 'URL',
       shorthand: 'p',
-      type: 'string',
+      type: String,
       deprecated: false,
-      multi: false,
     },
     {
       name: 'run',
       description: 'Test script to run for each deployment',
       argument: 'URL',
       shorthand: 'r',
-      type: 'string',
+      type: String,
       deprecated: false,
-      multi: false,
     },
   ],
   examples: [

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/command.ts

@@ -10,27 +10,24 @@ export const buildCommand: Command = {
       name: 'prod',
       description: 'Build a production deployment',
       shorthand: null,
-      type: 'string',
+      type: String,
       deprecated: false,
-      multi: false,
     },
     {
       name: 'output',
       description: 'Directory where built assets should be written to',
       shorthand: null,
       argument: 'PATH',
-      type: 'string',
+      type: String,
       deprecated: false,
-      multi: false,
     },
     {
       name: 'yes',
       description:
         'Skip the confirmation prompt about pulling environment variables and project settings when not found locally',
       shorthand: 'y',
-      type: 'boolean',
+      type: Boolean,
       deprecated: false,
-      multi: false,
     },
   ],
   examples: [

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
@@ -393,9 +386,7 @@ async function doBuild(
     }
 
     for (const w of detectedBuilders.warnings) {
-      console.log(
-        `Warning: ${w.message} ${w.action || 'Learn More'}: ${w.link}`
-      );
+      output.warn(w.message, null, w.link, w.action || 'Learn More');
     }
 
     if (detectedBuilders.builders) {
@@ -476,7 +467,7 @@ async function doBuild(
   const buildResults: Map<Builder, BuildResult | BuildOutputConfig> = new Map();
   const overrides: PathOverride[] = [];
   const repoRootPath = cwd;
-  const corepackShimDir = await initCorepack({ repoRootPath });
+  const corepackShimDir = await initCorepack({ repoRootPath }, output);
 
   for (const build of sortedBuilders) {
     if (typeof build.src !== 'string') continue;
@@ -667,9 +658,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 +671,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 +693,7 @@ async function getFramework(
 ): Promise<{ version: string } | undefined> {
   const detectedFramework = await detectFrameworkRecord({
     fs: new LocalFileSystemDetector(cwd),
-    frameworkList: frameworks,
+    frameworkList,
   });
 
   if (!detectedFramework) {
@@ -820,60 +808,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/command.ts

@@ -49,36 +49,32 @@ export const certsCommand: Command = {
       name: 'challenge-only',
       description: 'Only show challenges needed to issue a cert',
       shorthand: null,
-      type: 'string',
+      type: String,
       deprecated: false,
-      multi: false,
     },
     {
       name: 'crt',
       description: 'Certificate file',
       argument: 'FILE',
       shorthand: null,
-      type: 'string',
+      type: String,
       deprecated: false,
-      multi: false,
     },
     {
       name: 'key',
       description: 'Certificate key file',
       argument: 'FILE',
       shorthand: null,
-      type: 'string',
+      type: String,
       deprecated: false,
-      multi: false,
     },
     {
       name: 'ca',
       description: 'CA certificate chain file',
       argument: 'FILE',
       shorthand: null,
-      type: 'string',
+      type: String,
       deprecated: false,
-      multi: false,
     },
     {
       name: 'limit',
@@ -86,17 +82,15 @@ export const certsCommand: Command = {
         'Number of results to return per page (default: 20, max: 100)',
       argument: 'VALUE',
       shorthand: null,
-      type: 'string',
+      type: String,
       deprecated: false,
-      multi: false,
     },
     {
       name: 'next',
       description: 'Show next page of results',
       shorthand: 'n',
-      type: 'string',
+      type: String,
       deprecated: false,
-      multi: false,
     },
   ],
   examples: [

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/command.ts

@@ -14,147 +14,130 @@ export const deployCommand: Command = {
     {
       name: 'force',
       shorthand: 'f',
-      type: 'boolean',
+      type: Boolean,
       deprecated: false,
       description: 'Force a new deployment even if nothing has changed',
-      multi: false,
     },
     {
       name: 'with-cache',
       shorthand: null,
-      type: 'boolean',
+      type: Boolean,
       deprecated: false,
       description: 'Retain build cache when using "--force"',
-      multi: false,
     },
     {
       name: 'public',
       shorthand: 'p',
-      type: 'boolean',
+      type: Boolean,
       deprecated: false,
       description: 'Deployment is public (`/_src`) is exposed)',
-      multi: false,
     },
     {
       name: 'env',
       shorthand: 'e',
-      type: 'string',
+      type: [String],
       argument: 'key=value',
       deprecated: false,
-      multi: true,
       description:
         'Specify environment variables during run-time (e.g. `-e KEY1=value1 -e KEY2=value2`)',
     },
     {
       name: 'build-env',
       shorthand: 'b',
-      type: 'string',
+      type: [String],
       argument: 'key=value',
       deprecated: false,
-      multi: true,
       description:
         'Specify environment variables during build-time (e.g. `-b KEY1=value1 -b KEY2=value2`)',
     },
     {
       name: 'meta',
       shorthand: 'm',
-      type: 'string',
+      type: [String],
       argument: 'key=value',
       deprecated: false,
-      multi: true,
       description:
         'Specify metadata for the deployment (e.g. `-m KEY1=value1 -m KEY2=value2`)',
     },
     {
       name: 'regions',
       shorthand: null,
-      type: 'string',
+      type: String,
       deprecated: false,
       description: 'Set default regions to enable the deployment on',
-      multi: false,
     },
     {
       name: 'prebuilt',
       shorthand: null,
-      type: 'boolean',
+      type: Boolean,
       deprecated: false,
       description:
         'Use in combination with `vc build`. Deploy an existing build',
-      multi: false,
     },
     {
       name: 'prod',
       shorthand: null,
-      type: 'boolean',
+      type: Boolean,
       deprecated: false,
       description: 'Create a production deployment',
-      multi: false,
     },
     {
       name: 'archive',
       shorthand: null,
-      type: 'string',
+      type: String,
       deprecated: false,
       description:
         'Compress the deployment code into a file before uploading it',
-      multi: false,
     },
     {
       name: 'no-wait',
       shorthand: null,
-      type: 'boolean',
+      type: Boolean,
       deprecated: false,
       description: "Don't wait for the deployment to finish",
-      multi: false,
     },
     {
       name: 'skip-domain',
       shorthand: null,
-      type: 'boolean',
+      type: Boolean,
       deprecated: false,
       description:
         'Disable the automatic promotion (aliasing) of the relevant domains to a new production deployment. You can use `vc promote` to complete the domain-assignment process later',
-      multi: false,
     },
     {
       name: 'yes',
       shorthand: 'y',
-      type: 'boolean',
+      type: Boolean,
       deprecated: false,
       description: 'Use default options to skip all prompts',
-      multi: false,
     },
     {
       name: 'name',
       shorthand: 'n',
-      type: 'string',
+      type: String,
       deprecated: true,
       description: 'Provide a Vercel Project name',
-      multi: false,
     },
     {
       name: 'no-clipboard',
       shorthand: null,
-      type: 'boolean',
+      type: Boolean,
       deprecated: true,
       description: 'Do not copy deployment URL to clipboard',
-      multi: false,
     },
     {
       name: 'target',
       shorthand: null,
-      type: 'string',
+      type: String,
       deprecated: true,
       description: 'Specify the target deployment environment',
-      multi: false,
     },
     {
       name: 'confirm',
       shorthand: 'c',
-      type: 'boolean',
+      type: Boolean,
       deprecated: true,
       description: 'Use default options to skip all prompts',
-      multi: false,
     },
   ],
   examples: [

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

@@ -1,74 +1,78 @@
-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 { help, PrimitiveConstructor } from '../help';
 import { deployCommand } from './command';
 
 export default async (client: Client): Promise<number> => {
@@ -77,25 +81,13 @@ export default async (client: Client): Promise<number> => {
   let argv = null;
 
   const argOptions: {
-    [k: string]:
-      | BooleanConstructor
-      | StringConstructor
-      | string
-      | [StringConstructor];
+    [k: string]: PrimitiveConstructor | [PrimitiveConstructor] | string;
   } = {};
   for (const option of deployCommand.options) {
-    argOptions[`--${option.name}`] =
-      option.type === 'boolean' ? Boolean : String;
+    argOptions[`--${option.name}`] = option.type;
     if (option.shorthand) {
       argOptions[`-${option.shorthand}`] = `--${option.name}`;
     }
-    if (
-      option.name === 'env' ||
-      option.name === 'build-env' ||
-      option.name === 'meta'
-    ) {
-      argOptions[`--${option.name}`] = [String];
-    }
   }
 
   try {
@@ -299,7 +291,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 +302,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 +317,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 =
@@ -524,6 +519,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,14 +541,43 @@ 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,
+      };
+
+      if (status === 'linked') {
+        createArgs.projectSettings = {
+          ...createArgs.projectSettings,
+          ...localConfigurationOverrides,
+        };
+      }
     }
 
+    // Read the `engines.node` field from `package.json` and send as a
+    // `projectSettings` property as an optimization (so that the API
+    // does not need to retrieve the file to do this check).
+    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);
+        }
+      }
+    }
+    if (!createArgs.projectSettings) createArgs.projectSettings = {};
+    createArgs.projectSettings.nodeVersion = nodeVersion;
+
     deployment = await createDeploy(
       client,
       now,

packages/cli/src/commands/dev/command.ts

@@ -16,9 +16,8 @@ export const devCommand: Command = {
       description: 'Specify a URI endpoint on which to listen [0.0.0.0:3000]',
       argument: 'uri',
       shorthand: null,
-      type: 'string',
+      type: String,
       deprecated: false,
-      multi: false,
     },
   ],
   examples: [

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

@@ -85,12 +85,10 @@ export default async function add(
     return 1;
   }
 
-  console.log(
-    `${chalk.cyan('> Success!')} DNS record for domain ${chalk.bold(
-      domain
-    )} ${chalk.gray(`(${record.uid})`)} created under ${chalk.bold(
-      contextName
-    )} ${chalk.gray(addStamp())}`
+  output.success(
+    `DNS record for domain ${chalk.bold(domain)} ${chalk.gray(
+      `(${record.uid})`
+    )} created under ${chalk.bold(contextName)} ${chalk.gray(addStamp())}`
   );
 
   return 0;

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

@@ -74,9 +74,8 @@ export const dnsCommand: Command = {
       description: 'Show next page of results',
       argument: 'MS',
       shorthand: 'n',
-      type: 'string',
+      type: String,
       deprecated: false,
-      multi: false,
     },
     {
       name: 'limit',
@@ -84,9 +83,8 @@ export const dnsCommand: Command = {
       description:
         'Number of results to return per page (default: 20, max: 100)',
       argument: 'NUMBER',
-      type: 'string',
+      type: String,
       deprecated: false,
-      multi: false,
     },
   ],
   examples: [

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

@@ -52,12 +52,10 @@ export default async function add(
     return 1;
   }
 
-  console.log(
-    `${chalk.cyan('> Success!')} ${
-      recordIds.length
-    } DNS records for domain ${chalk.bold(domain)} created under ${chalk.bold(
-      contextName
-    )} ${chalk.gray(addStamp())}`
+  output.success(
+    `${recordIds.length} DNS records for domain ${chalk.bold(
+      domain
+    )} created under ${chalk.bold(contextName)} ${chalk.gray(addStamp())}`
   );
   return 0;
 }

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';
@@ -52,10 +52,8 @@ export default async function rm(
 
   const rmStamp = stamp();
   await deleteDNSRecordById(client, domainName, record.id);
-  console.log(
-    `${chalk.cyan('> Success!')} Record ${chalk.gray(
-      `${record.id}`
-    )} removed ${chalk.gray(rmStamp())}`
+  output.success(
+    `Record ${chalk.gray(`${record.id}`)} removed ${chalk.gray(rmStamp())}`
   );
   return 0;
 }
@@ -71,11 +69,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/add.ts

@@ -87,10 +87,10 @@ export default async function add(
   }
 
   // We can cast the information because we've just added the domain and it should be there
-  console.log(
-    `${chalk.cyan('> Success!')} Domain ${chalk.bold(
-      domainName
-    )} added to project ${chalk.bold(projectName)}. ${addStamp()}`
+  output.success(
+    `Domain ${chalk.bold(domainName)} added to project ${chalk.bold(
+      projectName
+    )}. ${addStamp()}`
   );
 
   if (isPublicSuffix(domainName)) {

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
     );
   }
 
@@ -164,10 +166,8 @@ export default async function buy(
   }
 
   if (buyResult.pending) {
-    console.log(
-      `${chalk.cyan('> Success!')} Domain ${param(
-        domainName
-      )} order was submitted ${purchaseStamp()}`
+    output.success(
+      `Domain ${param(domainName)} order was submitted ${purchaseStamp()}`
     );
     output.note(
       `Your domain is processing and will be available once the order is completed.`
@@ -176,11 +176,7 @@ export default async function buy(
       `  An email will be sent upon completion for you to start using your new domain.\n`
     );
   } else {
-    console.log(
-      `${chalk.cyan('> Success!')} Domain ${param(
-        domainName
-      )} purchased ${purchaseStamp()}`
-    );
+    output.success(`Domain ${param(domainName)} purchased ${purchaseStamp()}`);
     if (!buyResult.verified) {
       output.note(
         `Your domain is not fully configured yet so it may appear as not verified.`

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

@@ -104,17 +104,15 @@ export const domainsCommand: Command = {
       name: 'next',
       description: 'Show next page of results',
       shorthand: 'N',
-      type: 'string',
+      type: String,
       deprecated: false,
-      multi: false,
     },
     {
       name: 'yes',
       description: 'Skip the confirmation prompt when removing a domain',
       shorthand: 'y',
-      type: 'boolean',
+      type: Boolean,
       deprecated: false,
-      multi: false,
     },
     {
       name: 'limit',
@@ -122,18 +120,16 @@ export const domainsCommand: Command = {
       description:
         'Number of results to return per page (default: 20, max: 100)',
       argument: 'NUMBER',
-      type: 'string',
+      type: String,
       deprecated: false,
-      multi: false,
     },
     {
       name: 'force',
       shorthand: 'f',
-      type: 'boolean',
+      type: Boolean,
       deprecated: false,
       description:
         'Force a domain on a project and remove it from an existing one',
-      multi: false,
     },
   ],
   examples: [

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;
@@ -121,10 +122,8 @@ export default async function transferIn(
     return 1;
   }
 
-  console.log(
-    `${chalk.cyan('> Success!')} Domain ${param(
-      domainName
-    )} transfer started ${transferStamp()}`
+  output.success(
+    `Domain ${param(domainName)} transfer started ${transferStamp()}`
   );
   output.print(
     `  To finalize the transfer, we are waiting for approval from your current registrar.\n`

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

@@ -20,6 +20,7 @@ import { isAPIError } from '../../util/errors-ts';
 type Options = {
   '--debug': boolean;
   '--sensitive': boolean;
+  '--force': boolean;
 };
 
 export default async function add(
@@ -29,9 +30,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 +64,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(
@@ -91,7 +82,7 @@ export default async function add(
   );
   const choices = envTargetChoices.filter(c => !existing.has(c.value));
 
-  if (choices.length === 0) {
+  if (choices.length === 0 && !opts['--force']) {
     output.error(
       `The variable ${param(
         envName
@@ -107,26 +98,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,15 +120,13 @@ 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';
+  const upsert = opts['--force'] ? 'true' : '';
 
   const addStamp = stamp();
   try {
@@ -154,6 +135,7 @@ export default async function add(
       output,
       client,
       project.id,
+      upsert,
       type,
       envName,
       envValue,
@@ -170,9 +152,11 @@ export default async function add(
 
   output.print(
     `${prependEmoji(
-      `Added Environment Variable ${chalk.bold(
-        envName
-      )} to Project ${chalk.bold(project.name)} ${chalk.gray(addStamp())}`,
+      `${
+        opts['--force'] ? 'Overrode' : 'Added'
+      } Environment Variable ${chalk.bold(envName)} to Project ${chalk.bold(
+        project.name
+      )} ${chalk.gray(addStamp())}`,
       emoji('success')
     )}\n`
   );

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

@@ -39,9 +39,15 @@ export const envCommand: Command = {
           name: 'sensitive',
           description: 'Add a sensitive Environment Variable',
           shorthand: null,
-          type: 'string',
+          type: String,
+          deprecated: false,
+        },
+        {
+          name: 'force',
+          description: 'Force overwrites when a command would normally fail',
+          shorthand: null,
+          type: Boolean,
           deprecated: false,
-          multi: false,
         },
       ],
       examples: [],
@@ -82,26 +88,23 @@ export const envCommand: Command = {
       description:
         'Set the Environment (development, preview, production) when pulling Environment Variables',
       shorthand: null,
-      type: 'boolean',
+      type: Boolean,
       deprecated: false,
-      multi: false,
     },
     {
       name: 'git-branch',
       description:
         'Specify the Git branch to pull specific Environment Variables for',
       shorthand: null,
-      type: 'string',
+      type: String,
       deprecated: false,
-      multi: false,
     },
     {
       name: 'yes',
       description: 'Skip the confirmation prompt when removing an alias',
       shorthand: 'y',
-      type: 'boolean',
+      type: Boolean,
       deprecated: false,
-      multi: false,
     },
   ],
   examples: [
@@ -126,6 +129,10 @@ export const envCommand: Command = {
         `${packageName} env add DB_PASS production`,
       ],
     },
+    {
+      name: 'Override an existing Environment Variable of same target (production, preview, deployment)',
+      value: `${packageName} env add API_TOKEN --force`,
+    },
     {
       name: 'Add a sensitive Environment Variable',
       value: `${packageName} env add API_TOKEN --sensitive`,

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

@@ -35,6 +35,7 @@ export default async function main(client: Client) {
       '--environment': String,
       '--git-branch': String,
       '--sensitive': Boolean,
+      '--force': Boolean,
     });
   } catch (error) {
     handleError(error);

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,19 +1,23 @@
 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';
 
+export type PrimitiveConstructor =
+  | typeof String
+  | typeof Boolean
+  | typeof Number;
+
 export interface CommandOption {
   name: string;
   shorthand: string | null;
-  type: 'boolean' | 'string';
+  type: PrimitiveConstructor | [PrimitiveConstructor];
   argument?: string;
   deprecated: boolean;
   description?: string;
-  /** supports multiple entries */
-  multi: boolean;
 }
 export interface CommandArgument {
   name: string;
@@ -39,23 +43,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,
@@ -66,79 +54,70 @@ const globalCommandOptions: CommandOption[] = [
   {
     name: 'help',
     shorthand: 'h',
-    type: 'string',
+    type: String,
     description: 'Output usage information',
     deprecated: false,
-    multi: false,
   },
   {
     name: 'version',
     shorthand: 'v',
-    type: 'string',
+    type: String,
     description: 'Output the version number',
     deprecated: false,
-    multi: false,
   },
   {
     name: 'cwd',
     shorthand: null,
-    type: 'string',
+    type: String,
     argument: 'DIR',
     description:
       'Sets the current working directory for a single run of a command',
     deprecated: false,
-    multi: false,
   },
   {
     name: 'local-config',
     shorthand: 'A',
-    type: 'string',
+    type: String,
     argument: 'FILE',
     description: 'Path to the local `vercel.json` file',
     deprecated: false,
-    multi: false,
   },
   {
     name: 'global-config',
     shorthand: 'Q',
-    type: 'string',
+    type: String,
     argument: 'DIR',
     description: 'Path to the global `.vercel` directory',
     deprecated: false,
-    multi: false,
   },
   {
     name: 'debug',
     shorthand: 'd',
-    type: 'string',
+    type: String,
     description: 'Debug mode (default off)',
     deprecated: false,
-    multi: false,
   },
   {
     name: 'no-color',
     shorthand: null,
-    type: 'string',
+    type: String,
     description: 'No color mode (default off)',
     deprecated: false,
-    multi: false,
   },
   {
     name: 'scope',
     shorthand: 'S',
-    type: 'string',
+    type: String,
     description: 'Set a custom scope',
     deprecated: false,
-    multi: false,
   },
   {
     name: 'token',
     shorthand: 't',
-    type: 'string',
+    type: String,
     argument: 'TOKEN',
     description: 'Login token',
     deprecated: false,
-    multi: false,
   },
 ];
 

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

@@ -21,9 +21,8 @@ export const initCommand: Command = {
       description: 'Overwrite destination directory if exists [off]',
       argument: undefined,
       shorthand: 'f',
-      type: 'boolean',
+      type: Boolean,
       deprecated: false,
-      multi: false,
     },
   ],
   examples: [

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/inspect/command.ts

@@ -16,17 +16,15 @@ export const inspectCommand: Command = {
       description: 'Time to wait for deployment completion [3m]',
       argument: 'TIME',
       shorthand: null,
-      type: 'string',
+      type: String,
       deprecated: false,
-      multi: false,
     },
     {
       name: 'wait',
       description: 'Blocks until deployment completes',
       shorthand: null,
-      type: 'string',
+      type: String,
       deprecated: false,
-      multi: false,
     },
   ],
   examples: [