Version Packages (#11322)

This PR was opened by the [Changesets
release](https://github.com/changesets/action) GitHub action. When
you're ready to do a release, you can merge this and the packages will
be published to npm automatically. If you're not ready to do a release
yet, that's fine, whenever you add more changesets to main, this PR will
be updated.


# Releases
## @vercel/build-utils@7.10.0

### Minor Changes

- Allow environment variables to be specified for `EdgeFunction`
([#11029](https://github.com/vercel/vercel/pull/11029))

## vercel@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`](988f7b75a2),
[`1825b58df`](1825b58df8)]:
    -   @vercel/remix-builder@2.1.5
    -   @vercel/build-utils@7.10.0
    -   @vercel/node@3.0.25
    -   @vercel/static-build@2.4.5

## @vercel/client@13.1.8

### Patch Changes

- Updated dependencies
\[[`1825b58df`](1825b58df8)]:
    -   @vercel/build-utils@7.10.0

## @vercel/frameworks@3.0.1

### Patch Changes

- Swap jest for vitest in CLI unit tests
([#11302](https://github.com/vercel/vercel/pull/11302))

## @vercel/fs-detectors@5.2.2

### Patch Changes

- Updated dependencies
\[[`9ed967034`](9ed967034d)]:
    -   @vercel/frameworks@3.0.1

## @vercel/gatsby-plugin-vercel-builder@2.0.23

### Patch Changes

- Updated dependencies
\[[`1825b58df`](1825b58df8)]:
    -   @vercel/build-utils@7.10.0

## @vercel/node@3.0.25

### Patch Changes

- Updated dependencies
\[[`1825b58df`](1825b58df8)]:
    -   @vercel/build-utils@7.10.0

## @vercel/remix-builder@2.1.5

### Patch Changes

- Add `mjs` and `mts` extensions to vite detection
([#11307](https://github.com/vercel/vercel/pull/11307))

## @vercel/static-build@2.4.5

### Patch Changes

-   Updated dependencies \[]:
    -   @vercel/gatsby-plugin-vercel-builder@2.0.23

## @vercel-internals/types@1.0.28

### Patch Changes

- Updated dependencies
\[[`1825b58df`](1825b58df8)]:
    -   @vercel/build-utils@7.10.0

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

.changeset/curly-eyes-travel.md

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

.changeset/eleven-pants-attack.md

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

.changeset/neat-tigers-pay.md

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

.changeset/next-14-1-4.md

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

.changeset/slimy-nails-rescue.md

@@ -1,5 +0,0 @@
----
-"@vercel/remix-builder": patch
----
-
-Add `mjs` and `mts` extensions to vite detection

.changeset/sour-experts-dress.md

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

.changeset/spicy-icons-serve.md

@@ -1,4 +0,0 @@
----
----
-
-Update CODEOWNERS

.changeset/tasty-bikes-push.md

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

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/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/package.json

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

internals/types/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @vercel-internals/types
 
+## 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

internals/types/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "@vercel-internals/types",
-  "version": "1.0.27",
+  "version": "1.0.28",
   "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.9.1",
+    "@vercel/build-utils": "7.10.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.5",
+    "turbo": "1.13.0",
     "typescript": "4.9.5"
   },
   "scripts": {

packages/build-utils/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @vercel/build-utils
 
+## 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

packages/build-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "7.9.1",
+  "version": "7.10.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/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';
+import type { Config, Env, Files, FunctionFramework } from './types';
-
-interface Environment {
-  [key: string]: string;
-}
 
 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/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/cli/CHANGELOG.md

@@ -1,5 +1,19 @@
 # vercel
 
+## 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

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vercel",
-  "version": "33.6.1",
+  "version": "33.6.2",
   "preferGlobal": true,
   "license": "Apache-2.0",
   "description": "The command-line interface for Vercel",
@@ -12,7 +12,7 @@
   },
   "scripts": {
     "test": "jest --reporters=default --reporters=jest-junit --env node --verbose --bail",
-    "test-unit": "pnpm test test/unit/",
+    "test-unit": "pnpm vitest test/unit/",
     "test-e2e": "rimraf test/fixtures/integration && pnpm test test/integration-1.test.ts test/integration-2.test.ts test/integration-3.test.ts",
     "test-dev": "pnpm test test/dev/",
     "coverage": "codecov",
@@ -31,17 +31,17 @@
     "node": ">= 16"
   },
   "dependencies": {
-    "@vercel/build-utils": "7.9.1",
+    "@vercel/build-utils": "7.10.0",
     "@vercel/fun": "1.1.0",
     "@vercel/go": "3.0.5",
     "@vercel/hydrogen": "1.0.2",
     "@vercel/next": "4.1.6",
-    "@vercel/node": "3.0.24",
+    "@vercel/node": "3.0.25",
     "@vercel/python": "4.1.1",
     "@vercel/redwood": "2.0.8",
-    "@vercel/remix-builder": "2.1.4",
+    "@vercel/remix-builder": "2.1.5",
     "@vercel/ruby": "2.0.5",
-    "@vercel/static-build": "2.4.4",
+    "@vercel/static-build": "2.4.5",
     "chokidar": "3.3.1"
   },
   "devDependencies": {
@@ -88,12 +88,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.27",
+    "@vercel-internals/types": "1.0.28",
-    "@vercel/client": "13.1.7",
+    "@vercel/client": "13.1.8",
     "@vercel/error-utils": "2.0.2",
-    "@vercel/frameworks": "3.0.0",
+    "@vercel/frameworks": "3.0.1",
-    "@vercel/fs-detectors": "5.2.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",
@@ -165,6 +166,8 @@
     "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/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,
@@ -695,7 +695,7 @@ async function getFramework(
 ): Promise<{ version: string } | undefined> {
   const detectedFramework = await detectFrameworkRecord({
     fs: new LocalFileSystemDetector(cwd),
-    frameworkList: frameworks,
+    frameworkList,
   });
 
   if (!detectedFramework) {

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

@@ -3,6 +3,7 @@ import {
   getSupportedNodeVersion,
   scanParentDirs,
 } from '@vercel/build-utils';
+import { isZeroConfigBuild } from '../../util/is-zero-config-build';
 import {
   fileNameSymbol,
   VALID_ARCHIVE_FORMATS,
@@ -564,7 +565,7 @@ export default async (client: Client): Promise<number> => {
       autoAssignCustomDomains,
     };
 
-    if (!localConfig.builds || localConfig.builds.length === 0) {
+    if (isZeroConfigBuild(localConfig.builds)) {
       // Only add projectSettings for zero config deployments
       createArgs.projectSettings = {
         sourceFilesOutsideRootDirectory,

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

@@ -30,7 +30,7 @@ export default async function add(
   output: Output
 ) {
   // improve the way we show inquirer prompts
-  require('../../util/input/patch-inquirer');
+  await import('../../util/input/patch-inquirer');
 
   const stdInput = await readStandardInput(client.stdin);
   let [envName, envTargetArg, envGitBranch] = args;

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

@@ -30,7 +30,7 @@ export default async function rm(
   output: Output
 ) {
   // improve the way we show inquirer prompts
-  require('../../util/input/patch-inquirer');
+  await import('../../util/input/patch-inquirer');
 
   if (args.length > 3) {
     output.error(

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

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

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

@@ -78,6 +78,12 @@ async function run({ output, contextName, currentTeam, client }) {
 
   const commandName = getCommandName('secret ' + subcommand);
 
+  output.warn(
+    'On May 1st, 2024 secrets will be automatically converted to sensitive Environment Variables for Preview and Production environments.\n' +
+      'Secrets attached to Development environments will not be migrated.' +
+      'See https://vercel.com/changelog/legacy-environment-variable-secrets-are-being-sunset for more information.'
+  );
+
   if (subcommand === 'ls' || subcommand === 'list') {
     output.note(
       `The ${getCommandName(

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

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

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

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

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

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

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

@@ -5,7 +5,7 @@ export default async function confirm(
   message: string,
   preferred: boolean
 ): Promise<boolean> {
-  require('./patch-inquirer');
+  await import('./patch-inquirer');
 
   const answers = await client.prompt({
     type: 'confirm',

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

@@ -1,7 +1,7 @@
 import inquirer from 'inquirer';
 import confirm from './confirm';
 import chalk from 'chalk';
-import frameworkList, { Framework } from '@vercel/frameworks';
+import { frameworkList, Framework } from '@vercel/frameworks';
 import Client from '../client';
 import { isSettingValue } from '../is-setting-value';
 import type { ProjectSettings } from '@vercel-internals/types';

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

@@ -54,7 +54,7 @@ export default async function list(
     eraseFinalAnswer = false, // If true, the line with the final answer that inquirer prints will be erased before returning
   }: ListOptions
 ): Promise<string> {
-  require('./patch-inquirer');
+  await import('./patch-inquirer');
 
   let biggestLength = 0;
   let selected: string | undefined;

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

@@ -10,7 +10,7 @@ export default async function selectOrg(
   question: string,
   autoConfirm?: boolean
 ): Promise<Org> {
-  require('./patch-inquirer');
+  await import('./patch-inquirer');
   const {
     output,
     config: { currentTeam },

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

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

packages/cli/src/util/is-zero-config-build.ts

@@ -0,0 +1,11 @@
+import { Builder } from '@vercel/build-utils';
+
+export function isZeroConfigBuild(builds?: Builder[]): boolean {
+  return (
+    !builds ||
+    builds.length === 0 ||
+    // If the zeroConfig property is set on all builds, still consider it as
+    // zero config deployment
+    builds.every(buildConfig => buildConfig.config?.zeroConfig)
+  );
+}

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

@@ -2,6 +2,7 @@ import { join, basename } from 'path';
 import chalk from 'chalk';
 import { remove } from 'fs-extra';
 import { ProjectLinkResult, ProjectSettings } from '@vercel-internals/types';
+import { isZeroConfigBuild } from '../is-zero-config-build';
 import {
   getLinkedProject,
   linkFolderToProject,
@@ -160,8 +161,7 @@ export default async function setupAndLink(
   }
 
   config.currentTeam = org.type === 'team' ? org.id : undefined;
-  const isZeroConfig =
+  const isZeroConfig = !localConfig || isZeroConfigBuild(localConfig.builds);
-    !localConfig || !localConfig.builds || localConfig.builds.length === 0;
 
   try {
     let settings: ProjectSettings = {};

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

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

packages/cli/test/dev/fixtures/08-hugo/package.json

@@ -0,0 +1,6 @@
+{
+  "private": true,
+  "engines": {
+    "node": "16.x"
+  }
+}

packages/cli/test/dev/fixtures/08-hugo/themes/ananke/exampleSite/content/contact.md

@@ -10,6 +10,6 @@ menu:
 ---
 
 
-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"  >}}

packages/cli/test/dev/fixtures/custom-runtime/package.json

@@ -0,0 +1,6 @@
+{
+  "private": true,
+  "engines": {
+    "node": "16.x"
+  }
+}

packages/cli/test/dev/fixtures/go-work-with-shared/package.json

@@ -0,0 +1,6 @@
+{
+  "private": true,
+  "engines": {
+    "node": "16.x"
+  }
+}

packages/cli/test/dev/fixtures/go/package.json

@@ -0,0 +1,6 @@
+{
+  "private": true,
+  "engines": {
+    "node": "16.x"
+  }
+}

packages/cli/test/dev/fixtures/python-flask/package.json

@@ -0,0 +1,6 @@
+{
+  "private": true,
+  "engines": {
+    "node": "16.x"
+  }
+}

packages/cli/test/dev/integration-2.test.ts

@@ -119,7 +119,6 @@ test(
     await testPath(200, `/api/date`, new RegExp(`Current date is ${year}`));
     await testPath(200, `/api/date.py`, new RegExp(`Current date is ${year}`));
     await testPath(200, `/api/headers`, (body: any, res: any) => {
-      // @ts-ignore
       const { host } = new URL(res.url);
       expect(body).toBe(host);
     });
@@ -198,7 +197,6 @@ test(
     );
 
     await testPath(200, `/api/dump`, (body: any, res: any, isDev: any) => {
-      // @ts-ignore
       const { host } = new URL(res.url);
       const { env, headers } = JSON.parse(body);
 

packages/cli/test/fixtures/unit/pnpm-pnp-symlink/package.json

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

packages/cli/test/helpers/prepare.js

@@ -348,6 +348,9 @@ module.exports = async function prepare(session, binaryPath, tmpFixturesDir) {
     },
     'lambda-with-php-runtime': {
       'api/test.php': `<?php echo 'Hello from PHP'; ?>`,
+      'package.json': JSON.stringify({
+        engines: { node: '18.x' },
+      }),
       'vercel.json': JSON.stringify({
         functions: {
           'api/**/*.php': {

packages/cli/test/helpers/setup-unit-fixture.ts

@@ -1,3 +1,4 @@
+import { afterAll } from 'vitest';
 import findUp from 'find-up';
 import fs from 'fs-extra';
 import path from 'path';

packages/cli/test/mocks/client.ts

@@ -1,4 +1,5 @@
 const originalCwd = process.cwd();
+import { afterAll, beforeAll, afterEach } from 'vitest';
 
 // Register Jest matcher extensions for CLI unit tests
 import './matchers';

packages/cli/test/mocks/deployment.ts

@@ -1,3 +1,4 @@
+import { beforeEach } from 'vitest';
 import { URL } from 'url';
 import chance from 'chance';
 import { client } from './client';

packages/cli/test/mocks/matchers/index.ts

@@ -1,63 +1,13 @@
-/**
+import { expect } from 'vitest';
- * This file registers the custom Jest "matchers" that are useful for
+import { toOutput } from './matchers';
- * writing CLI unit tests, and sets them up to be recognized by TypeScript.
- *
- * References:
- *  - https://haspar.us/notes/adding-jest-custom-matchers-in-typescript
- *  - https://gist.github.com/hasparus/4ebaa17ec5d3d44607f522bcb1cda9fb
- */
 
-/// <reference types="@types/jest" />
+interface ToOutputMatchers<R = unknown> {
+  toOutput: (test: string, timeout?: number) => Promise<R>;
+}
 
-import * as matchers from './matchers';
+declare module 'vitest' {
-
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-type Tail<T extends unknown[]> = T extends [infer _Head, ...infer Tail]
-  ? Tail
-  : never;
-
-type AnyFunction = (...args: any[]) => any;
-type PromiseFunction = (...args: any[]) => Promise<any>;
-
-type GetMatcherType<TP, TResult> = TP extends PromiseFunction
-  ? (...args: Tail<Parameters<TP>>) => Promise<TResult>
-  : TP extends AnyFunction
-  ? (...args: Tail<Parameters<TP>>) => TResult
-  : TP;
-
-type GetMatchersType<TMatchers, TResult> = {
-  [P in keyof TMatchers]: GetMatcherType<TMatchers[P], TResult>;
-};
-
-type FirstParam<T extends AnyFunction> = Parameters<T>[0];
-
-type OnlyMethodsWhereFirstArgIsOfType<TObject, TWantedFirstArg> = {
-  [P in keyof TObject]: TObject[P] extends AnyFunction
-    ? TWantedFirstArg extends FirstParam<TObject[P]>
-      ? TObject[P]
-      : [
-          `Error: this function is present only when received is:`,
-          FirstParam<TObject[P]>
-        ]
-    : TObject[P];
-};
-
-declare global {
-  // eslint-disable-next-line @typescript-eslint/no-namespace
-  namespace jest {
   // eslint-disable-next-line @typescript-eslint/no-empty-interface
-    interface Matchers<R, T = {}>
+  interface Assertion<T = any> extends ToOutputMatchers<T> {}
-      extends GetMatchersType<
-        OnlyMethodsWhereFirstArgIsOfType<typeof matchers, T>,
-        R
-      > {}
-  }
 }
 
-const jestExpect = (global as any).expect;
+expect.extend({ toOutput });
-
-if (jestExpect !== undefined) {
-  jestExpect.extend(matchers);
-} else {
-  console.error("Couldn't find Jest's global expect.");
-}

packages/cli/test/mocks/matchers/to-output.ts

@@ -5,7 +5,7 @@ import {
   printReceived,
 } from 'jest-matcher-utils';
 import type { Readable } from 'stream';
-import type { MatcherState } from 'expect';
+import type { MatcherState } from '@vitest/expect';
 import type { MatcherHintOptions } from 'jest-matcher-utils';
 
 export async function toOutput(
@@ -13,7 +13,10 @@ export async function toOutput(
   stream: Readable,
   test: string,
   timeout = 3000
-) {
+): Promise<{
+  pass: boolean;
+  message: () => string;
+}> {
   const { isNot } = this;
   const matcherName = 'toOutput';
   const matcherHintOptions: MatcherHintOptions = {

packages/cli/test/unit/commands/__snapshots__/help.test.ts.snap

@@ -1,6 +1,6 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`help command help output snapshots column width 40 1`] = `
+exports[`help command > help output snapshots > column width 40 1`] = `
 "
   ▲ vercel deploy [project-path] [options]
 
@@ -186,7 +186,7 @@ exports[`help command help output snapshots column width 40 1`] = `
 "
 `;
 
-exports[`help command help output snapshots column width 80 1`] = `
+exports[`help command > help output snapshots > column width 80 1`] = `
 "
   ▲ vercel deploy [project-path] [options]
 
@@ -260,7 +260,7 @@ exports[`help command help output snapshots column width 80 1`] = `
 "
 `;
 
-exports[`help command help output snapshots column width 120 1`] = `
+exports[`help command > help output snapshots > column width 120 1`] = `
 "
   ▲ vercel deploy [project-path] [options]
 

packages/cli/test/unit/commands/alias.test.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from 'vitest';
 import { client } from '../../mocks/client';
 import alias from '../../../src/commands/alias';
 import { useUser } from '../../mocks/user';

packages/cli/test/unit/commands/bisect.test.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from 'vitest';
 import { client } from '../../mocks/client';
 import { useUser } from '../../mocks/user';
 import bisect from '../../../src/commands/bisect';

packages/cli/test/unit/commands/build/index.test.ts

@@ -1,3 +1,4 @@
+import { beforeAll, beforeEach, describe, expect, it } from 'vitest';
 import fs from 'fs-extra';
 import { join } from 'path';
 import { getWriteableDirectory } from '@vercel/build-utils';
@@ -7,8 +8,9 @@ import { defaultProject, useProject } from '../../../mocks/project';
 import { useTeams } from '../../../mocks/team';
 import { useUser } from '../../../mocks/user';
 import { execSync } from 'child_process';
+import { vi } from 'vitest';
 
-jest.setTimeout(6 * 60 * 1000);
+vi.setConfig({ testTimeout: 6 * 60 * 1000 });
 
 const fixture = (name: string) =>
   join(__dirname, '../../../fixtures/unit/commands/build', name);
@@ -932,7 +934,7 @@ describe('build', () => {
       name: 'Error',
       message:
         'Invalid vercel.json - `rewrites[2]` should NOT have additional property `src`. Did you mean `source`?',
-      stack: expect.stringContaining('at validateConfig'),
+      stack: expect.stringContaining('at Module.validateConfig'),
       hideStackTrace: true,
       code: 'INVALID_VERCEL_CONFIG',
       link: 'https://vercel.com/docs/concepts/projects/project-configuration#rewrites',

packages/cli/test/unit/commands/certs.test.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from 'vitest';
 import { client } from '../../mocks/client';
 import certs from '../../../src/commands/certs';
 import { useUser } from '../../mocks/user';

packages/cli/test/unit/commands/deploy.test.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from 'vitest';
 import bytes from 'bytes';
 import fs from 'fs-extra';
 import { join } from 'path';

packages/cli/test/unit/commands/dns.test.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from 'vitest';
 import { client } from '../../mocks/client';
 import dns from '../../../src/commands/dns';
 import { useUser } from '../../mocks/user';

packages/cli/test/unit/commands/domains.test.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from 'vitest';
 import { client } from '../../mocks/client';
 import domains from '../../../src/commands/domains';
 import { useUser } from '../../mocks/user';

packages/cli/test/unit/commands/env.test.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from 'vitest';
 import fs from 'fs-extra';
 import path from 'path';
 import { parse } from 'dotenv';

packages/cli/test/unit/commands/git.test.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from 'vitest';
 import { join } from 'path';
 import fs from 'fs-extra';
 import { useUser } from '../../mocks/user';

packages/cli/test/unit/commands/help.test.ts

@@ -1,3 +1,4 @@
+import { describe, expect, test } from 'vitest';
 import {
   help,
   lineToString,

packages/cli/test/unit/commands/inspect.test.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from 'vitest';
 import { client } from '../../mocks/client';
 import { useUser } from '../../mocks/user';
 import { useDeployment } from '../../mocks/deployment';

packages/cli/test/unit/commands/link.test.ts

@@ -1,3 +1,4 @@
+import { describe, it, expect } from 'vitest';
 import { basename, join } from 'path';
 import { readJSON } from 'fs-extra';
 import link from '../../../src/commands/link';

packages/cli/test/unit/commands/list.test.ts

@@ -1,3 +1,4 @@
+import { describe, it, expect } from 'vitest';
 import createLineIterator from 'line-async-iterator';
 import { client } from '../../mocks/client';
 import { useUser } from '../../mocks/user';

packages/cli/test/unit/commands/login.test.ts

@@ -1,9 +1,11 @@
+import { afterEach, beforeEach, describe, expect, it } from 'vitest';
 import login from '../../../src/commands/login';
 import { emoji } from '../../../src/util/emoji';
 import { client } from '../../mocks/client';
 import { useUser } from '../../mocks/user';
+import { vi } from 'vitest';
 
-jest.setTimeout(10000);
+vi.setConfig({ testTimeout: 10000 });
 
 describe('login', () => {
   it('should not allow the `--token` flag', async () => {

packages/cli/test/unit/commands/project.test.ts

@@ -1,3 +1,4 @@
+import { describe, it, expect } from 'vitest';
 import createLineIterator from 'line-async-iterator';
 import projects from '../../../src/commands/project';
 import { useUser } from '../../mocks/user';
@@ -6,6 +7,7 @@ import { defaultProject, useProject } from '../../mocks/project';
 import { client } from '../../mocks/client';
 import type { Project } from '@vercel-internals/types';
 import { parseSpacedTableRow } from '../../helpers/parse-table';
+import { vi } from 'vitest';
 
 describe('project', () => {
   describe('list', () => {
@@ -46,7 +48,7 @@ describe('project', () => {
     });
 
     it('should list projects running on an soon-to-be-deprecated Node.js version', async () => {
-      jest.useFakeTimers().setSystemTime(new Date('2023-12-08'));
+      vi.useFakeTimers().setSystemTime(new Date('2023-12-08'));
 
       const user = useUser();
       useTeams('team_dummy');
@@ -91,7 +93,7 @@ describe('project', () => {
       data.pop();
       expect(data).toEqual([project.project.name, 'https://foobar.com']);
 
-      jest.clearAllTimers();
+      vi.clearAllTimers();
     });
 
     it('should list projects when there is no production deployment', async () => {

packages/cli/test/unit/commands/promote.test.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from 'vitest';
 import chalk from 'chalk';
 import { client } from '../../mocks/client';
 import { defaultProject, useProject } from '../../mocks/project';
@@ -9,8 +10,9 @@ import { useDeployment } from '../../mocks/deployment';
 import { useTeams } from '../../mocks/team';
 import { useUser } from '../../mocks/user';
 import sleep from '../../../src/util/sleep';
+import { vi } from 'vitest';
 
-jest.setTimeout(60000);
+vi.setConfig({ testTimeout: 60000 });
 
 describe('promote', () => {
   it('should error if timeout is invalid', async () => {

packages/cli/test/unit/commands/pull.test.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from 'vitest';
 import fs from 'fs-extra';
 import path from 'path';
 import pull from '../../../src/commands/pull';

packages/cli/test/unit/commands/redeploy.test.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from 'vitest';
 import { client } from '../../mocks/client';
 import { defaultProject, useProject } from '../../mocks/project';
 import redeploy from '../../../src/commands/redeploy';

packages/cli/test/unit/commands/remove.test.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from 'vitest';
 import { client } from '../../mocks/client';
 import {
   defaultProject,

packages/cli/test/unit/commands/rollback.test.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from 'vitest';
 import chalk from 'chalk';
 import { client } from '../../mocks/client';
 import { defaultProject, useProject } from '../../mocks/project';
@@ -9,8 +10,9 @@ import { useDeployment } from '../../mocks/deployment';
 import { useTeams } from '../../mocks/team';
 import { useUser } from '../../mocks/user';
 import sleep from '../../../src/util/sleep';
+import { vi } from 'vitest';
 
-jest.setTimeout(60000);
+vi.setConfig({ testTimeout: 60000 });
 
 describe('rollback', () => {
   it('should error if timeout is invalid', async () => {

packages/cli/test/unit/commands/secrets.test.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from 'vitest';
 import { client } from '../../mocks/client';
 import secrets from '../../../src/commands/secrets';
 import { useSecrets } from '../../mocks/secrets';

packages/cli/test/unit/commands/switch.test.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from 'vitest';
 import { client } from '../../mocks/client';
 import teamsSwitch from '../../../src/commands/teams/switch';
 import { useUser } from '../../mocks/user';

packages/cli/test/unit/commands/teams.test.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from 'vitest';
 import { client } from '../../mocks/client';
 import teamsList from '../../../src/commands/teams/list';
 import { useUser } from '../../mocks/user';

packages/cli/test/unit/commands/whoami.test.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from 'vitest';
 import { client } from '../../mocks/client';
 import { useUser } from '../../mocks/user';
 import whoami from '../../../src/commands/whoami';

packages/cli/test/unit/util/bisect/normalize-url.test.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from 'vitest';
 import { normalizeURL } from '../../../../src/util/bisect/normalize-url';
 
 describe('normalize-url', () => {

packages/cli/test/unit/util/build/import-builders.test.ts

@@ -1,3 +1,4 @@
+import { describe, it, expect } from 'vitest';
 import { join } from 'path';
 import { remove } from 'fs-extra';
 import { getWriteableDirectory } from '@vercel/build-utils';
@@ -8,9 +9,10 @@ import {
 } from '../../../../src/util/build/import-builders';
 import vercelNextPkg from '@vercel/next/package.json';
 import vercelNodePkg from '@vercel/node/package.json';
+import { vi } from 'vitest';
 
 // these tests can take upwards of 190s on macos-latest
-jest.setTimeout(4 * 60 * 1000);
+vi.setConfig({ testTimeout: 4 * 60 * 1000 });
 
 const repoRoot = join(__dirname, '../../../../../..');
 

packages/cli/test/unit/util/build/merge.test.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from 'vitest';
 import { tmpdir } from 'os';
 import { join } from 'path';
 import { writeFile, readdir, mkdirp, stat, remove, readFile } from 'fs-extra';

packages/cli/test/unit/util/build/scrub-argv.test.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from 'vitest';
 import { scrubArgv } from '../../../../src/util/build/scrub-argv';
 
 describe('scrubArgv()', () => {

packages/cli/test/unit/util/build/sort-builders.test.ts

@@ -1,3 +1,4 @@
+import { describe, expect, test } from 'vitest';
 import { sortBuilders } from '../../../../src/util/build/sort-builders';
 
 describe('sortBuilders()', () => {

packages/cli/test/unit/util/client.test.ts

@@ -1,3 +1,4 @@
+import { beforeEach, describe, expect, it } from 'vitest';
 import { listen } from 'async-listen';
 import { createProxy } from 'proxy';
 import { ProxyAgent } from 'proxy-agent';

packages/cli/test/unit/util/confirm.test.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from 'vitest';
 import confirm from '../../../src/util/input/confirm';
 import { client } from '../../mocks/client';
 

packages/cli/test/unit/util/deploy/create-git-meta.test.ts

@@ -1,3 +1,4 @@
+import { describe, it, expect } from 'vitest';
 import { join } from 'path';
 import fs from 'fs-extra';
 import os from 'os';
@@ -14,8 +15,9 @@ import { parseRepoUrl } from '../../../../src/util/git/connect-git-provider';
 import { useUser } from '../../../mocks/user';
 import { defaultProject, useProject } from '../../../mocks/project';
 import type { Project } from '@vercel-internals/types';
+import { vi } from 'vitest';
 
-jest.setTimeout(10 * 1000);
+vi.setConfig({ testTimeout: 10 * 1000 });
 
 const fixture = (name: string) =>
   join(__dirname, '../../../fixtures/unit/create-git-meta', name);

packages/cli/test/unit/util/deploy/parse-target.test.ts

@@ -1,13 +1,15 @@
+import { describe, beforeEach, it, expect } from 'vitest';
 import parseTarget from '../../../../src/util/deploy/parse-target';
 import { Output } from '../../../../src/util/output';
+import { Mock, vi } from 'vitest';
 
 describe('parseTarget', () => {
   let output: Output;
 
   beforeEach(() => {
     output = new Output();
-    output.warn = jest.fn();
+    output.warn = vi.fn();
-    output.error = jest.fn();
+    output.error = vi.fn();
   });
 
   it('defaults to `undefined`', () => {
@@ -19,7 +21,7 @@ describe('parseTarget', () => {
     const result = parseTarget(output, 'not-a-real-environment');
     expect(result).toEqual(1);
 
-    const errorMock = (output.error as jest.Mock<any, any>).mock;
+    const errorMock = (output.error as Mock<any, any>).mock;
     expect(errorMock.calls[0][0]).toMatch(
       /not-a-real-environment.+is not valid/g
     );

packages/cli/test/unit/util/dev/headers.test.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from 'vitest';
 import { Headers } from 'node-fetch';
 import { applyOverriddenHeaders } from '../../../../src/util/dev/headers';
 

packages/cli/test/unit/util/dev/mime-type.test.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from 'vitest';
 import getMimeType from '../../../../src/util/dev/mime-type';
 
 describe('mime-type', () => {

packages/cli/test/unit/util/dev/parse-listen.test.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it, test } from 'vitest';
 import {
   parseListen,
   replaceLocalhost,

packages/cli/test/unit/util/dev/parse-query-string.test.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from 'vitest';
 import {
   parseQueryString,
   formatQueryString,

packages/cli/test/unit/util/dev/router.test.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from 'vitest';
 import { devRouter } from '../../../../src/util/dev/router';
 
 describe('devRouter', () => {

packages/cli/test/unit/util/dev/validate.test.ts

@@ -1,3 +1,4 @@
+import { describe, it, expect } from 'vitest';
 import { validateConfig } from '../../../../src/util/validate-config';
 
 describe('validateConfig', () => {

packages/cli/test/unit/util/error.test.ts

@@ -1,3 +1,4 @@
+import { afterAll, beforeAll, describe, expect, it } from 'vitest';
 import fetch from 'node-fetch';
 import { listen } from 'async-listen';
 import { createServer, IncomingMessage, Server, ServerResponse } from 'http';

packages/cli/test/unit/util/get-files.test.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from 'vitest';
 import { join, sep } from 'path';
 // @ts-ignore - Missing types for "alpha-sort"
 import { asc as alpha } from 'alpha-sort';

packages/cli/test/unit/util/get-latest-version.test.ts

@@ -1,12 +1,14 @@
+import { describe, it, expect, afterEach } from 'vitest';
 import fs from 'fs-extra';
 import sleep from '../../../src/util/sleep';
 import tmp from 'tmp-promise';
 import getLatestVersion from '../../../src/util/get-latest-version';
 import { join } from 'path';
+import { vi } from 'vitest';
 
 tmp.setGracefulCleanup();
 
-jest.setTimeout(25000);
+vi.setConfig({ testTimeout: 25000 });
 
 const cacheDir = tmp.tmpNameSync({
   prefix: 'test-vercel-cli-get-latest-version-',

packages/cli/test/unit/util/get-pagination-opts.test.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from 'vitest';
 import { getPaginationOpts } from '../../../src/util/get-pagination-opts';
 import getArgs from '../../../src/util/get-args';
 

packages/cli/test/unit/util/get-project-name.test.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from 'vitest';
 import getProjectName from '../../../src/util/get-project-name';
 
 describe('getProjectName', () => {