Version Packages (#11149 )

This PR was opened by the [Changesets release](https://github.com/changesets/action) GitHub action. When you're ready to do a release, you can merge this and the packages will be published to npm automatically. If you're not ready to do a release yet, that's fine, whenever you add more changesets to main, this PR will be updated. # Releases ## @vercel/build-utils@7.7.0 ### Minor Changes - Revert "Revert "Default ruby to only currently supported version (3.2.0)"" ([#11137](https://github.com/vercel/vercel/pull/11137)) ## @vercel/static-build@2.4.0 ### Minor Changes - Revert "Revert "Default ruby to only currently supported version (3.2.0)"" ([#11137](https://github.com/vercel/vercel/pull/11137)) ### Patch Changes - Updated dependencies \[]: - @vercel/gatsby-plugin-vercel-builder@2.0.18 ## vercel@33.5.1 ### Patch Changes - build: upgrade edge-runtime ([#11148](https://github.com/vercel/vercel/pull/11148)) - Updated dependencies \[[`24c3dd282`](24c3dd282d), [`10e200e0b`](10e200e0bf), [`678ebbe52`](678ebbe525)]: - @vercel/build-utils@7.7.0 - @vercel/static-build@2.4.0 - @vercel/node@3.0.19 ## @vercel/client@13.1.3 ### Patch Changes - Updated dependencies \[[`24c3dd282`](24c3dd282d)]: - @vercel/build-utils@7.7.0 ## @vercel/gatsby-plugin-vercel-builder@2.0.18 ### Patch Changes - Updated dependencies \[[`24c3dd282`](24c3dd282d)]: - @vercel/build-utils@7.7.0 ## @vercel/node@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`](24c3dd282d)]: - @vercel/build-utils@7.7.0 ## @vercel-internals/types@1.0.23 ### Patch Changes - Updated dependencies \[[`24c3dd282`](24c3dd282d)]: - @vercel/build-utils@7.7.0 Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
refactor: simplify content-length check (#11150 )
2025-12-24 03:39:11 +00:00 · 2024-02-13 11:52:52 -06:00 · 2024-02-13 11:45:29 -06:00 · 2024-02-13 11:20:11 -06:00 · 2024-02-13 14:52:46 +00:00 · 2024-02-13 08:27:46 -06:00
130 changed files with 21650 additions and 27422 deletions
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -2,17 +2,17 @@
 # https://help.github.com/en/articles/about-code-owners

 # Restricted Paths
-*                                        @TooTallNate @EndangeredMassa @cb1kenobi @Ethan-Arrowood @trek
-/.github/workflows                       @TooTallNate @EndangeredMassa @cb1kenobi @Ethan-Arrowood @trek @ijjk
-/packages/fs-detectors                   @TooTallNate @EndangeredMassa @cb1kenobi @Ethan-Arrowood @trek @agadzik @chloetedder
-/packages/next                           @TooTallNate @EndangeredMassa @cb1kenobi @Ethan-Arrowood @trek @ijjk @ztanner
-/packages/routing-utils                  @TooTallNate @EndangeredMassa @cb1kenobi @Ethan-Arrowood @trek @ijjk
-/packages/static-build                   @TooTallNate @EndangeredMassa @cb1kenobi @Ethan-Arrowood @trek
-/packages/edge                           @vercel/compute @TooTallNate @EndangeredMassa @cb1kenobi @Ethan-Arrowood @trek
+*                                        @TooTallNate @EndangeredMassa @trek
+/.github/workflows                       @TooTallNate @EndangeredMassa @trek @ijjk
+/packages/fs-detectors                   @TooTallNate @EndangeredMassa @trek @agadzik @chloetedder
+/packages/next                           @TooTallNate @EndangeredMassa @Ethan-Arrowood @trek @ijjk @ztanner
+/packages/routing-utils                  @TooTallNate @EndangeredMassa @trek @ijjk
+/packages/static-build                   @TooTallNate @EndangeredMassa @trek
+/packages/edge                           @vercel/compute @TooTallNate @EndangeredMassa @trek
 /examples                                @leerob
 /examples/create-react-app               @Timer
 /examples/nextjs                         @timneutkens @ijjk @ztanner @huozhi
-/packages/node                           @TooTallNate @EndangeredMassa @cb1kenobi @Ethan-Arrowood @trek @Kikobeats
+/packages/node                           @TooTallNate @EndangeredMassa @trek @Kikobeats

 # Unrestricted Paths
 .changeset/
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,8 +1,8 @@
 blank_issues_enabled: true
 contact_links:
  - name: Bug Report
-    url: https://vercel.com/support/request
-    about: Report a bug using the Vercel support form
+    url: https://vercel.com/help
+    about: Reach out to our support team
  - name: Feature Request
    url: https://github.com/orgs/vercel/discussions/new?category=ideas
    about: Share ideas for new features
--- a/examples/nextjs/app/globals.css
+++ b/examples/nextjs/app/globals.css
@@ -25,3 +25,9 @@ body {
    )
    rgb(var(--background-start-rgb));
 }
+
+@layer utilities {
+  .text-balance {
+    text-wrap: balance;
+  }
+}
--- a/examples/nextjs/app/layout.tsx
+++ b/examples/nextjs/app/layout.tsx
@@ -1,22 +1,22 @@
-import type { Metadata } from 'next'
-import { Inter } from 'next/font/google'
-import './globals.css'
+import type { Metadata } from "next";
+import { Inter } from "next/font/google";
+import "./globals.css";

-const inter = Inter({ subsets: ['latin'] })
+const inter = Inter({ subsets: ["latin"] });

 export const metadata: Metadata = {
-  title: 'Create Next App',
-  description: 'Generated by create next app',
-}
+  title: "Create Next App",
+  description: "Generated by create next app",
+};

 export default function RootLayout({
  children,
-}: {
-  children: React.ReactNode
-}) {
+}: Readonly<{
+  children: React.ReactNode;
+}>) {
  return (
    <html lang="en">
      <body className={inter.className}>{children}</body>
    </html>
-  )
+  );
 }
