Version Packages (#11193 )

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/frameworks@3.0.0 ### Major Changes - Make "remix" framework preset supersede "vite" ([#11031](https://github.com/vercel/vercel/pull/11031)) ## @vercel/fs-detectors@5.2.0 ### Minor Changes - Make "remix" framework preset supersede "vite" ([#11031](https://github.com/vercel/vercel/pull/11031)) ### Patch Changes - Updated dependencies \[[`1333071a3`](1333071a3a)]: - @vercel/frameworks@3.0.0 ## @vercel/remix-builder@2.1.0 ### Minor Changes - Remix Vite plugin support ([#11031](https://github.com/vercel/vercel/pull/11031)) ## vercel@33.5.3 ### Patch Changes - Updated dependencies \[[`c2d99855e`](c2d99855ea), [`1333071a3`](1333071a3a)]: - @vercel/next@4.1.3 - @vercel/remix-builder@2.1.0 ## @vercel/next@4.1.3 ### Patch Changes - Fix manifest with experimental flag ([#11192](https://github.com/vercel/vercel/pull/11192)) Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Remix Vite plugin support (#11031 )
2025-12-24 11:49:13 +00:00 · 2024-02-28 11:34:25 -06:00 · 2024-02-28 11:22:05 -06:00 · 2024-02-23 01:02:17 -08:00 · 2024-02-22 10:08:24 -06:00 · 2024-02-21 20:53:16 -08:00
546 changed files with 44457 additions and 29714 deletions
--- a/.eslintignore
+++ b/.eslintignore
@@ -38,7 +38,7 @@ packages/static-build/test/cache-fixtures
 packages/redwood/test/fixtures

 # remix
-packages/remix/test/fixtures
+packages/remix/test/fixtures-*

 # gatsby-plugin-vercel-analytics
 packages/gatsby-plugin-vercel-analytics
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -0,0 +1,64 @@
+version: 2
+
+updates:
+  - schedule:
+      interval: 'daily'
+    open-pull-requests-limit: 1
+    reviewers:
+      - 'trek'
+      - 'TooTallNate'
+      - 'EndangeredMassa'
+    commit-message:
+      prefix: '[framework-fixtures]'
+    package-ecosystem: 'npm'
+    directory: /packages/static-build/test/fixtures/angular-v17
+    allow:
+      - dependency-name: '@angular*'
+    groups:
+      core:
+        patterns:
+          - '@angular*'
+        update-types:
+          - 'minor'
+
+  - schedule:
+    interval: 'daily'
+    open-pull-requests-limit: 1
+    reviewers:
+      - 'trek'
+      - 'TooTallNate'
+      - 'EndangeredMassa'
+    commit-message:
+      prefix: '[framework-fixtures]'
+    package-ecosystem: 'npm'
+    directory: /packages/static-build/test/fixtures/astro-v4
+    allow:
+      - dependency-name: 'astro*'
+    groups:
+      core:
+        patterns:
+          - 'astro*'
+        update-types:
+          - 'minor'
+
+  - schedule:
+      interval: 'daily'
+    open-pull-requests-limit: 1
+    reviewers:
+      - 'trek'
+      - 'TooTallNate'
+      - 'EndangeredMassa'
+    commit-message:
+      prefix: '[framework-fixtures]'
+    package-ecosystem: 'npm'
+    directory: /packages/static-build/test/fixtures/hydrogen-v2023
+    allow:
+      - dependency-name: '@remix-run*'
+      - dependency-name: '@shopify*'
+    groups:
+      core:
+        patterns:
+          - '@remix-run*'
+          - '@shopify*'
+        update-types:
+          - 'minor'
--- a/.prettierignore
+++ b/.prettierignore
@@ -29,6 +29,7 @@ turbo-cache-key.json
 packages/*/dist
 packages/*/node_modules
 packages/**/test/fixtures
+packages/**/test/fixtures-*
 packages/**/test/dev/fixtures
 packages/**/test/build-fixtures
 packages/**/test/cache-fixtures
--- a/examples/package.json
+++ b/examples/package.json
@@ -9,7 +9,7 @@
  },
  "devDependencies": {
    "@types/jest": "27.4.1",
-    "@vercel/frameworks": "2.0.6"
+    "@vercel/frameworks": "3.0.0"
  },
  "version": null
 }
--- a/internals/types/CHANGELOG.md
+++ b/internals/types/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @vercel-internals/types

