Version Packages (#11275)

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.9.1

### Patch Changes

- Export `getSupportedNodeVersion`
([#11277](https://github.com/vercel/vercel/pull/11277))

## vercel@33.6.1

### Patch Changes

- Don't send `projectSettings.nodeVersion` for unsupported versions
([#11277](https://github.com/vercel/vercel/pull/11277))

- Updated dependencies
\[[`4bca0c6d0`](4bca0c6d0b),
[`a67ad4b5a`](a67ad4b5a1),
[`11218a179`](11218a1798),
[`64b97bf4b`](64b97bf4b5)]:
    -   @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

## @vercel/client@13.1.7

### Patch Changes

- Updated dependencies
\[[`11218a179`](11218a1798)]:
    -   @vercel/build-utils@7.9.1

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

### Patch Changes

- Updated dependencies
\[[`11218a179`](11218a1798)]:
    -   @vercel/build-utils@7.9.1

## @vercel/next@4.1.6

### Patch Changes

- Ensure that static PPR pages have static streaming lambda paths.
([#11259](https://github.com/vercel/vercel/pull/11259))

## @vercel/node@3.0.24

### Patch Changes

- Updated dependencies
\[[`11218a179`](11218a1798)]:
    -   @vercel/build-utils@7.9.1

## @vercel/remix-builder@2.1.4

### Patch Changes

- Disable `prepareCache()` npm install for Remix + Vite
([#11281](https://github.com/vercel/vercel/pull/11281))

## @vercel/static-build@2.4.4

### Patch Changes

- [framework-fixtures]: Bump the core group in
/packages/static-build/test/fixtures/angular-v17 with 15 updates
([#11274](https://github.com/vercel/vercel/pull/11274))

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

## @vercel-internals/types@1.0.27

### Patch Changes

- Updated dependencies
\[[`11218a179`](11218a1798)]:
    -   @vercel/build-utils@7.9.1

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

.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
+/.github/workflows                       @TooTallNate @EndangeredMassa @trek @onsclom @ijjk
+/packages/fs-detectors                   @TooTallNate @EndangeredMassa @trek @onsclom @agadzik @chloetedder
+/packages/next                           @TooTallNate @EndangeredMassa @trek @onsclom @timneutkens @ijjk @ztanner @huozhi @Ethan-Arrowood @styfle
+/packages/routing-utils                  @TooTallNate @EndangeredMassa @trek @onsclom @ijjk
+/packages/static-build                   @TooTallNate @EndangeredMassa @trek @onsclom
+/packages/edge                           @TooTallNate @EndangeredMassa @trek @onsclom @vercel/compute
+/examples                                @TooTallNate @EndangeredMassa @trek @onsclom @leerob
+/examples/create-react-app               @TooTallNate @EndangeredMassa @trek @onsclom @Timer
+/examples/nextjs                         @TooTallNate @EndangeredMassa @trek @onsclom @timneutkens @ijjk @ztanner @huozhi @Ethan-Arrowood @styfle
+/packages/node                           @TooTallNate @EndangeredMassa @trek @onsclom @Kikobeats
 
 # Unrestricted Paths
 .changeset/

.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*'

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
 

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/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/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

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

internals/types/CHANGELOG.md

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

internals/types/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "@vercel-internals/types",
-  "version": "1.0.25",
+  "version": "1.0.27",
   "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.8.0",
+    "@vercel/build-utils": "7.9.1",
     "@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.12.5",
     "typescript": "4.9.5"
   },
   "scripts": {

packages/build-utils/CHANGELOG.md

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

packages/build-utils/package.json

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

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',

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,

packages/cli/CHANGELOG.md

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

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.5",
+  "version": "33.6.1",
   "preferGlobal": true,
   "license": "Apache-2.0",
   "description": "The command-line interface for Vercel",
@@ -31,17 +31,17 @@
     "node": ">= 16"
   },
   "dependencies": {
-    "@vercel/build-utils": "7.8.0",
+    "@vercel/build-utils": "7.9.1",
     "@vercel/fun": "1.1.0",
     "@vercel/go": "3.0.5",
     "@vercel/hydrogen": "1.0.2",
-    "@vercel/next": "4.1.5",
-    "@vercel/node": "3.0.22",
+    "@vercel/next": "4.1.6",
+    "@vercel/node": "3.0.24",
     "@vercel/python": "4.1.1",
     "@vercel/redwood": "2.0.8",
-    "@vercel/remix-builder": "2.1.2",
+    "@vercel/remix-builder": "2.1.4",
     "@vercel/ruby": "2.0.5",
-    "@vercel/static-build": "2.4.2",
+    "@vercel/static-build": "2.4.4",
     "chokidar": "3.3.1"
   },
   "devDependencies": {
@@ -88,8 +88,8 @@
     "@types/yauzl-promise": "2.1.0",
     "@vercel-internals/constants": "1.0.4",
     "@vercel-internals/get-package-json": "1.0.0",
-    "@vercel-internals/types": "1.0.25",
-    "@vercel/client": "13.1.5",
+    "@vercel-internals/types": "1.0.27",
+    "@vercel/client": "13.1.7",
     "@vercel/error-utils": "2.0.2",
     "@vercel/frameworks": "3.0.0",
     "@vercel/fs-detectors": "5.2.1",
@@ -165,8 +165,6 @@
     "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

@@ -257,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
@@ -664,7 +661,7 @@ async function doBuild(
   const mergedOverrides: Record<string, PathOverride> =
     overrides.length > 0 ? Object.assign({}, ...overrides) : undefined;
 
-  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

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

@@ -1,73 +1,77 @@
-import ms from 'ms';
-import fs from 'fs-extra';
-import bytes from 'bytes';
-import chalk from 'chalk';
-import { join, resolve } from 'path';
+import {
+  getPrettyError,
+  getSupportedNodeVersion,
+  scanParentDirs,
+} from '@vercel/build-utils';
 import {
   fileNameSymbol,
   VALID_ARCHIVE_FORMATS,
   VercelConfig,
 } from '@vercel/client';
-import code from '../../util/output/code';
-import highlight from '../../util/output/highlight';
-import { readLocalConfig } from '../../util/config/files';
-import getArgs from '../../util/get-args';
-import { handleError } from '../../util/error';
-import Client from '../../util/client';
-import { getPrettyError } from '@vercel/build-utils';
-import toHumanPath from '../../util/humanize-path';
+import { errorToString, isErrnoException, isError } from '@vercel/error-utils';
+import bytes from 'bytes';
+import chalk from 'chalk';
+import fs from 'fs-extra';
+import ms from 'ms';
+import { join, resolve } from 'path';
 import Now, { CreateOptions } from '../../util';
-import stamp from '../../util/output/stamp';
+import Client from '../../util/client';
+import { readLocalConfig } from '../../util/config/files';
+import { createGitMeta } from '../../util/create-git-meta';
 import createDeploy from '../../util/deploy/create-deploy';
-import getDeployment from '../../util/get-deployment';
-import parseMeta from '../../util/parse-meta';
-import param from '../../util/output/param';
+import { getDeploymentChecks } from '../../util/deploy/get-deployment-checks';
+import getPrebuiltJson from '../../util/deploy/get-prebuilt-json';
+import parseTarget from '../../util/deploy/parse-target';
+import { printDeploymentStatus } from '../../util/deploy/print-deployment-status';
+import { isValidArchive } from '../../util/deploy/validate-archive-format';
+import purchaseDomainIfAvailable from '../../util/domains/purchase-domain-if-available';
+import { emoji, prependEmoji } from '../../util/emoji';
+import { handleError } from '../../util/error';
+import { SchemaValidationFailed } from '../../util/errors';
 import {
+  AliasDomainConfigured,
+  BuildError,
   BuildsRateLimited,
+  ConflictingFilePath,
+  ConflictingPathSegment,
   DeploymentNotFound,
+  DeploymentsRateLimited,
   DomainNotFound,
   DomainNotVerified,
   DomainPermissionDenied,
   DomainVerificationFailed,
   InvalidDomain,
+  isAPIError,
+  MissingBuildScript,
+  NotDomainOwner,
   TooManyRequests,
   UserAborted,
-  DeploymentsRateLimited,
-  AliasDomainConfigured,
-  MissingBuildScript,
-  ConflictingFilePath,
-  ConflictingPathSegment,
-  BuildError,
-  NotDomainOwner,
-  isAPIError,
 } from '../../util/errors-ts';
-import { SchemaValidationFailed } from '../../util/errors';
-import purchaseDomainIfAvailable from '../../util/domains/purchase-domain-if-available';
+import getArgs from '../../util/get-args';
+import getDeployment from '../../util/get-deployment';
+import getProjectName from '../../util/get-project-name';
+import toHumanPath from '../../util/humanize-path';
 import confirm from '../../util/input/confirm';
 import editProjectSettings from '../../util/input/edit-project-settings';
+import inputProject from '../../util/input/input-project';
+import { inputRootDirectory } from '../../util/input/input-root-directory';
+import selectOrg from '../../util/input/select-org';
+import { Output } from '../../util/output';
+import code from '../../util/output/code';
+import highlight from '../../util/output/highlight';
+import param from '../../util/output/param';
+import stamp from '../../util/output/stamp';
+import { parseEnv } from '../../util/parse-env';
+import parseMeta from '../../util/parse-meta';
+import { getCommandName } from '../../util/pkg-name';
 import {
   getLinkedProject,
   linkFolderToProject,
 } from '../../util/projects/link';
-import getProjectName from '../../util/get-project-name';
-import selectOrg from '../../util/input/select-org';
-import inputProject from '../../util/input/input-project';
-import { prependEmoji, emoji } from '../../util/emoji';
-import { inputRootDirectory } from '../../util/input/input-root-directory';
+import { pickOverrides } from '../../util/projects/project-settings';
 import validatePaths, {
   validateRootDirectory,
 } from '../../util/validate-paths';
-import { getCommandName } from '../../util/pkg-name';
-import { Output } from '../../util/output';
-import { getDeploymentChecks } from '../../util/deploy/get-deployment-checks';
-import parseTarget from '../../util/deploy/parse-target';
-import getPrebuiltJson from '../../util/deploy/get-prebuilt-json';
-import { createGitMeta } from '../../util/create-git-meta';
-import { isValidArchive } from '../../util/deploy/validate-archive-format';
-import { parseEnv } from '../../util/parse-env';
-import { errorToString, isErrnoException, isError } from '@vercel/error-utils';
-import { pickOverrides } from '../../util/projects/project-settings';
-import { printDeploymentStatus } from '../../util/deploy/print-deployment-status';
 import { help } from '../help';
 import { deployCommand } from './command';
 
@@ -513,6 +517,23 @@ export default async (client: Client): Promise<number> => {
     );
   }
 
+  const { packageJson } = await scanParentDirs(
+    join(cwd, project?.rootDirectory ?? ''),
+    true,
+    cwd
+  );
+  let nodeVersion: string | undefined;
+  if (packageJson?.engines?.node) {
+    try {
+      const { range } = await getSupportedNodeVersion(packageJson.engines.node);
+      nodeVersion = range;
+    } catch (error) {
+      if (error instanceof Error) {
+        output.warn(error.message);
+      }
+    }
+  }
+
   try {
     // if this flag is not set, use `undefined` to allow the project setting to be used
     const autoAssignCustomDomains = argv['--skip-domain'] ? false : undefined;
@@ -548,6 +569,7 @@ export default async (client: Client): Promise<number> => {
       createArgs.projectSettings = {
         sourceFilesOutsideRootDirectory,
         rootDirectory,
+        nodeVersion,
       };
 
       if (status !== 'not_linked') {

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
-  await import('../../util/input/patch-inquirer');
+  require('../../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
-  await import('../../util/input/patch-inquirer');
+  require('../../util/input/patch-inquirer');
 
   if (args.length > 3) {
     output.error(

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

@@ -1,10 +1,11 @@
-import { frameworks as 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/dev/server.ts

@@ -45,7 +45,7 @@ import {
   detectApiExtensions,
   isOfficialRuntime,
 } from '@vercel/fs-detectors';
-import { frameworks as 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> {
-  await import('./patch-inquirer');
+  require('./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 { Framework, frameworks as frameworkList } 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> {
-  await import('./patch-inquirer');
+  require('./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> {
-  await import('./patch-inquirer');
+  require('./patch-inquirer');
   const {
     output,
     config: { currentTeam },

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

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

packages/cli/test/dev/utils.js

@@ -10,9 +10,8 @@ const {
   disableSSO,
 } = require('../../../../test/lib/deployment/now-deploy');
 const { spawnSync, execFileSync } = require('child_process');
-const vitest = require('vitest');
 
-vitest.vi.setConfig({ testTimeout: 10 * 60 * 1000 });
+jest.setTimeout(10 * 60 * 1000);
 
 const isCI = !!process.env.CI;
 const sleep = ms => new Promise(resolve => setTimeout(resolve, ms));

packages/cli/test/fixtures/unit/.gitignore

@@ -0,0 +1 @@
+!.vercel

packages/cli/test/fixtures/unit/commands/build/monorepo/.vercel/project.json

@@ -0,0 +1,8 @@
+{
+  "orgId": ".",
+  "projectId": ".",
+  "settings": {
+    "framework": "next",
+    "rootDirectory": "apps/nextjs"
+  }
+}

packages/cli/test/fixtures/unit/commands/build/monorepo/apps/nextjs/.gitignore

@@ -0,0 +1,36 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+.yarn/install-state.gz
+
+# testing
+/coverage
+
+# next.js
+/.next/
+/out/
+
+# production
+/build
+
+# misc
+.DS_Store
+*.pem
+
+# debug
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# local env files
+.env*.local
+
+# vercel
+.vercel
+
+# typescript
+*.tsbuildinfo
+next-env.d.ts

packages/cli/test/fixtures/unit/commands/build/monorepo/apps/nextjs/next.config.js

@@ -0,0 +1 @@
+module.exports = {};

packages/cli/test/fixtures/unit/commands/build/monorepo/apps/nextjs/package.json

@@ -0,0 +1,11 @@
+{
+  "name": "nextjs-monorepo-test",
+  "scripts": {
+    "build": "next build"
+  },
+  "dependencies": {
+    "react": "^18",
+    "react-dom": "^18",
+    "next": "^12"
+  }
+}

packages/cli/test/fixtures/unit/commands/build/monorepo/apps/nextjs/pages/index.jsx

@@ -0,0 +1 @@
+export default () => <div>Hi</div>

packages/cli/test/fixtures/unit/commands/build/monorepo/package-lock.json

@@ -0,0 +1,463 @@
+{
+  "name": "monorepo",
+  "version": "0.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "monorepo",
+      "version": "0.0.0",
+      "workspaces": [
+        "apps/*"
+      ]
+    },
+    "apps/nextjs": {
+      "name": "nextjs-monorepo-test",
+      "dependencies": {
+        "next": "^12",
+        "react": "^18",
+        "react-dom": "^18"
+      }
+    },
+    "apps/nextjs/node_modules/@next/swc-android-arm-eabi": {
+      "version": "12.3.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-android-arm-eabi/-/swc-android-arm-eabi-12.3.4.tgz",
+      "integrity": "sha512-cM42Cw6V4Bz/2+j/xIzO8nK/Q3Ly+VSlZJTa1vHzsocJRYz8KT6MrreXaci2++SIZCF1rVRCDgAg5PpqRibdIA==",
+      "cpu": [
+        "arm"
+      ],
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "apps/nextjs/node_modules/@next/swc-android-arm64": {
+      "version": "12.3.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-android-arm64/-/swc-android-arm64-12.3.4.tgz",
+      "integrity": "sha512-5jf0dTBjL+rabWjGj3eghpLUxCukRhBcEJgwLedewEA/LJk2HyqCvGIwj5rH+iwmq1llCWbOky2dO3pVljrapg==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "apps/nextjs/node_modules/@next/swc-darwin-arm64": {
+      "version": "12.3.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-12.3.4.tgz",
+      "integrity": "sha512-DqsSTd3FRjQUR6ao0E1e2OlOcrF5br+uegcEGPVonKYJpcr0MJrtYmPxd4v5T6UCJZ+XzydF7eQo5wdGvSZAyA==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "apps/nextjs/node_modules/@next/swc-darwin-x64": {
+      "version": "12.3.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-12.3.4.tgz",
+      "integrity": "sha512-PPF7tbWD4k0dJ2EcUSnOsaOJ5rhT3rlEt/3LhZUGiYNL8KvoqczFrETlUx0cUYaXe11dRA3F80Hpt727QIwByQ==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "apps/nextjs/node_modules/@next/swc-freebsd-x64": {
+      "version": "12.3.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-freebsd-x64/-/swc-freebsd-x64-12.3.4.tgz",
+      "integrity": "sha512-KM9JXRXi/U2PUM928z7l4tnfQ9u8bTco/jb939pdFUHqc28V43Ohd31MmZD1QzEK4aFlMRaIBQOWQZh4D/E5lQ==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "apps/nextjs/node_modules/@next/swc-linux-arm-gnueabihf": {
+      "version": "12.3.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm-gnueabihf/-/swc-linux-arm-gnueabihf-12.3.4.tgz",
+      "integrity": "sha512-3zqD3pO+z5CZyxtKDTnOJ2XgFFRUBciOox6EWkoZvJfc9zcidNAQxuwonUeNts6Xbm8Wtm5YGIRC0x+12YH7kw==",
+      "cpu": [
+        "arm"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "apps/nextjs/node_modules/@next/swc-linux-arm64-gnu": {
+      "version": "12.3.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-12.3.4.tgz",
+      "integrity": "sha512-kiX0vgJGMZVv+oo1QuObaYulXNvdH/IINmvdZnVzMO/jic/B8EEIGlZ8Bgvw8LCjH3zNVPO3mGrdMvnEEPEhKA==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "apps/nextjs/node_modules/@next/swc-linux-arm64-musl": {
+      "version": "12.3.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-12.3.4.tgz",
+      "integrity": "sha512-EETZPa1juczrKLWk5okoW2hv7D7WvonU+Cf2CgsSoxgsYbUCZ1voOpL4JZTOb6IbKMDo6ja+SbY0vzXZBUMvkQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "apps/nextjs/node_modules/@next/swc-linux-x64-gnu": {
+      "version": "12.3.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-12.3.4.tgz",
+      "integrity": "sha512-4csPbRbfZbuWOk3ATyWcvVFdD9/Rsdq5YHKvRuEni68OCLkfy4f+4I9OBpyK1SKJ00Cih16NJbHE+k+ljPPpag==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "apps/nextjs/node_modules/@next/swc-linux-x64-musl": {
+      "version": "12.3.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-12.3.4.tgz",
+      "integrity": "sha512-YeBmI+63Ro75SUiL/QXEVXQ19T++58aI/IINOyhpsRL1LKdyfK/35iilraZEFz9bLQrwy1LYAR5lK200A9Gjbg==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "apps/nextjs/node_modules/@next/swc-win32-arm64-msvc": {
+      "version": "12.3.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-12.3.4.tgz",
+      "integrity": "sha512-Sd0qFUJv8Tj0PukAYbCCDbmXcMkbIuhnTeHm9m4ZGjCf6kt7E/RMs55Pd3R5ePjOkN7dJEuxYBehawTR/aPDSQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "apps/nextjs/node_modules/@next/swc-win32-ia32-msvc": {
+      "version": "12.3.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-12.3.4.tgz",
+      "integrity": "sha512-rt/vv/vg/ZGGkrkKcuJ0LyliRdbskQU+91bje+PgoYmxTZf/tYs6IfbmgudBJk6gH3QnjHWbkphDdRQrseRefQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "apps/nextjs/node_modules/@next/swc-win32-x64-msvc": {
+      "version": "12.3.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-12.3.4.tgz",
+      "integrity": "sha512-DQ20JEfTBZAgF8QCjYfJhv2/279M6onxFjdG/+5B0Cyj00/EdBxiWb2eGGFgQhrBbNv/lsvzFbbi0Ptf8Vw/bg==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "apps/nextjs/node_modules/next": {
+      "version": "12.3.4",
+      "resolved": "https://registry.npmjs.org/next/-/next-12.3.4.tgz",
+      "integrity": "sha512-VcyMJUtLZBGzLKo3oMxrEF0stxh8HwuW976pAzlHhI3t8qJ4SROjCrSh1T24bhrbjw55wfZXAbXPGwPt5FLRfQ==",
+      "dependencies": {
+        "@next/env": "12.3.4",
+        "@swc/helpers": "0.4.11",
+        "caniuse-lite": "^1.0.30001406",
+        "postcss": "8.4.14",
+        "styled-jsx": "5.0.7",
+        "use-sync-external-store": "1.2.0"
+      },
+      "bin": {
+        "next": "dist/bin/next"
+      },
+      "engines": {
+        "node": ">=12.22.0"
+      },
+      "optionalDependencies": {
+        "@next/swc-android-arm-eabi": "12.3.4",
+        "@next/swc-android-arm64": "12.3.4",
+        "@next/swc-darwin-arm64": "12.3.4",
+        "@next/swc-darwin-x64": "12.3.4",
+        "@next/swc-freebsd-x64": "12.3.4",
+        "@next/swc-linux-arm-gnueabihf": "12.3.4",
+        "@next/swc-linux-arm64-gnu": "12.3.4",
+        "@next/swc-linux-arm64-musl": "12.3.4",
+        "@next/swc-linux-x64-gnu": "12.3.4",
+        "@next/swc-linux-x64-musl": "12.3.4",
+        "@next/swc-win32-arm64-msvc": "12.3.4",
+        "@next/swc-win32-ia32-msvc": "12.3.4",
+        "@next/swc-win32-x64-msvc": "12.3.4"
+      },
+      "peerDependencies": {
+        "fibers": ">= 3.1.0",
+        "node-sass": "^6.0.0 || ^7.0.0",
+        "react": "^17.0.2 || ^18.0.0-0",
+        "react-dom": "^17.0.2 || ^18.0.0-0",
+        "sass": "^1.3.0"
+      },
+      "peerDependenciesMeta": {
+        "fibers": {
+          "optional": true
+        },
+        "node-sass": {
+          "optional": true
+        },
+        "sass": {
+          "optional": true
+        }
+      }
+    },
+    "apps/nextjs/node_modules/postcss": {
+      "version": "8.4.14",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz",
+      "integrity": "sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss"
+        }
+      ],
+      "dependencies": {
+        "nanoid": "^3.3.4",
+        "picocolors": "^1.0.0",
+        "source-map-js": "^1.0.2"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      }
+    },
+    "apps/remix": {
+      "name": "my-remix-app",
+      "extraneous": true,
+      "dependencies": {
+        "@remix-run/node": "^2.8.0",
+        "@remix-run/react": "^2.8.0",
+        "@remix-run/server-runtime": "^2.8.0",
+        "@vercel/analytics": "^1.2.2",
+        "@vercel/remix": "^2.8.0",
+        "isbot": "^4",
+        "react": "^18.2.0",
+        "react-dom": "^18.2.0"
+      },
+      "devDependencies": {
+        "@remix-run/dev": "^2.8.0",
+        "@types/react": "^18.2.20",
+        "@types/react-dom": "^18.2.7",
+        "typescript": "^5.1.6",
+        "vite": "^5.1.0",
+        "vite-tsconfig-paths": "^4.2.1"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/@next/env": {
+      "version": "12.3.4",
+      "resolved": "https://registry.npmjs.org/@next/env/-/env-12.3.4.tgz",
+      "integrity": "sha512-H/69Lc5Q02dq3o+dxxy5O/oNxFsZpdL6WREtOOtOM1B/weonIwDXkekr1KV5DPVPr12IHFPrMrcJQ6bgPMfn7A=="
+    },
+    "node_modules/@swc/helpers": {
+      "version": "0.4.11",
+      "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.4.11.tgz",
+      "integrity": "sha512-rEUrBSGIoSFuYxwBYtlUFMlE2CwGhmW+w9355/5oduSw8e5h2+Tj4UrAGNNgP9915++wj5vkQo0UuOBqOAq4nw==",
+      "dependencies": {
+        "tslib": "^2.4.0"
+      }
+    },
+    "node_modules/caniuse-lite": {
+      "version": "1.0.30001594",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001594.tgz",
+      "integrity": "sha512-VblSX6nYqyJVs8DKFMldE2IVCJjZ225LW00ydtUWwh5hk9IfkTOffO6r8gJNsH0qqqeAF8KrbMYA2VEwTlGW5g==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ]
+    },
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
+    },
+    "node_modules/loose-envify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "dependencies": {
+        "js-tokens": "^3.0.0 || ^4.0.0"
+      },
+      "bin": {
+        "loose-envify": "cli.js"
+      }
+    },
+    "node_modules/nanoid": {
+      "version": "3.3.7",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
+      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
+    "node_modules/nextjs-monorepo-test": {
+      "resolved": "apps/nextjs",
+      "link": true
+    },
+    "node_modules/picocolors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
+    },
+    "node_modules/react": {
+      "version": "18.2.0",
+      "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz",
+      "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==",
+      "dependencies": {
+        "loose-envify": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/react-dom": {
+      "version": "18.2.0",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz",
+      "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==",
+      "dependencies": {
+        "loose-envify": "^1.1.0",
+        "scheduler": "^0.23.0"
+      },
+      "peerDependencies": {
+        "react": "^18.2.0"
+      }
+    },
+    "node_modules/scheduler": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz",
+      "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==",
+      "dependencies": {
+        "loose-envify": "^1.1.0"
+      }
+    },
+    "node_modules/source-map-js": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
+      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/styled-jsx": {
+      "version": "5.0.7",
+      "resolved": "https://registry.npmjs.org/styled-jsx/-/styled-jsx-5.0.7.tgz",
+      "integrity": "sha512-b3sUzamS086YLRuvnaDigdAewz1/EFYlHpYBP5mZovKEdQQOIIYq8lApylub3HHZ6xFjV051kkGU7cudJmrXEA==",
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "peerDependencies": {
+        "react": ">= 16.8.0 || 17.x.x || ^18.0.0-0"
+      },
+      "peerDependenciesMeta": {
+        "@babel/core": {
+          "optional": true
+        },
+        "babel-plugin-macros": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/tslib": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
+    },
+    "node_modules/use-sync-external-store": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz",
+      "integrity": "sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==",
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+      }
+    }
+  }
+}

packages/cli/test/fixtures/unit/commands/build/monorepo/package.json

@@ -0,0 +1,9 @@
+{
+  "name": "monorepo",
+  "private": true,
+  "version": "0.0.0",
+  "description": "",
+  "workspaces": [
+    "apps/*"
+  ]
+}

packages/cli/test/fixtures/unit/commands/deploy/node-low-starting-range/.vercel/project.json

@@ -0,0 +1,4 @@
+{
+  "orgId": "team_dummy",
+  "projectId": "node-low-starting-range"
+}

packages/cli/test/fixtures/unit/commands/deploy/node-low-starting-range/api/index.js

@@ -0,0 +1 @@
+module.exports = (req, res) => res.end('Vercel');

packages/cli/test/fixtures/unit/commands/deploy/node-low-starting-range/package.json

@@ -0,0 +1,8 @@
+{
+  "name": "node-low-starting-range",
+  "version": "1.0.0",
+  "private": true,
+  "engines": {
+    "node": ">10"
+  }
+}

packages/cli/test/fixtures/unit/commands/deploy/node-low-version/.vercel/project.json

@@ -0,0 +1,4 @@
+{
+  "orgId": "team_dummy",
+  "projectId": "node-low-version"
+}

packages/cli/test/fixtures/unit/commands/deploy/node-low-version/api/index.js

@@ -0,0 +1 @@
+module.exports = (req, res) => res.end('Vercel');

packages/cli/test/fixtures/unit/commands/deploy/node-low-version/package.json

@@ -0,0 +1,8 @@
+{
+  "name": "node-low-version",
+  "version": "1.0.0",
+  "private": true,
+  "engines": {
+    "node": "10"
+  }
+}

packages/cli/test/fixtures/unit/commands/deploy/node/.vercel/project.json

@@ -0,0 +1,4 @@
+{
+  "orgId": "team_dummy",
+  "projectId": "node"
+}

packages/cli/test/fixtures/unit/commands/deploy/node/package.json

@@ -0,0 +1,8 @@
+{
+  "name": "node",
+  "version": "1.0.0",
+  "private": true,
+  "engines": {
+    "node": ">= 20.x"
+  }
+}

packages/cli/test/integration-1.test.ts

@@ -19,10 +19,9 @@ import {
 import formatOutput from './helpers/format-output';
 import type http from 'http';
 import type { CLIProcess } from './helpers/types';
-import { vi } from 'vitest';
 
 const TEST_TIMEOUT = 3 * 60 * 1000;
-vi.setConfig({ testTimeout: TEST_TIMEOUT });
+jest.setTimeout(TEST_TIMEOUT);
 
 const binaryPath = path.resolve(__dirname, `../scripts/start.js`);
 

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

@@ -27,10 +27,9 @@ import formatOutput from './helpers/format-output';
 import type { PackageJson } from '@vercel/build-utils';
 import type http from 'http';
 import { CLIProcess } from './helpers/types';
-import { vi } from 'vitest';
 
 const TEST_TIMEOUT = 3 * 60 * 1000;
-vi.setConfig({ testTimeout: TEST_TIMEOUT });
+jest.setTimeout(TEST_TIMEOUT);
 
 const binaryPath = path.resolve(__dirname, `../scripts/start.js`);
 const example = (name: string) =>

packages/cli/test/integration-3.test.ts

@@ -28,10 +28,9 @@ import {
 import formatOutput from './helpers/format-output';
 import type http from 'http';
 import type { NowJson, DeploymentLike } from './helpers/types';
-import { vi } from 'vitest';
 
 const TEST_TIMEOUT = 3 * 60 * 1000;
-vi.setConfig({ testTimeout: TEST_TIMEOUT });
+jest.setTimeout(TEST_TIMEOUT);
 
 const binaryPath = path.resolve(__dirname, `../scripts/start.js`);
 

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

@@ -1,328 +1,4 @@
-// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
-
-exports[`help command > help output snapshots > column width 40 1`] = `
-"
-  ▲ vercel deploy [project-path] [options]
-
-  Deploy your project to Vercel. The    
-  \`deploy\` command is the default       
-  command for the Vercel CLI, and can   
-  be omitted (\`vc deploy my-app\` equals 
-  \`vc my-app\`).                         
-
-  Options:
-
-       --archive                Compress
-                                the     
-                                deploym…
-                                code    
-                                into a  
-                                file    
-                                before  
-                                uploadi…
-                                it      
-  -b,  --build-env <key=value>  Specify 
-                                environ…
-                                variabl…
-                                during  
-                                build-t…
-                                (e.g.   
-                                \`-b     
-                                KEY1=va…
-                                -b      
-                                KEY2=va…
-  -e,  --env <key=value>        Specify 
-                                environ…
-                                variabl…
-                                during  
-                                run-time
-                                (e.g.   
-                                \`-e     
-                                KEY1=va…
-                                -e      
-                                KEY2=va…
-  -f,  --force                  Force a 
-                                new     
-                                deploym…
-                                even if 
-                                nothing 
-                                has     
-                                changed 
-  -m,  --meta <key=value>       Specify 
-                                metadata
-                                for the 
-                                deploym…
-                                (e.g.   
-                                \`-m     
-                                KEY1=va…
-                                -m      
-                                KEY2=va…
-       --no-wait                Don't   
-                                wait for
-                                the     
-                                deploym…
-                                to      
-                                finish  
-       --prebuilt               Use in  
-                                combina…
-                                with \`vc
-                                build\`. 
-                                Deploy  
-                                an      
-                                existing
-                                build   
-       --prod                   Create a
-                                product…
-                                deploym…
-  -p,  --public                 Deploym…
-                                is      
-                                public  
-                                (\`/_src…
-                                is      
-                                exposed)
-       --regions                Set     
-                                default 
-                                regions 
-                                to      
-                                enable  
-                                the     
-                                deploym…
-                                on      
-       --skip-domain            Disable 
-                                the     
-                                automat…
-                                promoti…
-                                (aliasi…
-                                of the  
-                                relevant
-                                domains 
-                                to a new
-                                product…
-                                deploym…
-                                You can 
-                                use \`vc 
-                                promote\`
-                                to      
-                                complete
-                                the     
-                                domain-…
-                                process 
-                                later   
-       --with-cache             Retain  
-                                build   
-                                cache   
-                                when    
-                                using   
-                                "--forc…
-  -y,  --yes                    Use     
-                                default 
-                                options 
-                                to skip 
-                                all     
-                                prompts 
-
-
-  Global Options:
-
-       --cwd <DIR>            Sets the  
-                              current   
-                              working   
-                              directory 
-                              for a     
-                              single run
-                              of a      
-                              command   
-  -d,  --debug                Debug mode
-                              (default  
-                              off)      
-  -Q,  --global-config <DIR>  Path to   
-                              the global
-                              \`.vercel\` 
-                              directory 
-  -h,  --help                 Output    
-                              usage     
-                              informati…
-  -A,  --local-config <FILE>  Path to   
-                              the local 
-                              \`vercel.j…
-                              file      
-       --no-color             No color  
-                              mode      
-                              (default  
-                              off)      
-  -S,  --scope                Set a     
-                              custom    
-                              scope     
-  -t,  --token <TOKEN>        Login     
-                              token     
-  -v,  --version              Output the
-                              version   
-                              number    
-
-
-  Examples:
-
-  - Deploy the current directory
-
-    $ vercel
-
-  - Deploy a custom path
-
-    $ vercel /usr/src/project
-
-  - Deploy with run-time Environment Variables
-
-    $ vercel -e NODE_ENV=production
-
-  - Deploy with prebuilt outputs
-
-    $ vercel build
-    $ vercel deploy --prebuilt
-
-  - Write Deployment URL to a file
-
-    $ vercel > deployment-url.txt
-
-"
-`;
-
-exports[`help command > help output snapshots > column width 80 1`] = `
-"
-  ▲ vercel deploy [project-path] [options]
-
-  Deploy your project to Vercel. The \`deploy\` command is the default command    
-  for the Vercel CLI, and can be omitted (\`vc deploy my-app\` equals \`vc         
-  my-app\`).                                                                     
-
-  Options:
-
-       --archive                Compress the deployment code into a file before 
-                                uploading it                                    
-  -b,  --build-env <key=value>  Specify environment variables during build-time 
-                                (e.g. \`-b KEY1=value1 -b KEY2=value2\`)          
-  -e,  --env <key=value>        Specify environment variables during run-time   
-                                (e.g. \`-e KEY1=value1 -e KEY2=value2\`)          
-  -f,  --force                  Force a new deployment even if nothing has      
-                                changed                                         
-  -m,  --meta <key=value>       Specify metadata for the deployment (e.g. \`-m   
-                                KEY1=value1 -m KEY2=value2\`)                    
-       --no-wait                Don't wait for the deployment to finish         
-       --prebuilt               Use in combination with \`vc build\`. Deploy an   
-                                existing build                                  
-       --prod                   Create a production deployment                  
-  -p,  --public                 Deployment is public (\`/_src\`) is exposed)      
-       --regions                Set default regions to enable the deployment on 
-       --skip-domain            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             
-       --with-cache             Retain build cache when using "--force"         
-  -y,  --yes                    Use default options to skip all prompts         
-
-
-  Global Options:
-
-       --cwd <DIR>            Sets the current working directory for a single   
-                              run of a command                                  
-  -d,  --debug                Debug mode (default off)                          
-  -Q,  --global-config <DIR>  Path to the global \`.vercel\` directory            
-  -h,  --help                 Output usage information                          
-  -A,  --local-config <FILE>  Path to the local \`vercel.json\` file              
-       --no-color             No color mode (default off)                       
-  -S,  --scope                Set a custom scope                                
-  -t,  --token <TOKEN>        Login token                                       
-  -v,  --version              Output the version number                         
-
-
-  Examples:
-
-  - Deploy the current directory
-
-    $ vercel
-
-  - Deploy a custom path
-
-    $ vercel /usr/src/project
-
-  - Deploy with run-time Environment Variables
-
-    $ vercel -e NODE_ENV=production
-
-  - Deploy with prebuilt outputs
-
-    $ vercel build
-    $ vercel deploy --prebuilt
-
-  - Write Deployment URL to a file
-
-    $ vercel > deployment-url.txt
-
-"
-`;
-
-exports[`help command > help output snapshots > column width 120 1`] = `
-"
-  ▲ vercel deploy [project-path] [options]
-
-  Deploy your project to Vercel. The \`deploy\` command is the default command for the Vercel CLI, and can be omitted     
-  (\`vc deploy my-app\` equals \`vc my-app\`).                                                                              
-
-  Options:
-
-       --archive                Compress the deployment code into a file before uploading it                            
-  -b,  --build-env <key=value>  Specify environment variables during build-time (e.g. \`-b KEY1=value1 -b KEY2=value2\`)  
-  -e,  --env <key=value>        Specify environment variables during run-time (e.g. \`-e KEY1=value1 -e KEY2=value2\`)    
-  -f,  --force                  Force a new deployment even if nothing has changed                                      
-  -m,  --meta <key=value>       Specify metadata for the deployment (e.g. \`-m KEY1=value1 -m KEY2=value2\`)              
-       --no-wait                Don't wait for the deployment to finish                                                 
-       --prebuilt               Use in combination with \`vc build\`. Deploy an existing build                            
-       --prod                   Create a production deployment                                                          
-  -p,  --public                 Deployment is public (\`/_src\`) is exposed)                                              
-       --regions                Set default regions to enable the deployment on                                         
-       --skip-domain            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    
-       --with-cache             Retain build cache when using "--force"                                                 
-  -y,  --yes                    Use default options to skip all prompts                                                 
-
-
-  Global Options:
-
-       --cwd <DIR>            Sets the current working directory for a single run of a command                          
-  -d,  --debug                Debug mode (default off)                                                                  
-  -Q,  --global-config <DIR>  Path to the global \`.vercel\` directory                                                    
-  -h,  --help                 Output usage information                                                                  
-  -A,  --local-config <FILE>  Path to the local \`vercel.json\` file                                                      
-       --no-color             No color mode (default off)                                                               
-  -S,  --scope                Set a custom scope                                                                        
-  -t,  --token <TOKEN>        Login token                                                                               
-  -v,  --version              Output the version number                                                                 
-
-
-  Examples:
-
-  - Deploy the current directory
-
-    $ vercel
-
-  - Deploy a custom path
-
-    $ vercel /usr/src/project
-
-  - Deploy with run-time Environment Variables
-
-    $ vercel -e NODE_ENV=production
-
-  - Deploy with prebuilt outputs
-
-    $ vercel build
-    $ vercel deploy --prebuilt
-
-  - Write Deployment URL to a file
-
-    $ vercel > deployment-url.txt
-
-"
-`;
+// Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`help command help output snapshots column width 40 1`] = `
 "

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

@@ -7,9 +7,8 @@ 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';
 
-vi.setConfig({ testTimeout: 6 * 60 * 1000 });
+jest.setTimeout(6 * 60 * 1000);
 
 const fixture = (name: string) =>
   join(__dirname, '../../../fixtures/unit/commands/build', name);
@@ -786,7 +785,7 @@ describe('build', () => {
     expect(files.sort()).toEqual(['index.html', 'package.json']);
   });
 
-  it('should set `VERCEL_ANALYTICS_ID` environment variable and warn users', async () => {
+  it('should set `VERCEL_ANALYTICS_ID` environment variable', async () => {
     const cwd = fixture('vercel-analytics');
     const output = join(cwd, '.vercel/output');
     client.cwd = cwd;
@@ -795,9 +794,6 @@ describe('build', () => {
 
     const env = await fs.readJSON(join(output, 'static', 'env.json'));
     expect(Object.keys(env).includes('VERCEL_ANALYTICS_ID')).toEqual(true);
-    await expect(client.stderr).toOutput(
-      'Vercel Speed Insights auto-injection is deprecated in favor of @vercel/speed-insights package. Learn more: https://vercel.link/upgrate-to-speed-insights-package'
-    );
   });
 
   it('should load environment variables from `.vercel/.env.preview.local`', async () => {
@@ -936,7 +932,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 Module.validateConfig'),
+      stack: expect.stringContaining('at validateConfig'),
       hideStackTrace: true,
       code: 'INVALID_VERCEL_CONFIG',
       link: 'https://vercel.com/docs/concepts/projects/project-configuration#rewrites',
@@ -1272,6 +1268,17 @@ describe('build', () => {
     });
   });
 
+  it('should detect framework version in monorepo app', async () => {
+    const cwd = fixture('monorepo');
+    const output = join(cwd, '.vercel/output');
+    client.cwd = cwd;
+    const exitCode = await build(client);
+    expect(exitCode).toEqual(0);
+
+    const config = await fs.readJSON(join(output, 'config.json'));
+    expect(typeof config.framework.version).toEqual('string');
+  });
+
   it('should create symlinks for duplicate references to Lambda / EdgeFunction instances', async () => {
     if (process.platform === 'win32') {
       console.log('Skipping test on Windows');

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

@@ -416,4 +416,152 @@ describe('deploy', () => {
       version: 2,
     });
   });
+
+  it('should send `projectSettings.nodeVersion` based on `engines.node` package.json field', async () => {
+    const user = useUser();
+    useTeams('team_dummy');
+    useProject({
+      ...defaultProject,
+      name: 'node',
+      id: 'QmbKpqpiUqbcke',
+    });
+
+    let body: any;
+    client.scenario.post(`/v13/deployments`, (req, res) => {
+      body = req.body;
+      res.json({
+        creator: {
+          uid: user.id,
+          username: user.username,
+        },
+        id: 'dpl_',
+      });
+    });
+    client.scenario.get(`/v13/deployments/dpl_`, (req, res) => {
+      res.json({
+        creator: {
+          uid: user.id,
+          username: user.username,
+        },
+        id: 'dpl_',
+        readyState: 'READY',
+        aliasAssigned: true,
+        alias: [],
+      });
+    });
+
+    const repoRoot = setupUnitFixture('commands/deploy/node');
+    client.cwd = repoRoot;
+    client.setArgv('deploy');
+    const exitCode = await deploy(client);
+    expect(exitCode).toEqual(0);
+    expect(body).toMatchObject({
+      source: 'cli',
+      version: 2,
+      projectSettings: {
+        nodeVersion: '20.x',
+        sourceFilesOutsideRootDirectory: true,
+      },
+    });
+  });
+
+  it('should send latest supported node version when given a >low-node-version based on `engines.node` package.json field', async () => {
+    const user = useUser();
+    useTeams('team_dummy');
+    useProject({
+      ...defaultProject,
+      name: 'node-low-starting-range',
+      id: 'QmbKpqpiUqbcke',
+    });
+
+    let body: any;
+    client.scenario.post(`/v13/deployments`, (req, res) => {
+      body = req.body;
+      res.json({
+        creator: {
+          uid: user.id,
+          username: user.username,
+        },
+        id: 'dpl_',
+      });
+    });
+    client.scenario.get(`/v13/deployments/dpl_`, (req, res) => {
+      res.json({
+        creator: {
+          uid: user.id,
+          username: user.username,
+        },
+        id: 'dpl_',
+        readyState: 'READY',
+        aliasAssigned: true,
+        alias: [],
+      });
+    });
+
+    const repoRoot = setupUnitFixture(
+      'commands/deploy/node-low-starting-range'
+    );
+    client.cwd = repoRoot;
+    client.setArgv('deploy');
+    const exitCode = await deploy(client);
+    expect(exitCode).toEqual(0);
+    expect(body).toMatchObject({
+      source: 'cli',
+      version: 2,
+      projectSettings: {
+        nodeVersion: '20.x',
+        sourceFilesOutsideRootDirectory: true,
+      },
+    });
+  });
+
+  it('should send no version when `engines.node` package.json field is fixed to an outdated version', async () => {
+    const user = useUser();
+    useTeams('team_dummy');
+    useProject({
+      ...defaultProject,
+      name: 'node-low-version',
+      id: 'QmbKpqpiUqbcke',
+    });
+
+    let body: any;
+    client.scenario.post(`/v13/deployments`, (req, res) => {
+      body = req.body;
+      res.json({
+        creator: {
+          uid: user.id,
+          username: user.username,
+        },
+        id: 'dpl_',
+      });
+    });
+    client.scenario.get(`/v13/deployments/dpl_`, (req, res) => {
+      res.json({
+        creator: {
+          uid: user.id,
+          username: user.username,
+        },
+        id: 'dpl_',
+        readyState: 'READY',
+        aliasAssigned: true,
+        alias: [],
+      });
+    });
+
+    const repoRoot = setupUnitFixture('commands/deploy/node-low-version');
+    client.cwd = repoRoot;
+    client.setArgv('deploy');
+    const exitCodePromise = deploy(client);
+    await expect(client.stderr).toOutput(
+      'WARN! Node.js Version "10.x" is discontinued and must be upgraded. Please set "engines": { "node": "20.x" } in your `package.json` file to use Node.js 20.'
+    );
+    await expect(exitCodePromise).resolves.toEqual(0);
+    expect(body).toMatchObject({
+      source: 'cli',
+      version: 2,
+      projectSettings: {
+        sourceFilesOutsideRootDirectory: true,
+      },
+    });
+  });
 });

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

@@ -2,9 +2,8 @@ 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';
 
-vi.setConfig({ testTimeout: 10000 });
+jest.setTimeout(10000);
 
 describe('login', () => {
   it('should not allow the `--token` flag', async () => {

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

@@ -6,7 +6,6 @@ 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', () => {
@@ -47,7 +46,7 @@ describe('project', () => {
     });
 
     it('should list projects running on an soon-to-be-deprecated Node.js version', async () => {
-      vi.useFakeTimers().setSystemTime(new Date('2023-12-08'));
+      jest.useFakeTimers().setSystemTime(new Date('2023-12-08'));
 
       const user = useUser();
       useTeams('team_dummy');
@@ -92,7 +91,7 @@ describe('project', () => {
       data.pop();
       expect(data).toEqual([project.project.name, 'https://foobar.com']);
 
-      vi.clearAllTimers();
+      jest.clearAllTimers();
     });
 
     it('should list projects when there is no production deployment', async () => {

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

@@ -9,9 +9,8 @@ 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';
 
-vi.setConfig({ testTimeout: 60000 });
+jest.setTimeout(60000);
 
 describe('promote', () => {
   it('should error if timeout is invalid', async () => {

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

@@ -9,9 +9,8 @@ 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';
 
-vi.setConfig({ testTimeout: 60000 });
+jest.setTimeout(60000);
 
 describe('rollback', () => {
   it('should error if timeout is invalid', async () => {

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

@@ -8,10 +8,9 @@ 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
-vi.setConfig({ testTimeout: 4 * 60 * 1000 });
+jest.setTimeout(4 * 60 * 1000);
 
 const repoRoot = join(__dirname, '../../../../../..');
 

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

@@ -14,9 +14,8 @@ 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';
 
-vi.setConfig({ testTimeout: 10 * 1000 });
+jest.setTimeout(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,14 +1,13 @@
 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 = vi.fn();
-    output.error = vi.fn();
+    output.warn = jest.fn();
+    output.error = jest.fn();
   });
 
   it('defaults to `undefined`', () => {
@@ -20,7 +19,7 @@ describe('parseTarget', () => {
     const result = parseTarget(output, 'not-a-real-environment');
     expect(result).toEqual(1);
 
-    const errorMock = (output.error as Mock<any, any>).mock;
+    const errorMock = (output.error as jest.Mock<any, any>).mock;
     expect(errorMock.calls[0][0]).toMatch(
       /not-a-real-environment.+is not valid/g
     );

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

@@ -3,11 +3,10 @@ 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();
 
-vi.setConfig({ testTimeout: 25000 });
+jest.setTimeout(25000);
 
 const cacheDir = tmp.tmpNameSync({
   prefix: 'test-vercel-cli-get-latest-version-',

packages/cli/vitest.config.ts

@@ -1,17 +0,0 @@
-/// <reference types="vitest" />
-import { defineConfig } from 'vite';
-
-export default defineConfig({
-  test: {
-    exclude: [
-      // default
-      '**/node_modules/**',
-      '**/dist/**',
-      '**/cypress/**',
-      '**/.{idea,git,cache,output,temp}/**',
-      '**/{karma,rollup,webpack,vite,vitest,jest,ava,babel,nyc,cypress,tsup,build}.config.*',
-      // some artifacts in the fixtures have spec files that we're not using
-      '**/*.spec.js',
-    ],
-  },
-});

packages/client/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @vercel/client
 
+## 13.1.7
+
+### Patch Changes
+
+- Updated dependencies [[`11218a179`](https://github.com/vercel/vercel/commit/11218a179870a5420c5a6ff720cd4aec4f7e1c5e)]:
+  - @vercel/build-utils@7.9.1
+
+## 13.1.6
+
+### Patch Changes
+
+- Updated dependencies [[`8ea93839c`](https://github.com/vercel/vercel/commit/8ea93839ccc70816f3ece9d7cfdb857aa7a4b015)]:
+  - @vercel/build-utils@7.9.0
+
 ## 13.1.5
 
 ### Patch Changes

packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/client",
-  "version": "13.1.5",
+  "version": "13.1.7",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "homepage": "https://vercel.com",
@@ -37,7 +37,7 @@
     "typescript": "4.9.5"
   },
   "dependencies": {
-    "@vercel/build-utils": "7.8.0",
+    "@vercel/build-utils": "7.9.1",
     "@vercel/error-utils": "2.0.2",
     "@vercel/routing-utils": "3.1.0",
     "@zeit/fetch": "5.2.0",

packages/frameworks/jest.config.js

@@ -1,5 +1,15 @@
+/** @type {import('@ts-jest/dist/types').InitialOptionsTsJest} */
 module.exports = {
+  preset: 'ts-jest',
+  testEnvironment: 'node',
   transform: {
-    '^.+\\.tsx?$': 'ts-jest',
+    '^.+\\.[tj]s$': [
+      'ts-jest',
+      {
+        diagnostics: true,
+        isolatedModules: true,
+        tsconfig: 'test/tsconfig.json',
+      },
+    ],
   },
 };

packages/fs-detectors/package.json

@@ -37,7 +37,7 @@
     "@types/minimatch": "3.0.5",
     "@types/node": "14.18.33",
     "@types/semver": "7.3.10",
-    "@vercel/build-utils": "7.8.0",
+    "@vercel/build-utils": "7.9.1",
     "jest-junit": "16.0.0",
     "typescript": "4.9.5"
   }

packages/gatsby-plugin-vercel-builder/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @vercel/gatsby-plugin-vercel-builder
 
+## 2.0.22
+
+### Patch Changes
+
+- Updated dependencies [[`11218a179`](https://github.com/vercel/vercel/commit/11218a179870a5420c5a6ff720cd4aec4f7e1c5e)]:
+  - @vercel/build-utils@7.9.1
+
+## 2.0.21
+
+### Patch Changes
+
+- Updated dependencies [[`8ea93839c`](https://github.com/vercel/vercel/commit/8ea93839ccc70816f3ece9d7cfdb857aa7a4b015)]:
+  - @vercel/build-utils@7.9.0
+
 ## 2.0.20
 
 ### Patch Changes

packages/gatsby-plugin-vercel-builder/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/gatsby-plugin-vercel-builder",
-  "version": "2.0.20",
+  "version": "2.0.22",
   "main": "dist/index.js",
   "files": [
     "dist",
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@sinclair/typebox": "0.25.24",
-    "@vercel/build-utils": "7.8.0",
+    "@vercel/build-utils": "7.9.1",
     "@vercel/routing-utils": "3.1.0",
     "esbuild": "0.14.47",
     "etag": "1.8.1",

packages/go/jest.config.js

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

packages/go/package.json

@@ -29,7 +29,7 @@
     "@types/node-fetch": "^2.3.0",
     "@types/tar": "6.1.5",
     "@types/yauzl-promise": "2.1.0",
-    "@vercel/build-utils": "7.8.0",
+    "@vercel/build-utils": "7.9.1",
     "async-retry": "1.3.3",
     "execa": "^1.0.0",
     "fs-extra": "^7.0.0",

packages/hydrogen/package.json

@@ -26,7 +26,7 @@
   "devDependencies": {
     "@types/jest": "27.5.1",
     "@types/node": "14.18.33",
-    "@vercel/build-utils": "7.8.0",
+    "@vercel/build-utils": "7.9.1",
     "execa": "3.2.0",
     "fs-extra": "11.1.0",
     "jest-junit": "16.0.0"

packages/next/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @vercel/next
 
+## 4.1.6
+
+### Patch Changes
+
+- Ensure that static PPR pages have static streaming lambda paths. ([#11259](https://github.com/vercel/vercel/pull/11259))
+
 ## 4.1.5
 
 ### Patch Changes

packages/next/jest.config.js

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

packages/next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "4.1.5",
+  "version": "4.1.6",
   "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",
@@ -40,7 +40,7 @@
     "@types/semver": "6.0.0",
     "@types/text-table": "0.2.1",
     "@types/webpack-sources": "3.2.0",
-    "@vercel/build-utils": "7.8.0",
+    "@vercel/build-utils": "7.9.1",
     "@vercel/routing-utils": "3.1.0",
     "async-sema": "3.0.1",
     "buffer-crc32": "0.2.13",

packages/next/src/index.ts

@@ -2142,7 +2142,6 @@ export const build: BuildV2 = async ({
       appPathRoutesManifest,
       isSharedLambdas,
       canUsePreviewMode,
-      omittedPrerenderRoutes,
     });
 
     await Promise.all(

packages/next/src/server-build.ts

@@ -1229,34 +1229,31 @@ export async function serverBuild({
             // We want to add the `experimentalStreamingLambdaPath` to this
             // output.
             experimentalStreamingLambdaPaths.set(outputName, key);
-          } else {
-            // As this is an omitted page, we should generate the experimental
-            // partial prerendering resume route for each of these routes that
-            // support partial prerendering. This is because the routes that
-            // haven't been omitted will have rewrite rules in place to rewrite
-            // the original request `/blog/my-slug` to the dynamic path
-            // `/blog/[slug]?nxtPslug=my-slug`.
-            for (const [
-              routePathname,
-              { srcRoute, experimentalPPR },
-            ] of Object.entries(prerenderManifest.staticRoutes)) {
-              // If the srcRoute doesn't match or this doesn't support
-              // experimental partial prerendering, then we can skip this route.
-              if (srcRoute !== pagePathname || !experimentalPPR) continue;
+          }
 
-              // If this route is the same as the page route, then we can skip
-              // it, because we've already added the lambda to the output.
-              if (routePathname === pagePathname) continue;
+          // For each static route that was generated, we should generate a
+          // specific partial prerendering resume route. This is because any
+          // static route that is matched will not hit the rewrite rules.
+          for (const [
+            routePathname,
+            { srcRoute, experimentalPPR },
+          ] of Object.entries(prerenderManifest.staticRoutes)) {
+            // If the srcRoute doesn't match or this doesn't support
+            // experimental partial prerendering, then we can skip this route.
+            if (srcRoute !== pagePathname || !experimentalPPR) continue;
 
-              const key = getPostponeResumePathname(
-                entryDirectory,
-                routePathname
-              );
-              lambdas[key] = lambda;
+            // If this route is the same as the page route, then we can skip
+            // it, because we've already added the lambda to the output.
+            if (routePathname === pagePathname) continue;
 
-              outputName = path.posix.join(entryDirectory, routePathname);
-              experimentalStreamingLambdaPaths.set(outputName, key);
-            }
+            const key = getPostponeResumePathname(
+              entryDirectory,
+              routePathname
+            );
+            lambdas[key] = lambda;
+
+            outputName = path.posix.join(entryDirectory, routePathname);
+            experimentalStreamingLambdaPaths.set(outputName, key);
           }
 
           continue;
@@ -1314,7 +1311,6 @@ export async function serverBuild({
     hasPages404: routesManifest.pages404,
     isCorrectNotFoundRoutes,
     isEmptyAllowQueryForPrendered,
-    omittedPrerenderRoutes,
   });
 
   await Promise.all(

packages/next/src/utils.ts

@@ -1938,7 +1938,6 @@ type OnPrerenderRouteArgs = {
   routesManifest?: RoutesManifest;
   isCorrectNotFoundRoutes?: boolean;
   isEmptyAllowQueryForPrendered?: boolean;
-  omittedPrerenderRoutes: ReadonlySet<string>;
 };
 let prerenderGroup = 1;
 
@@ -1975,7 +1974,6 @@ export const onPrerenderRoute =
       routesManifest,
       isCorrectNotFoundRoutes,
       isEmptyAllowQueryForPrendered,
-      omittedPrerenderRoutes,
     } = prerenderRouteArgs;
 
     if (isBlocking && isFallback) {
@@ -2211,12 +2209,19 @@ export const onPrerenderRoute =
       initialStatus = 404;
     }
 
+    /**
+     * If the route key had an `/index` suffix added, we need to note it so we
+     * can remove it from the output path later accurately.
+     */
+    let addedIndexSuffix = false;
+
     if (isAppPathRoute) {
       // for literal index routes we need to append an additional /index
       // due to the proxy's normalizing for /index routes
       if (routeKey !== '/index' && routeKey.endsWith('/index')) {
         routeKey = `${routeKey}/index`;
         routeFileNoExt = routeKey;
+        addedIndexSuffix = true;
       }
     }
 
@@ -2225,6 +2230,7 @@ export const onPrerenderRoute =
     if (!isAppPathRoute) {
       outputPathPage = normalizeIndexOutput(outputPathPage, isServerMode);
     }
+
     const outputPathPageOrig = path.posix.join(
       entryDirectory,
       origRouteFileNoExt
@@ -2408,20 +2414,25 @@ export const onPrerenderRoute =
           );
         }
 
-        // If a source route exists, and it's not listed as an omitted route,
-        // then use the src route as the basis for the experimental streaming
-        // lambda path. If the route doesn't have a source route or it's not
-        // omitted, then use the more specific `routeKey` as the basis.
-        if (srcRoute && !omittedPrerenderRoutes.has(srcRoute)) {
+        // Try to get the experimental streaming lambda path for the specific
+        // static route first, then try the srcRoute if it doesn't exist. If we
+        // can't find it at all, this constitutes an error.
+        experimentalStreamingLambdaPath = experimentalStreamingLambdaPaths.get(
+          pathnameToOutputName(entryDirectory, routeKey, addedIndexSuffix)
+        );
+        if (!experimentalStreamingLambdaPath && srcRoute) {
           experimentalStreamingLambdaPath =
             experimentalStreamingLambdaPaths.get(
               pathnameToOutputName(entryDirectory, srcRoute)
             );
-        } else {
-          experimentalStreamingLambdaPath =
-            experimentalStreamingLambdaPaths.get(
-              pathnameToOutputName(entryDirectory, routeKey)
-            );
+        }
+
+        if (!experimentalStreamingLambdaPath) {
+          throw new Error(
+            `Invariant: experimentalStreamingLambdaPath is undefined for routeKey=${routeKey} and srcRoute=${
+              srcRoute ?? 'null'
+            }`
+          );
         }
       }
 
@@ -2651,8 +2662,20 @@ export function getNextServerPath(nextVersion: string) {
     : 'next/dist/next-server/server';
 }
 
-export function pathnameToOutputName(entryDirectory: string, pathname: string) {
-  if (pathname === '/') pathname = '/index';
+function pathnameToOutputName(
+  entryDirectory: string,
+  pathname: string,
+  addedIndexSuffix = false
+) {
+  if (pathname === '/') {
+    pathname = '/index';
+  }
+  // If the `/index` was added for a route that ended in `/index` we need to
+  // strip the second one off before joining it with the entryDirectory.
+  else if (addedIndexSuffix) {
+    pathname = pathname.replace(/\/index$/, '');
+  }
+
   return path.posix.join(entryDirectory, pathname);
 }
 

packages/next/test/fixtures/00-app-dir-ppr-full/components/dynamic.jsx

@@ -20,7 +20,11 @@ export const Dynamic = ({ pathname, fallback }) => {
         {pathname && (
           <>
             <dt>Pathname</dt>
-            <dd>{pathname}</dd>
+            {/* We're encoding this using the following format so that even if
+                the HTML is sent as flight data, it will still retain the same
+                content, and can be inspected without having to run the
+                javascript. */}
+            <dd data-pathname={`data-pathname=${pathname}`}>{pathname}</dd>
           </>
         )}
         {messages.map(({ name, value }) => (

packages/next/test/fixtures/00-app-dir-ppr-full/index.test.js

@@ -59,6 +59,9 @@ describe(`${__dirname.split(path.sep).pop()}`, () => {
         const html = await res.text();
         expect(html).toContain(expected);
         expect(html).toContain('</html>');
+
+        // Validate that the loaded URL is correct.
+        expect(html).toContain(`data-pathname=${pathname}`);
       }
     );
 

packages/node/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @vercel/node
 
+## 3.0.24
+
+### Patch Changes
+
+- Updated dependencies [[`11218a179`](https://github.com/vercel/vercel/commit/11218a179870a5420c5a6ff720cd4aec4f7e1c5e)]:
+  - @vercel/build-utils@7.9.1
+
+## 3.0.23
+
+### Patch Changes
+
+- Updated dependencies [[`8ea93839c`](https://github.com/vercel/vercel/commit/8ea93839ccc70816f3ece9d7cfdb857aa7a4b015)]:
+  - @vercel/build-utils@7.9.0
+
 ## 3.0.22
 
 ### Patch Changes

packages/node/jest.config.js

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

packages/node/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/node",
-  "version": "3.0.22",
+  "version": "3.0.24",
   "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/node-js",
@@ -24,7 +24,7 @@
     "@edge-runtime/primitives": "4.1.0",
     "@edge-runtime/vm": "3.2.0",
     "@types/node": "14.18.33",
-    "@vercel/build-utils": "7.8.0",
+    "@vercel/build-utils": "7.9.1",
     "@vercel/error-utils": "2.0.2",
     "@vercel/nft": "0.26.4",
     "@vercel/static-config": "3.0.0",

packages/python/package.json

@@ -26,7 +26,7 @@
     "@types/jest": "27.4.1",
     "@types/node": "14.18.33",
     "@types/which": "3.0.0",
-    "@vercel/build-utils": "7.8.0",
+    "@vercel/build-utils": "7.9.1",
     "execa": "^1.0.0",
     "fs-extra": "11.1.1",
     "jest-junit": "16.0.0",

packages/redwood/package.json

@@ -28,7 +28,7 @@
     "@types/aws-lambda": "8.10.19",
     "@types/node": "14.18.33",
     "@types/semver": "6.0.0",
-    "@vercel/build-utils": "7.8.0",
+    "@vercel/build-utils": "7.9.1",
     "execa": "3.2.0",
     "fs-extra": "11.1.0",
     "jest-junit": "16.0.0"

packages/remix/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @vercel/remix-builder
 
+## 2.1.4
+
+### Patch Changes
+
+- Disable `prepareCache()` npm install for Remix + Vite ([#11281](https://github.com/vercel/vercel/pull/11281))
+
+## 2.1.3
+
+### Patch Changes
+
+- Improve hueristics for detecting Remix + Vite ([#11256](https://github.com/vercel/vercel/pull/11256))
+
 ## 2.1.2
 
 ### Patch Changes

packages/remix/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/remix-builder",
-  "version": "2.1.2",
+  "version": "2.1.4",
   "license": "Apache-2.0",
   "main": "./dist/index.js",
   "homepage": "https://vercel.com/docs",
@@ -32,7 +32,7 @@
     "@types/jest": "27.5.1",
     "@types/node": "14.18.33",
     "@types/semver": "7.3.13",
-    "@vercel/build-utils": "7.8.0",
+    "@vercel/build-utils": "7.9.1",
     "jest-junit": "16.0.0",
     "path-to-regexp": "6.2.1",
     "semver": "7.5.2"

packages/remix/src/build.ts

@@ -1,9 +1,8 @@
 import { build as buildVite } from './build-vite';
 import { build as buildLegacy } from './build-legacy';
-import { findConfig } from './utils';
+import { isVite } from './utils';
 import type { BuildV2 } from '@vercel/build-utils';
 
 export const build: BuildV2 = opts => {
-  const isLegacy = findConfig(opts.workPath, 'remix.config');
-  return isLegacy ? buildLegacy(opts) : buildVite(opts);
+  return isVite(opts.workPath) ? buildVite(opts) : buildLegacy(opts);
 };

packages/remix/src/prepare-cache.ts

@@ -5,8 +5,8 @@ import {
   runNpmInstall,
 } from '@vercel/build-utils';
 import { dirname, join, relative } from 'path';
-import { require_, chdirAndReadConfig } from './utils';
-import type { PrepareCache } from '@vercel/build-utils';
+import { require_, chdirAndReadConfig, isVite } from './utils';
+import type { Files, PrepareCache } from '@vercel/build-utils';
 
 export const prepareCache: PrepareCache = async ({
   entrypoint,
@@ -17,45 +17,49 @@ export const prepareCache: PrepareCache = async ({
   const root = repoRootPath || workPath;
   const mountpoint = dirname(entrypoint);
   const entrypointFsDirname = join(workPath, mountpoint);
+  let cacheDirFiles: Files | undefined;
 
-  // Because the `node_modules` directory was modified to install
-  // the forked Remix compiler, re-install to the "fresh" dependencies
-  // state before the cache gets created.
-  const nodeVersion = await getNodeVersion(
-    entrypointFsDirname,
-    undefined,
-    config
-  );
-  const spawnOpts = getSpawnOptions({}, nodeVersion);
-  await runNpmInstall(
-    entrypointFsDirname,
-    [],
-    {
-      ...spawnOpts,
-      stdio: 'ignore',
-    },
-    undefined,
-    nodeVersion
-  );
-
-  const packageJsonPath = join(entrypointFsDirname, 'package.json');
-  const remixRunDevPath = dirname(
-    require_.resolve('@remix-run/dev/package.json', {
-      paths: [entrypointFsDirname],
-    })
-  );
-  const remixConfig = await chdirAndReadConfig(
-    remixRunDevPath,
-    entrypointFsDirname,
-    packageJsonPath
-  );
-  const [nodeModulesFiles, cacheDirFiles] = await Promise.all([
-    // Cache `node_modules`
-    glob('**/node_modules/**', root),
+  if (!isVite(workPath)) {
+    // Because the `node_modules` directory was modified to install
+    // the forked Remix compiler, re-install to the "fresh" dependencies
+    // state before the cache gets created.
+    const nodeVersion = await getNodeVersion(
+      entrypointFsDirname,
+      undefined,
+      config
+    );
+    const spawnOpts = getSpawnOptions({}, nodeVersion);
+    await runNpmInstall(
+      entrypointFsDirname,
+      [],
+      {
+        ...spawnOpts,
+        stdio: 'ignore',
+      },
+      undefined,
+      nodeVersion
+    );
 
+    const packageJsonPath = join(entrypointFsDirname, 'package.json');
+    const remixRunDevPath = dirname(
+      require_.resolve('@remix-run/dev/package.json', {
+        paths: [entrypointFsDirname],
+      })
+    );
+    const remixConfig = await chdirAndReadConfig(
+      remixRunDevPath,
+      entrypointFsDirname,
+      packageJsonPath
+    );
     // Cache the Remix "cacheDirectory" (typically `.cache`)
-    glob(relative(root, join(remixConfig.cacheDirectory, '**')), root),
-  ]);
+    cacheDirFiles = await glob(
+      relative(root, join(remixConfig.cacheDirectory, '**')),
+      root
+    );
+  }
+
+  // Cache `node_modules`
+  const nodeModulesFiles = await glob('**/node_modules/**', root);
 
   return { ...nodeModulesFiles, ...cacheDirFiles };
 };

packages/remix/src/utils.ts

@@ -1,5 +1,5 @@
 import semver from 'semver';
-import { existsSync, promises as fs } from 'fs';
+import { existsSync, readFileSync, promises as fs } from 'fs';
 import { basename, dirname, join, relative, resolve, sep } from 'path';
 import { pathToRegexp, Key } from 'path-to-regexp';
 import { debug, type PackageJson } from '@vercel/build-utils';
@@ -420,3 +420,30 @@ export function logNftWarnings(warnings: Set<Error>, required?: string) {
     }
   }
 }
+
+export function isVite(dir: string): boolean {
+  const viteConfig = findConfig(dir, 'vite.config', ['.js', '.ts']);
+  if (!viteConfig) return false;
+
+  const remixConfig = findConfig(dir, 'remix.config');
+  if (!remixConfig) return true;
+
+  // `remix.config` and `vite.config` exist, so check a couple other ways
+
+  // Is `vite:build` found in the `package.json` "build" script?
+  const pkg: PackageJson = JSON.parse(
+    readFileSync(join(dir, 'package.json'), 'utf8')
+  );
+  if (pkg.scripts?.build && /\bvite:build\b/.test(pkg.scripts.build)) {
+    return true;
+  }
+
+  // Is `@remix-run/dev` package found in `vite.config`?
+  const viteConfigContents = readFileSync(viteConfig, 'utf8');
+  if (/['"]@remix-run\/dev['"]/.test(viteConfigContents)) {
+    return true;
+  }
+
+  // If none of those conditions matched, then treat it as a legacy project and print a warning
+  return false;
+}

packages/remix/test/fixtures-unit/by-build-command/package.json

@@ -0,0 +1,5 @@
+{
+  "scripts": {
+    "build": "remix vite:build"
+  }
+}

packages/remix/test/fixtures-unit/by-vite-config-legacy/package.json

@@ -0,0 +1 @@
+{}

packages/remix/test/fixtures-unit/by-vite-config-legacy/vite.config.ts

@@ -0,0 +1,6 @@
+import { defineConfig } from "vite";
+import tsconfigPaths from "vite-tsconfig-paths";
+
+export default defineConfig({
+  plugins: [tsconfigPaths()],
+});

packages/remix/test/fixtures-unit/by-vite-config/package.json

@@ -0,0 +1 @@
+{}

packages/remix/test/fixtures-unit/by-vite-config/vite.config.ts

@@ -0,0 +1,7 @@
+import { vitePlugin as remix } from "@remix-run/dev";
+import { defineConfig } from "vite";
+import tsconfigPaths from "vite-tsconfig-paths";
+
+export default defineConfig({
+  plugins: [remix(), tsconfigPaths()],
+});

packages/remix/test/fixtures-vite/01-no-preset/vercel.json

@@ -1,3 +0,0 @@
-{
-  "framework": "remix"
-}

packages/remix/test/fixtures-vite/02-interactive-remix-routing-v2/vercel.json

@@ -1,3 +0,0 @@
-{
-  "framework": "remix"
-}

packages/remix/test/unit.is-vite.test.ts

@@ -0,0 +1,30 @@
+import { join } from 'path';
+import { readdirSync } from 'fs';
+import { isVite } from '../src/utils';
+
+describe('isVite()', () => {
+  it.each([
+    ...readdirSync(join(__dirname, 'fixtures-legacy')).map(name => ({
+      name: join('fixtures-legacy', name),
+      expected: false,
+    })),
+    ...readdirSync(join(__dirname, 'fixtures-vite')).map(name => ({
+      name: join('fixtures-vite', name),
+      expected: true,
+    })),
+    {
+      name: 'fixtures-unit/by-build-command',
+      expected: true,
+    },
+    {
+      name: 'fixtures-unit/by-vite-config',
+      expected: true,
+    },
+    {
+      name: 'fixtures-unit/by-vite-config-legacy',
+      expected: false,
+    },
+  ])('should return `$expected` for "$name" route', ({ name, expected }) => {
+    expect(isVite(join(__dirname, name))).toEqual(expected);
+  });
+});