wip

strip to .next, report more failures
Use absolute paths for require
2026-01-01 12:19:15 +00:00 · 2024-02-06 09:58:28 +01:00 · 2024-01-31 16:17:45 +01:00 · 2024-01-31 16:17:45 +01:00 · 2024-01-31 16:17:45 +01:00 · 2024-01-31 16:17:45 +01:00
649 changed files with 4419 additions and 43361 deletions
--- a/.changeset/thirty-pears-whisper.md
+++ b/.changeset/thirty-pears-whisper.md
@@ -0,0 +1,5 @@
+---
+"@vercel/next": patch
+---
+
+Fix rewrite RSC handling with trailingSlash
--- a/.eslintignore
+++ b/.eslintignore
@@ -10,7 +10,6 @@ packages/*/test/fixtures
 packages/cli/@types
 packages/cli/download
 packages/cli/dist
-packages/cli/test/fixtures
 packages/cli/test/dev/fixtures
 packages/cli/bin
 packages/cli/link
@@ -39,7 +38,7 @@ packages/static-build/test/cache-fixtures
 packages/redwood/test/fixtures

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

 # gatsby-plugin-vercel-analytics
 packages/gatsby-plugin-vercel-analytics
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -2,17 +2,17 @@
 # https://help.github.com/en/articles/about-code-owners

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

 # Unrestricted Paths
 .changeset/
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,79 +0,0 @@
-version: 2
-
-updates:
-  - directory: /packages/static-build/test/fixtures/angular-v17
-    schedule:
-      interval: 'daily'
-    open-pull-requests-limit: 1
-    reviewers:
-      - 'trek'
-      - 'TooTallNate'
-      - 'EndangeredMassa'
-    commit-message:
-      prefix: '[framework-fixtures]'
-    package-ecosystem: 'npm'
-    allow:
-      - dependency-name: '@angular*'
-    ignore:
-      - dependency-name: '@angular*'
-        update-types:
-          ['version-update:semver-major', 'version-update:semver-patch']
-    groups:
-      core:
-        patterns:
-          - '@angular*'
-        update-types:
-          - 'minor'
-
-  - directory: /packages/static-build/test/fixtures/astro-v4
-    schedule:
-      interval: 'daily'
-    open-pull-requests-limit: 1
-    reviewers:
-      - 'trek'
-      - 'TooTallNate'
-      - 'EndangeredMassa'
-    commit-message:
-      prefix: '[framework-fixtures]'
-    package-ecosystem: 'npm'
-    allow:
-      - dependency-name: 'astro*'
-    ignore:
-      - dependency-name: 'astro*'
-        update-types:
-          ['version-update:semver-major', 'version-update:semver-patch']
-    groups:
-      core:
-        patterns:
-          - 'astro*'
-        update-types:
-          - 'minor'
-
-  - directory: /packages/static-build/test/fixtures/hydrogen-v2023
-    schedule:
-      interval: 'daily'
-    open-pull-requests-limit: 1
-    reviewers:
-      - 'trek'
-      - 'TooTallNate'
-      - 'EndangeredMassa'
-    commit-message:
-      prefix: '[framework-fixtures]'
-    package-ecosystem: 'npm'
-    allow:
-      - dependency-name: '@remix-run*'
-      - dependency-name: '@shopify*'
-    ignore:
-      - dependency-name: '@remix-run*'
-        update-types:
-          ['version-update:semver-major', 'version-update:semver-patch']
-      - dependency-name: '@shopify*'
-        update-types:
-          ['version-update:semver-major', 'version-update:semver-patch']
-    groups:
-      core:
-        patterns:
-          - '@remix-run*'
-          - '@shopify*'
-        update-types:
-          - 'minor'
--- a/.prettierignore
+++ b/.prettierignore
@@ -29,7 +29,6 @@ turbo-cache-key.json
 packages/*/dist
 packages/*/node_modules
 packages/**/test/fixtures
-packages/**/test/fixtures-*
 packages/**/test/dev/fixtures
 packages/**/test/build-fixtures
 packages/**/test/cache-fixtures
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@
  <a href="https://vercel.com/docs"><strong>Documentation</strong></a> ·
  <a href="https://vercel.com/changelog"><strong>Changelog</strong></a> ·
  <a href="https://vercel.com/templates"><strong>Templates</strong></a> ·
-  <a href="https://vercel.com/docs/cli"><strong>CLI</strong></a>
+  <a href="https://vercel.com/cli"><strong>CLI</strong></a>
 </p>
 <br/>

@@ -23,7 +23,7 @@ Vercel’s Frontend Cloud provides the developer experience and infrastructure t

 ## Deploy

-Get started by [importing a project](https://vercel.com/new) or using the [Vercel CLI](https://vercel.com/docs/cli). Then, `git push` to deploy.
+Get started by [importing a project](https://vercel.com/new) or using the [Vercel CLI](https://vercel.com/cli). Then, `git push` to deploy.

 ## Documentation

--- a/examples/README.md
+++ b/examples/README.md
@@ -1,6 +1,6 @@
 # Vercel Examples

-To get started using any of these examples as your own project, [install Vercel](https://vercel.com/docs/cli) and use either of the following commands in your terminal:
+To get started using any of these examples as your own project, [install Vercel](https://vercel.com/cli) and use either of the following commands in your terminal:

 ```sh
 vercel init                    # Pick an example in the CLI
--- a/examples/hydrogen-2/README.md
+++ b/examples/hydrogen-2/README.md
@@ -8,7 +8,7 @@ This directory is a brief example of a [Hydrogen v2](https://shopify.dev/custom-

 _Live Example: https://hydrogen-v2-template.vercel.app_

-You can also deploy using the [Vercel CLI](https://vercel.com/docs/cli):
+You can also deploy using the [Vercel CLI](https://vercel.com/cli):

 ```sh
 npm i -g vercel
--- a/examples/jekyll/Gemfile
+++ b/examples/jekyll/Gemfile
@@ -27,6 +27,3 @@ end

 # Performance-booster for watching directories on Windows
 gem "wdm", "~> 0.1.1", :platforms => [:mingw, :x64_mingw, :mswin]
-
-# Webrick not installed by default in Ruby 3.0+
-gem "webrick"
--- a/examples/jekyll/Gemfile.lock
+++ b/examples/jekyll/Gemfile.lock
@@ -1,20 +1,20 @@
 GEM
  remote: https://rubygems.org/
  specs:
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
    colorator (1.1.0)
-    concurrent-ruby (1.2.3)
-    em-websocket (0.5.3)
+    concurrent-ruby (1.1.8)
+    em-websocket (0.5.2)
      eventmachine (>= 0.12.9)
-      http_parser.rb (~> 0)
+      http_parser.rb (~> 0.6.0)
    eventmachine (1.2.7)
-    ffi (1.16.3)
+    ffi (1.14.2)
    forwardable-extended (2.6.0)
-    http_parser.rb (0.8.0)
-    i18n (1.14.1)
+    http_parser.rb (0.6.0)
+    i18n (1.8.9)
      concurrent-ruby (~> 1.0)
-    jekyll (4.2.2)
+    jekyll (4.2.0)
      addressable (~> 2.4)
      colorator (~> 1.0)
      em-websocket (~> 0.5)
@@ -29,20 +29,20 @@ GEM
      rouge (~> 3.0)
      safe_yaml (~> 1.0)
      terminal-table (~> 2.0)
-    jekyll-feed (0.17.0)
+    jekyll-feed (0.15.1)
      jekyll (>= 3.7, < 5.0)
-    jekyll-sass-converter (2.2.0)
+    jekyll-sass-converter (2.1.0)
      sassc (> 2.0.1, < 3.0)
-    jekyll-seo-tag (2.8.0)
+    jekyll-seo-tag (2.7.1)
      jekyll (>= 3.8, < 5.0)
    jekyll-watch (2.2.1)
      listen (~> 3.0)
-    kramdown (2.4.0)
+    kramdown (2.3.0)
      rexml
    kramdown-parser-gfm (1.1.0)
      kramdown (~> 2.0)
-    liquid (4.0.4)
-    listen (3.9.0)
+    liquid (4.0.3)
+    listen (3.4.1)
      rb-fsevent (~> 0.10, >= 0.10.3)
      rb-inotify (~> 0.9, >= 0.9.10)
    mercenary (0.4.0)
@@ -52,22 +52,21 @@ GEM
      jekyll-seo-tag (~> 2.1)
    pathutil (0.16.2)
      forwardable-extended (~> 2.6)
-    public_suffix (5.0.4)
-    rb-fsevent (0.11.2)
+    public_suffix (4.0.6)
+    rb-fsevent (0.10.4)
    rb-inotify (0.10.1)
      ffi (~> 1.0)
-    rexml (3.2.6)
-    rouge (3.30.0)
+    rexml (3.2.4)
+    rouge (3.26.0)
    safe_yaml (1.0.5)
    sassc (2.4.0)
      ffi (~> 1.9)
    terminal-table (2.0.0)
      unicode-display_width (~> 1.1, >= 1.1.1)
-    unicode-display_width (1.8.0)
-    webrick (1.8.1)
+    unicode-display_width (1.7.0)

 PLATFORMS
-  ruby
+  x86_64-linux

 DEPENDENCIES
  jekyll (~> 4.2.0)
@@ -76,7 +75,6 @@ DEPENDENCIES
  tzinfo (~> 1.2)
  tzinfo-data
  wdm (~> 0.1.1)
-  webrick

 BUNDLED WITH
-   2.5.6
+   2.2.4
--- a/examples/middleman/Gemfile
+++ b/examples/middleman/Gemfile
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'

-gem 'middleman', '~> 4.5'
-gem 'middleman-autoprefixer', '~> 3.0'
+gem 'middleman', '~> 4.2'
+gem 'middleman-autoprefixer', '~> 2.7'
 gem 'tzinfo-data', platforms: [:mswin, :mingw, :jruby, :x64_mingw]
 gem 'wdm', '~> 0.1', platforms: [:mswin, :mingw, :x64_mingw]
--- a/examples/middleman/Gemfile.lock
+++ b/examples/middleman/Gemfile.lock
@@ -1,60 +1,59 @@
 GEM
  remote: https://rubygems.org/
  specs:
-    activesupport (7.0.8.1)
+    activesupport (5.2.4.5)
      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
-    autoprefixer-rails (10.4.16.0)
-      execjs (~> 2)
-    backports (3.24.1)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    autoprefixer-rails (9.8.6.5)
+      execjs
+    backports (3.20.2)
    coffee-script (2.4.1)
      coffee-script-source
      execjs
    coffee-script-source (1.12.2)
-    concurrent-ruby (1.2.3)
-    contracts (0.16.1)
-    dotenv (3.1.0)
+    concurrent-ruby (1.1.8)
+    contracts (0.13.0)
+    dotenv (2.7.6)
    erubis (2.7.0)
-    execjs (2.9.1)
-    fast_blank (1.0.1)
-    fastimage (2.3.0)
-    ffi (1.16.3)
-    haml (6.3.0)
-      temple (>= 0.8.2)
-      thor
+    execjs (2.7.0)
+    fast_blank (1.0.0)
+    fastimage (2.2.2)
+    ffi (1.14.2)
+    haml (5.2.1)
+      temple (>= 0.8.0)
      tilt
    hamster (3.0.0)
      concurrent-ruby (~> 1.0)
    hashie (3.6.0)
-    i18n (1.6.0)
+    i18n (0.9.5)
      concurrent-ruby (~> 1.0)
-    kramdown (2.4.0)
+    kramdown (2.3.0)
      rexml
-    listen (3.9.0)
-      rb-fsevent (~> 0.10, >= 0.10.3)
-      rb-inotify (~> 0.9, >= 0.9.10)
+    listen (3.0.8)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
    memoist (0.16.2)
-    middleman (4.5.1)
+    middleman (4.3.11)
      coffee-script (~> 2.2)
      haml (>= 4.0.5)
      kramdown (>= 2.3.0)
-      middleman-cli (= 4.5.1)
-      middleman-core (= 4.5.1)
-    middleman-autoprefixer (3.0.0)
-      autoprefixer-rails (~> 10.0)
-      middleman-core (>= 4.0.0)
-    middleman-cli (4.5.1)
-      thor (>= 0.17.0, < 1.3.0)
-    middleman-core (4.5.1)
-      activesupport (>= 6.1, < 7.1)
-      addressable (~> 2.4)
+      middleman-cli (= 4.3.11)
+      middleman-core (= 4.3.11)
+    middleman-autoprefixer (2.10.1)
+      autoprefixer-rails (~> 9.1)
+      middleman-core (>= 3.3.3)
+    middleman-cli (4.3.11)
+      thor (>= 0.17.0, < 2.0)
+    middleman-core (4.3.11)
+      activesupport (>= 4.2, < 6.0)
+      addressable (~> 2.3)
      backports (~> 3.6)
-      bundler (~> 2.0)
-      contracts (~> 0.13, < 0.17)
+      bundler
+      contracts (~> 0.13.0)
      dotenv
      erubis
      execjs (~> 2.0)
@@ -62,52 +61,48 @@ GEM
      fastimage (~> 2.0)
      hamster (~> 3.0)
      hashie (~> 3.4)
-      i18n (~> 1.6.0)
-      listen (~> 3.0)
+      i18n (~> 0.9.0)
+      listen (~> 3.0.0)
      memoist (~> 0.14)
-      padrino-helpers (~> 0.15.0)
+      padrino-helpers (~> 0.13.0)
      parallel
      rack (>= 1.4.5, < 3)
      sassc (~> 2.0)
      servolux
      tilt (~> 2.0.9)
-      toml
      uglifier (~> 3.0)
-      webrick
-    minitest (5.22.2)
-    padrino-helpers (0.15.3)
-      i18n (>= 0.6.7, < 2)
-      padrino-support (= 0.15.3)
+    minitest (5.14.3)
+    padrino-helpers (0.13.3.4)
+      i18n (~> 0.6, >= 0.6.7)
+      padrino-support (= 0.13.3.4)
      tilt (>= 1.4.1, < 3)
-    padrino-support (0.15.3)
-    parallel (1.24.0)
-    parslet (2.0.0)
-    public_suffix (5.0.4)
-    rack (2.2.8.1)
-    rb-fsevent (0.11.2)
+    padrino-support (0.13.3.4)
+      activesupport (>= 3.1)
+    parallel (1.20.1)
+    public_suffix (4.0.6)
+    rack (2.2.3)
+    rb-fsevent (0.10.4)
    rb-inotify (0.10.1)
      ffi (~> 1.0)
-    rexml (3.2.6)
+    rexml (3.2.4)
    sassc (2.4.0)
      ffi (~> 1.9)
    servolux (0.13.0)
-    temple (0.10.3)
-    thor (1.2.2)
-    tilt (2.0.11)
-    toml (0.3.0)
-      parslet (>= 1.8.0, < 3.0.0)
-    tzinfo (2.0.6)
-      concurrent-ruby (~> 1.0)
+    temple (0.8.2)
+    thor (1.1.0)
+    thread_safe (0.3.6)
+    tilt (2.0.10)
+    tzinfo (1.2.9)
+      thread_safe (~> 0.1)
    uglifier (3.2.0)
      execjs (>= 0.3.0, < 3)
-    webrick (1.8.1)

 PLATFORMS
  x86_64-linux

 DEPENDENCIES
-  middleman (~> 4.5)
-  middleman-autoprefixer (~> 3.0)
+  middleman (~> 4.2)
+  middleman-autoprefixer (~> 2.7)
  tzinfo-data
  wdm (~> 0.1)

--- 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.1.3"
+    "next": "14.1.0"
  },
  "devDependencies": {
    "typescript": "^5",
@@ -22,6 +22,6 @@
    "postcss": "^8",
    "tailwindcss": "^3.3.0",
    "eslint": "^8",
-    "eslint-config-next": "14.1.3"
+    "eslint-config-next": "14.1.0"
  }
 }
--- a/examples/package.json
+++ b/examples/package.json
@@ -9,7 +9,7 @@
  },
  "devDependencies": {
    "@types/jest": "27.4.1",
-    "@vercel/frameworks": "3.0.0"
+    "@vercel/frameworks": "2.0.6"
  },
  "version": null
 }