--- a/examples/nextjs/app/page.tsx
+++ b/examples/nextjs/app/page.tsx
@@ -1,4 +1,4 @@
-import Image from 'next/image'
+import Image from "next/image";

 export default function Home() {
  return (
@@ -15,7 +15,7 @@ export default function Home() {
            target="_blank"
            rel="noopener noreferrer"
          >
-            By{' '}
+            By{" "}
            <Image
              src="/vercel.svg"
              alt="Vercel Logo"
@@ -28,7 +28,7 @@ export default function Home() {
        </div>
      </div>

-      <div className="relative flex place-items-center before:absolute before:h-[300px] before:w-[480px] before:-translate-x-1/2 before:rounded-full before:bg-gradient-radial before:from-white before:to-transparent before:blur-2xl before:content-[''] after:absolute after:-z-20 after:h-[180px] after:w-[240px] after:translate-x-1/3 after:bg-gradient-conic after:from-sky-200 after:via-blue-200 after:blur-2xl after:content-[''] before:dark:bg-gradient-to-br before:dark:from-transparent before:dark:to-blue-700 before:dark:opacity-10 after:dark:from-sky-900 after:dark:via-[#0141ff] after:dark:opacity-40 before:lg:h-[360px] z-[-1]">
+      <div className="relative flex place-items-center before:absolute before:h-[300px] before:w-full sm:before:w-[480px] before:-translate-x-1/2 before:rounded-full before:bg-gradient-radial before:from-white before:to-transparent before:blur-2xl before:content-[''] after:absolute after:-z-20 after:h-[180px] after:w-full sm:after:w-[240px] after:translate-x-1/3 after:bg-gradient-conic after:from-sky-200 after:via-blue-200 after:blur-2xl after:content-[''] before:dark:bg-gradient-to-br before:dark:from-transparent before:dark:to-blue-700 before:dark:opacity-10 after:dark:from-sky-900 after:dark:via-[#0141ff] after:dark:opacity-40 before:lg:h-[360px] z-[-1]">
        <Image
          className="relative dark:drop-shadow-[0_0_0.3rem_#ffffff70] dark:invert"
          src="/next.svg"
@@ -47,7 +47,7 @@ export default function Home() {
          rel="noopener noreferrer"
        >
          <h2 className={`mb-3 text-2xl font-semibold`}>
-            Docs{' '}
+            Docs{" "}
            <span className="inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none">
              -&gt;
            </span>
@@ -64,7 +64,7 @@ export default function Home() {
          rel="noopener noreferrer"
        >
          <h2 className={`mb-3 text-2xl font-semibold`}>
-            Learn{' '}
+            Learn{" "}
            <span className="inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none">
              -&gt;
            </span>
@@ -81,7 +81,7 @@ export default function Home() {
          rel="noopener noreferrer"
        >
          <h2 className={`mb-3 text-2xl font-semibold`}>
-            Templates{' '}
+            Templates{" "}
            <span className="inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none">
              -&gt;
            </span>
@@ -98,16 +98,16 @@ export default function Home() {
          rel="noopener noreferrer"
        >
          <h2 className={`mb-3 text-2xl font-semibold`}>
-            Deploy{' '}
+            Deploy{" "}
            <span className="inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none">
              -&gt;
            </span>
          </h2>
-          <p className={`m-0 max-w-[30ch] text-sm opacity-50`}>
+          <p className={`m-0 max-w-[30ch] text-sm opacity-50 text-balance`}>
            Instantly deploy your Next.js site to a shareable URL with Vercel.
          </p>
        </a>
      </div>
    </main>
-  )
+  );
 }
--- a/examples/nextjs/next.config.js
+++ b/examples/nextjs/next.config.js
@@ -1,4 +0,0 @@
-/** @type {import('next').NextConfig} */
-const nextConfig = {}
-
-module.exports = nextConfig
--- a/examples/nextjs/next.config.mjs
+++ b/examples/nextjs/next.config.mjs
@@ -0,0 +1,4 @@
+/** @type {import('next').NextConfig} */
+const nextConfig = {};
+
+export default nextConfig;
--- a/examples/nextjs/package-lock.json
+++ b/examples/nextjs/package-lock.json
--- a/examples/nextjs/package.json
+++ b/examples/nextjs/package.json
@@ -11,7 +11,7 @@
  "dependencies": {
    "react": "^18",
    "react-dom": "^18",
-    "next": "14.0.4"
+    "next": "14.1.0"
  },
  "devDependencies": {
    "typescript": "^5",
@@ -22,6 +22,6 @@
    "postcss": "^8",
    "tailwindcss": "^3.3.0",
    "eslint": "^8",
-    "eslint-config-next": "14.0.4"
+    "eslint-config-next": "14.1.0"
  }
 }
--- a/examples/nextjs/postcss.config.js
+++ b/examples/nextjs/postcss.config.js
@@ -3,4 +3,4 @@ module.exports = {
    tailwindcss: {},
    autoprefixer: {},
  },
-}
+};
--- a/examples/nextjs/tailwind.config.ts
+++ b/examples/nextjs/tailwind.config.ts
@@ -1,20 +1,20 @@
-import type { Config } from 'tailwindcss'
+import type { Config } from "tailwindcss";

 const config: Config = {
  content: [
-    './pages/**/*.{js,ts,jsx,tsx,mdx}',
-    './components/**/*.{js,ts,jsx,tsx,mdx}',
-    './app/**/*.{js,ts,jsx,tsx,mdx}',
+    "./pages/**/*.{js,ts,jsx,tsx,mdx}",
+    "./components/**/*.{js,ts,jsx,tsx,mdx}",
+    "./app/**/*.{js,ts,jsx,tsx,mdx}",
  ],
  theme: {
    extend: {
      backgroundImage: {
-        'gradient-radial': 'radial-gradient(var(--tw-gradient-stops))',
-        'gradient-conic':
-          'conic-gradient(from 180deg at 50% 50%, var(--tw-gradient-stops))',
+        "gradient-radial": "radial-gradient(var(--tw-gradient-stops))",
+        "gradient-conic":
+          "conic-gradient(from 180deg at 50% 50%, var(--tw-gradient-stops))",
      },
    },
  },
  plugins: [],
-}
-export default config
+};
+export default config;
--- a/examples/nextjs/tsconfig.json
+++ b/examples/nextjs/tsconfig.json
@@ -1,6 +1,5 @@
 {
  "compilerOptions": {
-    "target": "es5",
    "lib": ["dom", "dom.iterable", "esnext"],
    "allowJs": true,
    "skipLibCheck": true,
--- a/internals/types/CHANGELOG.md
+++ b/internals/types/CHANGELOG.md
@@ -1,5 +1,26 @@
 # @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
+
+- Updated dependencies [[`cdddb33ad`](https://github.com/vercel/vercel/commit/cdddb33ad49f6080c49f4fff3767e6111acd0bbe)]:
+  - @vercel/build-utils@7.5.1
+
 ## 1.0.20

 ### 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.20",
+  "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.0",
+    "@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.2",
+    "turbo": "1.12.2",
    "typescript": "4.9.5"
  },
  "scripts": {
--- a/packages/build-utils/CHANGELOG.md
+++ b/packages/build-utils/CHANGELOG.md
@@ -1,5 +1,31 @@
 # @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
+
+- Add experimental field to Lambda and size to FileFsRef output ([#11059](https://github.com/vercel/vercel/pull/11059))
+
 ## 7.5.0

 ### Minor Changes
--- a/packages/build-utils/package.json
+++ b/packages/build-utils/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/build-utils",
-  "version": "7.5.0",
+  "version": "7.7.0",
  "license": "Apache-2.0",
  "main": "./dist/index.js",
  "types": "./dist/index.d.js",
--- a/packages/build-utils/src/file-fs-ref.ts
+++ b/packages/build-utils/src/file-fs-ref.ts
@@ -11,6 +11,7 @@ interface FileFsRefOptions {
  mode?: number;
  contentType?: string;
  fsPath: string;
+  size?: number;
 }

 interface FromStreamOptions {
@@ -24,28 +25,38 @@ class FileFsRef implements FileBase {
  public type: 'FileFsRef';
  public mode: number;
  public fsPath: string;
+  public size?: number;
  public contentType: string | undefined;

-  constructor({ mode = 0o100644, contentType, fsPath }: FileFsRefOptions) {
+  constructor({
+    mode = 0o100644,
+    contentType,
+    fsPath,
+    size,
+  }: FileFsRefOptions) {
    assert(typeof mode === 'number');
    assert(typeof fsPath === 'string');
    this.type = 'FileFsRef';
    this.mode = mode;
    this.contentType = contentType;
    this.fsPath = fsPath;
+    this.size = size;
  }

  static async fromFsPath({
    mode,
    contentType,
    fsPath,
+    size,
  }: FileFsRefOptions): Promise<FileFsRef> {
    let m = mode;
-    if (!m) {
+    let s = size;
+    if (!m || typeof s === 'undefined') {
      const stat = await fs.lstat(fsPath);
      m = stat.mode;
+      s = stat.size;
    }
-    return new FileFsRef({ mode: m, contentType, fsPath });
+    return new FileFsRef({ mode: m, contentType, fsPath, size: s });
  }

  static async fromStream({
@@ -69,7 +80,7 @@ class FileFsRef implements FileBase {
      dest.on('error', reject);
    });

-    return new FileFsRef({ mode, contentType, fsPath });
+    return FileFsRef.fromFsPath({ mode, contentType, fsPath });
  }

  async toStreamAsync(): Promise<NodeJS.ReadableStream> {
--- 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/lambda.ts
+++ b/packages/build-utils/src/lambda.ts
@@ -37,6 +37,7 @@ export interface LambdaOptionsBase {

 export interface LambdaOptionsWithFiles extends LambdaOptionsBase {
  files: Files;
+  experimentalAllowBundling?: boolean;
 }

 /**
@@ -79,6 +80,7 @@ export class Lambda {
  supportsWrapper?: boolean;
  supportsResponseStreaming?: boolean;
  framework?: FunctionFramework;
+  experimentalAllowBundling?: boolean;

  constructor(opts: LambdaOptions) {
    const {
@@ -114,6 +116,16 @@ export class Lambda {
      );
    }

+    if (
+      'experimentalAllowBundling' in opts &&
+      opts.experimentalAllowBundling !== undefined
+    ) {
+      assert(
+        typeof opts.experimentalAllowBundling === 'boolean',
+        '"experimentalAllowBundling" is not a boolean'
+      );
+    }
+
    if (memory !== undefined) {
      assert(typeof memory === 'number', '"memory" is not a number');
    }
@@ -183,6 +195,10 @@ export class Lambda {
    this.supportsResponseStreaming =
      supportsResponseStreaming ?? experimentalResponseStreaming;
    this.framework = framework;
+    this.experimentalAllowBundling =
+      'experimentalAllowBundling' in opts
+        ? opts.experimentalAllowBundling
+        : undefined;
  }

  async createZip(): Promise<Buffer> {
--- 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/integration.test.ts
+++ b/packages/build-utils/test/integration.test.ts
@@ -23,6 +23,8 @@ const skipFixtures: string[] = [
  '23-pnpm-workspaces',
  '41-nx-monorepo',
  '42-npm-workspace-with-nx',
+  'jekyll-v4',
+  'middleman-v4',
 ];

 // eslint-disable-next-line no-restricted-syntax
--- 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,78 @@
 # vercel

+## 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
+
+- chore: deprecate next/nuxt/gastby Speed Insights injection in favor of @vercel/speed-insights ([#11048](https://github.com/vercel/vercel/pull/11048))
+
+### Patch Changes
+
+- fix error when @vercel/analytics is a transitive dependency of the deployed application ([#10892](https://github.com/vercel/vercel/pull/10892))
+
+- [cli] Add documentation string for `skip-domain` option ([#11051](https://github.com/vercel/vercel/pull/11051))
+
+- Updated dependencies [[`260125784`](https://github.com/vercel/vercel/commit/2601257846fa201fc9efde021a906c706f6191aa), [`cdddb33ad`](https://github.com/vercel/vercel/commit/cdddb33ad49f6080c49f4fff3767e6111acd0bbe), [`72d8604c9`](https://github.com/vercel/vercel/commit/72d8604c9dba108ccca41d6288b765a7ba727295), [`90d0455e1`](https://github.com/vercel/vercel/commit/90d0455e1ff7b5892ff4960226535f57f704ef6f), [`0716130e5`](https://github.com/vercel/vercel/commit/0716130e580a920d92d249d029ed37f92f2ca847), [`b6b151f39`](https://github.com/vercel/vercel/commit/b6b151f3917c5cb47226951446b9dbb96c7d872b), [`b185a7e20`](https://github.com/vercel/vercel/commit/b185a7e207b153c378bd3db2618eece3a3b6a93e)]:
+  - @vercel/static-build@2.1.0
+  - @vercel/build-utils@7.5.1
+  - @vercel/next@4.1.0
+  - @vercel/remix-builder@2.0.18
+  - @vercel/node@3.0.17
+
 ## 33.1.0

 ### Minor Changes
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
  "name": "vercel",
-  "version": "33.1.0",
+  "version": "33.5.1",
  "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.0",
+    "@vercel/build-utils": "7.7.0",
    "@vercel/fun": "1.1.0",
    "@vercel/go": "3.0.5",
    "@vercel/hydrogen": "1.0.2",
-    "@vercel/next": "4.0.17",
-    "@vercel/node": "3.0.16",
-    "@vercel/python": "4.1.0",
-    "@vercel/redwood": "2.0.6",
-    "@vercel/remix-builder": "2.0.17",
-    "@vercel/ruby": "2.0.4",
-    "@vercel/static-build": "2.0.17",
+    "@vercel/next": "4.1.1",
+    "@vercel/node": "3.0.19",
+    "@vercel/python": "4.1.1",
+    "@vercel/redwood": "2.0.7",
+    "@vercel/remix-builder": "2.0.19",
+    "@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,8 +88,8 @@
    "@types/yauzl-promise": "2.1.0",
    "@vercel-internals/constants": "1.0.4",
    "@vercel-internals/get-package-json": "1.0.0",
-    "@vercel-internals/types": "1.0.20",
-    "@vercel/client": "13.0.13",
+    "@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",
--- a/packages/cli/src/commands/build/index.ts
+++ b/packages/cli/src/commands/build/index.ts
@@ -1,4 +1,4 @@
-import fs from 'fs-extra';
+import fs, { readJSON } from 'fs-extra';
 import chalk from 'chalk';
 import dotenv from 'dotenv';
 import semver from 'semver';
@@ -22,6 +22,7 @@ import {
  Cron,
  validateNpmrc,
  Flag,
+  VariantDefinition,
 } from '@vercel/build-utils';
 import {
  detectBuilders,
@@ -71,6 +72,7 @@ import { setMonorepoDefaultSettings } from '../../util/build/monorepo';
 import { help } from '../help';
 import { buildCommand } from './command';
 import { scrubArgv } from '../../util/build/scrub-argv';
+import { cwd } from 'process';

 type BuildResult = BuildResultV2 | BuildResultV3;

@@ -94,7 +96,9 @@ interface BuildOutputConfig {
    version: string;
  };
  crons?: Cron[];
+  /** @deprecated Replaced by Variants. Remove once fully replaced. */
  flags?: Flag[];
+  variants?: Record<string, VariantDefinition>;
 }

 /**
@@ -257,6 +261,9 @@ export default async function main(client: Client): Promise<number> {
    if (project.settings.analyticsId) {
      envToUnset.add('VERCEL_ANALYTICS_ID');
      process.env.VERCEL_ANALYTICS_ID = project.settings.analyticsId;
+      output.warn(
+        'Vercel Speed Insights auto-injection is deprecated in favor of @vercel/speed-insights package. Learn more: https://vercel.link/upgrate-to-speed-insights-package'
+      );
    }

    // Some build processes use these env vars to platform detect Vercel
@@ -432,29 +439,6 @@ async function doBuild(

  const ops: Promise<Error | void>[] = [];

-  const dependencyMap = makeDepencyMap(pkg);
-  const speedInsighsVersion = dependencyMap.get('@vercel/speed-insights');
-  if (speedInsighsVersion) {
-    if (process.env.VERCEL_ANALYTICS_ID) {
-      output.warn(
-        `The \`VERCEL_ANALYTICS_ID\` environment variable is deprecated and will be removed in a future release. Please remove it from your environment variables`
-      );
-
-      delete process.env.VERCEL_ANALYTICS_ID;
-    }
-    buildsJson.features = {
-      ...(buildsJson.features ?? {}),
-      speedInsightsVersion: speedInsighsVersion,
-    };
-  }
-  const webAnalyticsVersion = dependencyMap.get('@vercel/analytics');
-  if (webAnalyticsVersion) {
-    buildsJson.features = {
-      ...(buildsJson.features ?? {}),
-      webAnalyticsVersion: webAnalyticsVersion,
-    };
-  }
-
  // Write the `detectedBuilders` result to output dir
  const buildsJsonBuilds = new Map<Builder, SerializedBuilder>(
    builds.map(build => {
@@ -474,10 +458,9 @@ async function doBuild(
      ];
    })
  );
+
  buildsJson.builds = Array.from(buildsJsonBuilds.values());
-  await fs.writeJSON(join(outputDir, 'builds.json'), buildsJson, {
-    spaces: 2,
-  });
+  await writeBuildJson(buildsJson, outputDir);

  // The `meta` config property is re-used for each Builder
  // invocation so that Builders can share state between
@@ -573,6 +556,7 @@ async function doBuild(
      // Start flushing the file outputs to the filesystem asynchronously
      ops.push(
        writeBuildResult(
+          repoRootPath,
          outputDir,
          buildResult,
          build,
@@ -608,6 +592,33 @@ async function doBuild(
    }
  }

+  let needBuildsJsonOverride = false;
+  const speedInsightsVersion = await readInstalledVersion(
+    client,
+    '@vercel/speed-insights'
+  );
+  if (speedInsightsVersion) {
+    buildsJson.features = {
+      ...(buildsJson.features ?? {}),
+      speedInsightsVersion,
+    };
+    needBuildsJsonOverride = true;
+  }
+  const webAnalyticsVersion = await readInstalledVersion(
+    client,
+    '@vercel/analytics'
+  );
+  if (webAnalyticsVersion) {
+    buildsJson.features = {
+      ...(buildsJson.features ?? {}),
+      webAnalyticsVersion,
+    };
+    needBuildsJsonOverride = true;
+  }
+  if (needBuildsJsonOverride) {
+    await writeBuildJson(buildsJson, outputDir);
+  }
+
  // Merge existing `config.json` file into the one that will be produced
  const configPath = join(outputDir, 'config.json');
  const existingConfig = await readJSONFile<BuildOutputConfig>(configPath);
@@ -670,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(
@@ -818,9 +832,69 @@ function mergeFlags(
  });
 }

-function makeDepencyMap(pkg: PackageJson | null): Map<string, string> {
-  return new Map([
-    ...Object.entries(pkg?.devDependencies ?? {}),
-    ...Object.entries(pkg?.dependencies ?? {}),
-  ]);
+/**
+ * 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 });
+}
+
+export async function readInstalledVersion(
+  { output }: Client,
+  pkgName: string
+): Promise<string | undefined> {
+  try {
+    const descriptorPath = require.resolve(`${pkgName}/package.json`, {
+      paths: [cwd()],
+    });
+    const descriptor = await readJSON(descriptorPath);
+    return descriptor?.version;
+  } catch (err) {
+    output.debug(
+      `Package ${pkgName} is not installed (failed to read its package.json: ${err})`
+    );
+  }
+  return;
 }
--- a/packages/cli/src/commands/deploy/command.ts
+++ b/packages/cli/src/commands/deploy/command.ts
@@ -112,7 +112,8 @@ export const deployCommand: Command = {
      shorthand: null,
      type: 'boolean',
      deprecated: false,
-      description: undefined,
+      description:
+        'Disable the automatic promotion (aliasing) of the relevant domains to a new production deployment. You can use `vc promote` to complete the domain-assignment process later',
      multi: false,
    },
    {
--- 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) => {
@@ -421,7 +424,6 @@ module.exports = async function prepare(session, binaryPath, tmpFixturesDir) {
        projectId: '.',
        settings: {
          framework: null,
-          installCommand: 'echo "skipping install"',
        },
      }),
      'package.json': JSON.stringify({
@@ -429,7 +431,22 @@ module.exports = async function prepare(session, binaryPath, tmpFixturesDir) {
          build: 'mkdir -p public && echo hi > public/index.txt',
        },
        dependencies: {
-          '@vercel/speed-insights': '0.0.1',
+          '@vercel/speed-insights': '0.0.4',
+        },
+      }),
+    },
+    'vc-build-indirect-web-analytics': {
+      '.vercel/project.json': JSON.stringify({
+        orgId: '.',
+        projectId: '.',
+        settings: {
+          framework: null,
+          installCommand: 'yarn add @vercel/analytics@1.1.1',
+        },
+      }),
+      'package.json': JSON.stringify({
+        scripts: {
+          build: 'mkdir -p public && echo hi > public/index.txt',
        },
      }),
    },
@@ -439,7 +456,6 @@ module.exports = async function prepare(session, binaryPath, tmpFixturesDir) {
        projectId: '.',
        settings: {
          framework: null,
-          installCommand: 'echo "skipping install"',
        },
      }),
      'package.json': JSON.stringify({
--- 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 () => {
@@ -1168,23 +1215,25 @@ test('[vc build] should build project with `@vercel/static-build`', async () =>
 });

 test('[vc build] should build project with `@vercel/speed-insights`', async () => {
-  try {
-    process.env.VERCEL_ANALYTICS_ID = '123';
+  const directory = await setupE2EFixture('vc-build-speed-insights');
+  const output = await execCli(binaryPath, ['build'], { cwd: directory });
+  expect(output.exitCode, formatOutput(output)).toBe(0);
+  expect(output.stderr).toContain('Build Completed in .vercel/output');
+  const builds = await fs.readJSON(
+    path.join(directory, '.vercel/output/builds.json')
+  );
+  expect(builds?.features?.speedInsightsVersion).toEqual('0.0.4');
+});

-    const directory = await setupE2EFixture('vc-build-speed-insights');
-    const output = await execCli(binaryPath, ['build'], { cwd: directory });
-    expect(output.exitCode, formatOutput(output)).toBe(0);
-    expect(output.stderr).toContain('Build Completed in .vercel/output');
-    expect(output.stderr).toContain(
-      'The `VERCEL_ANALYTICS_ID` environment variable is deprecated and will be removed in a future release. Please remove it from your environment variables'
-    );
-    const builds = await fs.readJSON(
-      path.join(directory, '.vercel/output/builds.json')
-    );
-    expect(builds?.features?.speedInsightsVersion).toEqual('0.0.1');
-  } finally {
-    delete process.env.VERCEL_ANALYTICS_ID;
-  }
+test('[vc build] should build project with an indirect dependency to `@vercel/analytics`', async () => {
+  const directory = await setupE2EFixture('vc-build-indirect-web-analytics');
+  const output = await execCli(binaryPath, ['build'], { cwd: directory });
+  expect(output.exitCode, formatOutput(output)).toBe(0);
+  expect(output.stderr).toContain('Build Completed in .vercel/output');
+  const builds = await fs.readJSON(
+    path.join(directory, '.vercel/output/builds.json')
+  );
+  expect(builds?.features?.webAnalyticsVersion).toEqual('1.1.1');
 });

 test('[vc build] should build project with `@vercel/analytics`', async () => {
--- a/packages/cli/test/unit/commands/snapshots/help.test.ts.snap
+++ b/packages/cli/test/unit/commands/snapshots/help.test.ts.snap
@@ -88,6 +88,26 @@ exports[`help command help output snapshots column width 40 1`] = `
                                the     
                                deploym…
                                on      
+       --skip-domain            Disable 
+                                the     
+                                automat…
+                                promoti…
+                                (aliasi…
+                                of the  
+                                relevant
+                                domains 
+                                to a new
+                                product…
+                                deploym…
+                                You can 
+                                use \`vc 
+                                promote\`
+                                to      
+                                complete
+                                the     
+                                domain-…
+                                process 
+                                later   
       --with-cache             Retain  
                                build   
                                cache   
@@ -192,6 +212,10 @@ exports[`help command help output snapshots column width 80 1`] = `
       --prod                   Create a production deployment                  
  -p,  --public                 Deployment is public (\`/_src\`) is exposed)      
       --regions                Set default regions to enable the deployment on 
+       --skip-domain            Disable the automatic promotion (aliasing) of   
+                                the relevant domains to a new production        
+                                deployment. You can use \`vc promote\` to complete
+                                the domain-assignment process later             
       --with-cache             Retain build cache when using "--force"         
  -y,  --yes                    Use default options to skip all prompts         

@@ -255,6 +279,8 @@ exports[`help command help output snapshots column width 120 1`] = `
       --prod                   Create a production deployment                                                          
  -p,  --public                 Deployment is public (\`/_src\`) is exposed)                                              
       --regions                Set default regions to enable the deployment on                                         
+       --skip-domain            Disable the automatic promotion (aliasing) of the relevant domains to a new production  
+                                deployment. You can use \`vc promote\` to complete the domain-assignment process later    
       --with-cache             Retain build cache when using "--force"                                                 
  -y,  --yes                    Use default options to skip all prompts                                                 

--- a/packages/cli/test/unit/commands/build/index.test.ts
+++ b/packages/cli/test/unit/commands/build/index.test.ts
@@ -785,7 +785,7 @@ describe('build', () => {
    expect(files.sort()).toEqual(['index.html', 'package.json']);
  });

-  it('should set `VERCEL_ANALYTICS_ID` environment variable', async () => {
+  it('should set `VERCEL_ANALYTICS_ID` environment variable and warn users', async () => {
    const cwd = fixture('vercel-analytics');
    const output = join(cwd, '.vercel/output');
    client.cwd = cwd;
@@ -794,6 +794,9 @@ describe('build', () => {

    const env = await fs.readJSON(join(output, 'static', 'env.json'));
    expect(Object.keys(env).includes('VERCEL_ANALYTICS_ID')).toEqual(true);
+    await expect(client.stderr).toOutput(
+      'Vercel Speed Insights auto-injection is deprecated in favor of @vercel/speed-insights package. Learn more: https://vercel.link/upgrate-to-speed-insights-package'
+    );
  });

  it('should load environment variables from `.vercel/.env.preview.local`', async () => {
--- a/packages/client/CHANGELOG.md
+++ b/packages/client/CHANGELOG.md
@@ -1,5 +1,38 @@
 # @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
+
+- Updated dependencies [[`cdddb33ad`](https://github.com/vercel/vercel/commit/cdddb33ad49f6080c49f4fff3767e6111acd0bbe)]:
+  - @vercel/build-utils@7.5.1
+
 ## 13.0.13

 ### Patch Changes
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/client",
-  "version": "13.0.13",
+  "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.0",
+    "@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/fs-detectors/package.json
+++ b/packages/fs-detectors/package.json
@@ -37,7 +37,7 @@
    "@types/minimatch": "3.0.5",
    "@types/node": "14.18.33",
    "@types/semver": "7.3.10",
-    "@vercel/build-utils": "7.5.0",
+    "@vercel/build-utils": "7.7.0",
    "jest-junit": "16.0.0",
    "typescript": "4.9.5"
  }
--- a/packages/gatsby-plugin-vercel-builder/CHANGELOG.md
+++ b/packages/gatsby-plugin-vercel-builder/CHANGELOG.md
@@ -1,5 +1,28 @@
 # @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
+
+- Updated dependencies [[`cdddb33ad`](https://github.com/vercel/vercel/commit/cdddb33ad49f6080c49f4fff3767e6111acd0bbe)]:
+  - @vercel/build-utils@7.5.1
+
 ## 2.0.15

 ### 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.15",
+  "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.0",
+    "@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.0",
+    "@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.0",
+    "@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,29 @@
 # @vercel/next

+## 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
+
+- fix error when @vercel/analytics is a transitive dependency of the deployed application ([#10892](https://github.com/vercel/vercel/pull/10892))
+
+### Patch Changes
+
+- Use `worker.name` instead of edge function name to fix type error in `@vercel/next` ([#11050](https://github.com/vercel/vercel/pull/11050))
+
 ## 4.0.17

 ### Patch Changes
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/next",
-  "version": "4.0.17",
+  "version": "4.1.1",
  "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.3"
  },
  "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.0",
+    "@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/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';
@@ -158,7 +182,7 @@ export async function serverBuild({
  imagesManifest?: NextImagesManifest;
  prerenderManifest: NextPrerenderedRoutes;
  requiredServerFilesManifest: NextRequiredServerFilesManifest;
-  variantsManifest: VariantsManifest | null;
+  variantsManifest: VariantsManifestLegacy | null;
 }): Promise<BuildResult> {
  lambdaPages = Object.assign({}, lambdaPages, lambdaAppPaths);

@@ -217,7 +241,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('?');
@@ -1068,9 +1092,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 });

@@ -1128,11 +1201,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 +1516,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
@@ -2053,6 +2053,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 +2189,6 @@ export const onPrerenderRoute =
      if (routeKey !== '/index' && routeKey.endsWith('/index')) {
        routeKey = `${routeKey}/index`;
        routeFileNoExt = routeKey;
-        origRouteFileNoExt = routeKey;
      }
    }

@@ -2255,15 +2259,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 +2473,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,
@@ -2856,6 +2872,7 @@ export async function getMiddlewareBundle({
          return {
            type,
            page: edgeFunction.page,
+            name: edgeFunction.name,
            edgeFunction: (() => {
              const { source, map } = wrappedModuleSource.sourceAndMap();
              const transformedMap = stringifySourceMap(
@@ -2951,8 +2968,7 @@ export async function getMiddlewareBundle({
    };

    for (const worker of workerConfigs.values()) {
-      const edgeFile = worker.edgeFunction.name;
-      let shortPath = edgeFile;
+      let shortPath = worker.name;

      // Replacing the folder prefix for the page
      //
@@ -2969,14 +2985,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 +3257,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 +3269,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 +3283,7 @@ export async function getVariantsManifest(

  if (!hasVariantsManifest) return null;

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

--- 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,32 @@
 # @vercel/node

+## 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
+
+- Updated dependencies [[`cdddb33ad`](https://github.com/vercel/vercel/commit/cdddb33ad49f6080c49f4fff3767e6111acd0bbe)]:
+  - @vercel/build-utils@7.5.1
+
 ## 3.0.16

 ### Patch Changes
--- a/packages/node/package.json
+++ b/packages/node/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/node",
-  "version": "3.0.16",
+  "version": "3.0.19",
  "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.0",
+    "@vercel/build-utils": "7.7.0",
    "@vercel/error-utils": "2.0.2",
-    "@vercel/nft": "0.26.2",
+    "@vercel/nft": "0.26.3",
    "@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.0",
+    "@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/python/test/fixtures/28-pydantic/requirements.txt
+++ b/packages/python/test/fixtures/28-pydantic/requirements.txt
@@ -1,2 +1,2 @@
-fastapi==0.54.1
-pydantic==1.5
+fastapi==0.109.0
+pydantic==2.5.3
--- a/packages/redwood/CHANGELOG.md
+++ b/packages/redwood/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @vercel/redwood

+## 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.7",
  "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.3",
    "@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.0",
+    "@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,21 @@
 # @vercel/remix-builder

+## 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
+
+- Fix functions without a output path edge case ([#11038](https://github.com/vercel/vercel/pull/11038))
+
+- Update `@remix-run/dev` fork to v2.5.0 ([#11054](https://github.com/vercel/vercel/pull/11054))
+
+- Update `@remix-run/dev` fork to v2.5.1 ([#11065](https://github.com/vercel/vercel/pull/11065))
+
 ## 2.0.17

 ### Patch Changes
--- a/packages/remix/package.json
+++ b/packages/remix/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/remix-builder",
-  "version": "2.0.17",
+  "version": "2.0.19",
  "license": "Apache-2.0",
  "main": "./dist/index.js",
  "homepage": "https://vercel.com/docs",
@@ -21,16 +21,16 @@
    "defaults"
  ],
  "dependencies": {
-    "@vercel/nft": "0.26.2",
+    "@vercel/nft": "0.26.3",
    "@vercel/static-config": "3.0.0",
    "ts-morph": "12.0.0"
  },
  "devDependencies": {
-    "@remix-run/dev": "npm:@vercel/remix-run-dev@2.4.1",
+    "@remix-run/dev": "npm:@vercel/remix-run-dev@2.5.1",
    "@types/jest": "27.5.1",
    "@types/node": "14.18.33",
    "@types/semver": "7.3.13",
-    "@vercel/build-utils": "7.5.0",
+    "@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/utils.ts
+++ b/packages/remix/src/utils.ts
@@ -148,7 +148,9 @@ export function getPathFromRoute(
 ): ResolvedRoutePaths {
  if (
    route.id === 'root' ||
-    (route.parentId === 'root' && !route.path && route.index)
+    (route.parentId === 'root' &&
+      (!route.path || route.path === '/') &&
+      route.index)
  ) {
    return { path: 'index', rePath: '/index' };
  }
--- a/packages/remix/test/fixtures/11-hydrogen-2-js/pnpm-lock.yaml
+++ b/packages/remix/test/fixtures/11-hydrogen-2-js/pnpm-lock.yaml
--- a/packages/remix/test/unit.get-path-from-route.test.ts
+++ b/packages/remix/test/unit.get-path-from-route.test.ts
@@ -112,10 +112,19 @@ describe('getPathFromRoute()', () => {
      parentId: 'root',
      file: 'routes/admin.(lol).tsx',
    },
+    manual: {
+      path: '/',
+      index: true,
+      caseSensitive: undefined,
+      id: 'manual',
+      parentId: 'root',
+      file: 'manual.tsx',
+    },
  };

  it.each([
    { id: 'root', expected: { path: 'index', rePath: '/index' } },
+    { id: 'manual', expected: { path: 'index', rePath: '/index' } },
    { id: 'routes/__pathless', expected: { path: '', rePath: '/' } },
    { id: 'routes/index', expected: { path: 'index', rePath: '/index' } },
    {
--- a/packages/ruby/CHANGELOG.md
+++ b/packages/ruby/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @vercel/ruby

+## 2.0.5
+
+### Patch Changes
+
+- add ruby3 to path during build ([#11094](https://github.com/vercel/vercel/pull/11094))
+
+- Remove deprecated `createLambda()` usage ([#11080](https://github.com/vercel/vercel/pull/11080))
+
 ## 2.0.4

 ### Patch Changes
--- a/packages/ruby/package.json
+++ b/packages/ruby/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@vercel/ruby",
  "author": "Nathan Cahill <nathan@nathancahill.com>",
-  "version": "2.0.4",
+  "version": "2.0.5",
  "license": "Apache-2.0",
  "main": "./dist/index",
  "homepage": "https://vercel.com/docs/runtimes#official-runtimes/ruby",
@@ -23,7 +23,7 @@
  "devDependencies": {
    "@types/fs-extra": "8.0.0",
    "@types/semver": "6.0.0",
-    "@vercel/build-utils": "7.5.0",
+    "@vercel/build-utils": "7.7.0",
    "execa": "2.0.4",
    "fs-extra": "^7.0.1",
    "jest-junit": "16.0.0",
--- a/packages/ruby/src/index.ts
+++ b/packages/ruby/src/index.ts
@@ -10,14 +10,16 @@ import {
  writeFile,
 } from 'fs-extra';
 import {
-  BuildOptions,
  download,
  getWriteableDirectory,
  glob,
-  createLambda,
+  Lambda,
  debug,
  walkParentDirs,
  cloneEnv,
+  FileBlob,
+  type Files,
+  type BuildV3,
 } from '@vercel/build-utils';
 import { installBundler } from './install-ruby';

@@ -46,6 +48,7 @@ async function bundleInstall(
  bundlePath: string,
  bundleDir: string,
  gemfilePath: string,
+  rubyPath: string,
  runtime: string
 ) {
  debug(`running "bundle install --deployment"...`);
@@ -74,7 +77,7 @@ async function bundleInstall(

  const bundlerEnv = cloneEnv(process.env, {
    // Ensure the correct version of `ruby` is in front of the $PATH
-    PATH: `${dirname(bundlePath)}:${process.env.PATH}`,
+    PATH: `${dirname(rubyPath)}:${dirname(bundlePath)}:${process.env.PATH}`,
    BUNDLE_SILENCE_ROOT_WARNING: '1',
    BUNDLE_APP_CONFIG: bundleAppConfig,
    BUNDLE_JOBS: '4',
@@ -114,13 +117,13 @@ async function bundleInstall(

 export const version = 3;

-export async function build({
+export const build: BuildV3 = async ({
  workPath,
  files,
  entrypoint,
  config,
  meta = {},
-}: BuildOptions) {
+}) => {
  await download(files, workPath, meta);
  const entrypointFsDirname = join(workPath, dirname(entrypoint));
  const gemfileName = 'Gemfile';
@@ -140,10 +143,8 @@ export async function build({
  const gemfileContents = gemfilePath
    ? await readFile(gemfilePath, 'utf8')
    : '';
-  const { gemHome, bundlerPath, vendorPath, runtime } = await installBundler(
-    meta,
-    gemfileContents
-  );
+  const { gemHome, bundlerPath, vendorPath, runtime, rubyPath } =
+    await installBundler(meta, gemfileContents);
  process.env.GEM_HOME = gemHome;
  debug(`Checking existing vendor directory at "${vendorPath}"`);
  const vendorDir = join(workPath, vendorPath);
@@ -187,7 +188,13 @@ export async function build({
      } else {
        // try installing. this won't work if native extesions are required.
        // if that's the case, gems should be vendored locally before deploying.
-        await bundleInstall(bundlerPath, bundleDir, gemfilePath, runtime);
+        await bundleInstall(
+          bundlerPath,
+          bundleDir,
+          gemfilePath,
+          rubyPath,
+          runtime
+        );
      }
    }
  } else {
@@ -217,12 +224,11 @@ export async function build({
  // somethig else
  const handlerRbFilename = 'vc__handler__ruby';

-  await writeFile(
-    join(workPath, `${handlerRbFilename}.rb`),
-    nowHandlerRbContents
-  );
+  const outputFiles: Files = await glob('**', workPath);

-  const outputFiles = await glob('**', workPath);
+  outputFiles[`${handlerRbFilename}.rb`] = new FileBlob({
+    data: nowHandlerRbContents,
+  });

  // static analysis is impossible with ruby.
  // instead, provide `includeFiles` and `excludeFiles` config options to reduce bundle size.
@@ -253,12 +259,12 @@ export async function build({
    }
  }

-  const lambda = await createLambda({
+  const output = new Lambda({
    files: outputFiles,
    handler: `${handlerRbFilename}.vc__handler`,
    runtime,
    environment: {},
  });

-  return { output: lambda };
-}
+  return { output };
+};
--- a/packages/ruby/vc_init.rb
+++ b/packages/ruby/vc_init.rb
@@ -81,6 +81,12 @@ def vc__handler(event:, context:)
  payload = JSON.parse(event['body'])
  path = payload['path']
  headers = payload['headers']
+
+  if ENV['VERCEL_DEBUG']
+    puts 'Request Headers: '
+    puts headers
+  end
+
  httpMethod = payload['method']
  encoding = payload['encoding']
  body = payload['body']
--- a/packages/static-build/CHANGELOG.md
+++ b/packages/static-build/CHANGELOG.md
@@ -1,5 +1,48 @@
 # @vercel/static-build

+## 2.4.0
+
+### Minor Changes
+
+- Revert "Revert "Default ruby to only currently supported version (3.2.0)"" ([#11137](https://github.com/vercel/vercel/pull/11137))
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @vercel/gatsby-plugin-vercel-builder@2.0.18
+
+## 2.3.0
+
+### Minor Changes
+
+- Revert "Default ruby to only currently supported version (3.2.0)" ([#11135](https://github.com/vercel/vercel/pull/11135))
+
+### Patch Changes
+
+- Updated dependencies [[`ab2444466`](https://github.com/vercel/vercel/commit/ab24444660339eaeacdaad7ff74594171a142b1e)]:
+  - @vercel/gatsby-plugin-vercel-builder@2.0.17
+
+## 2.2.0
+
+### Minor Changes
+
+- Default ruby to only currently supported version (3.2.0) ([#11104](https://github.com/vercel/vercel/pull/11104))
+
+### Patch Changes
+
+- [tests] Update Gatsby fixture versions ([#11101](https://github.com/vercel/vercel/pull/11101))
+
+## 2.1.0
+
+### Minor Changes
+
+- chore: deprecate next/nuxt/gastby Speed Insights injection in favor of @vercel/speed-insights ([#11048](https://github.com/vercel/vercel/pull/11048))
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @vercel/gatsby-plugin-vercel-builder@2.0.16
+
 ## 2.0.17

 ### Patch Changes
--- a/packages/static-build/package.json
+++ b/packages/static-build/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/static-build",
-  "version": "2.0.17",
+  "version": "2.4.0",
  "license": "Apache-2.0",
  "main": "./dist/index",
  "homepage": "https://vercel.com/docs/build-step",
@@ -21,7 +21,7 @@
  },
  "dependencies": {
    "@vercel/gatsby-plugin-vercel-analytics": "1.0.11",
-    "@vercel/gatsby-plugin-vercel-builder": "2.0.15",
+    "@vercel/gatsby-plugin-vercel-builder": "2.0.18",
    "@vercel/static-config": "3.0.0",
    "ts-morph": "12.0.0"
  },
@@ -35,7 +35,7 @@
    "@types/node-fetch": "2.5.4",
    "@types/promise-timeout": "1.3.0",
    "@types/semver": "7.3.13",
-    "@vercel/build-utils": "7.5.0",
+    "@vercel/build-utils": "7.7.0",
    "@vercel/error-utils": "2.0.2",
    "@vercel/frameworks": "2.0.6",
    "@vercel/fs-detectors": "5.1.6",
--- a/packages/static-build/src/index.ts
+++ b/packages/static-build/src/index.ts
@@ -46,6 +46,7 @@ import {
  LocalFileSystemDetector,
 } from '@vercel/fs-detectors';

+const SUPPORTED_RUBY_VERSION = '3.2.0';
 const sleep = (n: number) => new Promise(resolve => setTimeout(resolve, n));

 const DEV_SERVER_PORT_BIND_TIMEOUT = ms('5m');
@@ -541,12 +542,9 @@ export const build: BuildV2 = async ({
      pathList.push(vendorBin); // Add `./vendor/bin`
      debug(`Added "${vendorBin}" to PATH env because a Gemfile was found`);
      const dir = path.join(workPath, 'vendor', 'bundle', 'ruby');
-      const rubyVersion =
-        existsSync(dir) && statSync(dir).isDirectory()
-          ? readdirSync(dir)[0]
-          : '';
+      const rubyVersion = SUPPORTED_RUBY_VERSION;
      if (rubyVersion) {
-        gemHome = path.join(dir, rubyVersion); // Add `./vendor/bundle/ruby/2.7.0`
+        gemHome = path.join(dir, rubyVersion);
        debug(`Set GEM_HOME="${gemHome}" because a Gemfile was found`);
      }
    }
--- a/Show More
+++ b/Show More