+## 1.0.23
+
+### Patch Changes
+
+- Updated dependencies [[`24c3dd282`](https://github.com/vercel/vercel/commit/24c3dd282d7714cd63d2b94fb94745c45fdc79ab)]:
+  - @vercel/build-utils@7.7.0
+
+## 1.0.22
+
+### Patch Changes
+
+- Updated dependencies [[`b6ed28b9b`](https://github.com/vercel/vercel/commit/b6ed28b9b1712f882c93fe053b70d3eb1df21819), [`8ba0ce932`](https://github.com/vercel/vercel/commit/8ba0ce932434c6295fedb5307bee59a804b7e6a8), [`0d034b682`](https://github.com/vercel/vercel/commit/0d034b6820c0f3252949c0ffc483048c5aac7f04), [`abaa700ce`](https://github.com/vercel/vercel/commit/abaa700cea44c723cfc851baa2dfe9e1ae2e8a5c)]:
+  - @vercel/build-utils@7.6.0
+
 ## 1.0.21

 ### Patch Changes
--- a/internals/types/index.d.ts
+++ b/internals/types/index.d.ts
@@ -5,7 +5,12 @@ import type { Route } from '@vercel/routing-utils';
 import { PROJECT_ENV_TARGET } from '@vercel-internals/constants';

 export type ProjectEnvTarget = typeof PROJECT_ENV_TARGET[number];
-export type ProjectEnvType = 'plain' | 'secret' | 'encrypted' | 'system';
+export type ProjectEnvType =
+  | 'plain'
+  | 'secret'
+  | 'encrypted'
+  | 'system'
+  | 'sensitive';

 export type ProjectSettings = import('@vercel/build-utils').ProjectSettings;

--- a/internals/types/package.json
+++ b/internals/types/package.json
@@ -1,7 +1,7 @@
 {
  "private": true,
  "name": "@vercel-internals/types",
-  "version": "1.0.21",
+  "version": "1.0.23",
  "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.5.1",
+    "@vercel/build-utils": "7.7.0",
    "@vercel/routing-utils": "3.1.0"
  },
  "devDependencies": {
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
    "source-map-support": "0.5.12",
    "ts-eager": "2.0.2",
    "ts-jest": "29.1.0",
-    "turbo": "1.11.3",
+    "turbo": "1.12.4",
    "typescript": "4.9.5"
  },
  "scripts": {
--- a/packages/build-utils/CHANGELOG.md
+++ b/packages/build-utils/CHANGELOG.md
@@ -1,5 +1,25 @@
 # @vercel/build-utils

+## 7.7.0
+
+### Minor Changes
+
+- Revert "Revert "Default ruby to only currently supported version (3.2.0)"" ([#11137](https://github.com/vercel/vercel/pull/11137))
+
+## 7.6.0
+
+### Minor Changes
+
+- Revert "Default ruby to only currently supported version (3.2.0)" ([#11135](https://github.com/vercel/vercel/pull/11135))
+
+- Mark `flags` as deprecated and replace them with `variants` ([#11098](https://github.com/vercel/vercel/pull/11098))
+
+- [build-utils] change default package manager when no lockfile detected from `yarn` to `npm` (gated behind feature flag) ([#11131](https://github.com/vercel/vercel/pull/11131))
+
+### Patch Changes
+
+- Update internal type for variants ([#11111](https://github.com/vercel/vercel/pull/11111))
+
 ## 7.5.1

 ### Patch Changes
--- a/packages/build-utils/package.json
+++ b/packages/build-utils/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/build-utils",
-  "version": "7.5.1",
+  "version": "7.7.0",
  "license": "Apache-2.0",
  "main": "./dist/index.js",
  "types": "./dist/index.d.js",
--- a/packages/build-utils/src/fs/run-user-scripts.ts
+++ b/packages/build-utils/src/fs/run-user-scripts.ts
@@ -302,7 +302,7 @@ export async function scanParentDirs(
    });
  let lockfilePath: string | undefined;
  let lockfileVersion: number | undefined;
-  let cliType: CliType = 'yarn';
+  let cliType: CliType;

  const [hasYarnLock, packageLockJson, pnpmLockYaml, bunLockBin] =
    await Promise.all([
@@ -338,6 +338,12 @@ export async function scanParentDirs(
    lockfilePath = bunLockPath;
    // TODO: read "bun-lockfile-format-v0"
    lockfileVersion = 0;
+  } else {
+    if (process.env.VERCEL_ENABLE_NPM_DEFAULT === '1') {
+      cliType = 'npm';
+    } else {
+      cliType = 'yarn';
+    }
  }

  const packageJsonPath = pkgJsonPath || undefined;
@@ -414,6 +420,14 @@ export async function runNpmInstall(
      destPath
    );

+    if (!packageJsonPath) {
+      debug(
+        `Skipping dependency installation because no package.json was found for ${destPath}`
+      );
+      runNpmInstallSema.release();
+      return false;
+    }
+
    // Only allow `runNpmInstall()` to run once per `package.json`
    // when doing a default install (no additional args)
    if (meta && packageJsonPath && args.length === 0) {
--- a/packages/build-utils/src/types.ts
+++ b/packages/build-utils/src/types.ts
@@ -440,7 +440,9 @@ export interface Cron {
  schedule: string;
 }

-// TODO: Proper description once complete
+/**
+ * @deprecated Replaced by Variants. Remove once fully replaced.
+ */
 export interface Flag {
  key: string;
  defaultValue?: unknown;
@@ -471,7 +473,9 @@ export interface BuildResultV2Typical {
  framework?: {
    version: string;
  };
+  /** @deprecated Replaced by Variants. Remove once fully replaced. */
  flags?: Flag[];
+  variants?: Record<string, VariantDefinition>;
 }

 export type BuildResultV2 = BuildResultV2Typical | BuildResultBuildOutput;
@@ -491,3 +495,28 @@ export type ShouldServe = (
 export type StartDevServer = (
  options: StartDevServerOptions
 ) => Promise<StartDevServerResult>;
+
+/**
+ * TODO: The following types will eventually be exported by a more
+ *       relevant package.
+ */
+type VariantJSONArray = ReadonlyArray<VariantJSONValue>;
+
+type VariantJSONValue =
+  | string
+  | boolean
+  | number
+  | null
+  | VariantJSONArray
+  | { [key: string]: VariantJSONValue };
+
+type VariantOption = {
+  value: VariantJSONValue;
+  label?: string;
+};
+
+export interface VariantDefinition {
+  options?: VariantOption[];
+  origin?: string;
+  description?: string;
+}
--- a/packages/build-utils/test/fixtures/07-cross-install/api/yarn.lock
+++ b/packages/build-utils/test/fixtures/07-cross-install/api/yarn.lock
@@ -0,0 +1,4 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
--- a/packages/build-utils/test/fixtures/07-cross-install/lib/yarn.lock
+++ b/packages/build-utils/test/fixtures/07-cross-install/lib/yarn.lock
@@ -0,0 +1,4 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
--- a/packages/build-utils/test/fixtures/08-yarn-npm/with-yarn/yarn.lock
+++ b/packages/build-utils/test/fixtures/08-yarn-npm/with-yarn/yarn.lock
@@ -0,0 +1,4 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
--- a/packages/build-utils/test/fixtures/40-no-lockfile/package.json
+++ b/packages/build-utils/test/fixtures/40-no-lockfile/package.json
@@ -0,0 +1,9 @@
+{
+  "private": true,
+  "scripts": {
+    "build": "mkdir -p public && (printf \"npm version: \" && npm -v) > public/index.txt"
+  },
+  "dependencies": {
+    "sharp": "0.33.2"
+  }
+}
--- a/packages/build-utils/test/fixtures/40-no-lockfile/probes.json
+++ b/packages/build-utils/test/fixtures/40-no-lockfile/probes.json
@@ -0,0 +1,3 @@
+{
+  "probes": [{ "path": "/", "mustContain": "npm version: 8" }]
+}
--- a/packages/build-utils/test/fixtures/40-no-lockfile/vercel.json
+++ b/packages/build-utils/test/fixtures/40-no-lockfile/vercel.json
@@ -0,0 +1,7 @@
+{
+  "build": {
+    "env": {
+      "VERCEL_ENABLE_NPM_DEFAULT": "1"
+    }
+  }
+}
--- a/packages/build-utils/test/unit.test.ts
+++ b/packages/build-utils/test/unit.test.ts
@@ -576,6 +576,52 @@ it(
  ms('1m')
 );

+it('should return cliType npm when no lockfile is present and VERCEL_ENABLE_NPM_DEFAULT is set', async () => {
+  const originalRepoLockfilePath = path.join(
+    __dirname,
+    '..',
+    '..',
+    '..',
+    'pnpm-lock.yaml'
+  );
+  const originalRepoLockfileData = await fs.readFile(originalRepoLockfilePath);
+  await fs.remove(originalRepoLockfilePath);
+  try {
+    process.env.VERCEL_ENABLE_NPM_DEFAULT = '1';
+    const fixture = path.join(__dirname, 'fixtures', '40-no-lockfile');
+    const result = await scanParentDirs(fixture);
+    expect(result.cliType).toEqual('npm');
+    expect(result.lockfileVersion).toEqual(undefined);
+    expect(result.lockfilePath).toEqual(undefined);
+    expect(result.packageJsonPath).toEqual(path.join(fixture, 'package.json'));
+  } finally {
+    delete process.env.VERCEL_ENABLE_NPM_DEFAULT;
+    await fs.writeFile(originalRepoLockfilePath, originalRepoLockfileData);
+  }
+});
+
+it('should return cliType yarn when no lockfile is present and VERCEL_ENABLE_NPM_DEFAULT is not set', async () => {
+  const originalRepoLockfilePath = path.join(
+    __dirname,
+    '..',
+    '..',
+    '..',
+    'pnpm-lock.yaml'
+  );
+  const originalRepoLockfileData = await fs.readFile(originalRepoLockfilePath);
+  await fs.remove(originalRepoLockfilePath);
+  try {
+    const fixture = path.join(__dirname, 'fixtures', '40-no-lockfile');
+    const result = await scanParentDirs(fixture);
+    expect(result.cliType).toEqual('yarn');
+    expect(result.lockfileVersion).toEqual(undefined);
+    expect(result.lockfilePath).toEqual(undefined);
+    expect(result.packageJsonPath).toEqual(path.join(fixture, 'package.json'));
+  } finally {
+    await fs.writeFile(originalRepoLockfilePath, originalRepoLockfileData);
+  }
+});
+
 it('should return cliType bun and correct lock file for bun v1', async () => {
  const fixture = path.join(__dirname, 'fixtures', '31-bun-v1-with-yarn-lock');
  const result = await scanParentDirs(fixture);
--- a/packages/cli/CHANGELOG.md
+++ b/packages/cli/CHANGELOG.md
@@ -1,5 +1,77 @@
 # vercel

+## 33.5.3
+
+### Patch Changes
+
+- Updated dependencies [[`c2d99855e`](https://github.com/vercel/vercel/commit/c2d99855ea6132380434ed29643120680f95fad7), [`1333071a3`](https://github.com/vercel/vercel/commit/1333071a3a2d324679327bfdd4e872f8fd3521c6)]:
+  - @vercel/next@4.1.3
+  - @vercel/remix-builder@2.1.0
+
+## 33.5.2
+
+### Patch Changes
+
+- Updated dependencies [[`e109e3325`](https://github.com/vercel/vercel/commit/e109e3325ab5299da0903034175fabe72d486a4e), [`d17abf463`](https://github.com/vercel/vercel/commit/d17abf463acabf9e1e43b91200f18efd34e91f62), [`644721a90`](https://github.com/vercel/vercel/commit/644721a90da8cf98414d272be9da0a821a2ce217), [`ea0e9aeae`](https://github.com/vercel/vercel/commit/ea0e9aeaec8ddddb5a726be0d252df9cdbd84808), [`e318a0eea`](https://github.com/vercel/vercel/commit/e318a0eea55c9b8536b0874f66cfd03aca6f0adf), [`1fee87e76`](https://github.com/vercel/vercel/commit/1fee87e76f18d2f5e5524247cfce615fa1832e49), [`bfc01fd98`](https://github.com/vercel/vercel/commit/bfc01fd98f760a008d0d2e6c52b5216503b44b75), [`7910f2f30`](https://github.com/vercel/vercel/commit/7910f2f3070ff69742e845e795d4db77d598c181), [`440ef3ba9`](https://github.com/vercel/vercel/commit/440ef3ba98af8f05e7714c86c67c36dbda11e85c)]:
+  - @vercel/remix-builder@2.0.20
+  - @vercel/next@4.1.2
+  - @vercel/node@3.0.20
+  - @vercel/redwood@2.0.8
+
+## 33.5.1
+
+### Patch Changes
+
+- build: upgrade edge-runtime ([#11148](https://github.com/vercel/vercel/pull/11148))
+
+- Updated dependencies [[`24c3dd282`](https://github.com/vercel/vercel/commit/24c3dd282d7714cd63d2b94fb94745c45fdc79ab), [`10e200e0b`](https://github.com/vercel/vercel/commit/10e200e0bf8f692b6740e098e0572b4e7de83850), [`678ebbe52`](https://github.com/vercel/vercel/commit/678ebbe5255766656bf2dddc574e86b2999f11c8)]:
+  - @vercel/build-utils@7.7.0
+  - @vercel/static-build@2.4.0
+  - @vercel/node@3.0.19
+
+## 33.5.0
+
+### Minor Changes
+
+- Mark `flags` as deprecated and replace them with `variants` ([#11098](https://github.com/vercel/vercel/pull/11098))
+
+### Patch Changes
+
+- Updated dependencies [[`c32a909af`](https://github.com/vercel/vercel/commit/c32a909afcedf0ee55777d5dcaecc0c8383dd8c8), [`b6ed28b9b`](https://github.com/vercel/vercel/commit/b6ed28b9b1712f882c93fe053b70d3eb1df21819), [`d21bb9f87`](https://github.com/vercel/vercel/commit/d21bb9f87e1d837666fe8104d4e199b2590725d6), [`4027a1833`](https://github.com/vercel/vercel/commit/4027a1833718a92be74b2b3c5a4df23745d19a36), [`8ba0ce932`](https://github.com/vercel/vercel/commit/8ba0ce932434c6295fedb5307bee59a804b7e6a8), [`0d034b682`](https://github.com/vercel/vercel/commit/0d034b6820c0f3252949c0ffc483048c5aac7f04), [`abaa700ce`](https://github.com/vercel/vercel/commit/abaa700cea44c723cfc851baa2dfe9e1ae2e8a5c), [`3bad73401`](https://github.com/vercel/vercel/commit/3bad73401b4ec1f61e515965732cde8dcc052b17)]:
+  - @vercel/next@4.1.1
+  - @vercel/node@3.0.18
+  - @vercel/redwood@2.0.7
+  - @vercel/remix-builder@2.0.19
+  - @vercel/build-utils@7.6.0
+  - @vercel/static-build@2.3.0
+
+## 33.4.1
+
+### Patch Changes
+
+- Updated dependencies [[`d05e41eea`](https://github.com/vercel/vercel/commit/d05e41eeaf97a024157d2bd843782c95c39389be), [`de63e3562`](https://github.com/vercel/vercel/commit/de63e356223467447cda539ddc435a892303afc7)]:
+  - @vercel/static-build@2.2.0
+
+## 33.4.0
+
+### Minor Changes
+
+- Added a new option to add a sensitive environment variable ([#11033](https://github.com/vercel/vercel/pull/11033))
+
+## 33.3.0
+
+### Minor Changes
+
+- Emit "filePathMap" in `vc-config.json` for `FileFsRef` instances ([#11060](https://github.com/vercel/vercel/pull/11060))
+
+### Patch Changes
+
+- Update `vc dev` to support `Lambda` instances without `zipBuffer` ([#11080](https://github.com/vercel/vercel/pull/11080))
+
+- Updated dependencies [[`322c88536`](https://github.com/vercel/vercel/commit/322c88536dfa0ba3892eb580858ee54f6b04ed3f), [`62ca2efa7`](https://github.com/vercel/vercel/commit/62ca2efa731c4df46d586b94078b2dcb1c0bb934)]:
+  - @vercel/ruby@2.0.5
+  - @vercel/python@4.1.1
+
 ## 33.2.0

 ### Minor Changes
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
  "name": "vercel",
-  "version": "33.2.0",
+  "version": "33.5.3",
  "preferGlobal": true,
  "license": "Apache-2.0",
  "description": "The command-line interface for Vercel",
@@ -31,22 +31,22 @@
    "node": ">= 16"
  },
  "dependencies": {
-    "@vercel/build-utils": "7.5.1",
+    "@vercel/build-utils": "7.7.0",
    "@vercel/fun": "1.1.0",
    "@vercel/go": "3.0.5",
    "@vercel/hydrogen": "1.0.2",
-    "@vercel/next": "4.1.0",
-    "@vercel/node": "3.0.17",
-    "@vercel/python": "4.1.0",
-    "@vercel/redwood": "2.0.6",
-    "@vercel/remix-builder": "2.0.18",
-    "@vercel/ruby": "2.0.4",
-    "@vercel/static-build": "2.1.0",
+    "@vercel/next": "4.1.3",
+    "@vercel/node": "3.0.20",
+    "@vercel/python": "4.1.1",
+    "@vercel/redwood": "2.0.8",
+    "@vercel/remix-builder": "2.1.0",
+    "@vercel/ruby": "2.0.5",
+    "@vercel/static-build": "2.4.0",
    "chokidar": "3.3.1"
  },
  "devDependencies": {
    "@alex_neo/jest-expect-message": "1.0.5",
-    "@edge-runtime/node-utils": "2.2.2",
+    "@edge-runtime/node-utils": "2.3.0",
    "@next/env": "11.1.2",
    "@sentry/node": "5.5.0",
    "@sindresorhus/slugify": "0.11.0",
@@ -88,11 +88,11 @@
    "@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.21",
-    "@vercel/client": "13.0.14",
+    "@vercel-internals/types": "1.0.23",
+    "@vercel/client": "13.1.3",
    "@vercel/error-utils": "2.0.2",
-    "@vercel/frameworks": "2.0.6",
-    "@vercel/fs-detectors": "5.1.6",
+    "@vercel/frameworks": "3.0.0",
+    "@vercel/fs-detectors": "5.2.0",
    "@vercel/routing-utils": "3.1.0",
    "ajv": "6.12.2",
    "alpha-sort": "2.0.1",
--- a/packages/cli/src/commands/build/index.ts
+++ b/packages/cli/src/commands/build/index.ts
@@ -22,6 +22,7 @@ import {
  Cron,
  validateNpmrc,
  Flag,
+  VariantDefinition,
 } from '@vercel/build-utils';
 import {
  detectBuilders,
@@ -95,7 +96,9 @@ interface BuildOutputConfig {
    version: string;
  };
  crons?: Cron[];
+  /** @deprecated Replaced by Variants. Remove once fully replaced. */
  flags?: Flag[];
+  variants?: Record<string, VariantDefinition>;
 }

 /**
@@ -553,6 +556,7 @@ async function doBuild(
      // Start flushing the file outputs to the filesystem asynchronously
      ops.push(
        writeBuildResult(
+          repoRootPath,
          outputDir,
          buildResult,
          build,
@@ -677,10 +681,13 @@ async function doBuild(
    overrides: mergedOverrides,
    framework,
    crons: mergedCrons,
+    /** @deprecated Replaced by Variants. Remove once fully replaced. */
    flags: mergedFlags,
  };
  await fs.writeJSON(join(outputDir, 'config.json'), config, { spaces: 2 });

+  await writeVariantsJson(client, buildResults.values(), outputDir);
+
  const relOutputDir = relative(cwd, outputDir);
  output.print(
    `${prependEmoji(
@@ -825,6 +832,51 @@ function mergeFlags(
  });
 }

+/**
+ * Takes the build output and writes all the variants into the `variants.json`
+ * file. It'll skip variants that already exist.
+ */
+async function writeVariantsJson(
+  { output }: Client,
+  buildResults: Iterable<BuildResult | BuildOutputConfig>,
+  outputDir: string
+): Promise<void> {
+  const variantsFilePath = join(outputDir, 'variants.json');
+
+  let hasVariants = true;
+
+  const variants = (await fs.readJSON(variantsFilePath).catch(error => {
+    if (error.code === 'ENOENT') {
+      hasVariants = false;
+      return { definitions: {} };
+    }
+
+    throw error;
+  })) as { definitions: Record<string, VariantDefinition> };
+
+  for (const result of buildResults) {
+    if (!('variants' in result) || !result.variants) continue;
+
+    for (const [key, defintion] of Object.entries(result.variants)) {
+      if (result.variants[key]) {
+        output.warn(
+          `The variant "${key}" was found multiple times. Only its first occurrence will be considered.`
+        );
+        continue;
+      }
+
+      hasVariants = true;
+      variants.definitions[key] = defintion;
+    }
+  }
+
+  // Only create the file when there are variants to write,
+  // or when the file already exists.
+  if (hasVariants) {
+    await fs.writeJSON(variantsFilePath, variants, { spaces: 2 });
+  }
+}
+
 async function writeBuildJson(buildsJson: BuildsManifest, outputDir: string) {
  await fs.writeJSON(join(outputDir, 'builds.json'), buildsJson, { spaces: 2 });
 }
--- a/packages/cli/src/commands/env/add.ts
+++ b/packages/cli/src/commands/env/add.ts
@@ -19,6 +19,7 @@ import { isAPIError } from '../../util/errors-ts';

 type Options = {
  '--debug': boolean;
+  '--sensitive': boolean;
 };

 export default async function add(
@@ -144,6 +145,8 @@ export default async function add(
    envGitBranch = inputValue || '';
  }

+  const type = opts['--sensitive'] ? 'sensitive' : 'encrypted';
+
  const addStamp = stamp();
  try {
    output.spinner('Saving');
@@ -151,7 +154,7 @@ export default async function add(
      output,
      client,
      project.id,
-      'encrypted',
+      type,
      envName,
      envValue,
      envTargets,
--- a/packages/cli/src/commands/env/command.ts
+++ b/packages/cli/src/commands/env/command.ts
@@ -34,7 +34,16 @@ export const envCommand: Command = {
          required: false,
        },
      ],
-      options: [],
+      options: [
+        {
+          name: 'sensitive',
+          description: 'Add a sensitive Environment Variable',
+          shorthand: null,
+          type: 'string',
+          deprecated: false,
+          multi: false,
+        },
+      ],
      examples: [],
    },
    {
@@ -117,6 +126,10 @@ export const envCommand: Command = {
        `${packageName} env add DB_PASS production`,
      ],
    },
+    {
+      name: 'Add a sensitive Environment Variable',
+      value: `${packageName} env add API_TOKEN --sensitive`,
+    },
    {
      name: 'Add a new variable for a specific Environment and Git Branch',
      value: [
--- a/packages/cli/src/commands/env/index.ts
+++ b/packages/cli/src/commands/env/index.ts
@@ -34,6 +34,7 @@ export default async function main(client: Client) {
      '-y': '--yes',
      '--environment': String,
      '--git-branch': String,
+      '--sensitive': Boolean,
    });
  } catch (error) {
    handleError(error);
--- a/packages/cli/src/util/build/write-build-result.ts
+++ b/packages/cli/src/util/build/write-build-result.ts
@@ -14,6 +14,7 @@ import {
  BuildResultV2,
  BuildResultV3,
  File,
+  Files,
  FileFsRef,
  BuilderV2,
  BuilderV3,
@@ -45,6 +46,7 @@ interface FunctionConfiguration {
 }

 export async function writeBuildResult(
+  repoRootPath: string,
  outputDir: string,
  buildResult: BuildResultV2 | BuildResultV3,
  build: Builder,
@@ -55,6 +57,7 @@ export async function writeBuildResult(
  const { version } = builder;
  if (typeof version !== 'number' || version === 2) {
    return writeBuildResultV2(
+      repoRootPath,
      outputDir,
      buildResult as BuildResultV2,
      build,
@@ -62,6 +65,7 @@ export async function writeBuildResult(
    );
  } else if (version === 3) {
    return writeBuildResultV3(
+      repoRootPath,
      outputDir,
      buildResult as BuildResultV3,
      build,
@@ -107,6 +111,7 @@ function stripDuplicateSlashes(path: string): string {
 * the filesystem.
 */
 async function writeBuildResultV2(
+  repoRootPath: string,
  outputDir: string,
  buildResult: BuildResultV2,
  build: Builder,
@@ -136,6 +141,7 @@ async function writeBuildResultV2(
    const normalizedPath = stripDuplicateSlashes(path);
    if (isLambda(output)) {
      await writeLambda(
+        repoRootPath,
        outputDir,
        output,
        normalizedPath,
@@ -150,6 +156,7 @@ async function writeBuildResultV2(
      }

      await writeLambda(
+        repoRootPath,
        outputDir,
        output.lambda,
        normalizedPath,
@@ -210,6 +217,7 @@ async function writeBuildResultV2(
      );
    } else if (isEdgeFunction(output)) {
      await writeEdgeFunction(
+        repoRootPath,
        outputDir,
        output,
        normalizedPath,
@@ -231,6 +239,7 @@ async function writeBuildResultV2(
 * the filesystem.
 */
 async function writeBuildResultV3(
+  repoRootPath: string,
  outputDir: string,
  buildResult: BuildResultV3,
  build: Builder,
@@ -254,9 +263,15 @@ async function writeBuildResultV3(
    build.config?.zeroConfig ? src.substring(0, src.length - ext.length) : src
  );
  if (isLambda(output)) {
-    await writeLambda(outputDir, output, path, functionConfiguration);
+    await writeLambda(
+      repoRootPath,
+      outputDir,
+      output,
+      path,
+      functionConfiguration
+    );
  } else if (isEdgeFunction(output)) {
-    await writeEdgeFunction(outputDir, output, path);
+    await writeEdgeFunction(repoRootPath, outputDir, output, path);
  } else {
    throw new Error(
      `Unsupported output type: "${(output as any).type}" for ${build.src}`
@@ -364,6 +379,7 @@ async function writeFunctionSymlink(
 * @param existingFunctions (optional) Map of `Lambda`/`EdgeFunction` instances that have previously been written
 */
 async function writeEdgeFunction(
+  repoRootPath: string,
  outputDir: string,
  edgeFunction: EdgeFunction,
  path: string,
@@ -387,12 +403,17 @@ async function writeEdgeFunction(

  await fs.mkdirp(dest);
  const ops: Promise<any>[] = [];
-  ops.push(download(edgeFunction.files, dest));
+  const { files, filePathMap } = filesWithoutFsRefs(
+    edgeFunction.files,
+    repoRootPath
+  );
+  ops.push(download(files, dest));

  const config = {
    runtime: 'edge',
    ...edgeFunction,
    entrypoint: normalizePath(edgeFunction.entrypoint),
+    filePathMap,
    files: undefined,
    type: undefined,
  };
@@ -415,6 +436,7 @@ async function writeEdgeFunction(
 * @param existingFunctions (optional) Map of `Lambda`/`EdgeFunction` instances that have previously been written
 */
 async function writeLambda(
+  repoRootPath: string,
  outputDir: string,
  lambda: Lambda,
  path: string,
@@ -434,9 +456,12 @@ async function writeLambda(

  await fs.mkdirp(dest);
  const ops: Promise<any>[] = [];
+  let filePathMap: Record<string, string> | undefined;
  if (lambda.files) {
    // `files` is defined
-    ops.push(download(lambda.files, dest));
+    const f = filesWithoutFsRefs(lambda.files, repoRootPath);
+    filePathMap = f.filePathMap;
+    ops.push(download(f.files, dest));
  } else if (lambda.zipBuffer) {
    // Builders that use the deprecated `createLambda()` might only have `zipBuffer`
    ops.push(unzip(lambda.zipBuffer, dest));
@@ -452,6 +477,7 @@ async function writeLambda(
    handler: normalizePath(lambda.handler),
    memory,
    maxDuration,
+    filePathMap,
    type: undefined,
    files: undefined,
    zipBuffer: undefined,
@@ -559,3 +585,25 @@ export async function* findDirs(
    }
  }
 }
+
+/**
+ * Removes the `FileFsRef` instances from the `Files` object
+ * and returns them in a JSON serializable map of repo root
+ * relative paths to Lambda destination paths.
+ */
+function filesWithoutFsRefs(
+  files: Files,
+  repoRootPath: string
+): { files: Files; filePathMap?: Record<string, string> } {
+  let filePathMap: Record<string, string> | undefined;
+  const out: Files = {};
+  for (const [path, file] of Object.entries(files)) {
+    if (file.type === 'FileFsRef') {
+      if (!filePathMap) filePathMap = {};
+      filePathMap[path] = relative(repoRootPath, file.fsPath);
+    } else {
+      out[path] = file;
+    }
+  }
+  return { files: out, filePathMap };
+}
--- a/packages/cli/src/util/dev/builder-worker.js
+++ b/packages/cli/src/util/dev/builder-worker.js
@@ -42,6 +42,18 @@ async function processMessage(message) {
  // structure to JSON" errors, so delete the property...
  delete result.childProcesses;

+  if (builder.version === 3) {
+    if (result.output.type === 'Lambda') {
+      result.output.zipBuffer = await result.output.createZip();
+    }
+  } else {
+    for (const output of Object.values(result.output)) {
+      if (output.type === 'Lambda') {
+        output.zipBuffer = await output.createZip();
+      }
+    }
+  }
+
  process.send({ type: 'buildResult', result });
 }

--- a/packages/cli/src/util/dev/builder.ts
+++ b/packages/cli/src/util/dev/builder.ts
@@ -361,8 +361,10 @@ export async function executeBuild(
          await oldAsset.fn.destroy();
        }

+        const ZipFile = asset.zipBuffer || (await asset.createZip());
+
        asset.fn = await createFunction({
-          Code: { ZipFile: asset.zipBuffer },
+          Code: { ZipFile },
          Handler: asset.handler,
          Runtime: asset.runtime,
          MemorySize: asset.memory || 3008,
--- a/packages/cli/test/helpers/prepare.js
+++ b/packages/cli/test/helpers/prepare.js
@@ -382,6 +382,9 @@ module.exports = async function prepare(session, binaryPath, tmpFixturesDir) {
      'index.html': 'Hello',
      'vercel.json': '{"builds":[{"src":"*.html","use":"@vercel/static"}]}',
    },
+    'project-sensitive-env-vars': {
+      'package.json': '{}',
+    },
    'dev-proxy-headers-and-env': {
      'package.json': JSON.stringify({}),
      'server.js': `require('http').createServer((req, res) => {
--- a/packages/cli/test/integration-2.test.ts
+++ b/packages/cli/test/integration-2.test.ts
@@ -681,6 +681,53 @@ test('vercel env with unknown `VERCEL_ORG_ID` or `VERCEL_PROJECT_ID` should erro
  expect(output.stderr).toContain('Project not found');
 });

+test('add a sensitive env var', async () => {
+  const dir = await setupE2EFixture('project-sensitive-env-vars');
+  const projectName = `project-sensitive-env-vars-${
+    Math.random().toString(36).split('.')[1]
+  }`;
+
+  // remove previously linked project if it exists
+  await remove(path.join(dir, '.vercel'));
+
+  const vc = execCli(binaryPath, ['link'], {
+    cwd: dir,
+    env: {
+      FORCE_TTY: '1',
+    },
+  });
+
+  await setupProject(vc, projectName, {
+    buildCommand: `mkdir -p o && echo '<h1>custom hello</h1>' > o/index.html`,
+    outputDirectory: 'o',
+  });
+
+  await vc;
+
+  const link = require(path.join(dir, '.vercel/project.json'));
+
+  const addEnvCommand = execCli(
+    binaryPath,
+    ['env', 'add', 'envVarName', 'production', '--sensitive'],
+    {
+      env: {
+        VERCEL_ORG_ID: link.orgId,
+        VERCEL_PROJECT_ID: link.projectId,
+      },
+    }
+  );
+
+  await waitForPrompt(addEnvCommand, /What’s the value of [^?]+\?/);
+  addEnvCommand.stdin?.write('test\n');
+
+  const output = await addEnvCommand;
+
+  expect(output.exitCode, formatOutput(output)).toBe(0);
+  expect(output.stderr).toContain(
+    'Added Environment Variable envVarName to Project'
+  );
+});
+
 test('whoami with `VERCEL_ORG_ID` should favor `--scope` and should error', async () => {
  if (!token) {
    throw new Error('Shared state "token" not set.');
@@ -857,7 +904,7 @@ test('deploy pnpm twice using pnp and symlink=false', async () => {
  page = await fetch(stdout);
  text = await page.text();

-  expect(text).toBe('cache exists\n');
+  expect(text).toContain('cache exists\n');
 });

 test('reject deploying with wrong team .vercel config', async () => {
--- a/packages/client/CHANGELOG.md
+++ b/packages/client/CHANGELOG.md
@@ -1,5 +1,31 @@
 # @vercel/client

+## 13.1.3
+
+### Patch Changes
+
+- Updated dependencies [[`24c3dd282`](https://github.com/vercel/vercel/commit/24c3dd282d7714cd63d2b94fb94745c45fdc79ab)]:
+  - @vercel/build-utils@7.7.0
+
+## 13.1.2
+
+### Patch Changes
+
+- Updated dependencies [[`b6ed28b9b`](https://github.com/vercel/vercel/commit/b6ed28b9b1712f882c93fe053b70d3eb1df21819), [`8ba0ce932`](https://github.com/vercel/vercel/commit/8ba0ce932434c6295fedb5307bee59a804b7e6a8), [`0d034b682`](https://github.com/vercel/vercel/commit/0d034b6820c0f3252949c0ffc483048c5aac7f04), [`abaa700ce`](https://github.com/vercel/vercel/commit/abaa700cea44c723cfc851baa2dfe9e1ae2e8a5c)]:
+  - @vercel/build-utils@7.6.0
+
+## 13.1.1
+
+### Patch Changes
+
+- More helpful error message when `vc deploy --prebuilt` has missing files ([#11105](https://github.com/vercel/vercel/pull/11105))
+
+## 13.1.0
+
+### Minor Changes
+
+- Upload files referenced by "filePathMap" during `vc deploy --prebuilt` ([#11077](https://github.com/vercel/vercel/pull/11077))
+
 ## 13.0.14

 ### Patch Changes
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/client",
-  "version": "13.0.14",
+  "version": "13.1.3",
  "main": "dist/index.js",
  "typings": "dist/index.d.ts",
  "homepage": "https://vercel.com",
@@ -37,7 +37,8 @@
    "typescript": "4.9.5"
  },
  "dependencies": {
-    "@vercel/build-utils": "7.5.1",
+    "@vercel/build-utils": "7.7.0",
+    "@vercel/error-utils": "2.0.2",
    "@vercel/routing-utils": "3.1.0",
    "@zeit/fetch": "5.2.0",
    "async-retry": "1.2.3",
--- a/packages/client/src/create-deployment.ts
+++ b/packages/client/src/create-deployment.ts
@@ -1,9 +1,10 @@
 import { lstatSync } from 'fs-extra';
-import { isAbsolute, join, relative } from 'path';
+import { isAbsolute, join, relative, sep } from 'path';
 import { hash, hashes, mapToObject } from './utils/hashes';
 import { upload } from './upload';
 import { buildFileTree, createDebug } from './utils';
 import { DeploymentError } from './errors';
+import { isErrnoException } from '@vercel/error-utils';
 import {
  VercelClientOptions,
  DeploymentOptions,
@@ -90,27 +91,43 @@ export default function buildCreateDeployment() {

    let files;

-    if (clientOptions.archive === 'tgz') {
-      debug('Packing tarball');
-      const tarStream = tar
-        .pack(workPath, {
-          entries: fileList.map(file => relative(workPath, file)),
-        })
-        .pipe(createGzip());
-      const tarBuffer = await streamToBuffer(tarStream);
-      debug('Packed tarball');
-      files = new Map([
-        [
-          hash(tarBuffer),
-          {
-            names: [join(workPath, '.vercel/source.tgz')],
-            data: tarBuffer,
-            mode: 0o666,
-          },
-        ],
-      ]);
-    } else {
-      files = await hashes(fileList);
+    try {
+      if (clientOptions.archive === 'tgz') {
+        debug('Packing tarball');
+        const tarStream = tar
+          .pack(workPath, {
+            entries: fileList.map(file => relative(workPath, file)),
+          })
+          .pipe(createGzip());
+        const tarBuffer = await streamToBuffer(tarStream);
+        debug('Packed tarball');
+        files = new Map([
+          [
+            hash(tarBuffer),
+            {
+              names: [join(workPath, '.vercel/source.tgz')],
+              data: tarBuffer,
+              mode: 0o666,
+            },
+          ],
+        ]);
+      } else {
+        files = await hashes(fileList);
+      }
+    } catch (err: unknown) {
+      if (
+        clientOptions.prebuilt &&
+        isErrnoException(err) &&
+        err.code === 'ENOENT' &&
+        err.path
+      ) {
+        const errPath = relative(workPath, err.path);
+        err.message = `File does not exist: "${relative(workPath, errPath)}"`;
+        if (errPath.split(sep).includes('node_modules')) {
+          err.message = `Please ensure project dependencies have been installed:\n${err.message}`;
+        }
+      }
+      throw err;
    }

    debug(`Yielding a 'hashes-calculated' event with ${files.size} hashes`);
--- a/packages/client/src/utils/index.ts
+++ b/packages/client/src/utils/index.ts
@@ -1,7 +1,7 @@
 import { FilesMap } from './hashes';
 import { FetchOptions } from '@zeit/fetch';
 import { nodeFetch, zeitFetch } from './fetch';
-import { join, sep, relative } from 'path';
+import { join, sep, relative, basename } from 'path';
 import { URL } from 'url';
 import ignore from 'ignore';
 import { pkgVersion } from '../pkg';
@@ -109,6 +109,29 @@ export async function buildFileTree(
      return ignored;
    };
    fileList = await readdir(path, [ignores]);
+
+    if (prebuilt) {
+      // Traverse over the `.vc-config.json` files and include
+      // the files referenced by the "filePathMap" properties
+      const refs = new Set<string>();
+      const vcConfigFilePaths = fileList.filter(
+        file => basename(file) === '.vc-config.json'
+      );
+      await Promise.all(
+        vcConfigFilePaths.map(async p => {
+          const configJson = await readFile(p, 'utf8');
+          const config = JSON.parse(configJson);
+          if (!config.filePathMap) return;
+          for (const v of Object.values(config.filePathMap) as string[]) {
+            refs.add(join(path, v));
+          }
+        })
+      );
+      if (refs.size > 0) {
+        fileList = fileList.concat(Array.from(refs));
+      }
+    }
+
    debug(`Found ${fileList.length} files in the specified directory`);
  } else if (Array.isArray(path)) {
    // Array of file paths
--- a/packages/client/tests/fixtures/file-system-api/.gitignore
+++ b/packages/client/tests/fixtures/file-system-api/.gitignore
@@ -0,0 +1 @@
+!/.vercel
--- a/packages/client/tests/fixtures/file-system-api/.vercel/output/functions/api/another.func/.vc-config.json
+++ b/packages/client/tests/fixtures/file-system-api/.vercel/output/functions/api/another.func/.vc-config.json
@@ -0,0 +1,5 @@
+{
+    "filePathMap": {
+        "node_modules/another/index.js": "node_modules/another/index.js"
+    }
+}
--- a/packages/client/tests/fixtures/file-system-api/.vercel/output/functions/api/example.func/.vc-config.json
+++ b/packages/client/tests/fixtures/file-system-api/.vercel/output/functions/api/example.func/.vc-config.json
@@ -0,0 +1,5 @@
+{
+    "filePathMap": {
+        "node_modules/example/index.js": "node_modules/example/index.js"
+    }
+}
--- a/packages/client/tests/unit.utils.test.ts
+++ b/packages/client/tests/unit.utils.test.ts
@@ -109,7 +109,7 @@ describe('buildFileTree()', () => {
      normalizeWindowsPaths(fileList).sort()
    );

-    const expectedIgnoreList = ['.vercel'];
+    const expectedIgnoreList = ['.gitignore', '.vercel'];
    expect(normalizeWindowsPaths(expectedIgnoreList).sort()).toEqual(
      normalizeWindowsPaths(ignoreList).sort()
    );
@@ -124,14 +124,18 @@ describe('buildFileTree()', () => {
    );

    const expectedFileList = toAbsolutePaths(cwd, [
+      '.vercel/output/functions/api/another.func/.vc-config.json',
+      '.vercel/output/functions/api/example.func/.vc-config.json',
      '.vercel/output/static/baz.txt',
      '.vercel/output/static/sub/qux.txt',
+      'node_modules/another/index.js',
+      'node_modules/example/index.js',
    ]);
    expect(normalizeWindowsPaths(expectedFileList).sort()).toEqual(
      normalizeWindowsPaths(fileList).sort()
    );

-    const expectedIgnoreList = ['foo.txt', 'sub'];
+    const expectedIgnoreList = ['.gitignore', 'foo.txt', 'sub'];
    expect(normalizeWindowsPaths(expectedIgnoreList).sort()).toEqual(
      normalizeWindowsPaths(ignoreList).sort()
    );
--- a/packages/frameworks/CHANGELOG.md
+++ b/packages/frameworks/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @vercel/frameworks

+## 3.0.0
+
+### Major Changes
+
+- Make "remix" framework preset supersede "vite" ([#11031](https://github.com/vercel/vercel/pull/11031))
+
 ## 2.0.6

 ### Patch Changes
--- a/packages/frameworks/package.json
+++ b/packages/frameworks/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/frameworks",
-  "version": "2.0.6",
+  "version": "3.0.0",
  "main": "./dist/frameworks.js",
  "types": "./dist/frameworks.d.ts",
  "files": [
--- a/packages/frameworks/src/frameworks.ts
+++ b/packages/frameworks/src/frameworks.ts
@@ -202,11 +202,14 @@ export const frameworks = [
    description: 'A new Remix app — the result of running `npx create-remix`.',
    website: 'https://remix.run',
    sort: 6,
-    supersedes: 'hydrogen',
+    supersedes: ['hydrogen', 'vite'],
    useRuntime: { src: 'package.json', use: '@vercel/remix-builder' },
    ignoreRuntimes: ['@vercel/node'],
    detectors: {
      some: [
+        {
+          matchPackage: '@remix-run/dev',
+        },
        {
          path: 'remix.config.js',
        },
@@ -1734,7 +1737,7 @@ export const frameworks = [
    tagline: 'React framework for headless commerce',
    description: 'React framework for headless commerce',
    website: 'https://hydrogen.shopify.dev',
-    supersedes: 'vite',
+    supersedes: ['vite'],
    useRuntime: { src: 'package.json', use: '@vercel/hydrogen' },
    envPrefix: 'PUBLIC_',
    detectors: {
--- a/packages/frameworks/src/types.ts
+++ b/packages/frameworks/src/types.ts
@@ -220,7 +220,7 @@ export interface Framework {
   */
  defaultVersion?: string;
  /**
-   * Slug of another framework preset in which this framework supersedes.
+   * Array of slugs for other framework presets which this framework supersedes.
   */
-  supersedes?: string;
+  supersedes?: string[];
 }
--- a/packages/frameworks/test/frameworks.unit.test.ts
+++ b/packages/frameworks/test/frameworks.unit.test.ts
@@ -199,7 +199,7 @@ const Schema = {
      dependency: { type: 'string' },
      cachePattern: { type: 'string' },
      defaultVersion: { type: 'string' },
-      supersedes: { type: 'string' },
+      supersedes: { type: 'array', items: { type: 'string' } },
    },
  },
 };
--- a/packages/fs-detectors/CHANGELOG.md
+++ b/packages/fs-detectors/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @vercel/fs-detectors

+## 5.2.0
+
+### Minor Changes
+
+- Make "remix" framework preset supersede "vite" ([#11031](https://github.com/vercel/vercel/pull/11031))
+
+### Patch Changes
+
+- Updated dependencies [[`1333071a3`](https://github.com/vercel/vercel/commit/1333071a3a2d324679327bfdd4e872f8fd3521c6)]:
+  - @vercel/frameworks@3.0.0
+
 ## 5.1.6

 ### Patch Changes
--- a/packages/fs-detectors/package.json
+++ b/packages/fs-detectors/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/fs-detectors",
-  "version": "5.1.6",
+  "version": "5.2.0",
  "description": "Vercel filesystem detectors",
  "main": "./dist/index.js",
  "types": "./dist/index.d.ts",
@@ -22,7 +22,7 @@
  },
  "dependencies": {
    "@vercel/error-utils": "2.0.2",
-    "@vercel/frameworks": "2.0.6",
+    "@vercel/frameworks": "3.0.0",
    "@vercel/routing-utils": "3.1.0",
    "glob": "8.0.3",
    "js-yaml": "4.1.0",
@@ -37,7 +37,7 @@
    "@types/minimatch": "3.0.5",
    "@types/node": "14.18.33",
    "@types/semver": "7.3.10",
-    "@vercel/build-utils": "7.5.1",
+    "@vercel/build-utils": "7.7.0",
    "jest-junit": "16.0.0",
    "typescript": "4.9.5"
  }
--- a/packages/fs-detectors/src/detect-framework.ts
+++ b/packages/fs-detectors/src/detect-framework.ts
@@ -143,7 +143,9 @@ function removeSupersededFramework(
  const framework = matches[index];
  if (framework) {
    if (framework.supersedes) {
-      removeSupersededFramework(matches, framework.supersedes);
+      for (const slug of framework.supersedes) {
+        removeSupersededFramework(matches, slug);
+      }
    }
    matches.splice(index, 1);
  }
@@ -154,7 +156,9 @@ export function removeSupersededFrameworks(
 ) {
  for (const match of matches.slice()) {
    if (match?.supersedes) {
-      removeSupersededFramework(matches, match.supersedes);
+      for (const slug of match.supersedes) {
+        removeSupersededFramework(matches, slug);
+      }
    }
  }
 }
--- a/packages/fs-detectors/test/unit.framework-detector.test.ts
+++ b/packages/fs-detectors/test/unit.framework-detector.test.ts
@@ -166,12 +166,12 @@ describe('removeSupersededFrameworks()', () => {
    const matches = [
      { slug: 'storybook' },
      { slug: 'vite' },
-      { slug: 'hydrogen', supersedes: 'vite' },
+      { slug: 'hydrogen', supersedes: ['vite'] },
    ];
    removeSupersededFrameworks(matches);
    expect(matches).toEqual([
      { slug: 'storybook' },
-      { slug: 'hydrogen', supersedes: 'vite' },
+      { slug: 'hydrogen', supersedes: ['vite'] },
    ]);
  });

@@ -179,13 +179,13 @@ describe('removeSupersededFrameworks()', () => {
    const matches = [
      { slug: 'storybook' },
      { slug: 'vite' },
-      { slug: 'hydrogen', supersedes: 'vite' },
-      { slug: 'remix', supersedes: 'hydrogen' },
+      { slug: 'hydrogen', supersedes: ['vite'] },
+      { slug: 'remix', supersedes: ['hydrogen'] },
    ];
    removeSupersededFrameworks(matches);
    expect(matches).toEqual([
      { slug: 'storybook' },
-      { slug: 'remix', supersedes: 'hydrogen' },
+      { slug: 'remix', supersedes: ['hydrogen'] },
    ]);
  });
 });
@@ -442,6 +442,20 @@ describe('detectFramework()', () => {

    expect(await detectFramework({ fs, frameworkList })).toBe('storybook');
  });
+
+  it('Should detect Remix + Vite as `remix`', async () => {
+    const fs = new VirtualFilesystem({
+      'vite.config.ts': '',
+      'package.json': JSON.stringify({
+        dependencies: {
+          '@remix-run/dev': 'latest',
+          vite: 'latest',
+        },
+      }),
+    });
+
+    expect(await detectFramework({ fs, frameworkList })).toBe('remix');
+  });
 });

 describe('detectFrameworks()', () => {
@@ -497,6 +511,23 @@ describe('detectFrameworks()', () => {
    expect(slugs).toEqual(['nextjs', 'storybook']);
  });

+  it('Should detect Remix + Vite as `remix`', async () => {
+    const fs = new VirtualFilesystem({
+      'vite.config.ts': '',
+      'package.json': JSON.stringify({
+        dependencies: {
+          '@remix-run/dev': 'latest',
+          vite: 'latest',
+        },
+      }),
+    });
+
+    const slugs = (await detectFrameworks({ fs, frameworkList })).map(
+      f => f.slug
+    );
+    expect(slugs).toEqual(['remix']);
+  });
+
  it('Should detect "hydrogen" template as `hydrogen`', async () => {
    const fs = new LocalFileSystemDetector(join(EXAMPLES_DIR, 'hydrogen'));

--- a/packages/gatsby-plugin-vercel-builder/CHANGELOG.md
+++ b/packages/gatsby-plugin-vercel-builder/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @vercel/gatsby-plugin-vercel-builder

+## 2.0.18
+
+### Patch Changes
+
+- Updated dependencies [[`24c3dd282`](https://github.com/vercel/vercel/commit/24c3dd282d7714cd63d2b94fb94745c45fdc79ab)]:
+  - @vercel/build-utils@7.7.0
+
+## 2.0.17
+
+### Patch Changes
+
+- [gatsby-plugin-vercel-builder] use --keep-names esbuild flag ([#11117](https://github.com/vercel/vercel/pull/11117))
+
+- Updated dependencies [[`b6ed28b9b`](https://github.com/vercel/vercel/commit/b6ed28b9b1712f882c93fe053b70d3eb1df21819), [`8ba0ce932`](https://github.com/vercel/vercel/commit/8ba0ce932434c6295fedb5307bee59a804b7e6a8), [`0d034b682`](https://github.com/vercel/vercel/commit/0d034b6820c0f3252949c0ffc483048c5aac7f04), [`abaa700ce`](https://github.com/vercel/vercel/commit/abaa700cea44c723cfc851baa2dfe9e1ae2e8a5c)]:
+  - @vercel/build-utils@7.6.0
+
 ## 2.0.16

 ### Patch Changes
--- a/packages/gatsby-plugin-vercel-builder/package.json
+++ b/packages/gatsby-plugin-vercel-builder/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/gatsby-plugin-vercel-builder",
-  "version": "2.0.16",
+  "version": "2.0.18",
  "main": "dist/index.js",
  "files": [
    "dist",
@@ -20,7 +20,7 @@
  },
  "dependencies": {
    "@sinclair/typebox": "0.25.24",
-    "@vercel/build-utils": "7.5.1",
+    "@vercel/build-utils": "7.7.0",
    "@vercel/routing-utils": "3.1.0",
    "esbuild": "0.14.47",
    "etag": "1.8.1",
--- a/packages/gatsby-plugin-vercel-builder/src/handlers/build.ts
+++ b/packages/gatsby-plugin-vercel-builder/src/handlers/build.ts
@@ -35,6 +35,9 @@ export const writeHandler = async ({
      platform: 'node',
      bundle: true,
      minify: true,
+      // prevents renaming edge cases from causing failures like:
+      // https://github.com/node-fetch/node-fetch/issues/784
+      keepNames: true,
      define: {
        'process.env.NODE_ENV': "'production'",
        vercel_pathPrefix: JSON.stringify(prefix),
--- a/packages/go/package.json
+++ b/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.5.1",
+    "@vercel/build-utils": "7.7.0",
    "async-retry": "1.3.3",
    "execa": "^1.0.0",
    "fs-extra": "^7.0.0",
--- a/packages/hydrogen/package.json
+++ b/packages/hydrogen/package.json
@@ -26,7 +26,7 @@
  "devDependencies": {
    "@types/jest": "27.5.1",
    "@types/node": "14.18.33",
-    "@vercel/build-utils": "7.5.1",
+    "@vercel/build-utils": "7.7.0",
    "execa": "3.2.0",
    "fs-extra": "11.1.0",
    "jest-junit": "16.0.0"
--- a/packages/next/CHANGELOG.md
+++ b/packages/next/CHANGELOG.md
@@ -1,5 +1,37 @@
 # @vercel/next

+## 4.1.3
+
+### Patch Changes
+
+- Fix manifest with experimental flag ([#11192](https://github.com/vercel/vercel/pull/11192))
+
+## 4.1.2
+
+### Patch Changes
+
+- Update experimental bundle flag ([#11187](https://github.com/vercel/vercel/pull/11187))
+
+- [next] Add flag for experimental grouping ([#11177](https://github.com/vercel/vercel/pull/11177))
+
+- bump `@vercel/nft@0.26.4` ([#11155](https://github.com/vercel/vercel/pull/11155))
+
+- fix: missing experimental field ([#11184](https://github.com/vercel/vercel/pull/11184))
+
+## 4.1.1
+
+### Patch Changes
+
+- [node][next][redwood][remix] bump `@vercel/nft@0.26.3` ([#11115](https://github.com/vercel/vercel/pull/11115))
+
+- Load common chunks on module initialization ([#11126](https://github.com/vercel/vercel/pull/11126))
+
+- Fix index normalizing for app outputs ([#11099](https://github.com/vercel/vercel/pull/11099))
+
+- Mark `flags` as deprecated and replace them with `variants` ([#11098](https://github.com/vercel/vercel/pull/11098))
+
+- Fix rewrite RSC handling with trailingSlash ([#11107](https://github.com/vercel/vercel/pull/11107))
+
 ## 4.1.0

 ### Minor Changes
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/next",
-  "version": "4.1.0",
+  "version": "4.1.3",
  "license": "Apache-2.0",
  "main": "./dist/index",
  "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",
@@ -23,7 +23,7 @@
    "dist"
  ],
  "dependencies": {
-    "@vercel/nft": "0.26.2"
+    "@vercel/nft": "0.26.4"
  },
  "devDependencies": {
    "@types/aws-lambda": "8.10.19",
@@ -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.5.1",
+    "@vercel/build-utils": "7.7.0",
    "@vercel/routing-utils": "3.1.0",
    "async-sema": "3.0.1",
    "buffer-crc32": "0.2.13",
--- a/packages/next/src/index.ts
+++ b/packages/next/src/index.ts
@@ -511,7 +511,7 @@ export const build: BuildV2 = async ({
    entryPath,
    outputDirectory
  );
-  const omittedPrerenderRoutes = new Set(
+  const omittedPrerenderRoutes: ReadonlySet<string> = new Set(
    Object.keys(prerenderManifest.omittedRoutes)
  );

--- a/packages/next/src/server-build.ts
+++ b/packages/next/src/server-build.ts
@@ -47,7 +47,7 @@ import {
  UnwrapPromise,
  getOperationType,
  FunctionsConfigManifestV1,
-  VariantsManifest,
+  VariantsManifestLegacy,
  RSC_CONTENT_TYPE,
  RSC_PREFETCH_SUFFIX,
  normalizePrefetches,
@@ -70,6 +70,30 @@ const NEXT_DATA_MIDDLEWARE_RESOLVING_VERSION = 'v12.1.7-canary.33';
 const EMPTY_ALLOW_QUERY_FOR_PRERENDERED_VERSION = 'v12.2.0';
 const CORRECTED_MANIFESTS_VERSION = 'v12.2.0';

+// Ideally this should be in a Next.js manifest so we can change it in
+// the future but this also allows us to improve existing versions
+const PRELOAD_CHUNKS = {
+  APP_ROUTER_PAGES: [
+    '.next/server/webpack-runtime.js',
+    'next/dist/client/components/action-async-storage.external.js',
+    'next/dist/client/components/request-async-storage.external.js',
+    'next/dist/client/components/static-generation-async-storage.external.js',
+    'next/dist/compiled/next-server/app-page.runtime.prod.js',
+  ],
+  APP_ROUTER_HANDLER: [
+    '.next/server/webpack-runtime.js',
+    'next/dist/compiled/next-server/app-route.runtime.prod.js',
+  ],
+  PAGES_ROUTER_PAGES: [
+    '.next/server/webpack-runtime.js',
+    'next/dist/compiled/next-server/pages.runtime.prod.js',
+  ],
+  PAGES_ROUTER_API: [
+    '.next/server/webpack-api-runtime.js',
+    'next/dist/compiled/next-server/pages-api.runtime.prod.js',
+  ],
+};
+
 // related PR: https://github.com/vercel/next.js/pull/52997
 // and https://github.com/vercel/next.js/pull/56318
 const BUNDLED_SERVER_NEXT_VERSION = 'v13.5.4';
@@ -127,7 +151,7 @@ export async function serverBuild({
  pagesDir: string;
  baseDir: string;
  canUsePreviewMode: boolean;
-  omittedPrerenderRoutes: Set<string>;
+  omittedPrerenderRoutes: ReadonlySet<string>;
  localePrefixed404: boolean;
  staticPages: { [key: string]: FileFsRef };
  lambdaAppPaths: { [key: string]: FileFsRef };
@@ -158,10 +182,14 @@ export async function serverBuild({
  imagesManifest?: NextImagesManifest;
  prerenderManifest: NextPrerenderedRoutes;
  requiredServerFilesManifest: NextRequiredServerFilesManifest;
-  variantsManifest: VariantsManifest | null;
+  variantsManifest: VariantsManifestLegacy | null;
 }): Promise<BuildResult> {
  lambdaPages = Object.assign({}, lambdaPages, lambdaAppPaths);

+  const experimentalAllowBundling = Boolean(
+    process.env.NEXT_EXPERIMENTAL_FUNCTION_BUNDLING
+  );
+
  const lambdas: { [key: string]: Lambda } = {};
  const prerenders: { [key: string]: Prerender } = {};
  const lambdaPageKeys = Object.keys(lambdaPages);
@@ -217,7 +245,7 @@ export async function serverBuild({
    for (const rewrite of afterFilesRewrites) {
      if (rewrite.src && rewrite.dest) {
        rewrite.src = rewrite.src.replace(
-          '(?:/)?',
+          /\/?\(\?:\/\)\?/,
          '(?<rscsuff>(\\.prefetch)?\\.rsc)?(?:/)?'
        );
        let destQueryIndex = rewrite.dest.indexOf('?');
@@ -242,10 +270,11 @@ export async function serverBuild({
    nextVersion,
    CORRECT_MIDDLEWARE_ORDER_VERSION
  );
-  const isCorrectManifests = semver.gte(
-    nextVersion,
-    CORRECTED_MANIFESTS_VERSION
-  );
+  // experimental bundling prevents filtering manifests
+  // as we don't know what to filter by at this stage
+  const isCorrectManifests =
+    !experimentalAllowBundling &&
+    semver.gte(nextVersion, CORRECTED_MANIFESTS_VERSION);

  let hasStatic500 = !!staticPages[path.posix.join(entryDirectory, '500')];

@@ -336,7 +365,7 @@ export async function serverBuild({
    experimentalPPRRoutes.add(route);
  }

-  const prerenderRoutes = new Set<string>([
+  const prerenderRoutes: ReadonlySet<string> = new Set<string>([
    ...(canUsePreviewMode ? omittedPrerenderRoutes : []),
    ...Object.keys(prerenderManifest.blockingFallbackRoutes),
    ...Object.keys(prerenderManifest.fallbackRoutes),
@@ -744,7 +773,7 @@ export async function serverBuild({
      .filter(Boolean) as string[];

    let traceResult: NodeFileTraceResult | undefined;
-    let parentFilesMap: Map<string, Set<string>> | undefined;
+    let parentFilesMap: ReadonlyMap<string, Set<string>> | undefined;

    if (pathsToTrace.length > 0) {
      traceResult = await nodeFileTrace(pathsToTrace, {
@@ -859,6 +888,7 @@ export async function serverBuild({
    const pageExtensions = requiredServerFilesManifest.config?.pageExtensions;

    const pageLambdaGroups = await getPageLambdaGroups({
+      experimentalAllowBundling,
      entryPath: projectDir,
      config,
      functionsConfigManifest,
@@ -880,6 +910,7 @@ export async function serverBuild({
    }

    const appRouterLambdaGroups = await getPageLambdaGroups({
+      experimentalAllowBundling,
      entryPath: projectDir,
      config,
      functionsConfigManifest,
@@ -898,6 +929,7 @@ export async function serverBuild({
    });

    const appRouteHandlersLambdaGroups = await getPageLambdaGroups({
+      experimentalAllowBundling,
      entryPath: projectDir,
      config,
      functionsConfigManifest,
@@ -1068,9 +1100,58 @@ export async function serverBuild({
        }
      }

+      let launcherData = group.isAppRouter ? appLauncher : launcher;
+      let preloadChunks: string[] = [];
+
+      if (process.env.VERCEL_NEXT_PRELOAD_COMMON === '1') {
+        const nextPackageDir = path.dirname(
+          resolveFrom(projectDir, 'next/package.json')
+        );
+
+        if (group.isPages) {
+          preloadChunks = PRELOAD_CHUNKS.PAGES_ROUTER_PAGES;
+        } else if (group.isApiLambda) {
+          preloadChunks = PRELOAD_CHUNKS.PAGES_ROUTER_API;
+        } else if (group.isAppRouter && !group.isAppRouteHandler) {
+          preloadChunks = PRELOAD_CHUNKS.APP_ROUTER_PAGES;
+        } else if (group.isAppRouteHandler) {
+          preloadChunks = PRELOAD_CHUNKS.APP_ROUTER_HANDLER;
+        }
+        const normalizedPreloadChunks: string[] = [];
+
+        for (const preloadChunk of preloadChunks) {
+          const absoluteChunk = preloadChunk.startsWith('.next')
+            ? path.join(projectDir, preloadChunk)
+            : path.join(nextPackageDir, '..', preloadChunk);
+
+          // ensure the chunks are actually in this layer
+          if (
+            group.pseudoLayer[
+              path.join('.', path.relative(baseDir, absoluteChunk))
+            ]
+          ) {
+            normalizedPreloadChunks.push(
+              // relative files need to be prefixed with ./ for require
+              preloadChunk.startsWith('.next')
+                ? `./${preloadChunk}`
+                : preloadChunk
+            );
+          }
+        }
+
+        if (normalizedPreloadChunks.length > 0) {
+          launcherData = launcherData.replace(
+            '// @preserve next-server-preload-target',
+            normalizedPreloadChunks
+              .map(name => `require('${name}');`)
+              .join('\n')
+          );
+        }
+      }
+
      const launcherFiles: { [name: string]: FileFsRef | FileBlob } = {
        [path.join(path.relative(baseDir, projectDir), '___next_launcher.cjs')]:
-          new FileBlob({ data: group.isAppRouter ? appLauncher : launcher }),
+          new FileBlob({ data: launcherData }),
      };
      const operationType = getOperationType({ group, prerenderManifest });

@@ -1090,6 +1171,7 @@ export async function serverBuild({
        maxDuration: group.maxDuration,
        isStreaming: group.isStreaming,
        nextVersion,
+        experimentalAllowBundling,
      };

      const lambda = await createLambdaFromPseudoLayers(options);
@@ -1128,11 +1210,11 @@ export async function serverBuild({
            );
          });
        }
+        let outputName = path.posix.join(entryDirectory, pageNoExt);

-        let outputName = normalizeIndexOutput(
-          path.posix.join(entryDirectory, pageNoExt),
-          true
-        );
+        if (!group.isAppRouter && !group.isAppRouteHandler) {
+          outputName = normalizeIndexOutput(outputName, true);
+        }

        // If this is a PPR page, then we should prefix the output name.
        if (isPPR) {
@@ -1443,9 +1525,10 @@ export async function serverBuild({
        continue;
      }

-      const pathname = normalizeIndexOutput(
-        path.posix.join('./', entryDirectory, route === '/' ? '/index' : route),
-        true
+      const pathname = path.posix.join(
+        './',
+        entryDirectory,
+        route === '/' ? '/index' : route
      );

      if (lambdas[pathname]) {
--- a/packages/next/src/server-launcher.ts
+++ b/packages/next/src/server-launcher.ts
@@ -23,6 +23,8 @@ if (process.env.NODE_ENV !== 'production' && region !== 'dev1') {
 // eslint-disable-next-line
 const NextServer = require('__NEXT_SERVER_PATH__').default;

+// @preserve next-server-preload-target
+
 // __NEXT_CONFIG__ value is injected
 declare const __NEXT_CONFIG__: any;
 const conf = __NEXT_CONFIG__;
--- a/packages/next/src/utils.ts
+++ b/packages/next/src/utils.ts
@@ -307,14 +307,14 @@ export async function getRoutesManifest(
 export async function getDynamicRoutes(
  entryPath: string,
  entryDirectory: string,
-  dynamicPages: string[],
+  dynamicPages: ReadonlyArray<string>,
  isDev?: boolean,
  routesManifest?: RoutesManifest,
-  omittedRoutes?: Set<string>,
+  omittedRoutes?: ReadonlySet<string>,
  canUsePreviewMode?: boolean,
  bypassToken?: string,
  isServerMode?: boolean,
-  dynamicMiddlewareRouteMap?: Map<string, RouteWithSrc>,
+  dynamicMiddlewareRouteMap?: ReadonlyMap<string, RouteWithSrc>,
  experimentalPPR?: boolean
 ): Promise<RouteWithSrc[]> {
  if (routesManifest) {
@@ -442,7 +442,9 @@ export async function getDynamicRoutes(
  let getRouteRegex: ((pageName: string) => { re: RegExp }) | undefined =
    undefined;

-  let getSortedRoutes: ((normalizedPages: string[]) => string[]) | undefined;
+  let getSortedRoutes:
+    | ((normalizedPages: ReadonlyArray<string>) => string[])
+    | undefined;

  try {
    const resolved = require_.resolve('next-server/dist/lib/router/utils', {
@@ -645,10 +647,10 @@ export function filterStaticPages(
 }

 export function getFilesMapFromReasons(
-  fileList: Set<string>,
+  fileList: ReadonlySet<string>,
  reasons: NodeFileTraceReasons,
  ignoreFn?: (file: string, parent?: string) => boolean
-) {
+): ReadonlyMap<string, Set<string>> {
  // this uses the reasons tree to collect files specific to a
  // certain parent allowing us to not have to trace each parent
  // separately
@@ -804,6 +806,7 @@ export interface CreateLambdaFromPseudoLayersOptions
  layers: PseudoLayer[];
  isStreaming?: boolean;
  nextVersion?: string;
+  experimentalAllowBundling?: boolean;
 }

 // measured with 1, 2, 5, 10, and `os.cpus().length || 5`
@@ -815,6 +818,7 @@ export async function createLambdaFromPseudoLayers({
  layers,
  isStreaming,
  nextVersion,
+  experimentalAllowBundling,
  ...lambdaOptions
 }: CreateLambdaFromPseudoLayersOptions) {
  await createLambdaSema.acquire();
@@ -862,6 +866,7 @@ export async function createLambdaFromPseudoLayers({
      slug: 'nextjs',
      version: nextVersion,
    },
+    experimentalAllowBundling,
  });
 }

@@ -1361,7 +1366,7 @@ async function getSourceFilePathFromPage({
 }: {
  workPath: string;
  page: string;
-  pageExtensions?: string[];
+  pageExtensions?: ReadonlyArray<string>;
 }) {
  const usesSrcDir = await usesSrcDirectory(workPath);
  const extensionsToTry = pageExtensions || ['js', 'jsx', 'ts', 'tsx'];
@@ -1502,13 +1507,14 @@ export async function getPageLambdaGroups({
  internalPages,
  pageExtensions,
  inversedAppPathManifest,
+  experimentalAllowBundling,
 }: {
  entryPath: string;
  config: Config;
  functionsConfigManifest?: FunctionsConfigManifestV1;
-  pages: string[];
-  prerenderRoutes: Set<string>;
-  experimentalPPRRoutes: Set<string> | undefined;
+  pages: ReadonlyArray<string>;
+  prerenderRoutes: ReadonlySet<string>;
+  experimentalPPRRoutes: ReadonlySet<string> | undefined;
  pageTraces: {
    [page: string]: {
      [key: string]: FileFsRef;
@@ -1521,9 +1527,10 @@ export async function getPageLambdaGroups({
  initialPseudoLayer: PseudoLayerResult;
  initialPseudoLayerUncompressed: number;
  lambdaCompressedByteLimit: number;
-  internalPages: string[];
-  pageExtensions?: string[];
+  internalPages: ReadonlyArray<string>;
+  pageExtensions?: ReadonlyArray<string>;
  inversedAppPathManifest?: Record<string, string>;
+  experimentalAllowBundling?: boolean;
 }) {
  const groups: Array<LambdaGroup> = [];

@@ -1563,42 +1570,46 @@ export async function getPageLambdaGroups({
      opts = { ...vercelConfigOpts, ...opts };
    }

-    let matchingGroup = groups.find(group => {
-      const matches =
-        group.maxDuration === opts.maxDuration &&
-        group.memory === opts.memory &&
-        group.isPrerenders === isPrerenderRoute &&
-        group.isExperimentalPPR === isExperimentalPPR;
+    let matchingGroup = experimentalAllowBundling
+      ? undefined
+      : groups.find(group => {
+          const matches =
+            group.maxDuration === opts.maxDuration &&
+            group.memory === opts.memory &&
+            group.isPrerenders === isPrerenderRoute &&
+            group.isExperimentalPPR === isExperimentalPPR;

-      if (matches) {
-        let newTracedFilesSize = group.pseudoLayerBytes;
-        let newTracedFilesUncompressedSize = group.pseudoLayerUncompressedBytes;
+          if (matches) {
+            let newTracedFilesSize = group.pseudoLayerBytes;
+            let newTracedFilesUncompressedSize =
+              group.pseudoLayerUncompressedBytes;

-        for (const newPage of newPages) {
-          Object.keys(pageTraces[newPage] || {}).map(file => {
-            if (!group.pseudoLayer[file]) {
-              const item = tracedPseudoLayer[file] as PseudoFile;
+            for (const newPage of newPages) {
+              Object.keys(pageTraces[newPage] || {}).map(file => {
+                if (!group.pseudoLayer[file]) {
+                  const item = tracedPseudoLayer[file] as PseudoFile;

-              newTracedFilesSize += item.compBuffer?.byteLength || 0;
-              newTracedFilesUncompressedSize += item.uncompressedSize || 0;
+                  newTracedFilesSize += item.compBuffer?.byteLength || 0;
+                  newTracedFilesUncompressedSize += item.uncompressedSize || 0;
+                }
+              });
+              newTracedFilesSize +=
+                compressedPages[newPage].compBuffer.byteLength;
+              newTracedFilesUncompressedSize +=
+                compressedPages[newPage].uncompressedSize;
            }
-          });
-          newTracedFilesSize += compressedPages[newPage].compBuffer.byteLength;
-          newTracedFilesUncompressedSize +=
-            compressedPages[newPage].uncompressedSize;
-        }

-        const underUncompressedLimit =
-          newTracedFilesUncompressedSize <
-          MAX_UNCOMPRESSED_LAMBDA_SIZE - LAMBDA_RESERVED_UNCOMPRESSED_SIZE;
-        const underCompressedLimit =
-          newTracedFilesSize <
-          lambdaCompressedByteLimit - LAMBDA_RESERVED_COMPRESSED_SIZE;
+            const underUncompressedLimit =
+              newTracedFilesUncompressedSize <
+              MAX_UNCOMPRESSED_LAMBDA_SIZE - LAMBDA_RESERVED_UNCOMPRESSED_SIZE;
+            const underCompressedLimit =
+              newTracedFilesSize <
+              lambdaCompressedByteLimit - LAMBDA_RESERVED_COMPRESSED_SIZE;

-        return underUncompressedLimit && underCompressedLimit;
-      }
-      return false;
-    });
+            return underUncompressedLimit && underCompressedLimit;
+          }
+          return false;
+        });

    if (matchingGroup) {
      matchingGroup.pages.push(page);
@@ -1906,7 +1917,7 @@ type OnPrerenderRouteArgs = {
  isServerMode: boolean;
  canUsePreviewMode: boolean;
  lambdas: { [key: string]: Lambda };
-  experimentalStreamingLambdaPaths: Map<string, string> | undefined;
+  experimentalStreamingLambdaPaths: ReadonlyMap<string, string> | undefined;
  prerenders: { [key: string]: Prerender | File };
  pageLambdaMap: { [key: string]: string };
  routesManifest?: RoutesManifest;
@@ -2053,6 +2064,11 @@ export const onPrerenderRoute =

    let isAppPathRoute = false;

+    // experimentalPPR signals app path route
+    if (appDir && experimentalPPR) {
+      isAppPathRoute = true;
+    }
+
    // TODO: leverage manifest to determine app paths more accurately
    if (appDir && srcRoute && (!dataRoute || dataRoute?.endsWith('.rsc'))) {
      isAppPathRoute = true;
@@ -2184,7 +2200,6 @@ export const onPrerenderRoute =
      if (routeKey !== '/index' && routeKey.endsWith('/index')) {
        routeKey = `${routeKey}/index`;
        routeFileNoExt = routeKey;
-        origRouteFileNoExt = routeKey;
      }
    }

@@ -2255,15 +2270,20 @@ export const onPrerenderRoute =
      const lambdaId = pageLambdaMap[outputSrcPathPage];
      lambda = lambdas[lambdaId];
    } else {
-      const outputSrcPathPage = normalizeIndexOutput(
+      let outputSrcPathPage =
        srcRoute == null
          ? outputPathPageOrig
          : path.posix.join(
              entryDirectory,
              srcRoute === '/' ? '/index' : srcRoute
-            ),
-        isServerMode
-      );
+            );
+
+      if (!isAppPathRoute) {
+        outputSrcPathPage = normalizeIndexOutput(
+          outputSrcPathPage,
+          isServerMode
+        );
+      }

      lambda = lambdas[outputSrcPathPage];
    }
@@ -2464,11 +2484,18 @@ export const onPrerenderRoute =
            routesManifest,
            locale
          );
-          const localeOutputPathPage = normalizeIndexOutput(
-            path.posix.join(entryDirectory, localeRouteFileNoExt),
-            isServerMode
+          let localeOutputPathPage = path.posix.join(
+            entryDirectory,
+            localeRouteFileNoExt
          );

+          if (!isAppPathRoute) {
+            localeOutputPathPage = normalizeIndexOutput(
+              localeOutputPathPage,
+              isServerMode
+            );
+          }
+
          const origPrerenderPage = prerenders[outputPathPage];
          prerenders[localeOutputPathPage] = {
            ...origPrerenderPage,
@@ -2805,7 +2832,7 @@ export async function getMiddlewareBundle({
  appPathRoutesManifest: Record<string, string>;
 }): Promise<{
  staticRoutes: Route[];
-  dynamicRouteMap: Map<string, RouteWithSrc>;
+  dynamicRouteMap: ReadonlyMap<string, RouteWithSrc>;
  edgeFunctions: Record<string, EdgeFunction>;
 }> {
  const middlewareManifest = await getMiddlewareManifest(
@@ -2969,14 +2996,17 @@ export async function getMiddlewareBundle({
      }

      if (routesManifest?.basePath) {
-        shortPath = normalizeIndexOutput(
-          path.posix.join(
-            './',
-            routesManifest?.basePath,
-            shortPath.replace(/^\//, '')
-          ),
-          true
+        const isAppPathRoute = !!appPathRoutesManifest[shortPath];
+
+        shortPath = path.posix.join(
+          './',
+          routesManifest?.basePath,
+          shortPath.replace(/^\//, '')
        );
+
+        if (!isAppPathRoute) {
+          shortPath = normalizeIndexOutput(shortPath, true);
+        }
      }

      worker.edgeFunction.name = shortPath;
@@ -3238,7 +3268,8 @@ export function isApiPage(page: string | undefined) {
    .match(/(serverless|server)\/pages\/api(\/|\.js$)/);
 }

-export type VariantsManifest = Record<
+/** @deprecated */
+export type VariantsManifestLegacy = Record<
  string,
  {
    defaultValue?: unknown;
@@ -3249,7 +3280,7 @@ export type VariantsManifest = Record<
 export async function getVariantsManifest(
  entryPath: string,
  outputDirectory: string
-): Promise<null | VariantsManifest> {
+): Promise<null | VariantsManifestLegacy> {
  const pathVariantsManifest = path.join(
    entryPath,
    outputDirectory,
@@ -3263,7 +3294,7 @@ export async function getVariantsManifest(

  if (!hasVariantsManifest) return null;

-  const variantsManifest: VariantsManifest = await fs.readJSON(
+  const variantsManifest: VariantsManifestLegacy = await fs.readJSON(
    pathVariantsManifest
  );

@@ -3285,7 +3316,7 @@ export async function getServerlessPages(params: {
          glob('**/route.js', appDir),
          glob('**/_not-found.js', appDir),
        ]).then(items => Object.assign(...items))
-      : Promise.resolve({}),
+      : Promise.resolve({} as Record<string, FileFsRef>),
    getMiddlewareManifest(params.entryPath, params.outputDirectory),
  ]);

--- a/packages/next/test/fixtures/00-app-dir-middleware/vercel.json
+++ b/packages/next/test/fixtures/00-app-dir-middleware/vercel.json
@@ -22,7 +22,7 @@
        "redirect": "manual"
      },
      "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
      },
      "headers": {
        "RSC": "1"
@@ -46,7 +46,7 @@
        "redirect": "manual"
      },
      "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
      },
      "headers": {
        "RSC": "1"
@@ -70,7 +70,7 @@
        "redirect": "manual"
      },
      "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
      },
      "headers": {
        "RSC": "1"
--- a/packages/next/test/fixtures/00-app-dir-no-ppr/app/dynamic-index/[slug]/index/page.js
+++ b/packages/next/test/fixtures/00-app-dir-no-ppr/app/dynamic-index/[slug]/index/page.js
@@ -0,0 +1,7 @@
+export default function Page() {
+  return (
+    <>
+      <p>dynamic-index</p>
+    </>
+  )
+}
--- a/packages/next/test/fixtures/00-app-dir-no-ppr/vercel.json
+++ b/packages/next/test/fixtures/00-app-dir-no-ppr/vercel.json
@@ -18,7 +18,22 @@
    }
  ],
  "probes": [
-     {
+    {
+      "path": "/dynamic-index/hello/index",
+      "status": 200,
+      "mustContain": "dynamic-index"
+    },
+    {
+      "path": "/dynamic-index/hello/index",
+      "status": 200,
+      "mustContain": ":",
+      "mustNotContain": "<html",
+      "headers": {
+        "RSC": 1,
+        "Next-Router-Prefetch": 1
+      }
+    },
+    {
      "path": "/rewritten-to-dashboard",
      "status": 200,
      "mustContain": "html"
--- a/packages/next/test/fixtures/00-app-dir-ppr/app/dynamic-index/[slug]/index/page.js
+++ b/packages/next/test/fixtures/00-app-dir-ppr/app/dynamic-index/[slug]/index/page.js
@@ -0,0 +1,7 @@
+export default function Page() {
+  return (
+    <>
+      <p>dynamic-index</p>
+    </>
+  )
+}
--- a/packages/next/test/fixtures/00-app-dir-ppr/vercel.json
+++ b/packages/next/test/fixtures/00-app-dir-ppr/vercel.json
@@ -18,6 +18,21 @@
    }
  ],
  "probes": [
+    {
+      "path": "/dynamic-index/hello/index",
+      "status": 200,
+      "mustContain": "dynamic-index"
+    },
+    {
+      "path": "/dynamic-index/hello/index",
+      "status": 200,
+      "mustContain": ":",
+      "mustNotContain": "<html",
+      "headers": {
+        "RSC": 1,
+        "Next-Router-Prefetch": 1
+      }
+    },
    {
      "path": "/rewritten-to-dashboard",
      "status": 200,
@@ -132,7 +147,7 @@
      "status": 200,
      "mustContain": "hello from /ssg",
      "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
      }
    },
    {
@@ -148,7 +163,7 @@
      "path": "/ssg",
      "status": 200,
      "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
      },
      "headers": {
        "RSC": "1"
@@ -160,7 +175,7 @@
      "path": "/ssg",
      "status": 200,
      "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url",
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch",
        "content-type": "text/x-component"
      },
      "headers": {
@@ -195,14 +210,14 @@
      "status": 200,
      "mustContain": "hello from app/dashboard/deployments/[id]/settings",
      "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
      }
    },
    {
      "path": "/dashboard/deployments/123/settings",
      "status": 200,
      "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
      },
      "headers": {
        "RSC": "1"
@@ -215,14 +230,14 @@
      "status": 200,
      "mustContain": "catchall",
      "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
      }
    },
    {
      "path": "/dashboard/deployments/catchall/something",
      "status": 200,
      "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
      },
      "headers": {
        "RSC": "1"
@@ -235,7 +250,7 @@
      "status": 200,
      "mustContain": "hello from app/dashboard",
      "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
      }
    },
    {
@@ -255,7 +270,7 @@
      },
      "responseHeaders": {
        "content-type": "text/x-component",
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
      }
    },
    {
--- a/packages/next/test/fixtures/00-app-dir-static/vercel.json
+++ b/packages/next/test/fixtures/00-app-dir-static/vercel.json
@@ -11,7 +11,7 @@
      "status": 200,
      "mustContain": "hello from app/dashboard",
      "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
      }
    },
    {
@@ -31,7 +31,7 @@
      },
      "responseHeaders": {
        "content-type": "text/x-component",
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
      }
    },
    {
--- a/packages/next/test/fixtures/00-app-dir-trailing-slash/next.config.js
+++ b/packages/next/test/fixtures/00-app-dir-trailing-slash/next.config.js
@@ -6,7 +6,11 @@ module.exports = {
  rewrites: async () => {
    return [
      {
-        source: '/rewritten-to-dashboard',
+        source: '/rewritten-to-dashboard/',
+        destination: '/dashboard/',
+      },
+      {
+        source: '/:locale/t/size-chart/:chart/',
        destination: '/dashboard',
      },
    ];
--- a/packages/next/test/fixtures/00-app-dir-trailing-slash/vercel.json
+++ b/packages/next/test/fixtures/00-app-dir-trailing-slash/vercel.json
@@ -6,6 +6,30 @@
    }
  ],
  "probes": [
+    {
+      "path": "/en-us/t/size-chart/mens/",
+      "status": 200,
+      "mustContain": "hello from app/dashboard"
+    },
+    {
+      "path": "/en-us/t/size-chart/mens/",
+      "status": 200,
+       "headers": {
+        "RSC": 1,
+        "Next-Router-Prefetch": 1
+      },
+      "mustContain": ":{",
+      "mustNotContain": ".prefetch"
+    },
+    {
+      "path": "/en-us/t/size-chart/mens/",
+      "status": 200,
+       "headers": {
+        "RSC": 1
+      },
+      "mustContain": ":{",
+      "mustNotContain": ".rsc"
+    },
    {
      "path": "/dynamic/category-1/id-1/",
      "status": 200,
@@ -23,14 +47,14 @@
      "status": 200,
      "mustContain": "hello from /ssg",
      "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
      }
    },
    {
      "path": "/ssg/",
      "status": 200,
      "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
      },
      "headers": {
        "RSC": "1"
@@ -63,14 +87,14 @@
      "status": 200,
      "mustContain": "hello from app/dashboard/deployments/[id]/settings",
      "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
      }
    },
    {
      "path": "/dashboard/deployments/123/settings/",
      "status": 200,
      "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
      },
      "headers": {
        "RSC": "1"
@@ -83,14 +107,14 @@
      "status": 200,
      "mustContain": "catchall",
      "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
      }
    },
    {
      "path": "/dashboard/deployments/catchall/something/",
      "status": 200,
      "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
      },
      "headers": {
        "RSC": "1"
@@ -103,7 +127,7 @@
      "status": 200,
      "mustContain": "hello from app/dashboard",
      "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
      }
    },
    {
@@ -123,7 +147,7 @@
      },
      "responseHeaders": {
        "content-type": "text/x-component",
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
      }
    },
    {
--- a/packages/next/test/fixtures/01-app-dir-static/vercel.json
+++ b/packages/next/test/fixtures/01-app-dir-static/vercel.json
@@ -11,7 +11,7 @@
      "status": 200,
      "mustContain": "about",
      "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
      }
    },
    {
--- a/packages/node/CHANGELOG.md
+++ b/packages/node/CHANGELOG.md
@@ -1,5 +1,31 @@
 # @vercel/node

+## 3.0.20
+
+### Patch Changes
+
+- bump `@vercel/nft@0.26.4` ([#11155](https://github.com/vercel/vercel/pull/11155))
+
+## 3.0.19
+
+### Patch Changes
+
+- build: upgrade edge-runtime ([#11148](https://github.com/vercel/vercel/pull/11148))
+
+- refactor: simplify content-length check ([#11150](https://github.com/vercel/vercel/pull/11150))
+
+- Updated dependencies [[`24c3dd282`](https://github.com/vercel/vercel/commit/24c3dd282d7714cd63d2b94fb94745c45fdc79ab)]:
+  - @vercel/build-utils@7.7.0
+
+## 3.0.18
+
+### Patch Changes
+
+- [node][next][redwood][remix] bump `@vercel/nft@0.26.3` ([#11115](https://github.com/vercel/vercel/pull/11115))
+
+- Updated dependencies [[`b6ed28b9b`](https://github.com/vercel/vercel/commit/b6ed28b9b1712f882c93fe053b70d3eb1df21819), [`8ba0ce932`](https://github.com/vercel/vercel/commit/8ba0ce932434c6295fedb5307bee59a804b7e6a8), [`0d034b682`](https://github.com/vercel/vercel/commit/0d034b6820c0f3252949c0ffc483048c5aac7f04), [`abaa700ce`](https://github.com/vercel/vercel/commit/abaa700cea44c723cfc851baa2dfe9e1ae2e8a5c)]:
+  - @vercel/build-utils@7.6.0
+
 ## 3.0.17

 ### Patch Changes
--- a/packages/node/package.json
+++ b/packages/node/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/node",
-  "version": "3.0.17",
+  "version": "3.0.20",
  "license": "Apache-2.0",
  "main": "./dist/index",
  "homepage": "https://vercel.com/docs/runtimes#official-runtimes/node-js",
@@ -20,16 +20,18 @@
    "dist"
  ],
  "dependencies": {
-    "@edge-runtime/node-utils": "2.2.1",
-    "@edge-runtime/primitives": "4.0.5",
-    "@edge-runtime/vm": "3.1.7",
+    "@edge-runtime/node-utils": "2.3.0",
+    "@edge-runtime/primitives": "4.1.0",
+    "@edge-runtime/vm": "3.2.0",
    "@types/node": "14.18.33",
-    "@vercel/build-utils": "7.5.1",
+    "@vercel/build-utils": "7.7.0",
    "@vercel/error-utils": "2.0.2",
-    "@vercel/nft": "0.26.2",
+    "@vercel/nft": "0.26.4",
    "@vercel/static-config": "3.0.0",
    "async-listen": "3.0.0",
-    "edge-runtime": "2.5.7",
+    "cjs-module-lexer": "1.2.3",
+    "edge-runtime": "2.5.9",
+    "es-module-lexer": "1.4.1",
    "esbuild": "0.14.47",
    "etag": "1.8.1",
    "node-fetch": "2.6.9",
--- a/packages/node/src/dev-server.mts
+++ b/packages/node/src/dev-server.mts
@@ -11,11 +11,17 @@ import type { VercelProxyResponse } from './types.js';
 import { Config } from '@vercel/build-utils';
 import { createEdgeEventHandler } from './edge-functions/edge-handler.mjs';
 import { createServer, IncomingMessage, ServerResponse } from 'http';
-import { createServerlessEventHandler } from './serverless-functions/serverless-handler.mjs';
+import {
+  createServerlessEventHandler,
+  HTTP_METHODS,
+} from './serverless-functions/serverless-handler.mjs';
 import { isEdgeRuntime, logError, validateConfiguredRuntime } from './utils.js';
+import { init, parse as parseEsm } from 'es-module-lexer';
+import { parse as parseCjs } from 'cjs-module-lexer';
 import { getConfig } from '@vercel/static-config';
 import { Project } from 'ts-morph';
 import { listen } from 'async-listen';
+import { readFile } from 'fs/promises';

 const parseConfig = (entryPointPath: string) =>
  getConfig(new Project(), entryPointPath);
@@ -46,12 +52,31 @@ async function createEventHandler(
    );
  }

+  const content = await readFile(entrypointPath, 'utf8');
+
+  const isStreaming =
+    staticConfig?.supportsResponseStreaming ||
+    (await hasWebHandlers(async () => parseCjs(content).exports)) ||
+    (await hasWebHandlers(async () =>
+      init.then(() => parseEsm(content)[1].map(specifier => specifier.n))
+    ));
+
  return createServerlessEventHandler(entrypointPath, {
-    mode: staticConfig?.supportsResponseStreaming ? 'streaming' : 'buffer',
+    mode: isStreaming ? 'streaming' : 'buffer',
    shouldAddHelpers: options.shouldAddHelpers,
  });
 }

+async function hasWebHandlers(getExports: () => Promise<string[]>) {
+  const exports = await getExports().catch(() => []);
+  for (const name of exports) {
+    if (HTTP_METHODS.includes(name)) {
+      return true;
+    }
+  }
+  return false;
+}
+
 let handleEvent: (request: IncomingMessage) => Promise<VercelProxyResponse>;
 let handlerEventError: Error;
 let onExit: (() => Promise<void>) | undefined;
--- a/packages/node/src/edge-functions/edge-handler.mts
+++ b/packages/node/src/edge-functions/edge-handler.mts
@@ -230,8 +230,10 @@ export async function createEdgeEventHandler(
    }

    const body: Buffer | string | undefined = await serializeBody(request);
-    if (body !== undefined)
+
+    if (body !== undefined && body.length) {
      request.headers['content-length'] = String(body.length);
+    }

    const url = new URL(request.url ?? '/', server.url);
    const response = await undiciRequest(url, {
--- a/packages/node/src/serverless-functions/helpers-web.ts
+++ b/packages/node/src/serverless-functions/helpers-web.ts
@@ -1,26 +1,7 @@
 import type { ServerResponse, IncomingMessage } from 'http';
 import type { NodeHandler } from '@edge-runtime/node-utils';
 import { buildToNodeHandler } from '@edge-runtime/node-utils';
-
-class FetchEvent {
-  public request: Request;
-  public awaiting: Set<Promise<void>>;
-  public response: Response | null;
-
-  constructor(request: Request) {
-    this.request = request;
-    this.response = null;
-    this.awaiting = new Set();
-  }
-
-  respondWith(response: Response) {
-    this.response = response;
-  }
-
-  waitUntil() {
-    throw new Error('waitUntil is not implemented yet for Node.js');
-  }
-}
+import Edge from '@edge-runtime/primitives';

 const webHandlerToNodeHandler = buildToNodeHandler(
  {
@@ -32,8 +13,8 @@ const webHandlerToNodeHandler = buildToNodeHandler(
        super(input, addDuplexToInit(init));
      }
    },
-    Uint8Array: Uint8Array,
-    FetchEvent: FetchEvent,
+    Uint8Array,
+    FetchEvent: Edge.FetchEvent,
  },
  { defaultOrigin: 'https://vercel.com' }
 );
--- a/packages/node/src/serverless-functions/serverless-handler.mts
+++ b/packages/node/src/serverless-functions/serverless-handler.mts
@@ -27,7 +27,7 @@ type ServerlessFunctionSignature = (
 const [NODE_MAJOR] = process.versions.node.split('.').map(v => Number(v));

 /* https://nextjs.org/docs/app/building-your-application/routing/router-handlers#supported-http-methods */
-const HTTP_METHODS = [
+export const HTTP_METHODS = [
  'GET',
  'HEAD',
  'OPTIONS',
--- a/packages/node/test/dev-fixtures/serverless-web.js
+++ b/packages/node/test/dev-fixtures/serverless-web.js
@@ -1,10 +0,0 @@
-/* global Response */
-
-const baseUrl = ({ headers }) =>
-  `${headers.get('x-forwarded-proto')}://${headers.get('x-forwarded-host')}`;
-
-export function GET(request) {
-  const { searchParams } = new URL(request.url, baseUrl(request));
-  const name = searchParams.get('name');
-  return new Response(`Greetings, ${name}`);
-}
--- a/packages/node/test/dev-fixtures/web-handlers-edge.js
+++ b/packages/node/test/dev-fixtures/web-handlers-edge.js
@@ -0,0 +1,50 @@
+/* global ReadableStream, TextEncoderStream, Response */
+
+export const config = { runtime: 'edge' };
+
+const DEFER_MS = 10;
+
+const wait = ms => new Promise(resolve => setTimeout(resolve, ms));
+
+const streaming =
+  text =>
+  (_, { waitUntil }) => {
+    const DATA = text.split(' ');
+    let index = 0;
+
+    const readable = new ReadableStream({
+      async start(controller) {
+        while (index < DATA.length) {
+          const data = DATA[index++];
+          let chunk = data;
+          if (index !== DATA.length) chunk += ' ';
+          controller.enqueue(chunk);
+          await wait(DEFER_MS);
+        }
+        controller.close();
+      },
+    }).pipeThrough(new TextEncoderStream());
+
+    waitUntil(wait(DATA.length * DEFER_MS));
+
+    return new Response(readable, {
+      headers: {
+        'Content-Type': 'text/plain',
+        'x-web-handler': text,
+      },
+    });
+  };
+
+export const GET = streaming('Web handler using GET');
+
+export const HEAD = streaming('Web handler using HEAD');
+
+export const OPTIONS = streaming('Web handler using OPTIONS');
+
+export const POST = streaming('Web handler using POST');
+
+export const PUT = streaming('Web handler using PUT');
+
+export const DELETE = streaming('Web handler using DELETE');
+
+export const PATCH = streaming('Web handler using PATCH');
--- a/packages/node/test/dev-fixtures/web-handlers-node.js
+++ b/packages/node/test/dev-fixtures/web-handlers-node.js
@@ -0,0 +1,48 @@
+/* global ReadableStream, TextEncoderStream, Response */
+
+const DEFER_MS = 10;
+
+const wait = ms => new Promise(resolve => setTimeout(resolve, ms));
+
+const streaming =
+  text =>
+  (_, { waitUntil }) => {
+    const DATA = text.split(' ');
+    let index = 0;
+
+    const readable = new ReadableStream({
+      async start(controller) {
+        while (index < DATA.length) {
+          const data = DATA[index++];
+          let chunk = data;
+          if (index !== DATA.length) chunk += ' ';
+          controller.enqueue(chunk);
+          await wait(DEFER_MS);
+        }
+        controller.close();
+      },
+    }).pipeThrough(new TextEncoderStream());
+
+    waitUntil(wait(DATA.length * DEFER_MS));
+
+    return new Response(readable, {
+      headers: {
+        'Content-Type': 'text/plain',
+        'x-web-handler': text,
+      },
+    });
+  };
+
+export const GET = streaming('Web handler using GET');
+
+export const HEAD = streaming('Web handler using HEAD');
+
+export const OPTIONS = streaming('Web handler using OPTIONS');
+
+export const POST = streaming('Web handler using POST');
+
+export const PUT = streaming('Web handler using PUT');
+
+export const DELETE = streaming('Web handler using DELETE');
+
+export const PATCH = streaming('Web handler using PATCH');
--- a/packages/node/test/unit/dev.test.ts
+++ b/packages/node/test/unit/dev.test.ts
@@ -30,9 +30,9 @@ function testForkDevServer(entrypoint: string) {
 }

 (NODE_MAJOR < 18 ? test.skip : test)(
-  'runs an serverless function that exports GET',
+  'web handlers for node runtime',
  async () => {
-    const child = testForkDevServer('./serverless-response.js');
+    const child = testForkDevServer('./web-handlers-node.js');
    try {
      const result = await readMessage(child);
      if (result.state !== 'message') {
@@ -43,20 +43,251 @@ function testForkDevServer(entrypoint: string) {

      {
        const response = await fetch(
-          `http://${address}:${port}/api/serverless-response?name=Vercel`
+          `http://${address}:${port}/api/web-handlers-node`,
+          { method: 'GET' }
        );
        expect({
          status: response.status,
          body: await response.text(),
-        }).toEqual({ status: 200, body: 'Greetings, Vercel' });
+          transferEncoding: response.headers.get('transfer-encoding'),
+          'x-web-handler': response.headers.get('x-web-handler'),
+        }).toEqual({
+          status: 200,
+          body: 'Web handler using GET',
+          transferEncoding: 'chunked',
+          'x-web-handler': 'Web handler using GET',
+        });
      }
+      {
+        const response = await fetch(
+          `http://${address}:${port}/api/web-handlers-node`,
+          { method: 'POST' }
+        );
+        expect({
+          status: response.status,
+          body: await response.text(),
+          transferEncoding: response.headers.get('transfer-encoding'),
+          'x-web-handler': response.headers.get('x-web-handler'),
+        }).toEqual({
+          status: 200,
+          body: 'Web handler using POST',
+          transferEncoding: 'chunked',
+          'x-web-handler': 'Web handler using POST',
+        });
+      }
+      {
+        const response = await fetch(
+          `http://${address}:${port}/api/web-handlers-node`,
+          { method: 'DELETE' }
+        );
+        expect({
+          status: response.status,
+          body: await response.text(),
+          transferEncoding: response.headers.get('transfer-encoding'),
+          'x-web-handler': response.headers.get('x-web-handler'),
+        }).toEqual({
+          status: 200,
+          body: 'Web handler using DELETE',
+          transferEncoding: 'chunked',
+          'x-web-handler': 'Web handler using DELETE',
+        });
+      }
+      {
+        const response = await fetch(
+          `http://${address}:${port}/api/web-handlers-node`,
+          { method: 'PUT' }
+        );
+        expect({
+          status: response.status,
+          body: await response.text(),
+          transferEncoding: response.headers.get('transfer-encoding'),
+          'x-web-handler': response.headers.get('x-web-handler'),
+        }).toEqual({
+          status: 200,
+          body: 'Web handler using PUT',
+          transferEncoding: 'chunked',
+          'x-web-handler': 'Web handler using PUT',
+        });
+      }
+      {
+        const response = await fetch(
+          `http://${address}:${port}/api/web-handlers-node`,
+          { method: 'PATCH' }
+        );
+        expect({
+          status: response.status,
+          body: await response.text(),
+          transferEncoding: response.headers.get('transfer-encoding'),
+          'x-web-handler': response.headers.get('x-web-handler'),
+        }).toEqual({
+          status: 200,
+          body: 'Web handler using PATCH',
+          transferEncoding: 'chunked',
+          'x-web-handler': 'Web handler using PATCH',
+        });
+      }
+      {
+        const response = await fetch(
+          `http://${address}:${port}/api/web-handlers-node`,
+          { method: 'HEAD' }
+        );
+        expect({
+          status: response.status,
+          'x-web-handler': response.headers.get('x-web-handler'),
+        }).toEqual({
+          status: 200,
+          'x-web-handler': 'Web handler using HEAD',
+        });
+      }
+      {
+        const response = await fetch(
+          `http://${address}:${port}/api/web-handlers-node`,
+          { method: 'OPTIONS' }
+        );
+        expect({
+          status: response.status,
+          body: await response.text(),
+          transferEncoding: response.headers.get('transfer-encoding'),
+          'x-web-handler': response.headers.get('x-web-handler'),
+        }).toEqual({
+          status: 200,
+          body: 'Web handler using OPTIONS',
+          transferEncoding: 'chunked',
+          'x-web-handler': 'Web handler using OPTIONS',
+        });
+      }
+    } finally {
+      child.kill(9);
+    }
+  }
+);
+
+(NODE_MAJOR < 18 ? test.skip : test)(
+  'web handlers for edge runtime',
+  async () => {
+    const child = testForkDevServer('./web-handlers-edge.js');
+    try {
+      const result = await readMessage(child);
+      if (result.state !== 'message') {
+        throw new Error('Exited. error: ' + JSON.stringify(result.value));
+      }
+
+      const { address, port } = result.value;

      {
        const response = await fetch(
-          `http://${address}:${port}/api/serverless-response?name=Vercel`,
+          `http://${address}:${port}/api/web-handlers-edge`,
+          { method: 'GET' }
+        );
+        expect({
+          status: response.status,
+          body: await response.text(),
+          transferEncoding: response.headers.get('transfer-encoding'),
+          'x-web-handler': response.headers.get('x-web-handler'),
+        }).toEqual({
+          status: 200,
+          body: 'Web handler using GET',
+          transferEncoding: 'chunked',
+          'x-web-handler': 'Web handler using GET',
+        });
+      }
+      {
+        const response = await fetch(
+          `http://${address}:${port}/api/web-handlers-edge`,
+          { method: 'POST' }
+        );
+        expect({
+          status: response.status,
+          body: await response.text(),
+          transferEncoding: response.headers.get('transfer-encoding'),
+          'x-web-handler': response.headers.get('x-web-handler'),
+        }).toEqual({
+          status: 200,
+          body: 'Web handler using POST',
+          transferEncoding: 'chunked',
+          'x-web-handler': 'Web handler using POST',
+        });
+      }
+      {
+        const response = await fetch(
+          `http://${address}:${port}/api/web-handlers-edge`,
+          { method: 'DELETE' }
+        );
+
+        console.log(response);
+        expect({
+          status: response.status,
+          transferEncoding: response.headers.get('transfer-encoding'),
+          'x-web-handler': response.headers.get('x-web-handler'),
+        }).toEqual({
+          status: 200,
+          transferEncoding: 'chunked',
+          'x-web-handler': 'Web handler using DELETE',
+        });
+      }
+      {
+        const response = await fetch(
+          `http://${address}:${port}/api/web-handlers-edge`,
+          { method: 'PUT' }
+        );
+        expect({
+          status: response.status,
+          body: await response.text(),
+          transferEncoding: response.headers.get('transfer-encoding'),
+          'x-web-handler': response.headers.get('x-web-handler'),
+        }).toEqual({
+          status: 200,
+          body: 'Web handler using PUT',
+          transferEncoding: 'chunked',
+          'x-web-handler': 'Web handler using PUT',
+        });
+      }
+      {
+        const response = await fetch(
+          `http://${address}:${port}/api/web-handlers-edge`,
+          { method: 'PATCH' }
+        );
+        expect({
+          status: response.status,
+          body: await response.text(),
+          transferEncoding: response.headers.get('transfer-encoding'),
+          'x-web-handler': response.headers.get('x-web-handler'),
+        }).toEqual({
+          status: 200,
+          body: 'Web handler using PATCH',
+          transferEncoding: 'chunked',
+          'x-web-handler': 'Web handler using PATCH',
+        });
+      }
+      {
+        const response = await fetch(
+          `http://${address}:${port}/api/web-handlers-edge`,
          { method: 'HEAD' }
        );
-        expect({ status: response.status }).toEqual({ status: 405 });
+        expect({
+          status: response.status,
+          'x-web-handler': response.headers.get('x-web-handler'),
+        }).toEqual({
+          status: 200,
+          'x-web-handler': 'Web handler using HEAD',
+        });
+      }
+      {
+        const response = await fetch(
+          `http://${address}:${port}/api/web-handlers-edge`,
+          { method: 'OPTIONS' }
+        );
+        expect({
+          status: response.status,
+          body: await response.text(),
+          transferEncoding: response.headers.get('transfer-encoding'),
+          'x-web-handler': response.headers.get('x-web-handler'),
+        }).toEqual({
+          status: 200,
+          body: 'Web handler using OPTIONS',
+          transferEncoding: 'chunked',
+          'x-web-handler': 'Web handler using OPTIONS',
+        });
      }
    } finally {
      child.kill(9);
--- a/packages/python/CHANGELOG.md
+++ b/packages/python/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @vercel/python

+## 4.1.1
+
+### Patch Changes
+
+- Remove deprecated `createLambda()` usage ([#11080](https://github.com/vercel/vercel/pull/11080))
+
 ## 4.1.0

 ### Minor Changes
--- a/packages/python/package.json
+++ b/packages/python/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/python",
-  "version": "4.1.0",
+  "version": "4.1.1",
  "main": "./dist/index.js",
  "license": "Apache-2.0",
  "homepage": "https://vercel.com/docs/runtimes#official-runtimes/python",
@@ -26,7 +26,7 @@
    "@types/jest": "27.4.1",
    "@types/node": "14.18.33",
    "@types/which": "3.0.0",
-    "@vercel/build-utils": "7.5.1",
+    "@vercel/build-utils": "7.7.0",
    "execa": "^1.0.0",
    "fs-extra": "11.1.1",
    "jest-junit": "16.0.0",
--- a/packages/python/src/index.ts
+++ b/packages/python/src/index.ts
@@ -1,23 +1,27 @@
-import { join, dirname, basename } from 'path';
-import execa from 'execa';
 import fs from 'fs';
+import execa from 'execa';
 import { promisify } from 'util';
-const readFile = promisify(fs.readFile);
-const writeFile = promisify(fs.writeFile);
+import { join, dirname, basename } from 'path';
 import {
-  GlobOptions,
-  BuildOptions,
  getWriteableDirectory,
  download,
  glob,
-  createLambda,
+  Lambda,
+  FileBlob,
  shouldServe,
  debug,
  NowBuildError,
+  type BuildOptions,
+  type GlobOptions,
+  type BuildV3,
+  type Files,
 } from '@vercel/build-utils';
 import { installRequirement, installRequirementsFile } from './install';
 import { getLatestPythonVersion, getSupportedPythonVersion } from './version';

+const readFile = promisify(fs.readFile);
+const writeFile = promisify(fs.writeFile);
+
 async function pipenvConvert(cmd: string, srcDir: string) {
  debug('Running pipfile2req...');
  try {
@@ -53,13 +57,13 @@ export async function downloadFilesInWorkPath({
  return workPath;
 }

-export const build = async ({
+export const build: BuildV3 = async ({
  workPath,
  files: originalFiles,
  entrypoint,
  meta = {},
  config,
-}: BuildOptions) => {
+}) => {
  let pythonVersion = getLatestPythonVersion(meta);

  workPath = await downloadFilesInWorkPath({
@@ -190,12 +194,6 @@ export const build = async ({
    .replace(/__VC_HANDLER_MODULE_NAME/g, moduleName)
    .replace(/__VC_HANDLER_ENTRYPOINT/g, entrypointWithSuffix);

-  // in order to allow the user to have `server.py`, we need our `server.py` to be called
-  // somethig else
-  const handlerPyFilename = 'vc__handler__python';
-
-  await writeFile(join(workPath, `${handlerPyFilename}.py`), handlerPyContents);
-
  const globOptions: GlobOptions = {
    cwd: workPath,
    ignore:
@@ -204,14 +202,22 @@ export const build = async ({
        : 'node_modules/**',
  };

-  const lambda = await createLambda({
-    files: await glob('**', globOptions),
+  const files: Files = await glob('**', globOptions);
+
+  // in order to allow the user to have `server.py`, we
+  // need our `server.py` to be called something else
+  const handlerPyFilename = 'vc__handler__python';
+
+  files[`${handlerPyFilename}.py`] = new FileBlob({ data: handlerPyContents });
+
+  const output = new Lambda({
+    files,
    handler: `${handlerPyFilename}.vc_handler`,
    runtime: pythonVersion.runtime,
    environment: {},
  });

-  return { output: lambda };
+  return { output };
 };

 export { shouldServe };
--- a/packages/redwood/CHANGELOG.md
+++ b/packages/redwood/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @vercel/redwood

+## 2.0.8
+
+### Patch Changes
+
+- bump `@vercel/nft@0.26.4` ([#11155](https://github.com/vercel/vercel/pull/11155))
+
+## 2.0.7
+
+### Patch Changes
+
+- [node][next][redwood][remix] bump `@vercel/nft@0.26.3` ([#11115](https://github.com/vercel/vercel/pull/11115))
+
 ## 2.0.6

 ### Patch Changes
--- a/packages/redwood/package.json
+++ b/packages/redwood/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/redwood",
-  "version": "2.0.6",
+  "version": "2.0.8",
  "main": "./dist/index.js",
  "license": "Apache-2.0",
  "homepage": "https://vercel.com/docs",
@@ -20,7 +20,7 @@
    "type-check": "tsc --noEmit"
  },
  "dependencies": {
-    "@vercel/nft": "0.26.2",
+    "@vercel/nft": "0.26.4",
    "@vercel/routing-utils": "3.1.0",
    "semver": "6.3.1"
  },
@@ -28,7 +28,7 @@
    "@types/aws-lambda": "8.10.19",
    "@types/node": "14.18.33",
    "@types/semver": "6.0.0",
-    "@vercel/build-utils": "7.5.1",
+    "@vercel/build-utils": "7.7.0",
    "execa": "3.2.0",
    "fs-extra": "11.1.0",
    "jest-junit": "16.0.0"
--- a/packages/remix/CHANGELOG.md
+++ b/packages/remix/CHANGELOG.md
@@ -1,5 +1,33 @@
 # @vercel/remix-builder

+## 2.1.0
+
+### Minor Changes
+
+- Remix Vite plugin support ([#11031](https://github.com/vercel/vercel/pull/11031))
+
+## 2.0.20
+
+### Patch Changes
+
+- Don't install Remix fork when not using split configuration ([#11152](https://github.com/vercel/vercel/pull/11152))
+
+- Add `serverBundles` post-build sanity check and fallback ([#11153](https://github.com/vercel/vercel/pull/11153))
+
+- bump `@vercel/nft@0.26.4` ([#11155](https://github.com/vercel/vercel/pull/11155))
+
+- Update `@remix-run/dev` fork to v2.6.0 ([#11162](https://github.com/vercel/vercel/pull/11162))
+
+- Update `@remix-run/dev` fork to v2.7.0 ([#11180](https://github.com/vercel/vercel/pull/11180))
+
+- Update `@remix-run/dev` fork to v2.7.2 ([#11186](https://github.com/vercel/vercel/pull/11186))
+
+## 2.0.19
+
+### Patch Changes
+
+- [node][next][redwood][remix] bump `@vercel/nft@0.26.3` ([#11115](https://github.com/vercel/vercel/pull/11115))
+
 ## 2.0.18

 ### Patch Changes
--- a/packages/remix/package.json
+++ b/packages/remix/package.json
@@ -1,9 +1,10 @@
 {
  "name": "@vercel/remix-builder",
-  "version": "2.0.18",
+  "version": "2.1.0",
  "license": "Apache-2.0",
  "main": "./dist/index.js",
  "homepage": "https://vercel.com/docs",
+  "sideEffects": false,
  "repository": {
    "type": "git",
    "url": "https://github.com/vercel/vercel.git",
@@ -13,7 +14,7 @@
    "build": "node ../../utils/build-builder.mjs",
    "test": "jest --reporters=default --reporters=jest-junit --env node --verbose --bail --runInBand",
    "test-unit": "pnpm test test/unit.*test.*",
-    "test-e2e": "pnpm test test/integration.test.ts",
+    "test-e2e": "pnpm test test/integration-*.test.ts",
    "type-check": "tsc --noEmit"
  },
  "files": [
@@ -21,16 +22,17 @@
    "defaults"
  ],
  "dependencies": {
-    "@vercel/nft": "0.26.2",
+    "@vercel/error-utils": "2.0.2",
+    "@vercel/nft": "0.26.4",
    "@vercel/static-config": "3.0.0",
    "ts-morph": "12.0.0"
  },
  "devDependencies": {
-    "@remix-run/dev": "npm:@vercel/remix-run-dev@2.5.1",
+    "@remix-run/dev": "npm:@vercel/remix-run-dev@2.7.2",
    "@types/jest": "27.5.1",
    "@types/node": "14.18.33",
    "@types/semver": "7.3.13",
-    "@vercel/build-utils": "7.5.1",
+    "@vercel/build-utils": "7.7.0",
    "jest-junit": "16.0.0",
    "path-to-regexp": "6.2.1",
    "semver": "7.5.2"
--- a/packages/remix/src/build-legacy.ts
+++ b/packages/remix/src/build-legacy.ts
@@ -0,0 +1,814 @@
+import { Project } from 'ts-morph';
+import { readFileSync, promises as fs, existsSync } from 'fs';
+import { basename, dirname, extname, join, posix, relative, sep } from 'path';
+import {
+  debug,
+  download,
+  execCommand,
+  FileBlob,
+  FileFsRef,
+  getEnvForPackageManager,
+  getNodeVersion,
+  getSpawnOptions,
+  glob,
+  EdgeFunction,
+  NodejsLambda,
+  rename,
+  runNpmInstall,
+  runPackageJsonScript,
+  scanParentDirs,
+} from '@vercel/build-utils';
+import { getConfig } from '@vercel/static-config';
+import { nodeFileTrace } from '@vercel/nft';
+import type {
+  BuildV2,
+  Files,
+  NodeVersion,
+  PackageJson,
+  BuildResultV2Typical,
+} from '@vercel/build-utils';
+import type { ConfigRoute } from '@remix-run/dev/dist/config/routes';
+import type { BaseFunctionConfig } from '@vercel/static-config';
+import {
+  calculateRouteConfigHash,
+  findConfig,
+  getPathFromRoute,
+  getRegExpFromPath,
+  getResolvedRouteConfig,
+  isLayoutRoute,
+  ResolvedRouteConfig,
+  ResolvedNodeRouteConfig,
+  ResolvedEdgeRouteConfig,
+  findEntry,
+  chdirAndReadConfig,
+  resolveSemverMinMax,
+  ensureResolvable,
+  isESM,
+} from './utils';
+import { patchHydrogenServer } from './hydrogen';
+
+interface ServerBundle {
+  serverBuildPath: string;
+  routes: string[];
+}
+
+const remixBuilderPkg = JSON.parse(
+  readFileSync(join(__dirname, '../package.json'), 'utf8')
+);
+const remixRunDevForkVersion =
+  remixBuilderPkg.devDependencies['@remix-run/dev'];
+
+const DEFAULTS_PATH = join(__dirname, '../defaults');
+
+const edgeServerSrcPromise = fs.readFile(
+  join(DEFAULTS_PATH, 'server-edge.mjs'),
+  'utf-8'
+);
+const nodeServerSrcPromise = fs.readFile(
+  join(DEFAULTS_PATH, 'server-node.mjs'),
+  'utf-8'
+);
+
+// Minimum supported version of the `@vercel/remix` package
+const VERCEL_REMIX_MIN_VERSION = '1.10.0';
+
+// Minimum supported version of the `@vercel/remix-run-dev` forked compiler
+const REMIX_RUN_DEV_MIN_VERSION = '1.15.0';
+
+// Maximum version of `@vercel/remix-run-dev` fork
+// (and also `@vercel/remix` since they get published at the same time)
+const REMIX_RUN_DEV_MAX_VERSION = remixRunDevForkVersion.slice(
+  remixRunDevForkVersion.lastIndexOf('@') + 1
+);
+
+export const build: BuildV2 = async ({
+  entrypoint,
+  files,
+  workPath,
+  repoRootPath,
+  config,
+  meta = {},
+}) => {
+  const { installCommand, buildCommand } = config;
+
+  await download(files, workPath, meta);
+
+  const mountpoint = dirname(entrypoint);
+  const entrypointFsDirname = join(workPath, mountpoint);
+
+  // Run "Install Command"
+  const nodeVersion = await getNodeVersion(
+    entrypointFsDirname,
+    undefined,
+    config,
+    meta
+  );
+
+  const { cliType, packageJsonPath, lockfileVersion, lockfilePath } =
+    await scanParentDirs(entrypointFsDirname);
+
+  if (!packageJsonPath) {
+    throw new Error('Failed to locate `package.json` file in your project');
+  }
+
+  const [lockfileRaw, pkgRaw] = await Promise.all([
+    lockfilePath ? fs.readFile(lockfilePath) : null,
+    fs.readFile(packageJsonPath, 'utf8'),
+  ]);
+  const pkg = JSON.parse(pkgRaw);
+
+  const spawnOpts = getSpawnOptions(meta, nodeVersion);
+  if (!spawnOpts.env) {
+    spawnOpts.env = {};
+  }
+
+  spawnOpts.env = getEnvForPackageManager({
+    cliType,
+    lockfileVersion,
+    nodeVersion,
+    env: spawnOpts.env,
+  });
+
+  if (typeof installCommand === 'string') {
+    if (installCommand.trim()) {
+      console.log(`Running "install" command: \`${installCommand}\`...`);
+      await execCommand(installCommand, {
+        ...spawnOpts,
+        cwd: entrypointFsDirname,
+      });
+    } else {
+      console.log(`Skipping "install" command...`);
+    }
+  } else {
+    await runNpmInstall(entrypointFsDirname, [], spawnOpts, meta, nodeVersion);
+  }
+
+  const isHydrogen2 = Boolean(
+    pkg.dependencies?.['@shopify/remix-oxygen'] ||
+      pkg.devDependencies?.['@shopify/remix-oxygen']
+  );
+
+  // Determine the version of Remix based on the `@remix-run/dev`
+  // package version.
+  const remixRunDevPath = await ensureResolvable(
+    entrypointFsDirname,
+    repoRootPath,
+    '@remix-run/dev'
+  );
+  const remixRunDevPkg = JSON.parse(
+    readFileSync(join(remixRunDevPath, 'package.json'), 'utf8')
+  );
+  const remixVersion = remixRunDevPkg.version;
+
+  const remixConfig = await chdirAndReadConfig(
+    remixRunDevPath,
+    entrypointFsDirname,
+    packageJsonPath
+  );
+  const { serverEntryPoint, appDirectory } = remixConfig;
+  const remixRoutes = Object.values(remixConfig.routes);
+
+  let depsModified = false;
+
+  const remixRunDevPkgVersion: string | undefined =
+    pkg.dependencies?.['@remix-run/dev'] ||
+    pkg.devDependencies?.['@remix-run/dev'];
+
+  const serverBundlesMap = new Map<string, ConfigRoute[]>();
+  const resolvedConfigsMap = new Map<ConfigRoute, ResolvedRouteConfig>();
+
+  // Read the `export const config` (if any) for each route
+  const project = new Project();
+  const staticConfigsMap = new Map<ConfigRoute, BaseFunctionConfig | null>();
+  for (const route of remixRoutes) {
+    const routePath = join(remixConfig.appDirectory, route.file);
+    let staticConfig = getConfig(project, routePath);
+    if (staticConfig && isHydrogen2) {
+      console.log(
+        'WARN: `export const config` is currently not supported for Hydrogen v2 apps'
+      );
+      staticConfig = null;
+    }
+    staticConfigsMap.set(route, staticConfig);
+  }
+
+  for (const route of remixRoutes) {
+    const config = getResolvedRouteConfig(
+      route,
+      remixConfig.routes,
+      staticConfigsMap,
+      isHydrogen2
+    );
+    resolvedConfigsMap.set(route, config);
+  }
+
+  // Figure out which routes belong to which server bundles
+  // based on having common static config properties
+  for (const route of remixRoutes) {
+    if (isLayoutRoute(route.id, remixRoutes)) continue;
+
+    const config = resolvedConfigsMap.get(route);
+    if (!config) {
+      throw new Error(`Expected resolved config for "${route.id}"`);
+    }
+    const hash = calculateRouteConfigHash(config);
+
+    let routesForHash = serverBundlesMap.get(hash);
+    if (!Array.isArray(routesForHash)) {
+      routesForHash = [];
+      serverBundlesMap.set(hash, routesForHash);
+    }
+
+    routesForHash.push(route);
+  }
+
+  let serverBundles: ServerBundle[] = Array.from(
+    serverBundlesMap.entries()
+  ).map(([hash, routes]) => {
+    const runtime = resolvedConfigsMap.get(routes[0])?.runtime ?? 'nodejs';
+    return {
+      serverBuildPath: isHydrogen2
+        ? relative(entrypointFsDirname, remixConfig.serverBuildPath)
+        : `${relative(
+            entrypointFsDirname,
+            dirname(remixConfig.serverBuildPath)
+          )}/build-${runtime}-${hash}.js`,
+      routes: routes.map(r => r.id),
+    };
+  });
+
+  // If the project is *not* relying on split configurations, then set
+  // the `serverBuildPath` to the default Remix path, since the forked
+  // Remix compiler will not be used
+  if (!isHydrogen2 && serverBundles.length === 1) {
+    // `serverBuildTarget` and `serverBuildPath` are undefined with
+    // our remix config modifications, so use the default build path
+    serverBundles[0].serverBuildPath = 'build/index.js';
+  }
+
+  // If the project is relying on split configurations, then override
+  // the official `@remix-run/dev` package with the Vercel fork,
+  // which supports the `serverBundles` config
+  if (
+    serverBundles.length > 1 &&
+    !isHydrogen2 &&
+    remixRunDevPkg.name !== '@vercel/remix-run-dev' &&
+    !remixRunDevPkgVersion?.startsWith('https:')
+  ) {
+    const remixDevForkVersion = resolveSemverMinMax(
+      REMIX_RUN_DEV_MIN_VERSION,
+      REMIX_RUN_DEV_MAX_VERSION,
+      remixVersion
+    );
+    // Remove `@remix-run/dev`, add `@vercel/remix-run-dev`
+    if (pkg.devDependencies['@remix-run/dev']) {
+      delete pkg.devDependencies['@remix-run/dev'];
+      pkg.devDependencies['@vercel/remix-run-dev'] = remixDevForkVersion;
+    } else {
+      delete pkg.dependencies['@remix-run/dev'];
+      pkg.dependencies['@vercel/remix-run-dev'] = remixDevForkVersion;
+    }
+    depsModified = true;
+  }
+
+  // `app/entry.server.tsx` and `app/entry.client.tsx` are optional in Remix,
+  // so if either of those files are missing then add our own versions.
+  const userEntryServerFile = findEntry(appDirectory, 'entry.server');
+  if (!userEntryServerFile) {
+    await fs.copyFile(
+      join(DEFAULTS_PATH, 'entry.server.jsx'),
+      join(appDirectory, 'entry.server.jsx')
+    );
+    if (!pkg.dependencies['@vercel/remix']) {
+      // Dependency version resolution logic
+      // 1. Users app is on 1.9.0 -> we install the 1.10.0 (minimum) version of `@vercel/remix`.
+      // 2. Users app is on 1.11.0 (a version greater than 1.10.0 and less than the known max
+      //    published version) -> we install the (matching) 1.11.0 version of `@vercel/remix`.
+      // 3. Users app is on something greater than our latest version of the fork -> we install
+      //    the latest known published version of `@vercel/remix`.
+      const vercelRemixVersion = resolveSemverMinMax(
+        VERCEL_REMIX_MIN_VERSION,
+        REMIX_RUN_DEV_MAX_VERSION,
+        remixVersion
+      );
+      pkg.dependencies['@vercel/remix'] = vercelRemixVersion;
+      depsModified = true;
+    }
+  }
+
+  if (depsModified) {
+    await fs.writeFile(packageJsonPath, JSON.stringify(pkg, null, 2) + '\n');
+
+    // Bypass `--frozen-lockfile` enforcement by removing
+    // env vars that are considered to be CI
+    const nonCiEnv = { ...spawnOpts.env };
+    delete nonCiEnv.CI;
+    delete nonCiEnv.VERCEL;
+    delete nonCiEnv.NOW_BUILDER;
+
+    // Purposefully not passing `meta` here to avoid
+    // the optimization that prevents `npm install`
+    // from running a second time
+    await runNpmInstall(
+      entrypointFsDirname,
+      [],
+      {
+        ...spawnOpts,
+        env: nonCiEnv,
+      },
+      undefined,
+      nodeVersion
+    );
+  }
+
+  const userEntryClientFile = findEntry(
+    remixConfig.appDirectory,
+    'entry.client'
+  );
+  if (!userEntryClientFile) {
+    await fs.copyFile(
+      join(DEFAULTS_PATH, 'entry.client.react.jsx'),
+      join(appDirectory, 'entry.client.jsx')
+    );
+  }
+
+  let remixConfigWrapped = false;
+  let serverEntryPointAbs: string | undefined;
+  let originalServerEntryPoint: string | undefined;
+  const remixConfigPath = findConfig(entrypointFsDirname, 'remix.config');
+  const renamedRemixConfigPath = remixConfigPath
+    ? `${remixConfigPath}.original${extname(remixConfigPath)}`
+    : undefined;
+
+  try {
+    // We need to patch the `remix.config.js` file to force some values necessary
+    // for a build that works on either Node.js or the Edge runtime
+    if (!isHydrogen2 && remixConfigPath && renamedRemixConfigPath) {
+      await fs.rename(remixConfigPath, renamedRemixConfigPath);
+
+      let patchedConfig: string;
+      // Figure out if the `remix.config` file is using ESM syntax
+      if (isESM(renamedRemixConfigPath)) {
+        patchedConfig = `import config from './${basename(
+          renamedRemixConfigPath
+        )}';
+config.serverBuildTarget = undefined;
+config.serverModuleFormat = '${pkg.type === 'module' ? 'esm' : 'cjs'}';
+config.serverPlatform = 'node';
+config.serverBuildPath = undefined;
+config.serverBundles = ${JSON.stringify(serverBundles)};
+export default config;`;
+      } else {
+        patchedConfig = `const config = require('./${basename(
+          renamedRemixConfigPath
+        )}');
+config.serverBuildTarget = undefined;
+config.serverModuleFormat = '${pkg.type === 'module' ? 'esm' : 'cjs'}';
+config.serverPlatform = 'node';
+config.serverBuildPath = undefined;
+config.serverBundles = ${JSON.stringify(serverBundles)};
+module.exports = config;`;
+      }
+      await fs.writeFile(remixConfigPath, patchedConfig);
+      remixConfigWrapped = true;
+    }
+
+    // For Hydrogen v2, patch the `server.ts` file to be Vercel-compatible
+    if (isHydrogen2) {
+      if (remixConfig.serverEntryPoint) {
+        serverEntryPointAbs = join(
+          entrypointFsDirname,
+          remixConfig.serverEntryPoint
+        );
+        originalServerEntryPoint = await fs.readFile(
+          serverEntryPointAbs,
+          'utf8'
+        );
+        const patchedServerEntryPoint = patchHydrogenServer(
+          project,
+          serverEntryPointAbs
+        );
+        if (patchedServerEntryPoint) {
+          debug(
+            `Patched Hydrogen server file: ${remixConfig.serverEntryPoint}`
+          );
+          await fs.writeFile(serverEntryPointAbs, patchedServerEntryPoint);
+        }
+      } else {
+        console.log('WARN: No "server" field found in Remix config');
+      }
+    }
+
+    // Make `remix build` output production mode
+    spawnOpts.env.NODE_ENV = 'production';
+
+    // Run "Build Command"
+    if (buildCommand) {
+      debug(`Executing build command "${buildCommand}"`);
+      await execCommand(buildCommand, {
+        ...spawnOpts,
+        cwd: entrypointFsDirname,
+      });
+    } else {
+      if (hasScript('vercel-build', pkg)) {
+        debug(`Executing "yarn vercel-build"`);
+        await runPackageJsonScript(
+          entrypointFsDirname,
+          'vercel-build',
+          spawnOpts
+        );
+      } else if (hasScript('build', pkg)) {
+        debug(`Executing "yarn build"`);
+        await runPackageJsonScript(entrypointFsDirname, 'build', spawnOpts);
+      } else {
+        await execCommand('remix build', {
+          ...spawnOpts,
+          cwd: entrypointFsDirname,
+        });
+      }
+    }
+  } finally {
+    const cleanupOps: Promise<void>[] = [];
+    // Clean up our patched `remix.config.js` to be polite
+    if (remixConfigWrapped && remixConfigPath && renamedRemixConfigPath) {
+      cleanupOps.push(
+        fs
+          .rename(renamedRemixConfigPath, remixConfigPath)
+          .then(() => debug(`Restored original "${remixConfigPath}" file`))
+      );
+    }
+    // Restore original server entrypoint if it was modified (for Hydrogen v2)
+    if (serverEntryPointAbs && originalServerEntryPoint) {
+      cleanupOps.push(
+        fs
+          .writeFile(serverEntryPointAbs, originalServerEntryPoint)
+          .then(() => debug(`Restored original "${serverEntryPointAbs}" file`))
+      );
+    }
+    // Restore original `package.json` file and lockfile
+    if (depsModified) {
+      cleanupOps.push(
+        fs
+          .writeFile(packageJsonPath, pkgRaw)
+          .then(() => debug(`Restored original "${packageJsonPath}" file`))
+      );
+      if (lockfilePath && lockfileRaw) {
+        cleanupOps.push(
+          fs
+            .writeFile(lockfilePath, lockfileRaw)
+            .then(() => debug(`Restored original "${lockfilePath}" file`))
+        );
+      }
+    }
+    await Promise.all(cleanupOps);
+  }
+
+  // This needs to happen before we run NFT to create the Node/Edge functions
+  await Promise.all([
+    ensureResolvable(
+      entrypointFsDirname,
+      repoRootPath,
+      '@remix-run/server-runtime'
+    ),
+    !isHydrogen2
+      ? ensureResolvable(entrypointFsDirname, repoRootPath, '@remix-run/node')
+      : null,
+  ]);
+
+  const staticDir = join(entrypointFsDirname, 'public');
+
+  // Do a sanity check to ensure that the server bundles `serverBuildPath` was actually created.
+  // If it was not, then that usually means the Vercel forked Remix compiler was not used and
+  // thus only a singular server bundle was produced.
+  const serverBundlesRespected = existsSync(
+    join(entrypointFsDirname, serverBundles[0].serverBuildPath)
+  );
+  if (!serverBundlesRespected) {
+    console.warn(
+      'WARN: `serverBundles` configuration failed. Falling back to a singular server bundle.'
+    );
+    serverBundles = [
+      {
+        serverBuildPath: 'build/index.js',
+        routes: serverBundles.flatMap(b => b.routes),
+      },
+    ];
+  }
+
+  const [staticFiles, buildAssets, ...functions] = await Promise.all([
+    glob('**', staticDir),
+    glob('**', remixConfig.assetsBuildDirectory),
+    ...serverBundles.map(bundle => {
+      const firstRoute = remixConfig.routes[bundle.routes[0]];
+      const config = resolvedConfigsMap.get(firstRoute) ?? {
+        runtime: 'nodejs',
+      };
+      const serverBuildPath = join(entrypointFsDirname, bundle.serverBuildPath);
+
+      if (config.runtime === 'edge') {
+        return createRenderEdgeFunction(
+          entrypointFsDirname,
+          repoRootPath,
+          serverBuildPath,
+          serverEntryPoint,
+          remixVersion,
+          config
+        );
+      }
+
+      return createRenderNodeFunction(
+        nodeVersion,
+        entrypointFsDirname,
+        repoRootPath,
+        serverBuildPath,
+        serverEntryPoint,
+        remixVersion,
+        config
+      );
+    }),
+  ]);
+
+  const transformedBuildAssets = rename(buildAssets, name => {
+    return posix.join('./', remixConfig.publicPath, name);
+  });
+
+  const output: BuildResultV2Typical['output'] = {
+    ...staticFiles,
+    ...transformedBuildAssets,
+  };
+  const routes: any[] = [
+    {
+      src: `^/${remixConfig.publicPath.replace(/^\/|\/$/g, '')}/(.*)$`,
+      headers: { 'cache-control': 'public, max-age=31536000, immutable' },
+      continue: true,
+    },
+    {
+      handle: 'filesystem',
+    },
+  ];
+
+  for (const route of remixRoutes) {
+    // Layout routes don't get a function / route added
+    if (isLayoutRoute(route.id, remixRoutes)) continue;
+
+    const { path, rePath } = getPathFromRoute(route, remixConfig.routes);
+
+    // If the route is a pathless layout route (at the root level)
+    // and doesn't have any sub-routes, then a function should not be created.
+    if (!path) {
+      continue;
+    }
+
+    const funcIndex = serverBundles.findIndex(bundle => {
+      return bundle.routes.includes(route.id);
+    });
+    const func = functions[funcIndex];
+
+    if (!func) {
+      throw new Error(`Could not determine server bundle for "${route.id}"`);
+    }
+
+    output[path] = func;
+
+    // If this is a dynamic route then add a Vercel route
+    const re = getRegExpFromPath(rePath);
+    if (re) {
+      routes.push({
+        src: re.source,
+        dest: path,
+      });
+    }
+  }
+
+  // Add a 404 path for not found pages to be server-side rendered by Remix.
+  // Use an edge function bundle if one was generated, otherwise use Node.js.
+  if (!output['404']) {
+    const edgeFunctionIndex = Array.from(serverBundlesMap.values()).findIndex(
+      routes => {
+        const runtime = resolvedConfigsMap.get(routes[0])?.runtime;
+        return runtime === 'edge';
+      }
+    );
+    const func =
+      edgeFunctionIndex !== -1 ? functions[edgeFunctionIndex] : functions[0];
+    output['404'] = func;
+  }
+  routes.push({
+    src: '/(.*)',
+    dest: '/404',
+  });
+
+  return { routes, output, framework: { version: remixVersion } };
+};
+
+function hasScript(scriptName: string, pkg: PackageJson | null) {
+  const scripts = (pkg && pkg.scripts) || {};
+  return typeof scripts[scriptName] === 'string';
+}
+
+async function createRenderNodeFunction(
+  nodeVersion: NodeVersion,
+  entrypointDir: string,
+  rootDir: string,
+  serverBuildPath: string,
+  serverEntryPoint: string | undefined,
+  remixVersion: string,
+  config: ResolvedNodeRouteConfig
+): Promise<NodejsLambda> {
+  const files: Files = {};
+
+  let handler = relative(rootDir, serverBuildPath);
+  let handlerPath = join(rootDir, handler);
+  if (!serverEntryPoint) {
+    const baseServerBuildPath = basename(serverBuildPath, '.js');
+    handler = join(dirname(handler), `server-${baseServerBuildPath}.mjs`);
+    handlerPath = join(rootDir, handler);
+
+    // Copy the `server-node.mjs` file into the "build" directory
+    const nodeServerSrc = await nodeServerSrcPromise;
+    await writeEntrypointFile(
+      handlerPath,
+      nodeServerSrc.replace(
+        '@remix-run/dev/server-build',
+        `./${baseServerBuildPath}.js`
+      ),
+      rootDir
+    );
+  }
+
+  // Trace the handler with `@vercel/nft`
+  const trace = await nodeFileTrace([handlerPath], {
+    base: rootDir,
+    processCwd: entrypointDir,
+  });
+
+  for (const warning of trace.warnings) {
+    debug(`Warning from trace: ${warning.message}`);
+  }
+
+  for (const file of trace.fileList) {
+    files[file] = await FileFsRef.fromFsPath({ fsPath: join(rootDir, file) });
+  }
+
+  const fn = new NodejsLambda({
+    files,
+    handler,
+    runtime: nodeVersion.runtime,
+    shouldAddHelpers: false,
+    shouldAddSourcemapSupport: false,
+    operationType: 'SSR',
+    supportsResponseStreaming: true,
+    regions: config.regions,
+    memory: config.memory,
+    maxDuration: config.maxDuration,
+    framework: {
+      slug: 'remix',
+      version: remixVersion,
+    },
+  });
+
+  return fn;
+}
+
+async function createRenderEdgeFunction(
+  entrypointDir: string,
+  rootDir: string,
+  serverBuildPath: string,
+  serverEntryPoint: string | undefined,
+  remixVersion: string,
+  config: ResolvedEdgeRouteConfig
+): Promise<EdgeFunction> {
+  const files: Files = {};
+
+  let handler = relative(rootDir, serverBuildPath);
+  let handlerPath = join(rootDir, handler);
+  if (!serverEntryPoint) {
+    const baseServerBuildPath = basename(serverBuildPath, '.js');
+    handler = join(dirname(handler), `server-${baseServerBuildPath}.mjs`);
+    handlerPath = join(rootDir, handler);
+
+    // Copy the `server-edge.mjs` file into the "build" directory
+    const edgeServerSrc = await edgeServerSrcPromise;
+    await writeEntrypointFile(
+      handlerPath,
+      edgeServerSrc.replace(
+        '@remix-run/dev/server-build',
+        `./${baseServerBuildPath}.js`
+      ),
+      rootDir
+    );
+  }
+
+  let remixRunVercelPkgJson: string | undefined;
+
+  // Trace the handler with `@vercel/nft`
+  const trace = await nodeFileTrace([handlerPath], {
+    base: rootDir,
+    processCwd: entrypointDir,
+    conditions: ['edge-light', 'browser', 'module', 'import', 'require'],
+    async readFile(fsPath) {
+      let source: Buffer | string;
+      try {
+        source = await fs.readFile(fsPath);
+      } catch (err: any) {
+        if (err.code === 'ENOENT' || err.code === 'EISDIR') {
+          return null;
+        }
+        throw err;
+      }
+      if (basename(fsPath) === 'package.json') {
+        // For Edge Functions, patch "main" field to prefer "browser" or "module"
+        const pkgJson = JSON.parse(source.toString());
+
+        // When `@remix-run/vercel` is detected, we need to modify the `package.json`
+        // to include the "browser" field so that the proper Edge entrypoint file
+        // is used. This is a temporary stop gap until this PR is merged:
+        // https://github.com/remix-run/remix/pull/5537
+        if (pkgJson.name === '@remix-run/vercel') {
+          pkgJson.browser = 'dist/edge.js';
+          pkgJson.dependencies['@remix-run/server-runtime'] =
+            pkgJson.dependencies['@remix-run/node'];
+
+          if (!remixRunVercelPkgJson) {
+            remixRunVercelPkgJson = JSON.stringify(pkgJson, null, 2) + '\n';
+
+            // Copy in the edge entrypoint so that NFT can properly resolve it
+            const vercelEdgeEntrypointPath = join(
+              DEFAULTS_PATH,
+              'vercel-edge-entrypoint.js'
+            );
+            const vercelEdgeEntrypointDest = join(
+              dirname(fsPath),
+              'dist/edge.js'
+            );
+            await fs.copyFile(
+              vercelEdgeEntrypointPath,
+              vercelEdgeEntrypointDest
+            );
+          }
+        }
+
+        for (const prop of ['browser', 'module']) {
+          const val = pkgJson[prop];
+          if (typeof val === 'string') {
+            pkgJson.main = val;
+
+            // Return the modified `package.json` to nft
+            source = JSON.stringify(pkgJson);
+            break;
+          }
+        }
+      }
+      return source;
+    },
+  });
+
+  for (const warning of trace.warnings) {
+    debug(`Warning from trace: ${warning.message}`);
+  }
+
+  for (const file of trace.fileList) {
+    if (
+      remixRunVercelPkgJson &&
+      file.endsWith(`@remix-run${sep}vercel${sep}package.json`)
+    ) {
+      // Use the modified `@remix-run/vercel` package.json which contains "browser" field
+      files[file] = new FileBlob({ data: remixRunVercelPkgJson });
+    } else {
+      files[file] = await FileFsRef.fromFsPath({ fsPath: join(rootDir, file) });
+    }
+  }
+
+  const fn = new EdgeFunction({
+    files,
+    deploymentTarget: 'v8-worker',
+    entrypoint: handler,
+    regions: config.regions,
+    framework: {
+      slug: 'remix',
+      version: remixVersion,
+    },
+  });
+
+  return fn;
+}
+
+async function writeEntrypointFile(
+  path: string,
+  data: string,
+  rootDir: string
+) {
+  try {
+    await fs.writeFile(path, data);
+  } catch (err: any) {
+    if (err.code === 'ENOENT') {
+      throw new Error(
+        `The "${relative(
+          rootDir,
+          dirname(path)
+        )}" directory does not exist. Please contact support at https://vercel.com/help.`
+      );
+    }
+    throw err;
+  }
+}
--- a/packages/remix/src/build-vite.ts
+++ b/packages/remix/src/build-vite.ts
@@ -0,0 +1,477 @@
+import { readFileSync, promises as fs, statSync, existsSync } from 'fs';
+import { basename, dirname, join, relative, sep } from 'path';
+import { isErrnoException } from '@vercel/error-utils';
+import { nodeFileTrace } from '@vercel/nft';
+import {
+  BuildResultV2Typical,
+  debug,
+  execCommand,
+  getEnvForPackageManager,
+  getNodeVersion,
+  getSpawnOptions,
+  glob,
+  runNpmInstall,
+  runPackageJsonScript,
+  scanParentDirs,
+  FileBlob,
+  FileFsRef,
+  EdgeFunction,
+  NodejsLambda,
+} from '@vercel/build-utils';
+import {
+  ensureResolvable,
+  getPathFromRoute,
+  getRegExpFromPath,
+  hasScript,
+} from './utils';
+import type { BuildV2, Files, NodeVersion } from '@vercel/build-utils';
+
+const DEFAULTS_PATH = join(__dirname, '../defaults');
+
+const edgeServerSrcPromise = fs.readFile(
+  join(DEFAULTS_PATH, 'server-edge.mjs'),
+  'utf-8'
+);
+const nodeServerSrcPromise = fs.readFile(
+  join(DEFAULTS_PATH, 'server-node.mjs'),
+  'utf-8'
+);
+
+interface RemixBuildResult {
+  buildManifest: {
+    serverBundles?: Record<
+      string,
+      { id: string; file: string; config: Record<string, unknown> }
+    >;
+    routeIdToServerBundleId?: Record<string, string>;
+    routes: Record<
+      string,
+      {
+        id: string;
+        file: string;
+        path?: string;
+        index?: boolean;
+        parentId?: string;
+        config: Record<string, unknown>;
+      }
+    >;
+  };
+  remixConfig: {
+    buildDirectory: string;
+  };
+  viteConfig?: {
+    build?: {
+      assetsDir: string;
+    };
+  };
+}
+
+export const build: BuildV2 = async ({
+  entrypoint,
+  workPath,
+  repoRootPath,
+  config,
+  meta = {},
+}) => {
+  const { installCommand, buildCommand } = config;
+  const mountpoint = dirname(entrypoint);
+  const entrypointFsDirname = join(workPath, mountpoint);
+
+  // Run "Install Command"
+  const nodeVersion = await getNodeVersion(
+    entrypointFsDirname,
+    undefined,
+    config,
+    meta
+  );
+
+  const { cliType, lockfileVersion, packageJson } = await scanParentDirs(
+    entrypointFsDirname,
+    true
+  );
+
+  const spawnOpts = getSpawnOptions(meta, nodeVersion);
+  if (!spawnOpts.env) {
+    spawnOpts.env = {};
+  }
+
+  spawnOpts.env = getEnvForPackageManager({
+    cliType,
+    lockfileVersion,
+    nodeVersion,
+    env: spawnOpts.env,
+  });
+
+  if (typeof installCommand === 'string') {
+    if (installCommand.trim()) {
+      console.log(`Running "install" command: \`${installCommand}\`...`);
+      await execCommand(installCommand, {
+        ...spawnOpts,
+        cwd: entrypointFsDirname,
+      });
+    } else {
+      console.log(`Skipping "install" command...`);
+    }
+  } else {
+    await runNpmInstall(entrypointFsDirname, [], spawnOpts, meta, nodeVersion);
+  }
+
+  // Determine the version of Remix based on the `@remix-run/dev`
+  // package version.
+  const remixRunDevPath = await ensureResolvable(
+    entrypointFsDirname,
+    repoRootPath,
+    '@remix-run/dev'
+  );
+  const remixRunDevPkg = JSON.parse(
+    readFileSync(join(remixRunDevPath, 'package.json'), 'utf8')
+  );
+  const remixVersion = remixRunDevPkg.version;
+
+  // Make `remix build` output production mode
+  spawnOpts.env.NODE_ENV = 'production';
+
+  // Run "Build Command"
+  if (buildCommand) {
+    debug(`Executing build command "${buildCommand}"`);
+    await execCommand(buildCommand, {
+      ...spawnOpts,
+      cwd: entrypointFsDirname,
+    });
+  } else {
+    if (hasScript('vercel-build', packageJson)) {
+      debug(`Executing "vercel-build" script`);
+      await runPackageJsonScript(
+        entrypointFsDirname,
+        'vercel-build',
+        spawnOpts
+      );
+    } else if (hasScript('build', packageJson)) {
+      debug(`Executing "build" script`);
+      await runPackageJsonScript(entrypointFsDirname, 'build', spawnOpts);
+    } else {
+      await execCommand('remix build', {
+        ...spawnOpts,
+        cwd: entrypointFsDirname,
+      });
+    }
+  }
+
+  // This needs to happen before we run NFT to create the Node/Edge functions
+  // TODO: maybe remove this?
+  await Promise.all([
+    ensureResolvable(
+      entrypointFsDirname,
+      repoRootPath,
+      '@remix-run/server-runtime'
+    ),
+    ensureResolvable(entrypointFsDirname, repoRootPath, '@remix-run/node'),
+  ]);
+
+  const remixBuildResultPath = join(
+    entrypointFsDirname,
+    '.vercel/remix-build-result.json'
+  );
+  let remixBuildResult: RemixBuildResult | undefined;
+  try {
+    const remixBuildResultContents = readFileSync(remixBuildResultPath, 'utf8');
+    remixBuildResult = JSON.parse(remixBuildResultContents);
+  } catch (err: unknown) {
+    if (!isErrnoException(err) || err.code !== 'ENOENT') {
+      throw err;
+    }
+    // The project has not configured the `vercelPreset()`
+    // Preset in the "vite.config" file. Attempt to check
+    // for the default build output directory.
+    const buildDirectory = join(entrypointFsDirname, 'build');
+    if (statSync(buildDirectory).isDirectory()) {
+      console.warn('WARN: The `vercelPreset()` Preset was not detected.');
+      remixBuildResult = {
+        buildManifest: {
+          routes: {
+            root: {
+              path: '',
+              id: 'root',
+              file: 'app/root.tsx',
+              config: {},
+            },
+            'routes/_index': {
+              file: 'app/routes/_index.tsx',
+              id: 'routes/_index',
+              index: true,
+              parentId: 'root',
+              config: {},
+            },
+          },
+        },
+        remixConfig: {
+          buildDirectory,
+        },
+      };
+      // Detect if a server build exists (won't be the case when `ssr: false`)
+      const serverPath = 'build/server/index.js';
+      if (existsSync(join(entrypointFsDirname, serverPath))) {
+        remixBuildResult.buildManifest.routeIdToServerBundleId = {
+          'routes/_index': '',
+        };
+        remixBuildResult.buildManifest.serverBundles = {
+          '': {
+            id: '',
+            file: serverPath,
+            config: {},
+          },
+        };
+      }
+    }
+  }
+
+  if (!remixBuildResult) {
+    throw new Error(
+      'Could not determine build output directory. Please configure the `vercelPreset()` Preset from the `@vercel/remix` npm package'
+    );
+  }
+
+  const { buildManifest, remixConfig, viteConfig } = remixBuildResult;
+
+  const staticDir = join(remixConfig.buildDirectory, 'client');
+  const serverBundles = Object.values(buildManifest.serverBundles ?? {});
+
+  const [staticFiles, ...functions] = await Promise.all([
+    glob('**', staticDir),
+    ...serverBundles.map(bundle => {
+      if (bundle.config.runtime === 'edge') {
+        return createRenderEdgeFunction(
+          entrypointFsDirname,
+          repoRootPath,
+          join(entrypointFsDirname, bundle.file),
+          undefined,
+          remixVersion,
+          bundle.config
+        );
+      }
+
+      return createRenderNodeFunction(
+        nodeVersion,
+        entrypointFsDirname,
+        repoRootPath,
+        join(entrypointFsDirname, bundle.file),
+        undefined,
+        remixVersion,
+        bundle.config
+      );
+    }),
+  ]);
+
+  const functionsMap = new Map<string, EdgeFunction | NodejsLambda>();
+  for (let i = 0; i < serverBundles.length; i++) {
+    functionsMap.set(serverBundles[i].id, functions[i]);
+  }
+
+  const output: BuildResultV2Typical['output'] = staticFiles;
+  const assetsDir = viteConfig?.build?.assetsDir || 'assets';
+  const routes: any[] = [
+    {
+      src: `^/${assetsDir}/(.*)$`,
+      headers: { 'cache-control': 'public, max-age=31536000, immutable' },
+      continue: true,
+    },
+    {
+      handle: 'filesystem',
+    },
+  ];
+
+  for (const [id, functionId] of Object.entries(
+    buildManifest.routeIdToServerBundleId ?? {}
+  )) {
+    const route = buildManifest.routes[id];
+    const { path, rePath } = getPathFromRoute(route, buildManifest.routes);
+
+    // If the route is a pathless layout route (at the root level)
+    // and doesn't have any sub-routes, then a function should not be created.
+    if (!path) {
+      continue;
+    }
+
+    const func = functionsMap.get(functionId);
+    if (!func) {
+      throw new Error(`Could not determine server bundle for "${id}"`);
+    }
+
+    output[path] = func;
+
+    // If this is a dynamic route then add a Vercel route
+    const re = getRegExpFromPath(rePath);
+    if (re) {
+      routes.push({
+        src: re.source,
+        dest: path,
+      });
+    }
+  }
+
+  // For the 404 case, invoke the Function (or serve the static file
+  // for `ssr: false` mode) at the `/` path. Remix will serve its 404 route.
+  routes.push({
+    src: '/(.*)',
+    dest: '/',
+  });
+
+  return { routes, output, framework: { version: remixVersion } };
+};
+
+async function createRenderNodeFunction(
+  nodeVersion: NodeVersion,
+  entrypointDir: string,
+  rootDir: string,
+  serverBuildPath: string,
+  serverEntryPoint: string | undefined,
+  remixVersion: string,
+  config: /*TODO: ResolvedNodeRouteConfig*/ any
+): Promise<NodejsLambda> {
+  const files: Files = {};
+
+  let handler = relative(rootDir, serverBuildPath);
+  let handlerPath = join(rootDir, handler);
+  if (!serverEntryPoint) {
+    const baseServerBuildPath = basename(serverBuildPath, '.js');
+    handler = join(dirname(handler), `server-${baseServerBuildPath}.mjs`);
+    handlerPath = join(rootDir, handler);
+
+    // Copy the `server-node.mjs` file into the "build" directory
+    const nodeServerSrc = await nodeServerSrcPromise;
+    await fs.writeFile(
+      handlerPath,
+      nodeServerSrc.replace(
+        '@remix-run/dev/server-build',
+        `./${baseServerBuildPath}.js`
+      )
+    );
+  }
+
+  // Trace the handler with `@vercel/nft`
+  const trace = await nodeFileTrace([handlerPath], {
+    base: rootDir,
+    processCwd: entrypointDir,
+  });
+
+  for (const warning of trace.warnings) {
+    debug(`Warning from trace: ${warning.message}`);
+  }
+
+  for (const file of trace.fileList) {
+    files[file] = await FileFsRef.fromFsPath({ fsPath: join(rootDir, file) });
+  }
+
+  const fn = new NodejsLambda({
+    files,
+    handler,
+    runtime: nodeVersion.runtime,
+    shouldAddHelpers: false,
+    shouldAddSourcemapSupport: false,
+    operationType: 'SSR',
+    supportsResponseStreaming: true,
+    regions: config.regions,
+    memory: config.memory,
+    maxDuration: config.maxDuration,
+    framework: {
+      slug: 'remix',
+      version: remixVersion,
+    },
+  });
+
+  return fn;
+}
+
+async function createRenderEdgeFunction(
+  entrypointDir: string,
+  rootDir: string,
+  serverBuildPath: string,
+  serverEntryPoint: string | undefined,
+  remixVersion: string,
+  config: /* TODO: ResolvedEdgeRouteConfig*/ any
+): Promise<EdgeFunction> {
+  const files: Files = {};
+
+  let handler = relative(rootDir, serverBuildPath);
+  let handlerPath = join(rootDir, handler);
+  if (!serverEntryPoint) {
+    const baseServerBuildPath = basename(serverBuildPath, '.js');
+    handler = join(dirname(handler), `server-${baseServerBuildPath}.mjs`);
+    handlerPath = join(rootDir, handler);
+
+    // Copy the `server-edge.mjs` file into the "build" directory
+    const edgeServerSrc = await edgeServerSrcPromise;
+    await fs.writeFile(
+      handlerPath,
+      edgeServerSrc.replace(
+        '@remix-run/dev/server-build',
+        `./${baseServerBuildPath}.js`
+      )
+    );
+  }
+
+  let remixRunVercelPkgJson: string | undefined;
+
+  // Trace the handler with `@vercel/nft`
+  const trace = await nodeFileTrace([handlerPath], {
+    base: rootDir,
+    processCwd: entrypointDir,
+    conditions: ['edge-light', 'browser', 'module', 'import', 'require'],
+    async readFile(fsPath) {
+      let source: Buffer | string;
+      try {
+        source = await fs.readFile(fsPath);
+      } catch (err: any) {
+        if (err.code === 'ENOENT' || err.code === 'EISDIR') {
+          return null;
+        }
+        throw err;
+      }
+      if (basename(fsPath) === 'package.json') {
+        // For Edge Functions, patch "main" field to prefer "browser" or "module"
+        const pkgJson = JSON.parse(source.toString());
+
+        for (const prop of ['browser', 'module']) {
+          const val = pkgJson[prop];
+          if (typeof val === 'string') {
+            pkgJson.main = val;
+
+            // Return the modified `package.json` to nft
+            source = JSON.stringify(pkgJson);
+            break;
+          }
+        }
+      }
+      return source;
+    },
+  });
+
+  for (const warning of trace.warnings) {
+    debug(`Warning from trace: ${warning.message}`);
+  }
+
+  for (const file of trace.fileList) {
+    if (
+      remixRunVercelPkgJson &&
+      file.endsWith(`@remix-run${sep}vercel${sep}package.json`)
+    ) {
+      // Use the modified `@remix-run/vercel` package.json which contains "browser" field
+      files[file] = new FileBlob({ data: remixRunVercelPkgJson });
+    } else {
+      files[file] = await FileFsRef.fromFsPath({ fsPath: join(rootDir, file) });
+    }
+  }
+
+  const fn = new EdgeFunction({
+    files,
+    deploymentTarget: 'v8-worker',
+    entrypoint: handler,
+    regions: config.regions,
+    framework: {
+      slug: 'remix',
+      version: remixVersion,
+    },
+  });
+
+  return fn;
+}
--- a/packages/remix/src/build.ts
+++ b/packages/remix/src/build.ts
@@ -1,786 +1,9 @@
-import { Project } from 'ts-morph';
-import { readFileSync, promises as fs } from 'fs';
-import { basename, dirname, extname, join, posix, relative, sep } from 'path';
-import {
-  debug,
-  download,
-  execCommand,
-  FileBlob,
-  FileFsRef,
-  getEnvForPackageManager,
-  getNodeVersion,
-  getSpawnOptions,
-  glob,
-  EdgeFunction,
-  NodejsLambda,
-  rename,
-  runNpmInstall,
-  runPackageJsonScript,
-  scanParentDirs,
-} from '@vercel/build-utils';
-import { getConfig } from '@vercel/static-config';
-import { nodeFileTrace } from '@vercel/nft';
-import type {
-  BuildV2,
-  Files,
-  NodeVersion,
-  PackageJson,
-  BuildResultV2Typical,
-} from '@vercel/build-utils';
-import type { ConfigRoute } from '@remix-run/dev/dist/config/routes';
-import type { BaseFunctionConfig } from '@vercel/static-config';
-import {
-  calculateRouteConfigHash,
-  findConfig,
-  getPathFromRoute,
-  getRegExpFromPath,
-  getResolvedRouteConfig,
-  isLayoutRoute,
-  ResolvedRouteConfig,
-  ResolvedNodeRouteConfig,
-  ResolvedEdgeRouteConfig,
-  findEntry,
-  chdirAndReadConfig,
-  resolveSemverMinMax,
-  ensureResolvable,
-  isESM,
-} from './utils';
-import { patchHydrogenServer } from './hydrogen';
+import { build as buildVite } from './build-vite';
+import { build as buildLegacy } from './build-legacy';
+import { findConfig } from './utils';
+import type { BuildV2 } from '@vercel/build-utils';

-interface ServerBundle {
-  serverBuildPath: string;
-  routes: string[];
-}
-
-const remixBuilderPkg = JSON.parse(
-  readFileSync(join(__dirname, '../package.json'), 'utf8')
-);
-const remixRunDevForkVersion =
-  remixBuilderPkg.devDependencies['@remix-run/dev'];
-
-const DEFAULTS_PATH = join(__dirname, '../defaults');
-
-const edgeServerSrcPromise = fs.readFile(
-  join(DEFAULTS_PATH, 'server-edge.mjs'),
-  'utf-8'
-);
-const nodeServerSrcPromise = fs.readFile(
-  join(DEFAULTS_PATH, 'server-node.mjs'),
-  'utf-8'
-);
-
-// Minimum supported version of the `@vercel/remix` package
-const VERCEL_REMIX_MIN_VERSION = '1.10.0';
-
-// Minimum supported version of the `@vercel/remix-run-dev` forked compiler
-const REMIX_RUN_DEV_MIN_VERSION = '1.15.0';
-
-// Maximum version of `@vercel/remix-run-dev` fork
-// (and also `@vercel/remix` since they get published at the same time)
-const REMIX_RUN_DEV_MAX_VERSION = remixRunDevForkVersion.slice(
-  remixRunDevForkVersion.lastIndexOf('@') + 1
-);
-
-export const build: BuildV2 = async ({
-  entrypoint,
-  files,
-  workPath,
-  repoRootPath,
-  config,
-  meta = {},
-}) => {
-  const { installCommand, buildCommand } = config;
-
-  await download(files, workPath, meta);
-
-  const mountpoint = dirname(entrypoint);
-  const entrypointFsDirname = join(workPath, mountpoint);
-
-  // Run "Install Command"
-  const nodeVersion = await getNodeVersion(
-    entrypointFsDirname,
-    undefined,
-    config,
-    meta
-  );
-
-  const { cliType, packageJsonPath, lockfileVersion, lockfilePath } =
-    await scanParentDirs(entrypointFsDirname);
-
-  if (!packageJsonPath) {
-    throw new Error('Failed to locate `package.json` file in your project');
-  }
-
-  const [lockfileRaw, pkgRaw] = await Promise.all([
-    lockfilePath ? fs.readFile(lockfilePath) : null,
-    fs.readFile(packageJsonPath, 'utf8'),
-  ]);
-  const pkg = JSON.parse(pkgRaw);
-
-  const spawnOpts = getSpawnOptions(meta, nodeVersion);
-  if (!spawnOpts.env) {
-    spawnOpts.env = {};
-  }
-
-  spawnOpts.env = getEnvForPackageManager({
-    cliType,
-    lockfileVersion,
-    nodeVersion,
-    env: spawnOpts.env,
-  });
-
-  if (typeof installCommand === 'string') {
-    if (installCommand.trim()) {
-      console.log(`Running "install" command: \`${installCommand}\`...`);
-      await execCommand(installCommand, {
-        ...spawnOpts,
-        cwd: entrypointFsDirname,
-      });
-    } else {
-      console.log(`Skipping "install" command...`);
-    }
-  } else {
-    await runNpmInstall(entrypointFsDirname, [], spawnOpts, meta, nodeVersion);
-  }
-
-  const isHydrogen2 = Boolean(
-    pkg.dependencies?.['@shopify/remix-oxygen'] ||
-      pkg.devDependencies?.['@shopify/remix-oxygen']
-  );
-
-  // Determine the version of Remix based on the `@remix-run/dev`
-  // package version.
-  const remixRunDevPath = await ensureResolvable(
-    entrypointFsDirname,
-    repoRootPath,
-    '@remix-run/dev'
-  );
-  const remixRunDevPkg = JSON.parse(
-    readFileSync(join(remixRunDevPath, 'package.json'), 'utf8')
-  );
-  const remixVersion = remixRunDevPkg.version;
-
-  const remixConfig = await chdirAndReadConfig(
-    remixRunDevPath,
-    entrypointFsDirname,
-    packageJsonPath
-  );
-  const { serverEntryPoint, appDirectory } = remixConfig;
-  const remixRoutes = Object.values(remixConfig.routes);
-
-  let depsModified = false;
-
-  const remixRunDevPkgVersion: string | undefined =
-    pkg.dependencies?.['@remix-run/dev'] ||
-    pkg.devDependencies?.['@remix-run/dev'];
-
-  // Override the official `@remix-run/dev` package with the
-  // Vercel fork, which supports the `serverBundles` config
-  if (
-    !isHydrogen2 &&
-    remixRunDevPkg.name !== '@vercel/remix-run-dev' &&
-    !remixRunDevPkgVersion?.startsWith('https:')
-  ) {
-    const remixDevForkVersion = resolveSemverMinMax(
-      REMIX_RUN_DEV_MIN_VERSION,
-      REMIX_RUN_DEV_MAX_VERSION,
-      remixVersion
-    );
-    // Remove `@remix-run/dev`, add `@vercel/remix-run-dev`
-    if (pkg.devDependencies['@remix-run/dev']) {
-      delete pkg.devDependencies['@remix-run/dev'];
-      pkg.devDependencies['@vercel/remix-run-dev'] = remixDevForkVersion;
-    } else {
-      delete pkg.dependencies['@remix-run/dev'];
-      pkg.dependencies['@vercel/remix-run-dev'] = remixDevForkVersion;
-    }
-    depsModified = true;
-  }
-
-  // `app/entry.server.tsx` and `app/entry.client.tsx` are optional in Remix,
-  // so if either of those files are missing then add our own versions.
-  const userEntryServerFile = findEntry(appDirectory, 'entry.server');
-  if (!userEntryServerFile) {
-    await fs.copyFile(
-      join(DEFAULTS_PATH, 'entry.server.jsx'),
-      join(appDirectory, 'entry.server.jsx')
-    );
-    if (!pkg.dependencies['@vercel/remix']) {
-      // Dependency version resolution logic
-      // 1. Users app is on 1.9.0 -> we install the 1.10.0 (minimum) version of `@vercel/remix`.
-      // 2. Users app is on 1.11.0 (a version greater than 1.10.0 and less than the known max
-      //    published version) -> we install the (matching) 1.11.0 version of `@vercel/remix`.
-      // 3. Users app is on something greater than our latest version of the fork -> we install
-      //    the latest known published version of `@vercel/remix`.
-      const vercelRemixVersion = resolveSemverMinMax(
-        VERCEL_REMIX_MIN_VERSION,
-        REMIX_RUN_DEV_MAX_VERSION,
-        remixVersion
-      );
-      pkg.dependencies['@vercel/remix'] = vercelRemixVersion;
-      depsModified = true;
-    }
-  }
-
-  if (depsModified) {
-    await fs.writeFile(packageJsonPath, JSON.stringify(pkg, null, 2) + '\n');
-
-    // Bypass `--frozen-lockfile` enforcement by removing
-    // env vars that are considered to be CI
-    const nonCiEnv = { ...spawnOpts.env };
-    delete nonCiEnv.CI;
-    delete nonCiEnv.VERCEL;
-    delete nonCiEnv.NOW_BUILDER;
-
-    // Purposefully not passing `meta` here to avoid
-    // the optimization that prevents `npm install`
-    // from running a second time
-    await runNpmInstall(
-      entrypointFsDirname,
-      [],
-      {
-        ...spawnOpts,
-        env: nonCiEnv,
-      },
-      undefined,
-      nodeVersion
-    );
-  }
-
-  const userEntryClientFile = findEntry(
-    remixConfig.appDirectory,
-    'entry.client'
-  );
-  if (!userEntryClientFile) {
-    await fs.copyFile(
-      join(DEFAULTS_PATH, 'entry.client.react.jsx'),
-      join(appDirectory, 'entry.client.jsx')
-    );
-  }
-
-  let remixConfigWrapped = false;
-  let serverEntryPointAbs: string | undefined;
-  let originalServerEntryPoint: string | undefined;
-  const remixConfigPath = findConfig(entrypointFsDirname, 'remix.config');
-  const renamedRemixConfigPath = remixConfigPath
-    ? `${remixConfigPath}.original${extname(remixConfigPath)}`
-    : undefined;
-
-  // These get populated inside the try/catch below
-  let serverBundles: ServerBundle[];
-  const serverBundlesMap = new Map<string, ConfigRoute[]>();
-  const resolvedConfigsMap = new Map<ConfigRoute, ResolvedRouteConfig>();
-
-  try {
-    // Read the `export const config` (if any) for each route
-    const project = new Project();
-    const staticConfigsMap = new Map<ConfigRoute, BaseFunctionConfig | null>();
-    for (const route of remixRoutes) {
-      const routePath = join(remixConfig.appDirectory, route.file);
-      let staticConfig = getConfig(project, routePath);
-      if (staticConfig && isHydrogen2) {
-        console.log(
-          'WARN: `export const config` is currently not supported for Hydrogen v2 apps'
-        );
-        staticConfig = null;
-      }
-      staticConfigsMap.set(route, staticConfig);
-    }
-
-    for (const route of remixRoutes) {
-      const config = getResolvedRouteConfig(
-        route,
-        remixConfig.routes,
-        staticConfigsMap,
-        isHydrogen2
-      );
-      resolvedConfigsMap.set(route, config);
-    }
-
-    // Figure out which routes belong to which server bundles
-    // based on having common static config properties
-    for (const route of remixRoutes) {
-      if (isLayoutRoute(route.id, remixRoutes)) continue;
-
-      const config = resolvedConfigsMap.get(route);
-      if (!config) {
-        throw new Error(`Expected resolved config for "${route.id}"`);
-      }
-      const hash = calculateRouteConfigHash(config);
-
-      let routesForHash = serverBundlesMap.get(hash);
-      if (!Array.isArray(routesForHash)) {
-        routesForHash = [];
-        serverBundlesMap.set(hash, routesForHash);
-      }
-
-      routesForHash.push(route);
-    }
-
-    serverBundles = Array.from(serverBundlesMap.entries()).map(
-      ([hash, routes]) => {
-        const runtime = resolvedConfigsMap.get(routes[0])?.runtime ?? 'nodejs';
-        return {
-          serverBuildPath: isHydrogen2
-            ? relative(entrypointFsDirname, remixConfig.serverBuildPath)
-            : `${relative(
-                entrypointFsDirname,
-                dirname(remixConfig.serverBuildPath)
-              )}/build-${runtime}-${hash}.js`,
-          routes: routes.map(r => r.id),
-        };
-      }
-    );
-
-    // We need to patch the `remix.config.js` file to force some values necessary
-    // for a build that works on either Node.js or the Edge runtime
-    if (!isHydrogen2 && remixConfigPath && renamedRemixConfigPath) {
-      await fs.rename(remixConfigPath, renamedRemixConfigPath);
-
-      let patchedConfig: string;
-      // Figure out if the `remix.config` file is using ESM syntax
-      if (isESM(renamedRemixConfigPath)) {
-        patchedConfig = `import config from './${basename(
-          renamedRemixConfigPath
-        )}';
-config.serverBuildTarget = undefined;
-config.serverModuleFormat = '${pkg.type === 'module' ? 'esm' : 'cjs'}';
-config.serverPlatform = 'node';
-config.serverBuildPath = undefined;
-config.serverBundles = ${JSON.stringify(serverBundles)};
-export default config;`;
-      } else {
-        patchedConfig = `const config = require('./${basename(
-          renamedRemixConfigPath
-        )}');
-config.serverBuildTarget = undefined;
-config.serverModuleFormat = '${pkg.type === 'module' ? 'esm' : 'cjs'}';
-config.serverPlatform = 'node';
-config.serverBuildPath = undefined;
-config.serverBundles = ${JSON.stringify(serverBundles)};
-module.exports = config;`;
-      }
-      await fs.writeFile(remixConfigPath, patchedConfig);
-      remixConfigWrapped = true;
-    }
-
-    // For Hydrogen v2, patch the `server.ts` file to be Vercel-compatible
-    if (isHydrogen2) {
-      if (remixConfig.serverEntryPoint) {
-        serverEntryPointAbs = join(
-          entrypointFsDirname,
-          remixConfig.serverEntryPoint
-        );
-        originalServerEntryPoint = await fs.readFile(
-          serverEntryPointAbs,
-          'utf8'
-        );
-        const patchedServerEntryPoint = patchHydrogenServer(
-          project,
-          serverEntryPointAbs
-        );
-        if (patchedServerEntryPoint) {
-          debug(
-            `Patched Hydrogen server file: ${remixConfig.serverEntryPoint}`
-          );
-          await fs.writeFile(serverEntryPointAbs, patchedServerEntryPoint);
-        }
-      } else {
-        console.log('WARN: No "server" field found in Remix config');
-      }
-    }
-
-    // Make `remix build` output production mode
-    spawnOpts.env.NODE_ENV = 'production';
-
-    // Run "Build Command"
-    if (buildCommand) {
-      debug(`Executing build command "${buildCommand}"`);
-      await execCommand(buildCommand, {
-        ...spawnOpts,
-        cwd: entrypointFsDirname,
-      });
-    } else {
-      if (hasScript('vercel-build', pkg)) {
-        debug(`Executing "yarn vercel-build"`);
-        await runPackageJsonScript(
-          entrypointFsDirname,
-          'vercel-build',
-          spawnOpts
-        );
-      } else if (hasScript('build', pkg)) {
-        debug(`Executing "yarn build"`);
-        await runPackageJsonScript(entrypointFsDirname, 'build', spawnOpts);
-      } else {
-        await execCommand('remix build', {
-          ...spawnOpts,
-          cwd: entrypointFsDirname,
-        });
-      }
-    }
-  } finally {
-    const cleanupOps: Promise<void>[] = [];
-    // Clean up our patched `remix.config.js` to be polite
-    if (remixConfigWrapped && remixConfigPath && renamedRemixConfigPath) {
-      cleanupOps.push(
-        fs
-          .rename(renamedRemixConfigPath, remixConfigPath)
-          .then(() => debug(`Restored original "${remixConfigPath}" file`))
-      );
-    }
-    // Restore original server entrypoint if it was modified (for Hydrogen v2)
-    if (serverEntryPointAbs && originalServerEntryPoint) {
-      cleanupOps.push(
-        fs
-          .writeFile(serverEntryPointAbs, originalServerEntryPoint)
-          .then(() => debug(`Restored original "${serverEntryPointAbs}" file`))
-      );
-    }
-    // Restore original `package.json` file and lockfile
-    if (depsModified) {
-      cleanupOps.push(
-        fs
-          .writeFile(packageJsonPath, pkgRaw)
-          .then(() => debug(`Restored original "${packageJsonPath}" file`))
-      );
-      if (lockfilePath && lockfileRaw) {
-        cleanupOps.push(
-          fs
-            .writeFile(lockfilePath, lockfileRaw)
-            .then(() => debug(`Restored original "${lockfilePath}" file`))
-        );
-      }
-    }
-    await Promise.all(cleanupOps);
-  }
-
-  // This needs to happen before we run NFT to create the Node/Edge functions
-  await Promise.all([
-    ensureResolvable(
-      entrypointFsDirname,
-      repoRootPath,
-      '@remix-run/server-runtime'
-    ),
-    !isHydrogen2
-      ? ensureResolvable(entrypointFsDirname, repoRootPath, '@remix-run/node')
-      : null,
-  ]);
-
-  const staticDir = join(entrypointFsDirname, 'public');
-
-  const [staticFiles, buildAssets, ...functions] = await Promise.all([
-    glob('**', staticDir),
-    glob('**', remixConfig.assetsBuildDirectory),
-    ...serverBundles.map(bundle => {
-      const firstRoute = remixConfig.routes[bundle.routes[0]];
-      const config = resolvedConfigsMap.get(firstRoute) ?? {
-        runtime: 'nodejs',
-      };
-
-      if (config.runtime === 'edge') {
-        return createRenderEdgeFunction(
-          entrypointFsDirname,
-          repoRootPath,
-          join(entrypointFsDirname, bundle.serverBuildPath),
-          serverEntryPoint,
-          remixVersion,
-          config
-        );
-      }
-
-      return createRenderNodeFunction(
-        nodeVersion,
-        entrypointFsDirname,
-        repoRootPath,
-        join(entrypointFsDirname, bundle.serverBuildPath),
-        serverEntryPoint,
-        remixVersion,
-        config
-      );
-    }),
-  ]);
-
-  const transformedBuildAssets = rename(buildAssets, name => {
-    return posix.join('./', remixConfig.publicPath, name);
-  });
-
-  const output: BuildResultV2Typical['output'] = {
-    ...staticFiles,
-    ...transformedBuildAssets,
-  };
-  const routes: any[] = [
-    {
-      src: `^/${remixConfig.publicPath.replace(/^\/|\/$/g, '')}/(.*)$`,
-      headers: { 'cache-control': 'public, max-age=31536000, immutable' },
-      continue: true,
-    },
-    {
-      handle: 'filesystem',
-    },
-  ];
-
-  for (const route of remixRoutes) {
-    // Layout routes don't get a function / route added
-    if (isLayoutRoute(route.id, remixRoutes)) continue;
-
-    const { path, rePath } = getPathFromRoute(route, remixConfig.routes);
-
-    // If the route is a pathless layout route (at the root level)
-    // and doesn't have any sub-routes, then a function should not be created.
-    if (!path) {
-      continue;
-    }
-
-    const funcIndex = serverBundles.findIndex(bundle => {
-      return bundle.routes.includes(route.id);
-    });
-    const func = functions[funcIndex];
-
-    if (!func) {
-      throw new Error(`Could not determine server bundle for "${route.id}"`);
-    }
-
-    output[path] = func;
-
-    // If this is a dynamic route then add a Vercel route
-    const re = getRegExpFromPath(rePath);
-    if (re) {
-      routes.push({
-        src: re.source,
-        dest: path,
-      });
-    }
-  }
-
-  // Add a 404 path for not found pages to be server-side rendered by Remix.
-  // Use an edge function bundle if one was generated, otherwise use Node.js.
-  if (!output['404']) {
-    const edgeFunctionIndex = Array.from(serverBundlesMap.values()).findIndex(
-      routes => {
-        const runtime = resolvedConfigsMap.get(routes[0])?.runtime;
-        return runtime === 'edge';
-      }
-    );
-    const func =
-      edgeFunctionIndex !== -1 ? functions[edgeFunctionIndex] : functions[0];
-    output['404'] = func;
-  }
-  routes.push({
-    src: '/(.*)',
-    dest: '/404',
-  });
-
-  return { routes, output, framework: { version: remixVersion } };
+export const build: BuildV2 = opts => {
+  const isLegacy = findConfig(opts.workPath, 'remix.config');
+  return isLegacy ? buildLegacy(opts) : buildVite(opts);
 };
-
-function hasScript(scriptName: string, pkg: PackageJson | null) {
-  const scripts = (pkg && pkg.scripts) || {};
-  return typeof scripts[scriptName] === 'string';
-}
-
-async function createRenderNodeFunction(
-  nodeVersion: NodeVersion,
-  entrypointDir: string,
-  rootDir: string,
-  serverBuildPath: string,
-  serverEntryPoint: string | undefined,
-  remixVersion: string,
-  config: ResolvedNodeRouteConfig
-): Promise<NodejsLambda> {
-  const files: Files = {};
-
-  let handler = relative(rootDir, serverBuildPath);
-  let handlerPath = join(rootDir, handler);
-  if (!serverEntryPoint) {
-    const baseServerBuildPath = basename(serverBuildPath, '.js');
-    handler = join(dirname(handler), `server-${baseServerBuildPath}.mjs`);
-    handlerPath = join(rootDir, handler);
-
-    // Copy the `server-node.mjs` file into the "build" directory
-    const nodeServerSrc = await nodeServerSrcPromise;
-    await writeEntrypointFile(
-      handlerPath,
-      nodeServerSrc.replace(
-        '@remix-run/dev/server-build',
-        `./${baseServerBuildPath}.js`
-      ),
-      rootDir
-    );
-  }
-
-  // Trace the handler with `@vercel/nft`
-  const trace = await nodeFileTrace([handlerPath], {
-    base: rootDir,
-    processCwd: entrypointDir,
-  });
-
-  for (const warning of trace.warnings) {
-    debug(`Warning from trace: ${warning.message}`);
-  }
-
-  for (const file of trace.fileList) {
-    files[file] = await FileFsRef.fromFsPath({ fsPath: join(rootDir, file) });
-  }
-
-  const fn = new NodejsLambda({
-    files,
-    handler,
-    runtime: nodeVersion.runtime,
-    shouldAddHelpers: false,
-    shouldAddSourcemapSupport: false,
-    operationType: 'SSR',
-    supportsResponseStreaming: true,
-    regions: config.regions,
-    memory: config.memory,
-    maxDuration: config.maxDuration,
-    framework: {
-      slug: 'remix',
-      version: remixVersion,
-    },
-  });
-
-  return fn;
-}
-
-async function createRenderEdgeFunction(
-  entrypointDir: string,
-  rootDir: string,
-  serverBuildPath: string,
-  serverEntryPoint: string | undefined,
-  remixVersion: string,
-  config: ResolvedEdgeRouteConfig
-): Promise<EdgeFunction> {
-  const files: Files = {};
-
-  let handler = relative(rootDir, serverBuildPath);
-  let handlerPath = join(rootDir, handler);
-  if (!serverEntryPoint) {
-    const baseServerBuildPath = basename(serverBuildPath, '.js');
-    handler = join(dirname(handler), `server-${baseServerBuildPath}.mjs`);
-    handlerPath = join(rootDir, handler);
-
-    // Copy the `server-edge.mjs` file into the "build" directory
-    const edgeServerSrc = await edgeServerSrcPromise;
-    await writeEntrypointFile(
-      handlerPath,
-      edgeServerSrc.replace(
-        '@remix-run/dev/server-build',
-        `./${baseServerBuildPath}.js`
-      ),
-      rootDir
-    );
-  }
-
-  let remixRunVercelPkgJson: string | undefined;
-
-  // Trace the handler with `@vercel/nft`
-  const trace = await nodeFileTrace([handlerPath], {
-    base: rootDir,
-    processCwd: entrypointDir,
-    conditions: ['edge-light', 'browser', 'module', 'import', 'require'],
-    async readFile(fsPath) {
-      let source: Buffer | string;
-      try {
-        source = await fs.readFile(fsPath);
-      } catch (err: any) {
-        if (err.code === 'ENOENT' || err.code === 'EISDIR') {
-          return null;
-        }
-        throw err;
-      }
-      if (basename(fsPath) === 'package.json') {
-        // For Edge Functions, patch "main" field to prefer "browser" or "module"
-        const pkgJson = JSON.parse(source.toString());
-
-        // When `@remix-run/vercel` is detected, we need to modify the `package.json`
-        // to include the "browser" field so that the proper Edge entrypoint file
-        // is used. This is a temporary stop gap until this PR is merged:
-        // https://github.com/remix-run/remix/pull/5537
-        if (pkgJson.name === '@remix-run/vercel') {
-          pkgJson.browser = 'dist/edge.js';
-          pkgJson.dependencies['@remix-run/server-runtime'] =
-            pkgJson.dependencies['@remix-run/node'];
-
-          if (!remixRunVercelPkgJson) {
-            remixRunVercelPkgJson = JSON.stringify(pkgJson, null, 2) + '\n';
-
-            // Copy in the edge entrypoint so that NFT can properly resolve it
-            const vercelEdgeEntrypointPath = join(
-              DEFAULTS_PATH,
-              'vercel-edge-entrypoint.js'
-            );
-            const vercelEdgeEntrypointDest = join(
-              dirname(fsPath),
-              'dist/edge.js'
-            );
-            await fs.copyFile(
-              vercelEdgeEntrypointPath,
-              vercelEdgeEntrypointDest
-            );
-          }
-        }
-
-        for (const prop of ['browser', 'module']) {
-          const val = pkgJson[prop];
-          if (typeof val === 'string') {
-            pkgJson.main = val;
-
-            // Return the modified `package.json` to nft
-            source = JSON.stringify(pkgJson);
-            break;
-          }
-        }
-      }
-      return source;
-    },
-  });
-
-  for (const warning of trace.warnings) {
-    debug(`Warning from trace: ${warning.message}`);
-  }
-
-  for (const file of trace.fileList) {
-    if (
-      remixRunVercelPkgJson &&
-      file.endsWith(`@remix-run${sep}vercel${sep}package.json`)
-    ) {
-      // Use the modified `@remix-run/vercel` package.json which contains "browser" field
-      files[file] = new FileBlob({ data: remixRunVercelPkgJson });
-    } else {
-      files[file] = await FileFsRef.fromFsPath({ fsPath: join(rootDir, file) });
-    }
-  }
-
-  const fn = new EdgeFunction({
-    files,
-    deploymentTarget: 'v8-worker',
-    entrypoint: handler,
-    regions: config.regions,
-    framework: {
-      slug: 'remix',
-      version: remixVersion,
-    },
-  });
-
-  return fn;
-}
-
-async function writeEntrypointFile(
-  path: string,
-  data: string,
-  rootDir: string
-) {
-  try {
-    await fs.writeFile(path, data);
-  } catch (err: any) {
-    if (err.code === 'ENOENT') {
-      throw new Error(
-        `The "${relative(
-          rootDir,
-          dirname(path)
-        )}" directory does not exist. Please contact support at https://vercel.com/help.`
-      );
-    }
-    throw err;
-  }
-}
--- a/packages/remix/src/utils.ts
+++ b/packages/remix/src/utils.ts
@@ -2,7 +2,7 @@ import semver from 'semver';
 import { existsSync, promises as fs } from 'fs';
 import { basename, dirname, join, relative, resolve, sep } from 'path';
 import { pathToRegexp, Key } from 'path-to-regexp';
-import { debug } from '@vercel/build-utils';
+import { debug, type PackageJson } from '@vercel/build-utils';
 import { walkParentDirs } from '@vercel/build-utils';
 import { createRequire } from 'module';
 import type {
@@ -58,8 +58,12 @@ export function findEntry(dir: string, basename: string): string | undefined {

 const configExts = ['.js', '.cjs', '.mjs'];

-export function findConfig(dir: string, basename: string): string | undefined {
-  for (const ext of configExts) {
+export function findConfig(
+  dir: string,
+  basename: string,
+  exts = configExts
+): string | undefined {
+  for (const ext of exts) {
    const name = basename + ext;
    const file = join(dir, name);
    if (existsSync(file)) return file;
@@ -369,3 +373,8 @@ export function isESM(path: string): boolean {
  }
  return isESM;
 }
+
+export function hasScript(scriptName: string, pkg?: PackageJson) {
+  const scripts = pkg?.scripts || {};
+  return typeof scripts[scriptName] === 'string';
+}
--- a/packages/remix/test/fixtures-legacy/00-pnpm/.gitignore
+++ b/packages/remix/test/fixtures-legacy/00-pnpm/.gitignore
--- a/packages/remix/test/fixtures-legacy/00-pnpm/node_modules/.modules.yaml
+++ b/packages/remix/test/fixtures-legacy/00-pnpm/node_modules/.modules.yaml
--- a/packages/remix/test/fixtures-legacy/00-pnpm/node_modules/.pnpm/debug@4.3.4/node_modules/debug/LICENSE
+++ b/packages/remix/test/fixtures-legacy/00-pnpm/node_modules/.pnpm/debug@4.3.4/node_modules/debug/LICENSE
--- a/packages/remix/test/fixtures-legacy/00-pnpm/node_modules/.pnpm/debug@4.3.4/node_modules/debug/README.md
+++ b/packages/remix/test/fixtures-legacy/00-pnpm/node_modules/.pnpm/debug@4.3.4/node_modules/debug/README.md
--- a/packages/remix/test/fixtures-legacy/00-pnpm/node_modules/.pnpm/debug@4.3.4/node_modules/debug/package.json
+++ b/packages/remix/test/fixtures-legacy/00-pnpm/node_modules/.pnpm/debug@4.3.4/node_modules/debug/package.json
--- a/packages/remix/test/fixtures-legacy/00-pnpm/node_modules/.pnpm/debug@4.3.4/node_modules/debug/src/browser.js
+++ b/packages/remix/test/fixtures-legacy/00-pnpm/node_modules/.pnpm/debug@4.3.4/node_modules/debug/src/browser.js
--- a/packages/remix/test/fixtures-legacy/00-pnpm/node_modules/.pnpm/debug@4.3.4/node_modules/debug/src/common.js
+++ b/packages/remix/test/fixtures-legacy/00-pnpm/node_modules/.pnpm/debug@4.3.4/node_modules/debug/src/common.js
--- a/packages/remix/test/fixtures-legacy/00-pnpm/node_modules/.pnpm/debug@4.3.4/node_modules/debug/src/index.js
+++ b/packages/remix/test/fixtures-legacy/00-pnpm/node_modules/.pnpm/debug@4.3.4/node_modules/debug/src/index.js
--- a/packages/remix/test/fixtures-legacy/00-pnpm/node_modules/.pnpm/debug@4.3.4/node_modules/debug/src/node.js
+++ b/packages/remix/test/fixtures-legacy/00-pnpm/node_modules/.pnpm/debug@4.3.4/node_modules/debug/src/node.js
--- a/packages/remix/test/fixtures-legacy/00-pnpm/node_modules/.pnpm/debug@4.3.4/node_modules/ms
+++ b/packages/remix/test/fixtures-legacy/00-pnpm/node_modules/.pnpm/debug@4.3.4/node_modules/ms
--- a/packages/remix/test/fixtures-legacy/00-pnpm/node_modules/.pnpm/lock.yaml
+++ b/packages/remix/test/fixtures-legacy/00-pnpm/node_modules/.pnpm/lock.yaml
--- a/packages/remix/test/fixtures-legacy/00-pnpm/node_modules/.pnpm/ms@2.1.2/node_modules/ms/index.js
+++ b/packages/remix/test/fixtures-legacy/00-pnpm/node_modules/.pnpm/ms@2.1.2/node_modules/ms/index.js
--- a/Show More
+++ b/Show More