--- a/examples/remix/.gitignore
+++ b/examples/remix/.gitignore
@@ -1,5 +1,7 @@
 node_modules

+/.cache
 /build
+/public/build
 .env
 .vercel
--- a/examples/remix/README.md
+++ b/examples/remix/README.md
@@ -14,7 +14,7 @@ npx create-remix@latest --template vercel/vercel/examples/remix

 _Live Example: https://remix-run-template.vercel.app_

-You can also deploy using the [Vercel CLI](https://vercel.com/docs/cli):
+You can also deploy using the [Vercel CLI](https://vercel.com/cli):

 ```sh
 npm i -g vercel
--- a/examples/remix/app/root.tsx
+++ b/examples/remix/app/root.tsx
@@ -1,13 +1,20 @@
+import { cssBundleHref } from "@remix-run/css-bundle";
 import {
  Links,
+  LiveReload,
  Meta,
  Outlet,
  Scripts,
  ScrollRestoration,
 } from "@remix-run/react";
 import { Analytics } from "@vercel/analytics/react";
+import type { LinksFunction } from "@vercel/remix";

-export function Layout({ children }: { children: React.ReactNode }) {
+export const links: LinksFunction = () => [
+  ...(cssBundleHref ? [{ rel: "stylesheet", href: cssBundleHref }] : []),
+];
+
+export default function App() {
  return (
    <html lang="en">
      <head>
@@ -17,15 +24,12 @@ export function Layout({ children }: { children: React.ReactNode }) {
        <Links />
      </head>
      <body>
-        {children}
+        <Outlet />
        <ScrollRestoration />
        <Scripts />
+        <LiveReload />
        <Analytics />
      </body>
    </html>
  );
 }
-
-export default function App() {
-  return <Outlet />;
-}
--- a/examples/remix/package.json
+++ b/examples/remix/package.json
@@ -4,29 +4,29 @@
  "sideEffects": false,
  "type": "module",
  "scripts": {
-    "build": "remix vite:build",
-    "dev": "remix vite:dev",
+    "build": "remix build",
+    "dev": "remix dev --manual",
+    "start": "remix-serve ./build/index.js",
    "typecheck": "tsc"
  },
  "dependencies": {
-    "@remix-run/node": "^2.8.0",
-    "@remix-run/react": "^2.8.0",
-    "@remix-run/server-runtime": "^2.8.0",
-    "@vercel/analytics": "^1.2.2",
-    "@vercel/remix": "^2.8.0",
-    "isbot": "^4",
+    "@remix-run/css-bundle": "^2.0.0",
+    "@remix-run/node": "^2.0.0",
+    "@remix-run/react": "^2.0.0",
+    "@remix-run/serve": "^2.0.0",
+    "@vercel/analytics": "^1.0.2",
+    "@vercel/remix": "^2.0.0",
+    "isbot": "^3.6.8",
    "react": "^18.2.0",
    "react-dom": "^18.2.0"
  },
  "devDependencies": {
-    "@remix-run/dev": "^2.8.0",
-    "@remix-run/eslint-config": "^2.8.0",
+    "@remix-run/dev": "^2.0.0",
+    "@remix-run/eslint-config": "^2.0.0",
    "@types/react": "^18.2.20",
    "@types/react-dom": "^18.2.7",
    "eslint": "^8.38.0",
-    "typescript": "^5.1.6",
-    "vite": "^5.1.0",
-    "vite-tsconfig-paths": "^4.2.1"
+    "typescript": "^5.1.6"
  },
  "engines": {
    "node": ">=18.0.0"
--- a/packages/remix/test/fixtures-legacy/12-remix-v2/remix.config.js
+++ b/packages/remix/test/fixtures-legacy/12-remix-v2/remix.config.js
--- a/packages/remix/test/fixtures-legacy/12-remix-v2/remix.env.d.ts
+++ b/packages/remix/test/fixtures-legacy/12-remix-v2/remix.env.d.ts
--- a/examples/remix/tsconfig.json
+++ b/examples/remix/tsconfig.json
@@ -1,25 +1,22 @@
 {
-  "include": ["**/*.ts", "**/*.tsx"],
+  "include": ["remix.env.d.ts", "**/*.ts", "**/*.tsx"],
  "compilerOptions": {
    "lib": ["DOM", "DOM.Iterable", "ES2022"],
-    "types": ["@vercel/remix", "node", "vite/client"],
    "isolatedModules": true,
    "esModuleInterop": true,
    "jsx": "react-jsx",
-    "module": "ESNext",
    "moduleResolution": "Bundler",
    "resolveJsonModule": true,
    "target": "ES2022",
    "strict": true,
    "allowJs": true,
-    "skipLibCheck": true,
    "forceConsistentCasingInFileNames": true,
    "baseUrl": ".",
    "paths": {
      "~/*": ["./app/*"]
    },

-    // Vite takes care of building everything, not tsc.
+    // Remix takes care of building everything in `remix build`.
    "noEmit": true
  }
 }
--- a/examples/remix/vite.config.ts
+++ b/examples/remix/vite.config.ts
@@ -1,11 +0,0 @@
-import { vitePlugin as remix } from "@remix-run/dev";
-import { installGlobals } from "@remix-run/node";
-import { defineConfig } from "vite";
-import { vercelPreset } from '@vercel/remix/vite';
-import tsconfigPaths from "vite-tsconfig-paths";
-
-installGlobals();
-
-export default defineConfig({
-  plugins: [remix({ presets: [vercelPreset()] }), tsconfigPaths()],
-});
--- a/examples/sanity/README.md
+++ b/examples/sanity/README.md
@@ -18,7 +18,7 @@ Install dependencies:
 npx @sanity/cli install
 ```

-Pull down environment variables from your Vercel project (requires the [Vercel CLI](https://vercel.com/docs/cli)):
+Pull down environment variables from your Vercel project (requires the [Vercel CLI](https://vercel.com/cli)):

 ```sh
 vercel env pull
--- a/internals/types/CHANGELOG.md
+++ b/internals/types/CHANGELOG.md
@@ -1,47 +1,5 @@
 # @vercel-internals/types

-## 1.0.27
-
-### Patch Changes
-
- Updated dependencies [[`11218a179`](https://github.com/vercel/vercel/commit/11218a179870a5420c5a6ff720cd4aec4f7e1c5e)]:
-  - @vercel/build-utils@7.9.1
-
-## 1.0.26
-
-### Patch Changes
-
- Updated dependencies [[`8ea93839c`](https://github.com/vercel/vercel/commit/8ea93839ccc70816f3ece9d7cfdb857aa7a4b015)]:
-  - @vercel/build-utils@7.9.0
-
-## 1.0.25
-
-### Patch Changes
-
- Updated dependencies [[`908e7837d`](https://github.com/vercel/vercel/commit/908e7837d55bc02e708f402c700e00208415e954), [`5e3656ec1`](https://github.com/vercel/vercel/commit/5e3656ec1b3f0561091636582715ba09ddd8cb2d)]:
-  - @vercel/build-utils@7.8.0
-
-## 1.0.24
-
-### Patch Changes
-
- Updated dependencies [[`37b193c84`](https://github.com/vercel/vercel/commit/37b193c845d8b63d93bb0017fbc1a6a35306ef1f)]:
-  - @vercel/build-utils@7.7.1
-
-## 1.0.23
-
-### Patch Changes
-
- Updated dependencies [[`24c3dd282`](https://github.com/vercel/vercel/commit/24c3dd282d7714cd63d2b94fb94745c45fdc79ab)]:
-  - @vercel/build-utils@7.7.0
-
-## 1.0.22
-
-### Patch Changes
-
- Updated dependencies [[`b6ed28b9b`](https://github.com/vercel/vercel/commit/b6ed28b9b1712f882c93fe053b70d3eb1df21819), [`8ba0ce932`](https://github.com/vercel/vercel/commit/8ba0ce932434c6295fedb5307bee59a804b7e6a8), [`0d034b682`](https://github.com/vercel/vercel/commit/0d034b6820c0f3252949c0ffc483048c5aac7f04), [`abaa700ce`](https://github.com/vercel/vercel/commit/abaa700cea44c723cfc851baa2dfe9e1ae2e8a5c)]:
-  - @vercel/build-utils@7.6.0
-
 ## 1.0.21

 ### Patch Changes
--- a/internals/types/package.json
+++ b/internals/types/package.json
@@ -1,7 +1,7 @@
 {
  "private": true,
  "name": "@vercel-internals/types",
-  "version": "1.0.27",
+  "version": "1.0.21",
  "types": "index.d.ts",
  "main": "index.d.ts",
  "files": [
@@ -10,7 +10,7 @@
  "dependencies": {
    "@types/node": "14.14.31",
    "@vercel-internals/constants": "1.0.4",
-    "@vercel/build-utils": "7.9.1",
+    "@vercel/build-utils": "7.5.1",
    "@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.12.5",
+    "turbo": "1.11.3",
    "typescript": "4.9.5"
  },
  "scripts": {
--- a/packages/build-utils/CHANGELOG.md
+++ b/packages/build-utils/CHANGELOG.md
@@ -1,53 +1,5 @@
 # @vercel/build-utils

-## 7.9.1
-
-### Patch Changes
-
- Export `getSupportedNodeVersion` ([#11277](https://github.com/vercel/vercel/pull/11277))
-
-## 7.9.0
-
-### Minor Changes
-
- Add `base` parameter to `scanParentDirs()` ([#11261](https://github.com/vercel/vercel/pull/11261))
-
-## 7.8.0
-
-### Minor Changes
-
- Remove `VERCEL_ENABLE_NPM_DEFAULT` env var check ([#11242](https://github.com/vercel/vercel/pull/11242))
-
-### Patch Changes
-
- Rename variants to flags and remove legacy flags ([#11121](https://github.com/vercel/vercel/pull/11121))
-
-## 7.7.1
-
-### Patch Changes
-
- [build-utils] increase max memory limit ([#11209](https://github.com/vercel/vercel/pull/11209))
-
-## 7.7.0
-
-### Minor Changes
-
- Revert "Revert "Default ruby to only currently supported version (3.2.0)"" ([#11137](https://github.com/vercel/vercel/pull/11137))
-
-## 7.6.0
-
-### Minor Changes
-
- Revert "Default ruby to only currently supported version (3.2.0)" ([#11135](https://github.com/vercel/vercel/pull/11135))
-
- Mark `flags` as deprecated and replace them with `variants` ([#11098](https://github.com/vercel/vercel/pull/11098))
-
- [build-utils] change default package manager when no lockfile detected from `yarn` to `npm` (gated behind feature flag) ([#11131](https://github.com/vercel/vercel/pull/11131))
-
-### Patch Changes
-
- Update internal type for variants ([#11111](https://github.com/vercel/vercel/pull/11111))
-
 ## 7.5.1

 ### Patch Changes
--- a/packages/build-utils/package.json
+++ b/packages/build-utils/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/build-utils",
-  "version": "7.9.1",
+  "version": "7.5.1",
  "license": "Apache-2.0",
  "main": "./dist/index.js",
  "types": "./dist/index.d.js",
--- a/packages/build-utils/src/fs/run-user-scripts.ts
+++ b/packages/build-utils/src/fs/run-user-scripts.ts
@@ -276,13 +276,12 @@ export async function getNodeVersion(

 export async function scanParentDirs(
  destPath: string,
-  readPackageJson = false,
-  base = '/'
+  readPackageJson = false
 ): Promise<ScanParentDirsResult> {
  assert(path.isAbsolute(destPath));

  const pkgJsonPath = await walkParentDirs({
-    base,
+    base: '/',
    start: destPath,
    filename: 'package.json',
  });
@@ -292,7 +291,7 @@ export async function scanParentDirs(
      : undefined;
  const [yarnLockPath, npmLockPath, pnpmLockPath, bunLockPath] =
    await walkParentDirsMulti({
-      base,
+      base: '/',
      start: destPath,
      filenames: [
        'yarn.lock',
@@ -303,7 +302,7 @@ export async function scanParentDirs(
    });
  let lockfilePath: string | undefined;
  let lockfileVersion: number | undefined;
-  let cliType: CliType;
+  let cliType: CliType = 'yarn';

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

  const packageJsonPath = pkgJsonPath || undefined;
@@ -417,14 +414,6 @@ 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/index.ts
+++ b/packages/build-utils/src/index.ts
@@ -38,7 +38,6 @@ import {
 import {
  getLatestNodeVersion,
  getDiscontinuedNodeVersions,
-  getSupportedNodeVersion,
 } from './fs/node-version';
 import streamToBuffer from './fs/stream-to-buffer';
 import debug from './debug';
@@ -73,7 +72,6 @@ export {
  walkParentDirs,
  getNodeBinPath,
  getNodeBinPaths,
-  getSupportedNodeVersion,
  runNpmInstall,
  runBundleInstall,
  runPipInstall,
--- a/packages/build-utils/src/schemas.ts
+++ b/packages/build-utils/src/schemas.ts
@@ -14,7 +14,7 @@ export const functionsSchema = {
        },
        memory: {
          minimum: 128,
-          maximum: 3009,
+          maximum: 3008,
        },
        maxDuration: {
          type: 'number',
--- a/packages/build-utils/src/types.ts
+++ b/packages/build-utils/src/types.ts
@@ -440,6 +440,13 @@ export interface Cron {
  schedule: string;
 }

+// TODO: Proper description once complete
+export interface Flag {
+  key: string;
+  defaultValue?: unknown;
+  metadata: Record<string, unknown>;
+}
+
 /** The framework which created the function */
 export interface FunctionFramework {
  slug: string;
@@ -464,7 +471,7 @@ export interface BuildResultV2Typical {
  framework?: {
    version: string;
  };
-  flags?: { definitions: FlagDefinitions };
+  flags?: Flag[];
 }

 export type BuildResultV2 = BuildResultV2Typical | BuildResultBuildOutput;
@@ -484,30 +491,3 @@ export type ShouldServe = (
 export type StartDevServer = (
  options: StartDevServerOptions
 ) => Promise<StartDevServerResult>;
-
-/**
- * TODO: The following types will eventually be exported by a more
- *       relevant package.
- */
-type FlagJSONArray = ReadonlyArray<FlagJSONValue>;
-
-type FlagJSONValue =
-  | string
-  | boolean
-  | number
-  | null
-  | FlagJSONArray
-  | { [key: string]: FlagJSONValue };
-
-type FlagOption = {
-  value: FlagJSONValue;
-  label?: string;
-};
-
-export interface FlagDefinition {
-  options?: FlagOption[];
-  origin?: string;
-  description?: string;
-}
-
-export type FlagDefinitions = Record<string, FlagDefinition>;
--- a/packages/build-utils/test/fixtures/07-cross-install/api/yarn.lock
+++ b/packages/build-utils/test/fixtures/07-cross-install/api/yarn.lock
@@ -1,4 +0,0 @@
-# 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
@@ -1,4 +0,0 @@
-# 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
@@ -1,4 +0,0 @@
-# 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
@@ -1,9 +0,0 @@
-{
-  "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
@@ -1,3 +0,0 @@
-{
-  "probes": [{ "path": "/", "mustContain": "npm version: 8" }]
-}
--- 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,28 +576,6 @@ it(
  ms('1m')
 );

-it('should return cliType "npm" when no lockfile is present', 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('npm');
-    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,109 +1,5 @@
 # vercel

-## 33.6.1
-
-### Patch Changes
-
- Don't send `projectSettings.nodeVersion` for unsupported versions ([#11277](https://github.com/vercel/vercel/pull/11277))
-
- Updated dependencies [[`4bca0c6d0`](https://github.com/vercel/vercel/commit/4bca0c6d0bc25052b95bd02b12a0b891c86c4b49), [`a67ad4b5a`](https://github.com/vercel/vercel/commit/a67ad4b5a130bf0e56e18111b3f9ddad69cec0e1), [`11218a179`](https://github.com/vercel/vercel/commit/11218a179870a5420c5a6ff720cd4aec4f7e1c5e), [`64b97bf4b`](https://github.com/vercel/vercel/commit/64b97bf4b5203ecf9a95f63ce26a5c3360208966)]:
-  - @vercel/next@4.1.6
-  - @vercel/remix-builder@2.1.4
-  - @vercel/build-utils@7.9.1
-  - @vercel/static-build@2.4.4
-  - @vercel/node@3.0.24
-
-## 33.6.0
-
-### Minor Changes
-
- Set `projectSettings.nodeVersion` in `vc deploy` based on "engines.node" field ([#11261](https://github.com/vercel/vercel/pull/11261))
-
-### Patch Changes
-
- Stops warning about legacy Speed Insights for Next.js apps ([#11268](https://github.com/vercel/vercel/pull/11268))
-
- Fix framework version detection in monorepos ([#11212](https://github.com/vercel/vercel/pull/11212))
-
- Updated dependencies [[`8ea93839c`](https://github.com/vercel/vercel/commit/8ea93839ccc70816f3ece9d7cfdb857aa7a4b015), [`58ef91bfe`](https://github.com/vercel/vercel/commit/58ef91bfe8c2e7176e8783cc4eb91ee8580c70dc)]:
-  - @vercel/build-utils@7.9.0
-  - @vercel/remix-builder@2.1.3
-  - @vercel/node@3.0.23
-  - @vercel/static-build@2.4.3
-
-## 33.5.5
-
-### Patch Changes
-
- Rename variants to flags and remove legacy flags ([#11121](https://github.com/vercel/vercel/pull/11121))
-
- fix vc with root dir issues ([#11243](https://github.com/vercel/vercel/pull/11243))
-
- Updated dependencies [[`908e7837d`](https://github.com/vercel/vercel/commit/908e7837d55bc02e708f402c700e00208415e954), [`5e3656ec1`](https://github.com/vercel/vercel/commit/5e3656ec1b3f0561091636582715ba09ddd8cb2d), [`a53d1b0d3`](https://github.com/vercel/vercel/commit/a53d1b0d38efa9637f8b8f81a70898add87530e3)]:
-  - @vercel/build-utils@7.8.0
-  - @vercel/next@4.1.5
-  - @vercel/remix-builder@2.1.2
-  - @vercel/node@3.0.22
-  - @vercel/static-build@2.4.2
-
-## 33.5.4
-
-### Patch Changes
-
- [build-utils] increase max memory limit ([#11209](https://github.com/vercel/vercel/pull/11209))
-
- Updated dependencies [[`b1d8b83ab`](https://github.com/vercel/vercel/commit/b1d8b83abbf23a3485aedb490992d0a3bf44573f), [`37b193c84`](https://github.com/vercel/vercel/commit/37b193c845d8b63d93bb0017fbc1a6a35306ef1f), [`20237d4f7`](https://github.com/vercel/vercel/commit/20237d4f7b55b0697b57db15636c11204cb0dc39), [`f8fab639b`](https://github.com/vercel/vercel/commit/f8fab639bf49a60389b8d0b7b265a737c17b4ae1), [`6ed0fe6fb`](https://github.com/vercel/vercel/commit/6ed0fe6fb1e487545a790ff5b9fc691cf625f005)]:
-  - @vercel/next@4.1.4
-  - @vercel/build-utils@7.7.1
-  - @vercel/remix-builder@2.1.1
-  - @vercel/static-build@2.4.1
-  - @vercel/node@3.0.21
-
-## 33.5.3
-
-### Patch Changes
-
- Updated dependencies [[`c2d99855e`](https://github.com/vercel/vercel/commit/c2d99855ea6132380434ed29643120680f95fad7), [`1333071a3`](https://github.com/vercel/vercel/commit/1333071a3a2d324679327bfdd4e872f8fd3521c6)]:
-  - @vercel/next@4.1.3
-  - @vercel/remix-builder@2.1.0
-
-## 33.5.2
-
-### Patch Changes
-
- Updated dependencies [[`e109e3325`](https://github.com/vercel/vercel/commit/e109e3325ab5299da0903034175fabe72d486a4e), [`d17abf463`](https://github.com/vercel/vercel/commit/d17abf463acabf9e1e43b91200f18efd34e91f62), [`644721a90`](https://github.com/vercel/vercel/commit/644721a90da8cf98414d272be9da0a821a2ce217), [`ea0e9aeae`](https://github.com/vercel/vercel/commit/ea0e9aeaec8ddddb5a726be0d252df9cdbd84808), [`e318a0eea`](https://github.com/vercel/vercel/commit/e318a0eea55c9b8536b0874f66cfd03aca6f0adf), [`1fee87e76`](https://github.com/vercel/vercel/commit/1fee87e76f18d2f5e5524247cfce615fa1832e49), [`bfc01fd98`](https://github.com/vercel/vercel/commit/bfc01fd98f760a008d0d2e6c52b5216503b44b75), [`7910f2f30`](https://github.com/vercel/vercel/commit/7910f2f3070ff69742e845e795d4db77d598c181), [`440ef3ba9`](https://github.com/vercel/vercel/commit/440ef3ba98af8f05e7714c86c67c36dbda11e85c)]:
-  - @vercel/remix-builder@2.0.20
-  - @vercel/next@4.1.2
-  - @vercel/node@3.0.20
-  - @vercel/redwood@2.0.8
-
-## 33.5.1
-
-### Patch Changes
-
- build: upgrade edge-runtime ([#11148](https://github.com/vercel/vercel/pull/11148))
-
- Updated dependencies [[`24c3dd282`](https://github.com/vercel/vercel/commit/24c3dd282d7714cd63d2b94fb94745c45fdc79ab), [`10e200e0b`](https://github.com/vercel/vercel/commit/10e200e0bf8f692b6740e098e0572b4e7de83850), [`678ebbe52`](https://github.com/vercel/vercel/commit/678ebbe5255766656bf2dddc574e86b2999f11c8)]:
-  - @vercel/build-utils@7.7.0
-  - @vercel/static-build@2.4.0
-  - @vercel/node@3.0.19
-
-## 33.5.0
-
-### Minor Changes
-
- Mark `flags` as deprecated and replace them with `variants` ([#11098](https://github.com/vercel/vercel/pull/11098))
-
-### Patch Changes
-
- Updated dependencies [[`c32a909af`](https://github.com/vercel/vercel/commit/c32a909afcedf0ee55777d5dcaecc0c8383dd8c8), [`b6ed28b9b`](https://github.com/vercel/vercel/commit/b6ed28b9b1712f882c93fe053b70d3eb1df21819), [`d21bb9f87`](https://github.com/vercel/vercel/commit/d21bb9f87e1d837666fe8104d4e199b2590725d6), [`4027a1833`](https://github.com/vercel/vercel/commit/4027a1833718a92be74b2b3c5a4df23745d19a36), [`8ba0ce932`](https://github.com/vercel/vercel/commit/8ba0ce932434c6295fedb5307bee59a804b7e6a8), [`0d034b682`](https://github.com/vercel/vercel/commit/0d034b6820c0f3252949c0ffc483048c5aac7f04), [`abaa700ce`](https://github.com/vercel/vercel/commit/abaa700cea44c723cfc851baa2dfe9e1ae2e8a5c), [`3bad73401`](https://github.com/vercel/vercel/commit/3bad73401b4ec1f61e515965732cde8dcc052b17)]:
-  - @vercel/next@4.1.1
-  - @vercel/node@3.0.18
-  - @vercel/redwood@2.0.7
-  - @vercel/remix-builder@2.0.19
-  - @vercel/build-utils@7.6.0
-  - @vercel/static-build@2.3.0
-
 ## 33.4.1

 ### Patch Changes
--- a/packages/cli/jest.config.js
+++ b/packages/cli/jest.config.js
@@ -7,7 +7,6 @@ module.exports = {
      {
        diagnostics: true,
        isolatedModules: true,
-        tsconfig: 'test/tsconfig.json',
      },
    ],
  },
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
  "name": "vercel",
-  "version": "33.6.1",
+  "version": "33.4.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.9.1",
+    "@vercel/build-utils": "7.5.1",
    "@vercel/fun": "1.1.0",
    "@vercel/go": "3.0.5",
    "@vercel/hydrogen": "1.0.2",
-    "@vercel/next": "4.1.6",
-    "@vercel/node": "3.0.24",
+    "@vercel/next": "4.1.0",
+    "@vercel/node": "3.0.17",
    "@vercel/python": "4.1.1",
-    "@vercel/redwood": "2.0.8",
-    "@vercel/remix-builder": "2.1.4",
+    "@vercel/redwood": "2.0.6",
+    "@vercel/remix-builder": "2.0.18",
    "@vercel/ruby": "2.0.5",
-    "@vercel/static-build": "2.4.4",
+    "@vercel/static-build": "2.2.0",
    "chokidar": "3.3.1"
  },
  "devDependencies": {
    "@alex_neo/jest-expect-message": "1.0.5",
-    "@edge-runtime/node-utils": "2.3.0",
+    "@edge-runtime/node-utils": "2.2.2",
    "@next/env": "11.1.2",
    "@sentry/node": "5.5.0",
    "@sindresorhus/slugify": "0.11.0",
@@ -88,11 +88,11 @@
    "@types/yauzl-promise": "2.1.0",
    "@vercel-internals/constants": "1.0.4",
    "@vercel-internals/get-package-json": "1.0.0",
-    "@vercel-internals/types": "1.0.27",
-    "@vercel/client": "13.1.7",
+    "@vercel-internals/types": "1.0.21",
+    "@vercel/client": "13.1.1",
    "@vercel/error-utils": "2.0.2",
-    "@vercel/frameworks": "3.0.0",
-    "@vercel/fs-detectors": "5.2.1",
+    "@vercel/frameworks": "2.0.6",
+    "@vercel/fs-detectors": "5.1.6",
    "@vercel/routing-utils": "3.1.0",
    "ajv": "6.12.2",
    "alpha-sort": "2.0.1",
--- a/packages/cli/src/commands/build/index.ts
+++ b/packages/cli/src/commands/build/index.ts
@@ -21,7 +21,7 @@ import {
  NowBuildError,
  Cron,
  validateNpmrc,
-  type FlagDefinitions,
+  Flag,
 } from '@vercel/build-utils';
 import {
  detectBuilders,
@@ -95,6 +95,7 @@ interface BuildOutputConfig {
    version: string;
  };
  crons?: Cron[];
+  flags?: Flag[];
 }

 /**
@@ -257,6 +258,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
@@ -660,8 +664,9 @@ async function doBuild(
  const mergedWildcard = mergeWildcard(buildResults.values());
  const mergedOverrides: Record<string, PathOverride> =
    overrides.length > 0 ? Object.assign({}, ...overrides) : undefined;
+  const mergedFlags = mergeFlags(buildResults.values());

-  const framework = await getFramework(workPath, buildResults);
+  const framework = await getFramework(cwd, buildResults);

  // Write out the final `config.json` file based on the
  // user configuration and Builder build results
@@ -673,11 +678,10 @@ async function doBuild(
    overrides: mergedOverrides,
    framework,
    crons: mergedCrons,
+    flags: mergedFlags,
  };
  await fs.writeJSON(join(outputDir, 'config.json'), config, { spaces: 2 });

-  await writeFlagsJSON(client, buildResults.values(), outputDir);
-
  const relOutputDir = relative(cwd, outputDir);
  output.print(
    `${prependEmoji(
@@ -810,52 +814,16 @@ function mergeWildcard(
  return wildcard;
 }

-/**
- * Takes the build output and writes all the flags into the `flags.json`
- * file. It'll skip flags that already exist.
- */
-async function writeFlagsJSON(
-  { output }: Client,
-  buildResults: Iterable<BuildResult | BuildOutputConfig>,
-  outputDir: string
-): Promise<void> {
-  const flagsFilePath = join(outputDir, 'flags.json');
-
-  let hasFlags = true;
-
-  const flags = (await fs.readJSON(flagsFilePath).catch(error => {
-    if (error.code === 'ENOENT') {
-      hasFlags = false;
-      return { definitions: {} };
+function mergeFlags(
+  buildResults: Iterable<BuildResult | BuildOutputConfig>
+): BuildResultV2Typical['flags'] {
+  return Array.from(buildResults).flatMap(result => {
+    if ('flags' in result) {
+      return result.flags ?? [];
    }

-    throw error;
-  })) as { definitions: FlagDefinitions };
-
-  for (const result of buildResults) {
-    if (!('flags' in result) || !result.flags || !result.flags.definitions)
-      continue;
-
-    for (const [key, definition] of Object.entries(result.flags.definitions)) {
-      if (result.flags.definitions[key]) {
-        output.warn(
-          `The flag "${key}" was found multiple times. Only its first occurrence will be considered.`
-        );
-        continue;
-      }
-
-      hasFlags = true;
-      flags.definitions[key] = definition;
-    }
-  }
-
-  // Only create the file when there are flags to write,
-  // or when the file already exists.
-  // Checking `definitions` alone won't be enough in case there
-  // are other properties set.
-  if (hasFlags) {
-    await fs.writeJSON(flagsFilePath, flags, { spaces: 2 });
-  }
+    return [];
+  });
 }

 async function writeBuildJson(buildsJson: BuildsManifest, outputDir: string) {
--- a/packages/cli/src/commands/deploy/index.ts
+++ b/packages/cli/src/commands/deploy/index.ts
@@ -1,77 +1,73 @@
-import {
-  getPrettyError,
-  getSupportedNodeVersion,
-  scanParentDirs,
-} from '@vercel/build-utils';
+import ms from 'ms';
+import fs from 'fs-extra';
+import bytes from 'bytes';
+import chalk from 'chalk';
+import { join, resolve } from 'path';
 import {
  fileNameSymbol,
  VALID_ARCHIVE_FORMATS,
  VercelConfig,
 } from '@vercel/client';
-import { errorToString, isErrnoException, isError } from '@vercel/error-utils';
-import bytes from 'bytes';
-import chalk from 'chalk';
-import fs from 'fs-extra';
-import ms from 'ms';
-import { join, resolve } from 'path';
-import Now, { CreateOptions } from '../../util';
-import Client from '../../util/client';
+import code from '../../util/output/code';
+import highlight from '../../util/output/highlight';
 import { readLocalConfig } from '../../util/config/files';
-import { createGitMeta } from '../../util/create-git-meta';
-import createDeploy from '../../util/deploy/create-deploy';
-import { getDeploymentChecks } from '../../util/deploy/get-deployment-checks';
-import getPrebuiltJson from '../../util/deploy/get-prebuilt-json';
-import parseTarget from '../../util/deploy/parse-target';
-import { printDeploymentStatus } from '../../util/deploy/print-deployment-status';
-import { isValidArchive } from '../../util/deploy/validate-archive-format';
-import purchaseDomainIfAvailable from '../../util/domains/purchase-domain-if-available';
-import { emoji, prependEmoji } from '../../util/emoji';
+import getArgs from '../../util/get-args';
 import { handleError } from '../../util/error';
-import { SchemaValidationFailed } from '../../util/errors';
+import Client from '../../util/client';
+import { getPrettyError } from '@vercel/build-utils';
+import toHumanPath from '../../util/humanize-path';
+import Now, { CreateOptions } from '../../util';
+import stamp from '../../util/output/stamp';
+import createDeploy from '../../util/deploy/create-deploy';
+import getDeployment from '../../util/get-deployment';
+import parseMeta from '../../util/parse-meta';
+import param from '../../util/output/param';
 import {
-  AliasDomainConfigured,
-  BuildError,
  BuildsRateLimited,
-  ConflictingFilePath,
-  ConflictingPathSegment,
  DeploymentNotFound,
-  DeploymentsRateLimited,
  DomainNotFound,
  DomainNotVerified,
  DomainPermissionDenied,
  DomainVerificationFailed,
  InvalidDomain,
-  isAPIError,
-  MissingBuildScript,
-  NotDomainOwner,
  TooManyRequests,
  UserAborted,
+  DeploymentsRateLimited,
+  AliasDomainConfigured,
+  MissingBuildScript,
+  ConflictingFilePath,
+  ConflictingPathSegment,
+  BuildError,
+  NotDomainOwner,
+  isAPIError,
 } from '../../util/errors-ts';
-import getArgs from '../../util/get-args';
-import getDeployment from '../../util/get-deployment';
-import getProjectName from '../../util/get-project-name';
-import toHumanPath from '../../util/humanize-path';
+import { SchemaValidationFailed } from '../../util/errors';
+import purchaseDomainIfAvailable from '../../util/domains/purchase-domain-if-available';
 import confirm from '../../util/input/confirm';
 import editProjectSettings from '../../util/input/edit-project-settings';
-import inputProject from '../../util/input/input-project';
-import { inputRootDirectory } from '../../util/input/input-root-directory';
-import selectOrg from '../../util/input/select-org';
-import { Output } from '../../util/output';
-import code from '../../util/output/code';
-import highlight from '../../util/output/highlight';
-import param from '../../util/output/param';
-import stamp from '../../util/output/stamp';
-import { parseEnv } from '../../util/parse-env';
-import parseMeta from '../../util/parse-meta';
-import { getCommandName } from '../../util/pkg-name';
 import {
  getLinkedProject,
  linkFolderToProject,
 } from '../../util/projects/link';
-import { pickOverrides } from '../../util/projects/project-settings';
+import getProjectName from '../../util/get-project-name';
+import selectOrg from '../../util/input/select-org';
+import inputProject from '../../util/input/input-project';
+import { prependEmoji, emoji } from '../../util/emoji';
+import { inputRootDirectory } from '../../util/input/input-root-directory';
 import validatePaths, {
  validateRootDirectory,
 } from '../../util/validate-paths';
+import { getCommandName } from '../../util/pkg-name';
+import { Output } from '../../util/output';
+import { getDeploymentChecks } from '../../util/deploy/get-deployment-checks';
+import parseTarget from '../../util/deploy/parse-target';
+import getPrebuiltJson from '../../util/deploy/get-prebuilt-json';
+import { createGitMeta } from '../../util/create-git-meta';
+import { isValidArchive } from '../../util/deploy/validate-archive-format';
+import { parseEnv } from '../../util/parse-env';
+import { errorToString, isErrnoException, isError } from '@vercel/error-utils';
+import { pickOverrides } from '../../util/projects/project-settings';
+import { printDeploymentStatus } from '../../util/deploy/print-deployment-status';
 import { help } from '../help';
 import { deployCommand } from './command';

@@ -517,23 +513,6 @@ export default async (client: Client): Promise<number> => {
    );
  }

-  const { packageJson } = await scanParentDirs(
-    join(cwd, project?.rootDirectory ?? ''),
-    true,
-    cwd
-  );
-  let nodeVersion: string | undefined;
-  if (packageJson?.engines?.node) {
-    try {
-      const { range } = await getSupportedNodeVersion(packageJson.engines.node);
-      nodeVersion = range;
-    } catch (error) {
-      if (error instanceof Error) {
-        output.warn(error.message);
-      }
-    }
-  }
-
  try {
    // if this flag is not set, use `undefined` to allow the project setting to be used
    const autoAssignCustomDomains = argv['--skip-domain'] ? false : undefined;
@@ -566,18 +545,12 @@ export default async (client: Client): Promise<number> => {

    if (!localConfig.builds || localConfig.builds.length === 0) {
      // Only add projectSettings for zero config deployments
-      createArgs.projectSettings = {
-        sourceFilesOutsideRootDirectory,
-        rootDirectory,
-        nodeVersion,
-      };
-
-      if (status !== 'not_linked') {
-        createArgs.projectSettings = {
-          ...createArgs.projectSettings,
-          ...localConfigurationOverrides,
-        };
-      }
+      createArgs.projectSettings =
+        status === 'not_linked'
+          ? {
+              sourceFilesOutsideRootDirectory,
+            }
+          : { ...localConfigurationOverrides, sourceFilesOutsideRootDirectory };
    }

    deployment = await createDeploy(
--- a/packages/cli/src/util/dev/builder.ts
+++ b/packages/cli/src/util/dev/builder.ts
@@ -367,7 +367,7 @@ export async function executeBuild(
          Code: { ZipFile },
          Handler: asset.handler,
          Runtime: asset.runtime,
-          MemorySize: asset.memory || 3009,
+          MemorySize: asset.memory || 3008,
          Environment: {
            Variables: {
              ...vercelConfig.env,
--- a/packages/cli/src/util/link/setup-and-link.ts
+++ b/packages/cli/src/util/link/setup-and-link.ts
@@ -198,7 +198,6 @@ export default async function setupAndLink(
        projectSettings: {
          ...localConfigurationOverrides,
          sourceFilesOutsideRootDirectory,
-          rootDirectory,
        },
        autoAssignCustomDomains: true,
      };
--- a/packages/cli/test/fixtures/unit/.gitignore
+++ b/packages/cli/test/fixtures/unit/.gitignore
@@ -1 +0,0 @@
-!.vercel
--- a/packages/cli/test/fixtures/unit/commands/build/monorepo/.vercel/project.json
+++ b/packages/cli/test/fixtures/unit/commands/build/monorepo/.vercel/project.json
@@ -1,8 +0,0 @@
-{
-  "orgId": ".",
-  "projectId": ".",
-  "settings": {
-    "framework": "next",
-    "rootDirectory": "apps/nextjs"
-  }
-}
--- a/packages/cli/test/fixtures/unit/commands/build/monorepo/apps/nextjs/.gitignore
+++ b/packages/cli/test/fixtures/unit/commands/build/monorepo/apps/nextjs/.gitignore
@@ -1,36 +0,0 @@
-# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
-
-# dependencies
-/node_modules
-/.pnp
-.pnp.js
-.yarn/install-state.gz
-
-# testing
-/coverage
-
-# next.js
-/.next/
-/out/
-
-# production
-/build
-
-# misc
-.DS_Store
-*.pem
-
-# debug
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-
-# local env files
-.env*.local
-
-# vercel
-.vercel
-
-# typescript
-*.tsbuildinfo
-next-env.d.ts
--- a/packages/cli/test/fixtures/unit/commands/build/monorepo/apps/nextjs/next.config.js
+++ b/packages/cli/test/fixtures/unit/commands/build/monorepo/apps/nextjs/next.config.js
@@ -1 +0,0 @@
-module.exports = {};
--- a/packages/cli/test/fixtures/unit/commands/build/monorepo/apps/nextjs/package.json
+++ b/packages/cli/test/fixtures/unit/commands/build/monorepo/apps/nextjs/package.json
@@ -1,11 +0,0 @@
-{
-  "name": "nextjs-monorepo-test",
-  "scripts": {
-    "build": "next build"
-  },
-  "dependencies": {
-    "react": "^18",
-    "react-dom": "^18",
-    "next": "^12"
-  }
-}
--- a/packages/cli/test/fixtures/unit/commands/build/monorepo/apps/nextjs/pages/index.jsx
+++ b/packages/cli/test/fixtures/unit/commands/build/monorepo/apps/nextjs/pages/index.jsx
@@ -1 +0,0 @@
-export default () => <div>Hi</div>
--- a/packages/cli/test/fixtures/unit/commands/build/monorepo/package-lock.json
+++ b/packages/cli/test/fixtures/unit/commands/build/monorepo/package-lock.json
@@ -1,463 +0,0 @@
-{
-  "name": "monorepo",
-  "version": "0.0.0",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "monorepo",
-      "version": "0.0.0",
-      "workspaces": [
-        "apps/*"
-      ]
-    },
-    "apps/nextjs": {
-      "name": "nextjs-monorepo-test",
-      "dependencies": {
-        "next": "^12",
-        "react": "^18",
-        "react-dom": "^18"
-      }
-    },
-    "apps/nextjs/node_modules/@next/swc-android-arm-eabi": {
-      "version": "12.3.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-android-arm-eabi/-/swc-android-arm-eabi-12.3.4.tgz",
-      "integrity": "sha512-cM42Cw6V4Bz/2+j/xIzO8nK/Q3Ly+VSlZJTa1vHzsocJRYz8KT6MrreXaci2++SIZCF1rVRCDgAg5PpqRibdIA==",
-      "cpu": [
-        "arm"
-      ],
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "apps/nextjs/node_modules/@next/swc-android-arm64": {
-      "version": "12.3.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-android-arm64/-/swc-android-arm64-12.3.4.tgz",
-      "integrity": "sha512-5jf0dTBjL+rabWjGj3eghpLUxCukRhBcEJgwLedewEA/LJk2HyqCvGIwj5rH+iwmq1llCWbOky2dO3pVljrapg==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "apps/nextjs/node_modules/@next/swc-darwin-arm64": {
-      "version": "12.3.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-12.3.4.tgz",
-      "integrity": "sha512-DqsSTd3FRjQUR6ao0E1e2OlOcrF5br+uegcEGPVonKYJpcr0MJrtYmPxd4v5T6UCJZ+XzydF7eQo5wdGvSZAyA==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "apps/nextjs/node_modules/@next/swc-darwin-x64": {
-      "version": "12.3.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-12.3.4.tgz",
-      "integrity": "sha512-PPF7tbWD4k0dJ2EcUSnOsaOJ5rhT3rlEt/3LhZUGiYNL8KvoqczFrETlUx0cUYaXe11dRA3F80Hpt727QIwByQ==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "apps/nextjs/node_modules/@next/swc-freebsd-x64": {
-      "version": "12.3.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-freebsd-x64/-/swc-freebsd-x64-12.3.4.tgz",
-      "integrity": "sha512-KM9JXRXi/U2PUM928z7l4tnfQ9u8bTco/jb939pdFUHqc28V43Ohd31MmZD1QzEK4aFlMRaIBQOWQZh4D/E5lQ==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "apps/nextjs/node_modules/@next/swc-linux-arm-gnueabihf": {
-      "version": "12.3.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm-gnueabihf/-/swc-linux-arm-gnueabihf-12.3.4.tgz",
-      "integrity": "sha512-3zqD3pO+z5CZyxtKDTnOJ2XgFFRUBciOox6EWkoZvJfc9zcidNAQxuwonUeNts6Xbm8Wtm5YGIRC0x+12YH7kw==",
-      "cpu": [
-        "arm"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "apps/nextjs/node_modules/@next/swc-linux-arm64-gnu": {
-      "version": "12.3.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-12.3.4.tgz",
-      "integrity": "sha512-kiX0vgJGMZVv+oo1QuObaYulXNvdH/IINmvdZnVzMO/jic/B8EEIGlZ8Bgvw8LCjH3zNVPO3mGrdMvnEEPEhKA==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "apps/nextjs/node_modules/@next/swc-linux-arm64-musl": {
-      "version": "12.3.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-12.3.4.tgz",
-      "integrity": "sha512-EETZPa1juczrKLWk5okoW2hv7D7WvonU+Cf2CgsSoxgsYbUCZ1voOpL4JZTOb6IbKMDo6ja+SbY0vzXZBUMvkQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "apps/nextjs/node_modules/@next/swc-linux-x64-gnu": {
-      "version": "12.3.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-12.3.4.tgz",
-      "integrity": "sha512-4csPbRbfZbuWOk3ATyWcvVFdD9/Rsdq5YHKvRuEni68OCLkfy4f+4I9OBpyK1SKJ00Cih16NJbHE+k+ljPPpag==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "apps/nextjs/node_modules/@next/swc-linux-x64-musl": {
-      "version": "12.3.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-12.3.4.tgz",
-      "integrity": "sha512-YeBmI+63Ro75SUiL/QXEVXQ19T++58aI/IINOyhpsRL1LKdyfK/35iilraZEFz9bLQrwy1LYAR5lK200A9Gjbg==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "apps/nextjs/node_modules/@next/swc-win32-arm64-msvc": {
-      "version": "12.3.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-12.3.4.tgz",
-      "integrity": "sha512-Sd0qFUJv8Tj0PukAYbCCDbmXcMkbIuhnTeHm9m4ZGjCf6kt7E/RMs55Pd3R5ePjOkN7dJEuxYBehawTR/aPDSQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "apps/nextjs/node_modules/@next/swc-win32-ia32-msvc": {
-      "version": "12.3.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-12.3.4.tgz",
-      "integrity": "sha512-rt/vv/vg/ZGGkrkKcuJ0LyliRdbskQU+91bje+PgoYmxTZf/tYs6IfbmgudBJk6gH3QnjHWbkphDdRQrseRefQ==",
-      "cpu": [
-        "ia32"
-      ],
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "apps/nextjs/node_modules/@next/swc-win32-x64-msvc": {
-      "version": "12.3.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-12.3.4.tgz",
-      "integrity": "sha512-DQ20JEfTBZAgF8QCjYfJhv2/279M6onxFjdG/+5B0Cyj00/EdBxiWb2eGGFgQhrBbNv/lsvzFbbi0Ptf8Vw/bg==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "apps/nextjs/node_modules/next": {
-      "version": "12.3.4",
-      "resolved": "https://registry.npmjs.org/next/-/next-12.3.4.tgz",
-      "integrity": "sha512-VcyMJUtLZBGzLKo3oMxrEF0stxh8HwuW976pAzlHhI3t8qJ4SROjCrSh1T24bhrbjw55wfZXAbXPGwPt5FLRfQ==",
-      "dependencies": {
-        "@next/env": "12.3.4",
-        "@swc/helpers": "0.4.11",
-        "caniuse-lite": "^1.0.30001406",
-        "postcss": "8.4.14",
-        "styled-jsx": "5.0.7",
-        "use-sync-external-store": "1.2.0"
-      },
-      "bin": {
-        "next": "dist/bin/next"
-      },
-      "engines": {
-        "node": ">=12.22.0"
-      },
-      "optionalDependencies": {
-        "@next/swc-android-arm-eabi": "12.3.4",
-        "@next/swc-android-arm64": "12.3.4",
-        "@next/swc-darwin-arm64": "12.3.4",
-        "@next/swc-darwin-x64": "12.3.4",
-        "@next/swc-freebsd-x64": "12.3.4",
-        "@next/swc-linux-arm-gnueabihf": "12.3.4",
-        "@next/swc-linux-arm64-gnu": "12.3.4",
-        "@next/swc-linux-arm64-musl": "12.3.4",
-        "@next/swc-linux-x64-gnu": "12.3.4",
-        "@next/swc-linux-x64-musl": "12.3.4",
-        "@next/swc-win32-arm64-msvc": "12.3.4",
-        "@next/swc-win32-ia32-msvc": "12.3.4",
-        "@next/swc-win32-x64-msvc": "12.3.4"
-      },
-      "peerDependencies": {
-        "fibers": ">= 3.1.0",
-        "node-sass": "^6.0.0 || ^7.0.0",
-        "react": "^17.0.2 || ^18.0.0-0",
-        "react-dom": "^17.0.2 || ^18.0.0-0",
-        "sass": "^1.3.0"
-      },
-      "peerDependenciesMeta": {
-        "fibers": {
-          "optional": true
-        },
-        "node-sass": {
-          "optional": true
-        },
-        "sass": {
-          "optional": true
-        }
-      }
-    },
-    "apps/nextjs/node_modules/postcss": {
-      "version": "8.4.14",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz",
-      "integrity": "sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/postcss"
-        }
-      ],
-      "dependencies": {
-        "nanoid": "^3.3.4",
-        "picocolors": "^1.0.0",
-        "source-map-js": "^1.0.2"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14"
-      }
-    },
-    "apps/remix": {
-      "name": "my-remix-app",
-      "extraneous": true,
-      "dependencies": {
-        "@remix-run/node": "^2.8.0",
-        "@remix-run/react": "^2.8.0",
-        "@remix-run/server-runtime": "^2.8.0",
-        "@vercel/analytics": "^1.2.2",
-        "@vercel/remix": "^2.8.0",
-        "isbot": "^4",
-        "react": "^18.2.0",
-        "react-dom": "^18.2.0"
-      },
-      "devDependencies": {
-        "@remix-run/dev": "^2.8.0",
-        "@types/react": "^18.2.20",
-        "@types/react-dom": "^18.2.7",
-        "typescript": "^5.1.6",
-        "vite": "^5.1.0",
-        "vite-tsconfig-paths": "^4.2.1"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@next/env": {
-      "version": "12.3.4",
-      "resolved": "https://registry.npmjs.org/@next/env/-/env-12.3.4.tgz",
-      "integrity": "sha512-H/69Lc5Q02dq3o+dxxy5O/oNxFsZpdL6WREtOOtOM1B/weonIwDXkekr1KV5DPVPr12IHFPrMrcJQ6bgPMfn7A=="
-    },
-    "node_modules/@swc/helpers": {
-      "version": "0.4.11",
-      "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.4.11.tgz",
-      "integrity": "sha512-rEUrBSGIoSFuYxwBYtlUFMlE2CwGhmW+w9355/5oduSw8e5h2+Tj4UrAGNNgP9915++wj5vkQo0UuOBqOAq4nw==",
-      "dependencies": {
-        "tslib": "^2.4.0"
-      }
-    },
-    "node_modules/caniuse-lite": {
-      "version": "1.0.30001594",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001594.tgz",
-      "integrity": "sha512-VblSX6nYqyJVs8DKFMldE2IVCJjZ225LW00ydtUWwh5hk9IfkTOffO6r8gJNsH0qqqeAF8KrbMYA2VEwTlGW5g==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ]
-    },
-    "node_modules/js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
-    },
-    "node_modules/loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "dependencies": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
-      },
-      "bin": {
-        "loose-envify": "cli.js"
-      }
-    },
-    "node_modules/nanoid": {
-      "version": "3.3.7",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
-      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
-    },
-    "node_modules/nextjs-monorepo-test": {
-      "resolved": "apps/nextjs",
-      "link": true
-    },
-    "node_modules/picocolors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
-    },
-    "node_modules/react": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz",
-      "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==",
-      "dependencies": {
-        "loose-envify": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/react-dom": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz",
-      "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==",
-      "dependencies": {
-        "loose-envify": "^1.1.0",
-        "scheduler": "^0.23.0"
-      },
-      "peerDependencies": {
-        "react": "^18.2.0"
-      }
-    },
-    "node_modules/scheduler": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz",
-      "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==",
-      "dependencies": {
-        "loose-envify": "^1.1.0"
-      }
-    },
-    "node_modules/source-map-js": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/styled-jsx": {
-      "version": "5.0.7",
-      "resolved": "https://registry.npmjs.org/styled-jsx/-/styled-jsx-5.0.7.tgz",
-      "integrity": "sha512-b3sUzamS086YLRuvnaDigdAewz1/EFYlHpYBP5mZovKEdQQOIIYq8lApylub3HHZ6xFjV051kkGU7cudJmrXEA==",
-      "engines": {
-        "node": ">= 12.0.0"
-      },
-      "peerDependencies": {
-        "react": ">= 16.8.0 || 17.x.x || ^18.0.0-0"
-      },
-      "peerDependenciesMeta": {
-        "@babel/core": {
-          "optional": true
-        },
-        "babel-plugin-macros": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/tslib": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
-      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
-    },
-    "node_modules/use-sync-external-store": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz",
-      "integrity": "sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
-      }
-    }
-  }
-}
--- a/packages/cli/test/fixtures/unit/commands/build/monorepo/package.json
+++ b/packages/cli/test/fixtures/unit/commands/build/monorepo/package.json
@@ -1,9 +0,0 @@
-{
-  "name": "monorepo",
-  "private": true,
-  "version": "0.0.0",
-  "description": "",
-  "workspaces": [
-    "apps/*"
-  ]
-}
--- a/packages/cli/test/fixtures/unit/commands/build/with-flags/.vercel/project.json
+++ b/packages/cli/test/fixtures/unit/commands/build/with-flags/.vercel/project.json
@@ -1,7 +0,0 @@
-{
-  "orgId": ".",
-  "projectId": ".",
-  "settings": {
-    "framework": null
-  }
-}
--- a/packages/cli/test/fixtures/unit/commands/build/with-flags/build.js
+++ b/packages/cli/test/fixtures/unit/commands/build/with-flags/build.js
@@ -1,21 +0,0 @@
-const fs = require('fs');
-const path = require('path');
-
-async function main() {
-  const outputDir = path.join(__dirname, '.vercel', 'output');
-
-  await fs.promises.mkdir(outputDir).catch((error) => {
-    if (error.code === 'EEXIST') return;
-    throw error;
-  });
-
-  await fs.promises.copyFile(path.join(__dirname, 'config.json'), path.join(outputDir, 'config.json'));
-  await fs.promises.copyFile(path.join(__dirname, 'flags.json'), path.join(outputDir, 'flags.json'));
-}
-
-main().then(() => {
-  process.exit(0);
-}).catch((error) => {
-  console.error(error);
-  process.exit(1);
-});
--- a/packages/cli/test/fixtures/unit/commands/build/with-flags/config.json
+++ b/packages/cli/test/fixtures/unit/commands/build/with-flags/config.json
@@ -1,3 +0,0 @@
-{
-  "version": 3
-}
--- a/packages/cli/test/fixtures/unit/commands/build/with-flags/flags.json
+++ b/packages/cli/test/fixtures/unit/commands/build/with-flags/flags.json
@@ -1,7 +0,0 @@
-{
-  "definitions": {
-    "my-next-flag": {
-      "options": [{ "value": true }, { "value": false }]
-    }
-  }
-}
--- a/packages/cli/test/fixtures/unit/commands/build/with-flags/package.json
+++ b/packages/cli/test/fixtures/unit/commands/build/with-flags/package.json
@@ -1,5 +0,0 @@
-{
-  "scripts": {
-    "build": "node build.js"
-  }
-}
--- a/packages/cli/test/fixtures/unit/commands/deploy/node-low-starting-range/.vercel/project.json
+++ b/packages/cli/test/fixtures/unit/commands/deploy/node-low-starting-range/.vercel/project.json
@@ -1,4 +0,0 @@
-{
-  "orgId": "team_dummy",
-  "projectId": "node-low-starting-range"
-}
--- a/packages/cli/test/fixtures/unit/commands/deploy/node-low-starting-range/api/index.js
+++ b/packages/cli/test/fixtures/unit/commands/deploy/node-low-starting-range/api/index.js
@@ -1 +0,0 @@
-module.exports = (req, res) => res.end('Vercel');
--- a/packages/cli/test/fixtures/unit/commands/deploy/node-low-starting-range/package.json
+++ b/packages/cli/test/fixtures/unit/commands/deploy/node-low-starting-range/package.json
@@ -1,8 +0,0 @@
-{
-  "name": "node-low-starting-range",
-  "version": "1.0.0",
-  "private": true,
-  "engines": {
-    "node": ">10"
-  }
-}
--- a/packages/cli/test/fixtures/unit/commands/deploy/node-low-version/.vercel/project.json
+++ b/packages/cli/test/fixtures/unit/commands/deploy/node-low-version/.vercel/project.json
@@ -1,4 +0,0 @@
-{
-  "orgId": "team_dummy",
-  "projectId": "node-low-version"
-}
--- a/packages/cli/test/fixtures/unit/commands/deploy/node-low-version/api/index.js
+++ b/packages/cli/test/fixtures/unit/commands/deploy/node-low-version/api/index.js
@@ -1 +0,0 @@
-module.exports = (req, res) => res.end('Vercel');
--- a/packages/cli/test/fixtures/unit/commands/deploy/node-low-version/package.json
+++ b/packages/cli/test/fixtures/unit/commands/deploy/node-low-version/package.json
@@ -1,8 +0,0 @@
-{
-  "name": "node-low-version",
-  "version": "1.0.0",
-  "private": true,
-  "engines": {
-    "node": "10"
-  }
-}
--- a/packages/cli/test/fixtures/unit/commands/deploy/node/.vercel/project.json
+++ b/packages/cli/test/fixtures/unit/commands/deploy/node/.vercel/project.json
@@ -1,4 +0,0 @@
-{
-  "orgId": "team_dummy",
-  "projectId": "node"
-}
--- a/packages/cli/test/fixtures/unit/commands/deploy/node/package.json
+++ b/packages/cli/test/fixtures/unit/commands/deploy/node/package.json
@@ -1,8 +0,0 @@
-{
-  "name": "node",
-  "version": "1.0.0",
-  "private": true,
-  "engines": {
-    "node": ">= 20.x"
-  }
-}
--- a/packages/cli/test/helpers/prepare.js
+++ b/packages/cli/test/helpers/prepare.js
@@ -265,23 +265,6 @@ module.exports = async function prepare(session, binaryPath, tmpFixturesDir) {
        },
      }),
    },
-    'zero-config-next-js-nested': {
-      'app/pages/index.js':
-        'export default () => <div><h1>Now CLI test</h1><p>Zero-config + Next.js</p></div>',
-      'app/package.json': JSON.stringify({
-        name: 'zero-config-next-js-test',
-        scripts: {
-          dev: 'next',
-          start: 'next start',
-          build: 'next build',
-        },
-        dependencies: {
-          next: 'latest',
-          react: 'latest',
-          'react-dom': 'latest',
-        },
-      }),
-    },
    'lambda-with-128-memory': {
      'api/memory.js': `
        module.exports = (req, res) => {
--- a/packages/cli/test/integration-1.test.ts
+++ b/packages/cli/test/integration-1.test.ts
@@ -19,7 +19,6 @@ import {
 import formatOutput from './helpers/format-output';
 import type http from 'http';
 import type { CLIProcess } from './helpers/types';
-
 const TEST_TIMEOUT = 3 * 60 * 1000;
 jest.setTimeout(TEST_TIMEOUT);

@@ -585,37 +584,6 @@ test('deploy fails using --local-config flag with non-existent path', async () =
  expect(stderr).toMatch(/does-not-exist\.json/);
 });

-test('deploy using --local-config flag above target', async () => {
-  const root = await setupE2EFixture('zero-config-next-js-nested');
-  const projectName = `project-link-dev-${
-    Math.random().toString(36).split('.')[1]
-  }`;
-
-  const vc = execCli(binaryPath, ['deploy', `--name=${projectName}`], {
-    cwd: root,
-  });
-
-  await waitForPrompt(vc, /Set up and deploy [^?]+\?/);
-  vc.stdin?.write('yes\n');
-
-  await waitForPrompt(vc, 'Which scope do you want to deploy to?');
-  vc.stdin?.write('\n');
-
-  await waitForPrompt(vc, 'Link to existing project?');
-  vc.stdin?.write('no\n');
-
-  await waitForPrompt(vc, `What’s your project’s name? (${projectName})`);
-  vc.stdin?.write(`\n`);
-
-  await waitForPrompt(vc, 'In which directory is your code located?');
-  vc.stdin?.write('app\n');
-
-  // This means the framework detection worked!
-  await waitForPrompt(vc, 'Auto-detected Project Settings (Next.js)');
-
-  vc.kill();
-});
-
 test('deploy using --local-config flag above target', async () => {
  const root = await setupE2EFixture('local-config-above-target');
  const target = path.join(root, 'dir');
--- a/packages/cli/test/integration-2.test.ts
+++ b/packages/cli/test/integration-2.test.ts
@@ -1006,45 +1006,6 @@ test('[vc link --yes] should not show prompts and autolink', async () => {
  ).toBe(true);
 });

-test('[vc link] should detect frameworks in project rootDirectory', async () => {
-  const dir = await setupE2EFixture('zero-config-next-js-nested');
-  const projectRootDir = 'app';
-
-  const projectName = `project-link-dev-${
-    Math.random().toString(36).split('.')[1]
-  }`;
-
-  // remove previously linked project if it exists
-  await remove(path.join(dir, '.vercel'));
-
-  const vc = execCli(binaryPath, ['link', `--project=${projectName}`], {
-    cwd: dir,
-    env: {
-      FORCE_TTY: '1',
-    },
-  });
-
-  await waitForPrompt(vc, /Set up [^?]+\?/);
-  vc.stdin?.write('yes\n');
-
-  await waitForPrompt(vc, 'Which scope should contain your project?');
-  vc.stdin?.write('\n');
-
-  await waitForPrompt(vc, 'Link to existing project?');
-  vc.stdin?.write('no\n');
-
-  await waitForPrompt(vc, 'What’s your project’s name?');
-  vc.stdin?.write(`${projectName}\n`);
-
-  await waitForPrompt(vc, 'In which directory is your code located?');
-  vc.stdin?.write(`${projectRootDir}\n`);
-
-  // This means the framework detection worked!
-  await waitForPrompt(vc, 'Auto-detected Project Settings (Next.js)');
-
-  vc.kill();
-});
-
 test('[vc link] should not duplicate paths in .gitignore', async () => {
  const dir = await setupE2EFixture('project-link-gitignore');

--- a/packages/cli/test/integration-3.test.ts
+++ b/packages/cli/test/integration-3.test.ts
@@ -1175,7 +1175,7 @@ test('render build errors', async () => {
  const output = await execCli(binaryPath, [deploymentPath, '--yes']);

  expect(output.exitCode, formatOutput(output)).toBe(1);
-  expect(output.stderr).toMatch(/Command "npm run build" exited with 1/gm);
+  expect(output.stderr).toMatch(/Command "yarn run build" exited with 1/gm);
 });

 test('invalid deployment, projects and alias names', async () => {
--- 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 () => {
@@ -1247,74 +1250,43 @@ describe('build', () => {
      (await fs.readFile(join(output, 'static/index.txt'), 'utf8')).trim()
    ).toEqual('marketing');
  });
-
-  it('should write to flags.json', async () => {
-    const cwd = fixture('with-flags');
-    const output = join(cwd, '.vercel', 'output');
-
-    client.cwd = cwd;
-    client.setArgv('build', '--yes');
-
-    const exitCode = await build(client);
-    expect(exitCode).toEqual(0);
-
-    expect(fs.existsSync(join(output, 'flags.json'))).toBe(true);
-    expect(fs.readJSONSync(join(output, 'flags.json'))).toEqual({
-      definitions: {
-        'my-next-flag': {
-          options: [{ value: true }, { value: false }],
-        },
-      },
-    });
-  });
-
-  it('should detect framework version in monorepo app', async () => {
-    const cwd = fixture('monorepo');
-    const output = join(cwd, '.vercel/output');
-    client.cwd = cwd;
-    const exitCode = await build(client);
-    expect(exitCode).toEqual(0);
-
-    const config = await fs.readJSON(join(output, 'config.json'));
-    expect(typeof config.framework.version).toEqual('string');
-  });
-
-  it('should create symlinks for duplicate references to Lambda / EdgeFunction instances', async () => {
-    if (process.platform === 'win32') {
-      console.log('Skipping test on Windows');
-      return;
-    }
-    const cwd = fixture('functions-symlink');
-    const output = join(cwd, '.vercel/output');
-    client.cwd = cwd;
-    const exitCode = await build(client);
-    expect(exitCode).toEqual(0);
-
-    // "functions" directory has output Functions
-    const functions = await fs.readdir(join(output, 'functions'));
-    expect(functions.sort()).toEqual([
-      'edge.func',
-      'edge2.func',
-      'lambda.func',
-      'lambda2.func',
-    ]);
-    expect(
-      fs.lstatSync(join(output, 'functions/lambda.func')).isDirectory()
-    ).toEqual(true);
-    expect(
-      fs.lstatSync(join(output, 'functions/edge.func')).isDirectory()
-    ).toEqual(true);
-    expect(
-      fs.lstatSync(join(output, 'functions/lambda2.func')).isSymbolicLink()
-    ).toEqual(true);
-    expect(
-      fs.lstatSync(join(output, 'functions/edge2.func')).isSymbolicLink()
-    ).toEqual(true);
-    expect(fs.readlinkSync(join(output, 'functions/lambda2.func'))).toEqual(
-      'lambda.func'
-    );
-    expect(fs.readlinkSync(join(output, 'functions/edge2.func'))).toEqual(
-      'edge.func'
-    );
-  });
+});
+
+it('should create symlinks for duplicate references to Lambda / EdgeFunction instances', async () => {
+  if (process.platform === 'win32') {
+    console.log('Skipping test on Windows');
+    return;
+  }
+  const cwd = fixture('functions-symlink');
+  const output = join(cwd, '.vercel/output');
+  client.cwd = cwd;
+  const exitCode = await build(client);
+  expect(exitCode).toEqual(0);
+
+  // "functions" directory has output Functions
+  const functions = await fs.readdir(join(output, 'functions'));
+  expect(functions.sort()).toEqual([
+    'edge.func',
+    'edge2.func',
+    'lambda.func',
+    'lambda2.func',
+  ]);
+  expect(
+    fs.lstatSync(join(output, 'functions/lambda.func')).isDirectory()
+  ).toEqual(true);
+  expect(
+    fs.lstatSync(join(output, 'functions/edge.func')).isDirectory()
+  ).toEqual(true);
+  expect(
+    fs.lstatSync(join(output, 'functions/lambda2.func')).isSymbolicLink()
+  ).toEqual(true);
+  expect(
+    fs.lstatSync(join(output, 'functions/edge2.func')).isSymbolicLink()
+  ).toEqual(true);
+  expect(fs.readlinkSync(join(output, 'functions/lambda2.func'))).toEqual(
+    'lambda.func'
+  );
+  expect(fs.readlinkSync(join(output, 'functions/edge2.func'))).toEqual(
+    'edge.func'
+  );
 });
--- a/packages/cli/test/unit/commands/deploy.test.ts
+++ b/packages/cli/test/unit/commands/deploy.test.ts
@@ -416,152 +416,4 @@ describe('deploy', () => {
      version: 2,
    });
  });
-
-  it('should send `projectSettings.nodeVersion` based on `engines.node` package.json field', async () => {
-    const user = useUser();
-    useTeams('team_dummy');
-    useProject({
-      ...defaultProject,
-      name: 'node',
-      id: 'QmbKpqpiUqbcke',
-    });
-
-    let body: any;
-    client.scenario.post(`/v13/deployments`, (req, res) => {
-      body = req.body;
-      res.json({
-        creator: {
-          uid: user.id,
-          username: user.username,
-        },
-        id: 'dpl_',
-      });
-    });
-    client.scenario.get(`/v13/deployments/dpl_`, (req, res) => {
-      res.json({
-        creator: {
-          uid: user.id,
-          username: user.username,
-        },
-        id: 'dpl_',
-        readyState: 'READY',
-        aliasAssigned: true,
-        alias: [],
-      });
-    });
-
-    const repoRoot = setupUnitFixture('commands/deploy/node');
-    client.cwd = repoRoot;
-    client.setArgv('deploy');
-    const exitCode = await deploy(client);
-    expect(exitCode).toEqual(0);
-    expect(body).toMatchObject({
-      source: 'cli',
-      version: 2,
-      projectSettings: {
-        nodeVersion: '20.x',
-        sourceFilesOutsideRootDirectory: true,
-      },
-    });
-  });
-
-  it('should send latest supported node version when given a >low-node-version based on `engines.node` package.json field', async () => {
-    const user = useUser();
-    useTeams('team_dummy');
-    useProject({
-      ...defaultProject,
-      name: 'node-low-starting-range',
-      id: 'QmbKpqpiUqbcke',
-    });
-
-    let body: any;
-    client.scenario.post(`/v13/deployments`, (req, res) => {
-      body = req.body;
-      res.json({
-        creator: {
-          uid: user.id,
-          username: user.username,
-        },
-        id: 'dpl_',
-      });
-    });
-    client.scenario.get(`/v13/deployments/dpl_`, (req, res) => {
-      res.json({
-        creator: {
-          uid: user.id,
-          username: user.username,
-        },
-        id: 'dpl_',
-        readyState: 'READY',
-        aliasAssigned: true,
-        alias: [],
-      });
-    });
-
-    const repoRoot = setupUnitFixture(
-      'commands/deploy/node-low-starting-range'
-    );
-    client.cwd = repoRoot;
-    client.setArgv('deploy');
-    const exitCode = await deploy(client);
-    expect(exitCode).toEqual(0);
-    expect(body).toMatchObject({
-      source: 'cli',
-      version: 2,
-      projectSettings: {
-        nodeVersion: '20.x',
-        sourceFilesOutsideRootDirectory: true,
-      },
-    });
-  });
-
-  it('should send no version when `engines.node` package.json field is fixed to an outdated version', async () => {
-    const user = useUser();
-    useTeams('team_dummy');
-    useProject({
-      ...defaultProject,
-      name: 'node-low-version',
-      id: 'QmbKpqpiUqbcke',
-    });
-
-    let body: any;
-    client.scenario.post(`/v13/deployments`, (req, res) => {
-      body = req.body;
-      res.json({
-        creator: {
-          uid: user.id,
-          username: user.username,
-        },
-        id: 'dpl_',
-      });
-    });
-    client.scenario.get(`/v13/deployments/dpl_`, (req, res) => {
-      res.json({
-        creator: {
-          uid: user.id,
-          username: user.username,
-        },
-        id: 'dpl_',
-        readyState: 'READY',
-        aliasAssigned: true,
-        alias: [],
-      });
-    });
-
-    const repoRoot = setupUnitFixture('commands/deploy/node-low-version');
-    client.cwd = repoRoot;
-    client.setArgv('deploy');
-    const exitCodePromise = deploy(client);
-    await expect(client.stderr).toOutput(
-      'WARN! Node.js Version "10.x" is discontinued and must be upgraded. Please set "engines": { "node": "20.x" } in your `package.json` file to use Node.js 20.'
-    );
-    await expect(exitCodePromise).resolves.toEqual(0);
-    expect(body).toMatchObject({
-      source: 'cli',
-      version: 2,
-      projectSettings: {
-        sourceFilesOutsideRootDirectory: true,
-      },
-    });
-  });
 });
--- a/packages/cli/test/unit/util/dev/validate.test.ts
+++ b/packages/cli/test/unit/util/dev/validate.test.ts
@@ -253,12 +253,12 @@ describe('validateConfig', () => {
    const error = validateConfig({
      functions: {
        'api/test.js': {
-          memory: 3010,
+          memory: 3009,
        },
      },
    });
    expect(error!.message).toEqual(
-      "Invalid vercel.json - `functions['api/test.js'].memory` should be <= 3009."
+      "Invalid vercel.json - `functions['api/test.js'].memory` should be <= 3008."
    );
    expect(error!.link).toEqual(
      'https://vercel.com/docs/concepts/projects/project-configuration#functions'
--- a/packages/client/CHANGELOG.md
+++ b/packages/client/CHANGELOG.md
@@ -1,47 +1,5 @@
 # @vercel/client

-## 13.1.7
-
-### Patch Changes
-
- Updated dependencies [[`11218a179`](https://github.com/vercel/vercel/commit/11218a179870a5420c5a6ff720cd4aec4f7e1c5e)]:
-  - @vercel/build-utils@7.9.1
-
-## 13.1.6
-
-### Patch Changes
-
- Updated dependencies [[`8ea93839c`](https://github.com/vercel/vercel/commit/8ea93839ccc70816f3ece9d7cfdb857aa7a4b015)]:
-  - @vercel/build-utils@7.9.0
-
-## 13.1.5
-
-### Patch Changes
-
- Updated dependencies [[`908e7837d`](https://github.com/vercel/vercel/commit/908e7837d55bc02e708f402c700e00208415e954), [`5e3656ec1`](https://github.com/vercel/vercel/commit/5e3656ec1b3f0561091636582715ba09ddd8cb2d)]:
-  - @vercel/build-utils@7.8.0
-
-## 13.1.4
-
-### Patch Changes
-
- Updated dependencies [[`37b193c84`](https://github.com/vercel/vercel/commit/37b193c845d8b63d93bb0017fbc1a6a35306ef1f)]:
-  - @vercel/build-utils@7.7.1
-
-## 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
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/client",
-  "version": "13.1.7",
+  "version": "13.1.1",
  "main": "dist/index.js",
  "typings": "dist/index.d.ts",
  "homepage": "https://vercel.com",
@@ -37,7 +37,7 @@
    "typescript": "4.9.5"
  },
  "dependencies": {
-    "@vercel/build-utils": "7.9.1",
+    "@vercel/build-utils": "7.5.1",
    "@vercel/error-utils": "2.0.2",
    "@vercel/routing-utils": "3.1.0",
    "@zeit/fetch": "5.2.0",
--- a/packages/frameworks/CHANGELOG.md
+++ b/packages/frameworks/CHANGELOG.md
@@ -1,11 +1,5 @@
 # @vercel/frameworks

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

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

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

 ### Patch Changes
--- a/packages/fs-detectors/package.json
+++ b/packages/fs-detectors/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/fs-detectors",
-  "version": "5.2.1",
+  "version": "5.1.6",
  "description": "Vercel filesystem detectors",
  "main": "./dist/index.js",
  "types": "./dist/index.d.ts",
@@ -22,7 +22,7 @@
  },
  "dependencies": {
    "@vercel/error-utils": "2.0.2",
-    "@vercel/frameworks": "3.0.0",
+    "@vercel/frameworks": "2.0.6",
    "@vercel/routing-utils": "3.1.0",
    "glob": "8.0.3",
    "js-yaml": "4.1.0",
@@ -37,7 +37,7 @@
    "@types/minimatch": "3.0.5",
    "@types/node": "14.18.33",
    "@types/semver": "7.3.10",
-    "@vercel/build-utils": "7.9.1",
+    "@vercel/build-utils": "7.5.1",
    "jest-junit": "16.0.0",
    "typescript": "4.9.5"
  }
--- a/packages/fs-detectors/src/detect-builders.ts
+++ b/packages/fs-detectors/src/detect-builders.ts
@@ -612,11 +612,11 @@ function validateFunctions({ functions = {} }: Options) {

    if (
      func.memory !== undefined &&
-      (func.memory < 128 || func.memory > 3009)
+      (func.memory < 128 || func.memory > 3008)
    ) {
      return {
        code: 'invalid_function_memory',
-        message: 'Functions must have a memory value between 128 and 3009',
+        message: 'Functions must have a memory value between 128 and 3008',
      };
    }

--- a/packages/fs-detectors/src/detect-framework.ts
+++ b/packages/fs-detectors/src/detect-framework.ts
@@ -143,9 +143,7 @@ function removeSupersededFramework(
  const framework = matches[index];
  if (framework) {
    if (framework.supersedes) {
-      for (const slug of framework.supersedes) {
-        removeSupersededFramework(matches, slug);
-      }
+      removeSupersededFramework(matches, framework.supersedes);
    }
    matches.splice(index, 1);
  }
@@ -156,9 +154,7 @@ export function removeSupersededFrameworks(
 ) {
  for (const match of matches.slice()) {
    if (match?.supersedes) {
-      for (const slug of match.supersedes) {
-        removeSupersededFramework(matches, slug);
-      }
+      removeSupersededFramework(matches, match.supersedes);
    }
  }
 }
--- a/packages/fs-detectors/test/unit.framework-detector.test.ts
+++ b/packages/fs-detectors/test/unit.framework-detector.test.ts
@@ -166,12 +166,12 @@ describe('removeSupersededFrameworks()', () => {
    const matches = [
      { slug: 'storybook' },
      { slug: 'vite' },
-      { slug: 'hydrogen', supersedes: ['vite'] },
+      { slug: 'hydrogen', supersedes: 'vite' },
    ];
    removeSupersededFrameworks(matches);
    expect(matches).toEqual([
      { slug: 'storybook' },
-      { slug: 'hydrogen', supersedes: ['vite'] },
+      { slug: 'hydrogen', supersedes: 'vite' },
    ]);
  });

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

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

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

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

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

-## 2.0.22
-
-### Patch Changes
-
- Updated dependencies [[`11218a179`](https://github.com/vercel/vercel/commit/11218a179870a5420c5a6ff720cd4aec4f7e1c5e)]:
-  - @vercel/build-utils@7.9.1
-
-## 2.0.21
-
-### Patch Changes
-
- Updated dependencies [[`8ea93839c`](https://github.com/vercel/vercel/commit/8ea93839ccc70816f3ece9d7cfdb857aa7a4b015)]:
-  - @vercel/build-utils@7.9.0
-
-## 2.0.20
-
-### Patch Changes
-
- Updated dependencies [[`908e7837d`](https://github.com/vercel/vercel/commit/908e7837d55bc02e708f402c700e00208415e954), [`5e3656ec1`](https://github.com/vercel/vercel/commit/5e3656ec1b3f0561091636582715ba09ddd8cb2d)]:
-  - @vercel/build-utils@7.8.0
-
-## 2.0.19
-
-### Patch Changes
-
- Updated dependencies [[`37b193c84`](https://github.com/vercel/vercel/commit/37b193c845d8b63d93bb0017fbc1a6a35306ef1f)]:
-  - @vercel/build-utils@7.7.1
-
-## 2.0.18
-
-### Patch Changes
-
- Updated dependencies [[`24c3dd282`](https://github.com/vercel/vercel/commit/24c3dd282d7714cd63d2b94fb94745c45fdc79ab)]:
-  - @vercel/build-utils@7.7.0
-
-## 2.0.17
-
-### Patch Changes
-
- [gatsby-plugin-vercel-builder] use --keep-names esbuild flag ([#11117](https://github.com/vercel/vercel/pull/11117))
-
- Updated dependencies [[`b6ed28b9b`](https://github.com/vercel/vercel/commit/b6ed28b9b1712f882c93fe053b70d3eb1df21819), [`8ba0ce932`](https://github.com/vercel/vercel/commit/8ba0ce932434c6295fedb5307bee59a804b7e6a8), [`0d034b682`](https://github.com/vercel/vercel/commit/0d034b6820c0f3252949c0ffc483048c5aac7f04), [`abaa700ce`](https://github.com/vercel/vercel/commit/abaa700cea44c723cfc851baa2dfe9e1ae2e8a5c)]:
-  - @vercel/build-utils@7.6.0
-
 ## 2.0.16

 ### Patch Changes
--- a/packages/gatsby-plugin-vercel-builder/package.json
+++ b/packages/gatsby-plugin-vercel-builder/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/gatsby-plugin-vercel-builder",
-  "version": "2.0.22",
+  "version": "2.0.16",
  "main": "dist/index.js",
  "files": [
    "dist",
@@ -20,7 +20,7 @@
  },
  "dependencies": {
    "@sinclair/typebox": "0.25.24",
-    "@vercel/build-utils": "7.9.1",
+    "@vercel/build-utils": "7.5.1",
    "@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,9 +35,6 @@ 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/jest.config.js
+++ b/packages/go/jest.config.js
@@ -8,7 +8,6 @@ module.exports = {
      {
        diagnostics: true,
        isolatedModules: true,
-        tsconfig: 'test/tsconfig.json',
      },
    ],
  },
--- 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.9.1",
+    "@vercel/build-utils": "7.5.1",
    "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.9.1",
+    "@vercel/build-utils": "7.5.1",
    "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,55 +1,5 @@
 # @vercel/next

-## 4.1.6
-
-### Patch Changes
-
- Ensure that static PPR pages have static streaming lambda paths. ([#11259](https://github.com/vercel/vercel/pull/11259))
-
-## 4.1.5
-
-### Patch Changes
-
- Rename variants to flags and remove legacy flags ([#11121](https://github.com/vercel/vercel/pull/11121))
-
-## 4.1.4
-
-### Patch Changes
-
- Enable partial prerendering support for pre-generated pages ([#11183](https://github.com/vercel/vercel/pull/11183))
-
-## 4.1.3
-
-### Patch Changes
-
- Fix manifest with experimental flag ([#11192](https://github.com/vercel/vercel/pull/11192))
-
-## 4.1.2
-
-### Patch Changes
-
- Update experimental bundle flag ([#11187](https://github.com/vercel/vercel/pull/11187))
-
- [next] Add flag for experimental grouping ([#11177](https://github.com/vercel/vercel/pull/11177))
-
- bump `@vercel/nft@0.26.4` ([#11155](https://github.com/vercel/vercel/pull/11155))
-
- fix: missing experimental field ([#11184](https://github.com/vercel/vercel/pull/11184))
-
-## 4.1.1
-
-### Patch Changes
-
- [node][next][redwood][remix] bump `@vercel/nft@0.26.3` ([#11115](https://github.com/vercel/vercel/pull/11115))
-
- Load common chunks on module initialization ([#11126](https://github.com/vercel/vercel/pull/11126))
-
- Fix index normalizing for app outputs ([#11099](https://github.com/vercel/vercel/pull/11099))
-
- Mark `flags` as deprecated and replace them with `variants` ([#11098](https://github.com/vercel/vercel/pull/11098))
-
- Fix rewrite RSC handling with trailingSlash ([#11107](https://github.com/vercel/vercel/pull/11107))
-
 ## 4.1.0

 ### Minor Changes
--- a/packages/next/jest.config.js
+++ b/packages/next/jest.config.js
@@ -8,7 +8,6 @@ module.exports = {
      {
        diagnostics: true,
        isolatedModules: true,
-        tsconfig: 'test/tsconfig.json',
      },
    ],
  },
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/next",
-  "version": "4.1.6",
+  "version": "4.1.0",
  "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.4"
+    "@vercel/nft": "0.26.2"
  },
  "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.9.1",
+    "@vercel/build-utils": "7.5.1",
    "@vercel/routing-utils": "3.1.0",
    "async-sema": "3.0.1",
    "buffer-crc32": "0.2.13",
--- a/packages/next/src/index.ts
+++ b/packages/next/src/index.ts
@@ -511,7 +511,7 @@ export const build: BuildV2 = async ({
    entryPath,
    outputDirectory
  );
-  const omittedPrerenderRoutes: ReadonlySet<string> = new Set(
+  const omittedPrerenderRoutes = new Set(
    Object.keys(prerenderManifest.omittedRoutes)
  );

@@ -1142,10 +1142,6 @@ export const build: BuildV2 = async ({
      appPathRoutesManifest,
    });

-    /**
-     * This is a detection for preview mode that's required for the pages
-     * router.
-     */
    const canUsePreviewMode = Object.keys(pages).some(page =>
      isApiPage(pages[page].fsPath)
    );
@@ -1320,22 +1316,6 @@ export const build: BuildV2 = async ({
      }
    }

-    /**
-     * All of the routes that have `experimentalPPR` enabled.
-     */
-    const experimentalPPRRoutes = new Set<string>();
-
-    for (const [route, { experimentalPPR }] of [
-      ...Object.entries(prerenderManifest.staticRoutes),
-      ...Object.entries(prerenderManifest.blockingFallbackRoutes),
-      ...Object.entries(prerenderManifest.fallbackRoutes),
-      ...Object.entries(prerenderManifest.omittedRoutes),
-    ]) {
-      if (!experimentalPPR) continue;
-
-      experimentalPPRRoutes.add(route);
-    }
-
    if (requiredServerFilesManifest) {
      if (!routesManifest) {
        throw new Error(
@@ -1391,7 +1371,6 @@ export const build: BuildV2 = async ({
        hasIsr404Page,
        hasIsr500Page,
        variantsManifest,
-        experimentalPPRRoutes,
      });
    }

@@ -1904,18 +1883,17 @@ export const build: BuildV2 = async ({
      );
    }

-    dynamicRoutes = await getDynamicRoutes({
+    dynamicRoutes = await getDynamicRoutes(
      entryPath,
      entryDirectory,
      dynamicPages,
-      isDev: false,
+      false,
      routesManifest,
-      omittedRoutes: omittedPrerenderRoutes,
+      omittedPrerenderRoutes,
      canUsePreviewMode,
-      bypassToken: prerenderManifest.bypassToken || '',
-      isServerMode,
-      experimentalPPRRoutes,
-    }).then(arr =>
+      prerenderManifest.bypassToken || '',
+      isServerMode
+    ).then(arr =>
      localizeDynamicRoutes(
        arr,
        dynamicPrefix,
@@ -1934,18 +1912,17 @@ export const build: BuildV2 = async ({

      // we need to include the prerenderManifest.omittedRoutes here
      // for the page to be able to be matched in the lambda for preview mode
-      const completeDynamicRoutes = await getDynamicRoutes({
+      const completeDynamicRoutes = await getDynamicRoutes(
        entryPath,
        entryDirectory,
        dynamicPages,
-        isDev: false,
+        false,
        routesManifest,
-        omittedRoutes: undefined,
+        undefined,
        canUsePreviewMode,
-        bypassToken: prerenderManifest.bypassToken || '',
-        isServerMode,
-        experimentalPPRRoutes,
-      }).then(arr =>
+        prerenderManifest.bypassToken || '',
+        isServerMode
+      ).then(arr =>
        arr.map(route => {
          route.src = route.src.replace('^', `^${dynamicPrefix}`);
          return route;
@@ -2144,30 +2121,20 @@ export const build: BuildV2 = async ({
      canUsePreviewMode,
    });

-    await Promise.all(
-      Object.keys(prerenderManifest.staticRoutes).map(route =>
-        prerenderRoute(route, {})
-      )
+    Object.keys(prerenderManifest.staticRoutes).forEach(route =>
+      prerenderRoute(route, { isBlocking: false, isFallback: false })
    );
-
-    await Promise.all(
-      Object.keys(prerenderManifest.fallbackRoutes).map(route =>
-        prerenderRoute(route, { isFallback: true })
-      )
+    Object.keys(prerenderManifest.fallbackRoutes).forEach(route =>
+      prerenderRoute(route, { isBlocking: false, isFallback: true })
    );
-
-    await Promise.all(
-      Object.keys(prerenderManifest.blockingFallbackRoutes).map(route =>
-        prerenderRoute(route, { isBlocking: true })
-      )
+    Object.keys(prerenderManifest.blockingFallbackRoutes).forEach(route =>
+      prerenderRoute(route, { isBlocking: true, isFallback: false })
    );

    if (static404Page && canUsePreviewMode) {
-      await Promise.all(
-        Array.from(omittedPrerenderRoutes).map(route =>
-          prerenderRoute(route, { isOmitted: true })
-        )
-      );
+      omittedPrerenderRoutes.forEach(route => {
+        prerenderRoute(route, { isOmitted: true });
+      });
    }

    // We still need to use lazyRoutes if the dataRoutes field
--- a/packages/next/src/server-build.ts
+++ b/packages/next/src/server-build.ts
@@ -12,6 +12,7 @@ import {
  debug,
  glob,
  Files,
+  Flag,
  BuildResultV2Typical as BuildResult,
  NodejsLambda,
 } from '@vercel/build-utils';
@@ -51,7 +52,6 @@ import {
  RSC_PREFETCH_SUFFIX,
  normalizePrefetches,
  CreateLambdaFromPseudoLayersOptions,
-  getPostponeResumePathname,
 } from './utils';
 import {
  nodeFileTrace,
@@ -70,30 +70,6 @@ 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';
@@ -142,7 +118,6 @@ export async function serverBuild({
  lambdaCompressedByteLimit,
  requiredServerFilesManifest,
  variantsManifest,
-  experimentalPPRRoutes,
 }: {
  appPathRoutesManifest?: Record<string, string>;
  dynamicPages: string[];
@@ -152,7 +127,7 @@ export async function serverBuild({
  pagesDir: string;
  baseDir: string;
  canUsePreviewMode: boolean;
-  omittedPrerenderRoutes: ReadonlySet<string>;
+  omittedPrerenderRoutes: Set<string>;
  localePrefixed404: boolean;
  staticPages: { [key: string]: FileFsRef };
  lambdaAppPaths: { [key: string]: FileFsRef };
@@ -184,14 +159,9 @@ export async function serverBuild({
  prerenderManifest: NextPrerenderedRoutes;
  requiredServerFilesManifest: NextRequiredServerFilesManifest;
  variantsManifest: VariantsManifest | null;
-  experimentalPPRRoutes: ReadonlySet<string>;
 }): Promise<BuildResult> {
  lambdaPages = Object.assign({}, lambdaPages, lambdaAppPaths);

-  const experimentalAllowBundling = Boolean(
-    process.env.NEXT_EXPERIMENTAL_FUNCTION_BUNDLING
-  );
-
  const lambdas: { [key: string]: Lambda } = {};
  const prerenders: { [key: string]: Prerender } = {};
  const lambdaPageKeys = Object.keys(lambdaPages);
@@ -272,11 +242,10 @@ export async function serverBuild({
    nextVersion,
    CORRECT_MIDDLEWARE_ORDER_VERSION
  );
-  // experimental bundling prevents filtering manifests
-  // as we don't know what to filter by at this stage
-  const isCorrectManifests =
-    !experimentalAllowBundling &&
-    semver.gte(nextVersion, CORRECTED_MANIFESTS_VERSION);
+  const isCorrectManifests = semver.gte(
+    nextVersion,
+    CORRECTED_MANIFESTS_VERSION
+  );

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

@@ -355,7 +324,19 @@ export async function serverBuild({
    internalPages.push('404.js');
  }

-  const prerenderRoutes: ReadonlySet<string> = new Set<string>([
+  const experimentalPPRRoutes = new Set<string>();
+
+  for (const [route, { experimentalPPR }] of [
+    ...Object.entries(prerenderManifest.staticRoutes),
+    ...Object.entries(prerenderManifest.blockingFallbackRoutes),
+    ...Object.entries(prerenderManifest.fallbackRoutes),
+  ]) {
+    if (!experimentalPPR) continue;
+
+    experimentalPPRRoutes.add(route);
+  }
+
+  const prerenderRoutes = new Set<string>([
    ...(canUsePreviewMode ? omittedPrerenderRoutes : []),
    ...Object.keys(prerenderManifest.blockingFallbackRoutes),
    ...Object.keys(prerenderManifest.fallbackRoutes),
@@ -763,7 +744,7 @@ export async function serverBuild({
      .filter(Boolean) as string[];

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

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

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

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

    const appRouteHandlersLambdaGroups = await getPageLambdaGroups({
-      experimentalAllowBundling,
      entryPath: projectDir,
      config,
      functionsConfigManifest,
@@ -1023,12 +1001,54 @@ export async function serverBuild({

    for (const group of combinedGroups) {
      const groupPageFiles: { [key: string]: PseudoFile } = {};
+      const filesCounter = new Map<string, number>();
+      const filesMap = new Map<string, string>();

      for (const page of [...group.pages, ...internalPages]) {
        const pageFileName = path.normalize(
          path.relative(baseDir, lambdaPages[page].fsPath)
        );
        groupPageFiles[pageFileName] = compressedPages[page];
+
+        const traceFileRef = getBuildTraceFile(getOriginalPagePath(page));
+        if (traceFileRef && !internalPages.includes(page)) {
+          const traceFile = await fs.readFile(traceFileRef.fsPath, 'utf8');
+          const { files } = JSON.parse(traceFile) as { files: string[] };
+          const pagePath = path.join(
+            appDir && Boolean(lambdaAppPaths[page]) ? appDir : pagesDir,
+            getOriginalPagePath(page)
+          );
+
+          const pageDir = path.dirname(pagePath);
+
+          filesCounter.set(pagePath, 1);
+          let relPath0 = `./${path.relative(path.resolve(baseDir), pagePath)}`;
+          if (relPath0.startsWith('./apps/vercel-site/')) {
+            relPath0 = relPath0.replace('./apps/vercel-site/', './');
+          }
+          filesMap.set(pagePath, relPath0);
+          // filesMap.set(pagePath, pagePath);
+
+          files.forEach((file: string) => {
+            const absolutePath = path.join(pageDir, file);
+            const count = filesCounter.get(absolutePath) || 0;
+            filesCounter.set(absolutePath, count + 1);
+            let relPath = path.relative(
+              path.resolve(baseDir),
+              path.resolve(absolutePath)
+            );
+
+            if (!relPath.startsWith('..')) {
+              relPath = './' + relPath;
+            }
+            if (relPath.startsWith('./apps/vercel-site/')) {
+              relPath = relPath.replace('./apps/vercel-site/', './');
+            }
+
+            filesMap.set(absolutePath, relPath);
+            // filesMap.set(absolutePath, absolutePath);
+          });
+        }
      }

      const updatedManifestFiles: { [name: string]: FileBlob } = {};
@@ -1090,58 +1110,41 @@ export async function serverBuild({
        }
      }

-      let launcherData = group.isAppRouter ? appLauncher : launcher;
-      let preloadChunks: string[] = [];
+      const commonFiles = new Set<string>();
+      const restFiles = new Set<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
-            );
+      for (const [file, count] of filesCounter) {
+        const relative = filesMap.get(file)!;
+        if (
+          file.endsWith('.js') ||
+          file.endsWith('.mjs') ||
+          file.endsWith('.json') ||
+          file.endsWith('.cjs')
+        ) {
+          if (count === group.pages.length) {
+            commonFiles.add(relative);
+          } else {
+            restFiles.add(relative);
          }
        }
-
-        if (normalizedPreloadChunks.length > 0) {
-          launcherData = launcherData.replace(
-            '// @preserve next-server-preload-target',
-            normalizedPreloadChunks
-              .map(name => `require('${name}');`)
-              .join('\n')
-          );
-        }
      }

+      let launcherContent = group.isAppRouter ? appLauncher : launcher;
+      launcherContent = launcherContent.replace(
+        'const commonChunks = __COMMON_CHUNKS__',
+        `const commonChunks = ${JSON.stringify(
+          Array.from(commonFiles.values())
+        )};`
+      );
+
+      launcherContent = launcherContent.replace(
+        'const restChunks = __REST_CHUNKS__',
+        `const restChunks = ${JSON.stringify(Array.from(restFiles.values()))};`
+      );
+
      const launcherFiles: { [name: string]: FileFsRef | FileBlob } = {
        [path.join(path.relative(baseDir, projectDir), '___next_launcher.cjs')]:
-          new FileBlob({ data: launcherData }),
+          new FileBlob({ data: launcherContent }),
      };
      const operationType = getOperationType({ group, prerenderManifest });

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

      const lambda = await createLambdaFromPseudoLayers(options);
@@ -1175,7 +1177,7 @@ export async function serverBuild({
      // lambda for the page for revalidation.
      let revalidate: NodejsLambda | undefined;
      if (isPPR) {
-        if (!options.isStreaming) {
+        if (isPPR && !options.isStreaming) {
          throw new Error("Invariant: PPR lambda isn't streaming");
        }

@@ -1187,28 +1189,24 @@ export async function serverBuild({
        });
      }

-      for (const pageFilename of group.pages) {
-        // This is the name of the page, where the root is `index`.
-        const pageName = pageFilename.replace(/\.js$/, '');
-
-        // This is the name of the page prefixed with a `/`, where the root is
-        // `/index`.
-        const pagePath = path.posix.join('/', pageName);
-
-        // This is the routable pathname for the page, where the root is `/`.
-        const pagePathname = pagePath === '/index' ? '/' : pagePath;
-
-        let isPrerender = prerenderRoutes.has(pagePathname);
+      for (const page of group.pages) {
+        const pageNoExt = page.replace(/\.js$/, '');
+        let isPrerender = prerenderRoutes.has(
+          path.join('/', pageNoExt === 'index' ? '' : pageNoExt)
+        );

        if (!isPrerender && routesManifest?.i18n) {
          isPrerender = routesManifest.i18n.locales.some(locale => {
            return prerenderRoutes.has(
-              path.join('/', locale, pageName === 'index' ? '' : pageName)
+              path.join('/', locale, pageNoExt === 'index' ? '' : pageNoExt)
            );
          });
        }

-        let outputName = path.posix.join(entryDirectory, pageName);
+        let outputName = normalizeIndexOutput(
+          path.posix.join(entryDirectory, pageNoExt),
+          true
+        );

        // If this is a PPR page, then we should prefix the output name.
        if (isPPR) {
@@ -1216,53 +1214,24 @@ export async function serverBuild({
            throw new Error("Invariant: PPR lambda isn't set");
          }

-          // Assign the revalidate lambda to the output name. That's used to
-          // perform the initial static shell render.
+          // Get the get the base path prefixed route, without the index
+          // normalization.
+          outputName = path.posix.join(entryDirectory, pageNoExt);
          lambdas[outputName] = revalidate;

-          // If this isn't an omitted page, then we should add the link from the
-          // page to the postpone resume lambda.
-          if (!omittedPrerenderRoutes.has(pagePathname)) {
-            const key = getPostponeResumePathname(entryDirectory, pageName);
-            lambdas[key] = lambda;
-
-            // We want to add the `experimentalStreamingLambdaPath` to this
-            // output.
-            experimentalStreamingLambdaPaths.set(outputName, key);
-          }
-
-          // For each static route that was generated, we should generate a
-          // specific partial prerendering resume route. This is because any
-          // static route that is matched will not hit the rewrite rules.
-          for (const [
-            routePathname,
-            { srcRoute, experimentalPPR },
-          ] of Object.entries(prerenderManifest.staticRoutes)) {
-            // If the srcRoute doesn't match or this doesn't support
-            // experimental partial prerendering, then we can skip this route.
-            if (srcRoute !== pagePathname || !experimentalPPR) continue;
-
-            // If this route is the same as the page route, then we can skip
-            // it, because we've already added the lambda to the output.
-            if (routePathname === pagePathname) continue;
-
-            const key = getPostponeResumePathname(
-              entryDirectory,
-              routePathname
-            );
-            lambdas[key] = lambda;
-
-            outputName = path.posix.join(entryDirectory, routePathname);
-            experimentalStreamingLambdaPaths.set(outputName, key);
-          }
+          const pprOutputName = path.posix.join(
+            entryDirectory,
+            '/_next/postponed/resume',
+            pageNoExt
+          );
+          lambdas[pprOutputName] = lambda;

+          // We want to add the `experimentalStreamingLambdaPath` to this
+          // output.
+          experimentalStreamingLambdaPaths.set(outputName, pprOutputName);
          continue;
        }

-        if (!group.isAppRouter && !group.isAppRouteHandler) {
-          outputName = normalizeIndexOutput(outputName, true);
-        }
-
        // we add locale prefixed outputs for SSR pages,
        // this is handled in onPrerenderRoute for SSG pages
        if (
@@ -1270,7 +1239,7 @@ export async function serverBuild({
          !isPrerender &&
          !group.isAppRouter &&
          (!isCorrectLocaleAPIRoutes ||
-            !(pageName === 'api' || pageName.startsWith('api/')))
+            !(pageNoExt === 'api' || pageNoExt.startsWith('api/')))
        ) {
          for (const locale of i18n.locales) {
            lambdas[
@@ -1278,7 +1247,7 @@ export async function serverBuild({
                path.posix.join(
                  entryDirectory,
                  locale,
-                  pageName === 'index' ? '' : pageName
+                  pageNoExt === 'index' ? '' : pageNoExt
                ),
                true
              )
@@ -1318,13 +1287,11 @@ export async function serverBuild({
      prerenderRoute(route, {})
    )
  );
-
  await Promise.all(
    Object.keys(prerenderManifest.fallbackRoutes).map(route =>
      prerenderRoute(route, { isFallback: true })
    )
  );
-
  await Promise.all(
    Object.keys(prerenderManifest.blockingFallbackRoutes).map(route =>
      prerenderRoute(route, { isBlocking: true })
@@ -1333,9 +1300,9 @@ export async function serverBuild({

  if (static404Page && canUsePreviewMode) {
    await Promise.all(
-      Array.from(omittedPrerenderRoutes).map(route =>
-        prerenderRoute(route, { isOmitted: true })
-      )
+      [...omittedPrerenderRoutes].map(route => {
+        return prerenderRoute(route, { isOmitted: true });
+      })
    );
  }

@@ -1344,7 +1311,6 @@ export async function serverBuild({
    if (routesManifest?.i18n) {
      route = normalizeLocalePath(route, routesManifest.i18n.locales).pathname;
    }
-
    delete lambdas[
      normalizeIndexOutput(
        path.posix.join('./', entryDirectory, route === '/' ? '/index' : route),
@@ -1368,19 +1334,19 @@ export async function serverBuild({
    middleware.staticRoutes.length > 0 &&
    semver.gte(nextVersion, NEXT_DATA_MIDDLEWARE_RESOLVING_VERSION);

-  const dynamicRoutes = await getDynamicRoutes({
+  const dynamicRoutes = await getDynamicRoutes(
    entryPath,
    entryDirectory,
    dynamicPages,
-    isDev: false,
+    false,
    routesManifest,
-    omittedRoutes: omittedPrerenderRoutes,
+    omittedPrerenderRoutes,
    canUsePreviewMode,
-    bypassToken: prerenderManifest.bypassToken || '',
-    isServerMode: true,
-    dynamicMiddlewareRouteMap: middleware.dynamicRouteMap,
-    experimentalPPRRoutes,
-  }).then(arr =>
+    prerenderManifest.bypassToken || '',
+    true,
+    middleware.dynamicRouteMap,
+    experimental.ppr
+  ).then(arr =>
    localizeDynamicRoutes(
      arr,
      dynamicPrefix,
@@ -1551,10 +1517,9 @@ export async function serverBuild({
        continue;
      }

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

      if (lambdas[pathname]) {
@@ -1574,50 +1539,18 @@ export async function serverBuild({
    'RSC, Next-Router-State-Tree, Next-Router-Prefetch';
  const appNotFoundPath = path.posix.join('.', entryDirectory, '_not-found');

+  const flags: Flag[] = variantsManifest
+    ? Object.entries(variantsManifest).map(([key, value]) => ({
+        key,
+        ...value,
+        metadata: value.metadata ?? {},
+      }))
+    : [];
+
  if (experimental.ppr && !rscPrefetchHeader) {
    throw new Error("Invariant: cannot use PPR without 'rsc.prefetchHeader'");
  }

-  // If we're using the Experimental Partial Prerendering, we should ensure that
-  // all the routes that support it (and are listed) have configured lambdas.
-  // This only applies to routes that do not have fallbacks enabled (these are
-  // routes that have `dynamicParams =  false` defined.
-  if (experimental.ppr) {
-    for (const { srcRoute, dataRoute, experimentalPPR } of Object.values(
-      prerenderManifest.staticRoutes
-    )) {
-      // Only apply this to the routes that support experimental PPR and
-      // that also have their `dataRoute` and `srcRoute` defined.
-      if (!experimentalPPR || !dataRoute || !srcRoute) continue;
-
-      // If the srcRoute is not omitted, then we don't need to do anything. This
-      // is the indicator that a route should only have it's prerender defined
-      // and not a lambda.
-      if (!omittedPrerenderRoutes.has(srcRoute)) continue;
-
-      // The lambda paths have their leading `/` stripped.
-      const srcPathname = srcRoute.substring(1);
-      const dataPathname = dataRoute.substring(1);
-
-      // If we already have an associated lambda for the `.rsc` route, then
-      // we can skip this.
-      const dataPathnameExists = dataPathname in lambdas;
-      if (dataPathnameExists) continue;
-
-      // We require that the source route has a lambda associated with it. If
-      // it doesn't this is an error.
-      const srcPathnameExists = srcPathname in lambdas;
-      if (!srcPathnameExists) {
-        throw new Error(
-          `Invariant: Expected to have a lambda for the source route: ${srcPathname}`
-        );
-      }
-
-      // Associate the data pathname with the source pathname's lambda.
-      lambdas[dataPathname] = lambdas[srcPathname];
-    }
-  }
-
  return {
    wildcard: wildcardConfig,
    images: getImagesConfig(imagesManifest),
@@ -2341,6 +2274,6 @@ export async function serverBuild({
          ]),
    ],
    framework: { version: nextVersion },
-    flags: variantsManifest || undefined,
+    flags,
  };
 }
--- a/packages/next/src/server-launcher.ts
+++ b/packages/next/src/server-launcher.ts
@@ -1,4 +1,4 @@
-import { IncomingMessage, ServerResponse } from 'http';
+import type { IncomingMessage, ServerResponse } from 'http';
 // The Next.js builder can emit the project in a subdirectory depending on how
 // many folder levels of `node_modules` are traced. To ensure `process.cwd()`
 // returns the proper path, we change the directory to the folder with the
@@ -23,8 +23,6 @@ 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__;
@@ -55,6 +53,56 @@ const serve =
 // The default handler method should be exported as a function on the module.
 module.exports = serve(nextServer.getRequestHandler());

+declare const __COMMON_CHUNKS__: string[];
+const commonChunks = __COMMON_CHUNKS__;
+module.exports.preload = async () => {
+  // const start = performance.now();
+  // const failed: string[] = [];
+  // for (const chunk of commonChunks) {
+  //   try {
+  //     require(chunk);
+  //   } catch (e: any) {
+  //     failed.push(e.message);
+  //   }
+  // }
+  // performance.measure('vc:common-chunks', {
+  //   detail: 'Next.js common chunks',
+  //   end: performance.now(),
+  //   start,
+  // });
+  // if (failed.length > 0) {
+  //   throw new Error(
+  //     `Failed to preload chunks: ${failed.length}: ${failed.join(', ')}`
+  //   );
+  // }
+};
+
+declare const __REST_CHUNKS__: string[];
+const restChunks = __REST_CHUNKS__;
+module.exports.postload = async () => {
+  // @ts-ignore
+  const precompile = globalThis[Symbol.for('@vercel/node-module-precompile')];
+  const files = [...commonChunks, ...restChunks];
+  const failed: string[] = [];
+  const success: string[] = [];
+
+  for (const file of files) {
+    try {
+      precompile(require.resolve(file));
+      success.push(file);
+    } catch (error: any) {
+      failed.push(error.message);
+    }
+  }
+
+  console.log('Precompiled files:', success.join(', \n'));
+  if (failed.length > 0) {
+    throw new Error(
+      `Failed to postload chunks: ${failed.length}: ${failed.join(',\n')}`
+    );
+  }
+};
+
 // If available, add `getRequestHandlerWithMetadata` to the export if it's
 // required by the configuration.
 if (
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Javi Velasco	b27501c281	wip	2024-02-06 09:58:28 +01:00
dvoytenko	3f29798a5a	strip to .next, report more failures	2024-01-31 16:17:45 +01:00
dvoytenko	5358a00611	Use absolute paths for require	2024-01-31 16:17:45 +01:00
Javi Velasco	70db54f59b	Add measures	2024-01-31 16:17:45 +01:00
Javi Velasco	aafdd66b79	Use require	2024-01-31 16:17:45 +01:00
Javi Velasco	ca59387aac	Add common and rest of chunks to the server launcher template	2024-01-31 16:17:45 +01:00
Javi Velasco	fb5eac2fbc	Add logic to add common and rest of chunks	2024-01-31 16:17:45 +01:00
				`@@ -1 +0,0 @@`
				`module.exports = (req, res) => res.end('Vercel');`