Version Packages (#10861)

Allows for Ruby 3.2 Serverless Functions to be created.

**Note:** New test fixtures will be added after this is deployed to production.

.github/CODEOWNERS

@@ -2,19 +2,17 @@
 # https://help.github.com/en/articles/about-code-owners
 
 # Restricted Paths
-*                                        @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood @trek
-/.github/workflows                       @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood @trek @ijjk
-/packages/fs-detectors                   @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood @trek @agadzik @chloetedder
-/packages/next                           @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood @trek @ijjk
-/packages/routing-utils                  @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood @trek @ijjk
-/packages/edge                           @vercel/compute
+*                                        @TooTallNate @EndangeredMassa @cb1kenobi @Ethan-Arrowood @trek
+/.github/workflows                       @TooTallNate @EndangeredMassa @cb1kenobi @Ethan-Arrowood @trek @ijjk
+/packages/fs-detectors                   @TooTallNate @EndangeredMassa @cb1kenobi @Ethan-Arrowood @trek @agadzik @chloetedder
+/packages/next                           @TooTallNate @EndangeredMassa @cb1kenobi @Ethan-Arrowood @trek @ijjk @ztanner
+/packages/routing-utils                  @TooTallNate @EndangeredMassa @cb1kenobi @Ethan-Arrowood @trek @ijjk
+/packages/static-build                   @TooTallNate @EndangeredMassa @cb1kenobi @Ethan-Arrowood @trek
+/packages/edge                           @vercel/compute @TooTallNate @EndangeredMassa @cb1kenobi @Ethan-Arrowood @trek
 /examples                                @leerob
 /examples/create-react-app               @Timer
-/examples/nextjs                         @timneutkens @ijjk @styfle
-/examples/hugo                           @styfle
-/examples/jekyll                         @styfle
-/examples/zola                           @styfle
-/packages/node                           @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood @trek @Kikobeats
+/examples/nextjs                         @timneutkens @ijjk @ztanner @huozhi
+/packages/node                           @TooTallNate @EndangeredMassa @cb1kenobi @Ethan-Arrowood @trek @Kikobeats
 
 # Unrestricted Paths
 .changeset/

.github/workflows/cron-update-gatsby-fixtures.yml

@@ -18,7 +18,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-node@v3
         with:
-          node-version: 14
+          node-version: 16
       - name: Enable corepack
         run: corepack enable pnpm
       - name: Update Gatsby Fixtures

.github/workflows/test-lint.yml

@@ -49,3 +49,5 @@ jobs:
       - run: pnpm install
       - run: pnpm run lint
       - run: pnpm run prettier-check
+      - run: pnpm run build
+      - run: pnpm run type-check

.github/workflows/test.yml

@@ -64,12 +64,17 @@ jobs:
           fetch-depth: 2
       - uses: actions/setup-node@v3
         with:
-          node-version: ${{ env.NODE_VERSION }}
+          node-version: ${{ matrix.nodeVersion || env.NODE_VERSION }}
 
       - name: Install Hugo
         if: matrix.runner == 'macos-latest'
         run: curl -L -O https://github.com/gohugoio/hugo/releases/download/v0.56.0/hugo_0.56.0_macOS-64bit.tar.gz && tar -xzf hugo_0.56.0_macOS-64bit.tar.gz && mv ./hugo packages/cli/test/dev/fixtures/08-hugo/
 
+      # yarn 1.22.21 introduced a Corepack bug when running tests.
+      # this can be removed once https://github.com/yarnpkg/yarn/issues/9015 is resolved
+      - name: install yarn@1.22.19
+        run: npm i -g yarn@1.22.19
+
       - name: install pnpm@8.3.1
         run: npm i -g pnpm@8.3.1
 
@@ -83,7 +88,7 @@ jobs:
         env:
           FORCE_COLOR: '1'
       - name: Test ${{matrix.packageName}}
-        run: node utils/gen.js && node_modules/.bin/turbo run test --cache-dir=".turbo" --log-order=stream --scope=${{matrix.packageName}} --no-deps -- ${{ join(matrix.testPaths, ' ') }}
+        run: node utils/gen.js && node_modules/.bin/turbo run test --summarize --cache-dir=".turbo" --log-order=stream --scope=${{matrix.packageName}} --no-deps -- ${{ join(matrix.testPaths, ' ') }}
         shell: bash
         env:
           JEST_JUNIT_OUTPUT_FILE: ${{github.workspace}}/.junit-reports/${{matrix.scriptName}}-${{matrix.packageName}}-${{matrix.chunkNumber}}-${{ matrix.runner }}.xml
@@ -91,13 +96,19 @@ jobs:
           VERCEL_TEST_TOKEN: ${{ secrets.VERCEL_TEST_TOKEN }}
           VERCEL_TEST_REGISTRATION_URL: ${{ secrets.VERCEL_TEST_REGISTRATION_URL }}
           FORCE_COLOR: '1'
-
+      - name: 'Determine Turbo HIT or MISS'
+        if: ${{ !cancelled() }}
+        id: turbo-summary
+        shell: bash
+        run: |
+          TURBO_MISS_COUNT=`node utils/determine-turbo-hit-or-miss.js`
+          echo "MISS COUNT: $TURBO_MISS_COUNT"
+          echo "misses=$TURBO_MISS_COUNT" >> $GITHUB_OUTPUT
       - name: fetch ssl certificate after tests (linux, os x)
         if: matrix.runner != 'windows-latest'
         run: echo | openssl s_client -showcerts -servername 'api.vercel.com' -connect 76.76.21.21:443
-
       - name: 'Upload Test Report to Datadog'
-        if: always()
+        if: ${{ steps['turbo-summary'].outputs.misses != '0' && !cancelled() }}
         run: 'npx @datadog/datadog-ci@2.18.1 junit upload --service vercel-cli .junit-reports'
         env:
           DATADOG_API_KEY: ${{secrets.DATADOG_API_KEY_CLI}}

.github/workflows/update-remix-run-dev.yml

@@ -17,6 +17,8 @@ jobs:
           fetch-depth: 0
       - name: Setup node
         uses: actions/setup-node@v3
+        with:
+          node-version: 16
       - name: Enable corepack
         run: corepack enable pnpm
       - name: Update @remix-run/dev

.node_version

@@ -0,0 +1 @@
+v16.20.2

.nvmrc

@@ -0,0 +1 @@
+16.20.2

DEVELOPING_A_RUNTIME.md

@@ -385,6 +385,7 @@ This is a [class](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Refere
 
 This is an abstract enumeration type that is implemented by one of the following possible `String` values:
 
+- `nodejs20.x`
 - `nodejs18.x`
 - `nodejs16.x`
 - `go1.x`

examples/CHANGELOG.md

@@ -0,0 +1,7 @@
+# examples
+
+## null
+
+### Patch Changes
+
+- update examples to use at least node@16 ([#10395](https://github.com/vercel/vercel/pull/10395))

examples/__tests__/integration/angular.test.ts

@@ -1,5 +1,4 @@
 import { deployExample } from '../test-utils';
-it('should deploy', async () => {
-  await deployExample(__filename);
+it('[examples] should deploy angular', async () => {
+  await deployExample('angular');
 });
-  

examples/__tests__/integration/astro.test.ts

@@ -1,5 +1,4 @@
 import { deployExample } from '../test-utils';
-it('should deploy', async () => {
-  await deployExample(__filename);
+it('[examples] should deploy astro', async () => {
+  await deployExample('astro');
 });
-  

examples/__tests__/integration/blitzjs.test.ts

@@ -1,5 +1,4 @@
 import { deployExample } from '../test-utils';
-it('should deploy', async () => {
-  await deployExample(__filename);
+it('[examples] should deploy blitzjs', async () => {
+  await deployExample('blitzjs');
 });
-  

examples/__tests__/integration/brunch.test.ts

@@ -1,5 +1,4 @@
 import { deployExample } from '../test-utils';
-it('should deploy', async () => {
-  await deployExample(__filename);
+it('[examples] should deploy brunch', async () => {
+  await deployExample('brunch');
 });
-  

examples/__tests__/integration/create-react-app.test.ts

@@ -1,5 +1,4 @@
 import { deployExample } from '../test-utils';
-it('should deploy', async () => {
-  await deployExample(__filename);
+it('[examples] should deploy create-react-app', async () => {
+  await deployExample('create-react-app');
 });
-  

examples/__tests__/integration/docusaurus-2.test.ts

@@ -1,5 +1,4 @@
 import { deployExample } from '../test-utils';
-it('should deploy', async () => {
-  await deployExample(__filename);
+it('[examples] should deploy docusaurus-2', async () => {
+  await deployExample('docusaurus-2');
 });
-  

examples/__tests__/integration/docusaurus.test.ts

@@ -1,5 +1,4 @@
 import { deployExample } from '../test-utils';
-it('should deploy', async () => {
-  await deployExample(__filename);
+it('[examples] should deploy docusaurus', async () => {
+  await deployExample('docusaurus');
 });
-  

examples/__tests__/integration/dojo.test.ts

@@ -1,5 +1,4 @@
 import { deployExample } from '../test-utils';
-it('should deploy', async () => {
-  await deployExample(__filename);
+it('[examples] should deploy dojo', async () => {
+  await deployExample('dojo');
 });
-  

examples/__tests__/integration/eleventy.test.ts

@@ -1,5 +1,4 @@
 import { deployExample } from '../test-utils';
-it('should deploy', async () => {
-  await deployExample(__filename);
+it('[examples] should deploy eleventy', async () => {
+  await deployExample('eleventy');
 });
-  

examples/__tests__/integration/ember.test.ts

@@ -1,5 +1,4 @@
 import { deployExample } from '../test-utils';
-it('should deploy', async () => {
-  await deployExample(__filename);
+it('[examples] should deploy ember', async () => {
+  await deployExample('ember');
 });
-  

examples/__tests__/integration/gatsby.test.ts

@@ -1,5 +1,4 @@
 import { deployExample } from '../test-utils';
-it('should deploy', async () => {
-  await deployExample(__filename);
+it('[examples] should deploy gatsby', async () => {
+  await deployExample('gatsby');
 });
-  

examples/__tests__/integration/gridsome.test.ts

@@ -1,5 +1,4 @@
 import { deployExample } from '../test-utils';
-it('should deploy', async () => {
-  await deployExample(__filename);
+it('[examples] should deploy gridsome', async () => {
+  await deployExample('gridsome');
 });
-  

examples/__tests__/integration/hexo.test.ts

@@ -1,5 +1,4 @@
 import { deployExample } from '../test-utils';
-it('should deploy', async () => {
-  await deployExample(__filename);
+it('[examples] should deploy hexo', async () => {
+  await deployExample('hexo');
 });
-  

examples/__tests__/integration/hugo.test.ts

@@ -1,5 +1,4 @@
 import { deployExample } from '../test-utils';
-it('should deploy', async () => {
-  await deployExample(__filename);
+it('[examples] should deploy hugo', async () => {
+  await deployExample('hugo');
 });
-  

examples/__tests__/integration/hydrogen-2.test.ts

@@ -1,5 +1,4 @@
 import { deployExample } from '../test-utils';
-it('should deploy', async () => {
-  await deployExample(__filename);
+it('[examples] should deploy hydrogen-2', async () => {
+  await deployExample('hydrogen-2');
 });
-  

examples/__tests__/integration/hydrogen.test.ts

@@ -1,5 +1,4 @@
 import { deployExample } from '../test-utils';
-it('should deploy', async () => {
-  await deployExample(__filename);
+it('[examples] should deploy hydrogen', async () => {
+  await deployExample('hydrogen');
 });
-  

examples/__tests__/integration/ionic-angular.test.ts

@@ -1,5 +1,4 @@
 import { deployExample } from '../test-utils';
-it('should deploy', async () => {
-  await deployExample(__filename);
+it('[examples] should deploy ionic-angular', async () => {
+  await deployExample('ionic-angular');
 });
-  

examples/__tests__/integration/ionic-react.test.ts

@@ -1,5 +1,4 @@
 import { deployExample } from '../test-utils';
-it('should deploy', async () => {
-  await deployExample(__filename);
+it('[examples] should deploy ionic-react', async () => {
+  await deployExample('ionic-react');
 });
-  

examples/__tests__/integration/jekyll.test.ts

@@ -1,5 +1,4 @@
 import { deployExample } from '../test-utils';
-it('should deploy', async () => {
-  await deployExample(__filename);
+it('[examples] should deploy jekyll', async () => {
+  await deployExample('jekyll');
 });
-  

examples/__tests__/integration/middleman.test.ts

@@ -1,5 +1,4 @@
 import { deployExample } from '../test-utils';
-it('should deploy', async () => {
-  await deployExample(__filename);
+it('[examples] should deploy middleman', async () => {
+  await deployExample('middleman');
 });
-  

examples/__tests__/integration/nextjs.test.ts

@@ -1,5 +1,4 @@
 import { deployExample } from '../test-utils';
-it('should deploy', async () => {
-  await deployExample(__filename);
+it('[examples] should deploy nextjs', async () => {
+  await deployExample('nextjs');
 });
-  

examples/__tests__/integration/node_modules.test.ts

@@ -1,5 +1,4 @@
 import { deployExample } from '../test-utils';
-it('should deploy', async () => {
-  await deployExample(__filename);
+it('[examples] should deploy node_modules', async () => {
+  await deployExample('node_modules');
 });
-  

examples/__tests__/integration/nuxtjs.test.ts

@@ -1,5 +1,4 @@
 import { deployExample } from '../test-utils';
-it('should deploy', async () => {
-  await deployExample(__filename);
+it('[examples] should deploy nuxtjs', async () => {
+  await deployExample('nuxtjs');
 });
-  

examples/__tests__/integration/parcel.test.ts

@@ -1,5 +1,4 @@
 import { deployExample } from '../test-utils';
-it('should deploy', async () => {
-  await deployExample(__filename);
+it('[examples] should deploy parcel', async () => {
+  await deployExample('parcel');
 });
-  

examples/__tests__/integration/polymer.test.ts

@@ -1,5 +1,4 @@
 import { deployExample } from '../test-utils';
-it('should deploy', async () => {
-  await deployExample(__filename);
+it('[examples] should deploy polymer', async () => {
+  await deployExample('polymer');
 });
-  

examples/__tests__/integration/preact.test.ts

@@ -1,5 +1,4 @@
 import { deployExample } from '../test-utils';
-it('should deploy', async () => {
-  await deployExample(__filename);
+it('[examples] should deploy preact', async () => {
+  await deployExample('preact');
 });
-  

examples/__tests__/integration/redwoodjs.test.ts

@@ -1,5 +1,4 @@
 import { deployExample } from '../test-utils';
-it('should deploy', async () => {
-  await deployExample(__filename);
+it('[examples] should deploy redwoodjs', async () => {
+  await deployExample('redwoodjs');
 });
-  

examples/__tests__/integration/remix.test.ts

@@ -1,5 +1,4 @@
 import { deployExample } from '../test-utils';
-it('should deploy', async () => {
-  await deployExample(__filename);
+it('[examples] should deploy remix', async () => {
+  await deployExample('remix');
 });
-  

examples/__tests__/integration/saber.test.ts

@@ -1,5 +1,4 @@
 import { deployExample } from '../test-utils';
-it('should deploy', async () => {
-  await deployExample(__filename);
+it('[examples] should deploy saber', async () => {
+  await deployExample('saber');
 });
-  

examples/__tests__/integration/sanity.test.ts

@@ -1,5 +1,4 @@
 import { deployExample } from '../test-utils';
-it('should deploy', async () => {
-  await deployExample(__filename);
+it('[examples] should deploy sanity', async () => {
+  await deployExample('sanity');
 });
-  

examples/__tests__/integration/sapper.test.ts

@@ -1,5 +1,4 @@
 import { deployExample } from '../test-utils';
-it('should deploy', async () => {
-  await deployExample(__filename);
+it('[examples] should deploy sapper', async () => {
+  await deployExample('sapper');
 });
-  

examples/__tests__/integration/scully.test.ts

@@ -1,5 +1,4 @@
 import { deployExample } from '../test-utils';
-it('should deploy', async () => {
-  await deployExample(__filename);
+it('[examples] should deploy scully', async () => {
+  await deployExample('scully');
 });
-  

examples/__tests__/integration/solidstart.test.ts

@@ -1,5 +1,4 @@
 import { deployExample } from '../test-utils';
-it('should deploy', async () => {
-  await deployExample(__filename);
+it('[examples] should deploy solidstart', async () => {
+  await deployExample('solidstart');
 });
-  

examples/__tests__/integration/stencil.test.ts

@@ -1,5 +1,4 @@
 import { deployExample } from '../test-utils';
-it('should deploy', async () => {
-  await deployExample(__filename);
+it('[examples] should deploy stencil', async () => {
+  await deployExample('stencil');
 });
-  

examples/__tests__/integration/storybook.test.ts

@@ -1,4 +1,4 @@
 import { deployExample } from '../test-utils';
-it('should deploy', async () => {
-  await deployExample(__filename);
+it('[examples] should deploy storybook', async () => {
+  await deployExample('storybook');
 });

examples/__tests__/integration/svelte.test.ts

@@ -1,5 +1,4 @@
 import { deployExample } from '../test-utils';
-it('should deploy', async () => {
-  await deployExample(__filename);
+it('[examples] should deploy svelte', async () => {
+  await deployExample('svelte');
 });
-  

examples/__tests__/integration/sveltekit-1.test.ts

@@ -1,5 +1,4 @@
 import { deployExample } from '../test-utils';
-it('should deploy', async () => {
-  await deployExample(__filename);
+it('[examples] should deploy sveltekit-1', async () => {
+  await deployExample('sveltekit-1');
 });
-  

examples/__tests__/integration/sveltekit.test.ts

@@ -1,5 +1,4 @@
 import { deployExample } from '../test-utils';
-it('should deploy', async () => {
-  await deployExample(__filename);
+it('[examples] should deploy sveltekit', async () => {
+  await deployExample('sveltekit');
 });
-  

examples/__tests__/integration/umijs.test.ts

@@ -1,5 +1,4 @@
 import { deployExample } from '../test-utils';
-it('should deploy', async () => {
-  await deployExample(__filename);
+it('[examples] should deploy umijs', async () => {
+  await deployExample('umijs');
 });
-  

examples/__tests__/integration/vite.test.ts

@@ -1,5 +1,4 @@
 import { deployExample } from '../test-utils';
-it('should deploy', async () => {
-  await deployExample(__filename);
+it('[examples] should deploy vite', async () => {
+  await deployExample('vite');
 });
-  

examples/__tests__/integration/vitepress.test.ts

@@ -1,5 +1,4 @@
 import { deployExample } from '../test-utils';
-it('should deploy', async () => {
-  await deployExample(__filename);
+it('[examples] should deploy vitepress', async () => {
+  await deployExample('vitepress');
 });
-  

examples/__tests__/integration/vue.test.ts

@@ -1,5 +1,4 @@
 import { deployExample } from '../test-utils';
-it('should deploy', async () => {
-  await deployExample(__filename);
+it('[examples] should deploy vue', async () => {
+  await deployExample('vue');
 });
-  

examples/__tests__/integration/vuepress.test.ts

@@ -1,5 +1,4 @@
 import { deployExample } from '../test-utils';
-it('should deploy', async () => {
-  await deployExample(__filename);
+it('[examples] should deploy vuepress', async () => {
+  await deployExample('vuepress');
 });
-  

examples/__tests__/integration/zola.test.ts

@@ -1,5 +1,4 @@
 import { deployExample } from '../test-utils';
-it('should deploy', async () => {
-  await deployExample(__filename);
+it('[examples] should deploy zola', async () => {
+  await deployExample('zola');
 });
-  

examples/astro/README.md

@@ -3,9 +3,10 @@
 This directory is a brief example of an [Astro](https://astro.build/) site that can be deployed to Vercel with zero configuration. This demo showcases:
 
 - `/` - A static page (pre-rendered)
-- `/ssr` - A page that uses server-side rendering (through Vercel Edge Functions)
-- `/ssr-with-swr-caching` - Similar to the previous page, but also caches the response on the Vercel Edge Network using `cache-control` headers
-- `/edge.json` - An Astro API Endpoint that returns JSON data using Vercel Edge Functions
+- `/ssr` - A page that uses server-side rendering (through [Vercel Edge Functions](https://vercel.com/docs/functions/edge-functions))
+- `/ssr-with-swr-caching` - Similar to the previous page, but also caches the response on the [Vercel Edge Network](https://vercel.com/docs/edge-network/overview) using `cache-control` headers
+- `/image` - Astro [Asset](https://docs.astro.build/en/guides/assets/) using Vercel [Image Optimization](https://vercel.com/docs/image-optimization)
+- `/edge.json` - An Astro API Endpoint that returns JSON data using [Vercel Edge Functions](https://vercel.com/docs/functions/edge-functions)
 
 Learn more about [Astro on Vercel](https://vercel.com/docs/frameworks/astro).
 

examples/astro/astro.config.mjs

@@ -1,7 +1,17 @@
 import { defineConfig } from 'astro/config';
+// Use Vercel Edge Functions (Recommended)
 import vercel from '@astrojs/vercel/edge';
+// Can also use Serverless Functions
+// import vercel from '@astrojs/vercel/serverless';
+// Or a completely static build
+// import vercel from '@astrojs/vercel/static';
 
 export default defineConfig({
   output: 'server',
-  adapter: vercel(),
+  experimental: {
+    assets: true
+   },
+  adapter: vercel({
+    imageService: true,
+  }),
 });

examples/astro/package.json

@@ -8,8 +8,8 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/vercel": "3.2.2",
-    "astro": "^2.2.1",
+    "@astrojs/vercel": "3.8.2",
+    "astro": "^2.10.14",
     "react": "18.2.0",
     "web-vitals": "^3.3.1"
   }

examples/astro/src/env.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="astro/client" />
+/// <reference types="astro/client-image" />
 
 interface ImportMetaEnv {
 	readonly PUBLIC_VERCEL_ANALYTICS_ID: string;

examples/astro/src/pages/image.astro

@@ -0,0 +1,6 @@
+---
+import { Image } from 'astro:assets';
+import astroLogo from '../assets/logo.png';
+---
+
+<Image src={astroLogo} alt="Astro Logo" width={50} quality={75} />

examples/ionic-angular/src/index.html

@@ -29,7 +29,7 @@
 
   <!-- Replace the API key with your own, see:
     https://developers.google.com/maps/documentation/javascript/get-api-key -->
-  <!-- <script async="" defer="" src="https://maps.googleapis.com/maps/api/js?key=AIzaSyB8pf6ZdFQj5qw7rc_HSGrhUwQKfIe9ICw"></script> -->
+  <!-- <script async="" defer="" src="https://maps.googleapis.com/maps/api/js?key=<YOUR_GOOGLE_MAPS_API_KEY>"></script> -->
 
   <noscript>Please enable JavaScript to continue using this application.</noscript>
 </body>

examples/nextjs/.gitignore

@@ -4,6 +4,7 @@
 /node_modules
 /.pnp
 .pnp.js
+.yarn/install-state.gz
 
 # testing
 /coverage

examples/nextjs/README.md

@@ -10,6 +10,8 @@ npm run dev
 yarn dev
 # or
 pnpm dev
+# or
+bun dev
 ```
 
 Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.

examples/nextjs/app/layout.tsx

@@ -1,6 +1,6 @@
-import './globals.css'
 import type { Metadata } from 'next'
 import { Inter } from 'next/font/google'
+import './globals.css'
 
 const inter = Inter({ subsets: ['latin'] })
 

examples/nextjs/app/page.tsx

@@ -87,7 +87,7 @@ export default function Home() {
             </span>
           </h2>
           <p className={`m-0 max-w-[30ch] text-sm opacity-50`}>
-            Explore the Next.js 13 playground.
+            Explore starter templates for Next.js.
           </p>
         </a>
 

examples/nextjs/package.json

@@ -9,17 +9,19 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@types/node": "20.5.1",
-    "@types/react": "18.2.20",
-    "@types/react-dom": "18.2.7",
-    "autoprefixer": "10.4.15",
-    "eslint": "8.47.0",
-    "eslint-config-next": "13.4.19",
-    "next": "13.4.19",
-    "postcss": "8.4.28",
-    "react": "18.2.0",
-    "react-dom": "18.2.0",
-    "tailwindcss": "3.3.3",
-    "typescript": "5.1.6"
+    "react": "^18",
+    "react-dom": "^18",
+    "next": "14.0.3"
+  },
+  "devDependencies": {
+    "typescript": "^5",
+    "@types/node": "^20",
+    "@types/react": "^18",
+    "@types/react-dom": "^18",
+    "autoprefixer": "^10.0.1",
+    "postcss": "^8",
+    "tailwindcss": "^3.3.0",
+    "eslint": "^8",
+    "eslint-config-next": "14.0.3"
   }
 }

examples/package.json

@@ -9,6 +9,7 @@
   },
   "devDependencies": {
     "@types/jest": "27.4.1",
-    "@vercel/frameworks": "2.0.1"
-  }
+    "@vercel/frameworks": "2.0.3"
+  },
+  "version": null
 }

examples/polymer/package.json

@@ -30,6 +30,6 @@
     "wct-browser-legacy": "^1.0.0"
   },
   "engines": {
-    "node": ">=8.0"
+    "node": ">=16.0"
   }
 }

examples/redwoodjs/package.json

@@ -14,7 +14,7 @@
     "extends": "@redwoodjs/eslint-config"
   },
   "engines": {
-    "node": ">=12",
+    "node": "16.x",
     "yarn": ">=1.15"
   }
 }

examples/remix/.gitignore

@@ -4,9 +4,4 @@ node_modules
 /build
 /public/build
 .env
-
 .vercel
-.output
-
-/api/index.js
-/api/index.js.map

examples/remix/README.md

@@ -2,6 +2,12 @@
 
 This directory is a brief example of a [Remix](https://remix.run/docs) site that can be deployed to Vercel with zero configuration.
 
+To get started, run the Remix cli with this template
+
+```sh
+npx create-remix@latest --template vercel/vercel/examples/remix
+```
+
 ## Deploy Your Own
 
 [![Deploy with Vercel](https://vercel.com/button)](https://vercel.com/new/clone?repository-url=https://github.com/vercel/vercel/tree/main/examples/remix&template=remix)

examples/remix/app/root.tsx

@@ -19,7 +19,7 @@ export default function App() {
     <html lang="en">
       <head>
         <meta charSet="utf-8" />
-        <meta name="viewport" content="width=device-width,initial-scale=1" />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
         <Meta />
         <Links />
       </head>

examples/remix/app/routes/_index.tsx

@@ -1,10 +1,15 @@
-import type { V2_MetaFunction } from "@vercel/remix";
+import type { MetaFunction } from "@vercel/remix";
 
-export const meta: V2_MetaFunction = () => [{ title: "New Remix App" }];
+export const meta: MetaFunction = () => {
+  return [
+    { title: "New Remix App" },
+    { name: "description", content: "Welcome to Remix!" },
+  ];
+};
 
 export default function Index() {
   return (
-    <div style={{ fontFamily: "system-ui, sans-serif", lineHeight: "1.4" }}>
+    <div style={{ fontFamily: "system-ui, sans-serif", lineHeight: "1.8" }}>
       <h1>Welcome to Remix</h1>
       <ul>
         <li>

examples/remix/app/routes/edge.tsx

@@ -1,8 +1,8 @@
-import type { V2_MetaFunction } from "@vercel/remix";
+import type { MetaFunction } from "@vercel/remix";
 
 export const config = { runtime: "edge" };
 
-export const meta: V2_MetaFunction = () => [{ title: "Remix@Edge | New Remix App" }];
+export const meta: MetaFunction = () => [{ title: "Remix@Edge | New Remix App" }];
 
 export default function Edge() {
   return (

examples/remix/package.json

@@ -1,32 +1,34 @@
 {
+  "name": "my-remix-app",
   "private": true,
   "sideEffects": false,
+  "type": "module",
   "scripts": {
     "build": "remix build",
-    "dev": "remix dev",
-    "start": "remix-serve build",
+    "dev": "remix dev --manual",
+    "start": "remix-serve ./build/index.js",
     "typecheck": "tsc"
   },
   "dependencies": {
-    "@remix-run/css-bundle": "^1.18.0",
-    "@remix-run/node": "^1.18.0",
-    "@remix-run/react": "^1.18.0",
-    "@remix-run/serve": "^1.18.0",
-    "@vercel/analytics": "^0.1.11",
-    "@vercel/remix": "^1.18.0",
+    "@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": "^1.18.0",
-    "@remix-run/eslint-config": "^1.18.0",
-    "@types/react": "^18.0.25",
-    "@types/react-dom": "^18.0.11",
-    "eslint": "^8.28.0",
-    "typescript": "^5.1.3"
+    "@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"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=18.0.0"
   }
 }

examples/remix/remix.config.js

@@ -1,17 +1,8 @@
 /** @type {import('@remix-run/dev').AppConfig} */
-module.exports = {
-  future: {
-    v2_dev: true,
-    v2_errorBoundary: true,
-    v2_headers: true,
-    v2_meta: true,
-    v2_normalizeFormMethod: true,
-    v2_routeConvention: true,
-  },
+export default {
   ignoredRouteFiles: ["**/.*"],
-  serverModuleFormat: "cjs",
   // appDirectory: "app",
   // assetsBuildDirectory: "public/build",
-  // serverBuildPath: "build/index.js",
   // publicPath: "/build/",
+  // serverBuildPath: "build/index.js",
 };

examples/remix/tsconfig.json

@@ -1,13 +1,13 @@
 {
   "include": ["remix.env.d.ts", "**/*.ts", "**/*.tsx"],
   "compilerOptions": {
-    "lib": ["DOM", "DOM.Iterable", "ES2019"],
+    "lib": ["DOM", "DOM.Iterable", "ES2022"],
     "isolatedModules": true,
     "esModuleInterop": true,
     "jsx": "react-jsx",
-    "moduleResolution": "node",
+    "moduleResolution": "Bundler",
     "resolveJsonModule": true,
-    "target": "ES2019",
+    "target": "ES2022",
     "strict": true,
     "allowJs": true,
     "forceConsistentCasingInFileNames": true,

examples/umijs/package.json

@@ -46,6 +46,6 @@
     ]
   },
   "engines": {
-    "node": ">=8.0.0 <17"
+    "node": "16.x"
   }
 }

examples/vuepress/package.json

@@ -5,7 +5,7 @@
     "build": "vuepress build src"
   },
   "engines": {
-    "node": ">=14.0.0 <18.0.0"
+    "node": ">=16.0.0 <18.0.0"
   },
   "devDependencies": {
     "vuepress": "1.9.7"

internals/get-package-json/package.json

@@ -8,7 +8,7 @@
     "dist"
   ],
   "scripts": {
-    "build": "tsc",
+    "build": "node ../../utils/build.mjs",
     "test": "jest --reporters=default --reporters=jest-junit --env node --verbose --runInBand --bail",
     "test-unit": "pnpm test tests/unit"
   },

internals/get-package-json/tsconfig.json

@@ -1,7 +1,9 @@
 {
   "extends": "@vercel-internals/tsconfig",
   "compilerOptions": {
-    "outDir": "dist"
+    "outDir": "dist",
+    "declaration": true,
+    "emitDeclarationOnly": true
   },
   "include": ["src/**/*"]
 }

internals/types/CHANGELOG.md

@@ -1,5 +1,68 @@
 # @vercel-internals/types
 
+## 1.0.16
+
+### Patch Changes
+
+- Updated dependencies [[`88da7463c`](https://github.com/vercel/vercel/commit/88da7463ce12df91d49fbde85cb617030d55f558)]:
+  - @vercel/build-utils@7.2.5
+
+## 1.0.15
+
+### Patch Changes
+
+- Updated dependencies [[`65dec5b7e`](https://github.com/vercel/vercel/commit/65dec5b7e752f4da8fe0ffdb25215170453f6f8b)]:
+  - @vercel/build-utils@7.2.4
+
+## 1.0.14
+
+### Patch Changes
+
+- Updated dependencies [[`0861dc8fb`](https://github.com/vercel/vercel/commit/0861dc8fbcea1037626b00664a4b6c22f1b0a7ed)]:
+  - @vercel/build-utils@7.2.3
+
+## 1.0.13
+
+### Patch Changes
+
+- Updated dependencies [[`9e9fac019`](https://github.com/vercel/vercel/commit/9e9fac0191cb1428ac9e5479c3d5c8afd7b7d357)]:
+  - @vercel/routing-utils@3.1.0
+
+## 1.0.12
+
+### Patch Changes
+
+- Updated dependencies [[`2f5b0aeeb`](https://github.com/vercel/vercel/commit/2f5b0aeeb183ed3ea8cbc68cb3bc3c949c486ada)]:
+  - @vercel/build-utils@7.2.2
+
+## 1.0.11
+
+### Patch Changes
+
+- Updated dependencies [[`decdf27fb`](https://github.com/vercel/vercel/commit/decdf27fb5ca914fe50a9320c4fd50ef79d2fbb3)]:
+  - @vercel/build-utils@7.2.1
+
+## 1.0.10
+
+### Patch Changes
+
+- Updated dependencies [[`50e04dd85`](https://github.com/vercel/vercel/commit/50e04dd8584664c842a86c15d92d654f4ea8dcbb), [`45b73c7e8`](https://github.com/vercel/vercel/commit/45b73c7e86458564dc0bab007f6f6365c4c4ab5d), [`d8bc570f6`](https://github.com/vercel/vercel/commit/d8bc570f604950d97156d4f33c8accecf3b3b28f)]:
+  - @vercel/build-utils@7.2.0
+
+## 1.0.9
+
+### Patch Changes
+
+- Updated dependencies [[`5609a1187`](https://github.com/vercel/vercel/commit/5609a1187be9d6cf8d5f16825690c5ea72f17dc5), [`1b4de4a98`](https://github.com/vercel/vercel/commit/1b4de4a986f7a612aac834ebae3ec7bb9e9b8cf8)]:
+  - @vercel/build-utils@7.1.1
+
+## 1.0.8
+
+### Patch Changes
+
+- Updated dependencies [[`9e3827c78`](https://github.com/vercel/vercel/commit/9e3827c785e1bc45f2bed421132167381481770f)]:
+  - @vercel/build-utils@7.1.0
+
 ## 1.0.7
 
 ### Patch Changes

internals/types/index.d.ts

@@ -65,6 +65,8 @@ export type User = {
   billing: Billing;
   name?: string;
   limited?: boolean;
+  version?: 'northstar';
+  defaultTeamId?: string;
 };
 
 export interface Team {
@@ -426,7 +428,8 @@ export type ProjectLinkedError = {
     | 'TEAM_DELETED'
     | 'PATH_IS_FILE'
     | 'INVALID_ROOT_DIRECTORY'
-    | 'MISSING_PROJECT_SETTINGS';
+    | 'MISSING_PROJECT_SETTINGS'
+    | 'TOO_MANY_PROJECTS';
 };
 
 export type ProjectLinkResult =

internals/types/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "@vercel-internals/types",
-  "version": "1.0.7",
+  "version": "1.0.16",
   "types": "index.d.ts",
   "main": "index.d.ts",
   "files": [
@@ -10,8 +10,8 @@
   "dependencies": {
     "@types/node": "14.14.31",
     "@vercel-internals/constants": "1.0.4",
-    "@vercel/build-utils": "7.0.0",
-    "@vercel/routing-utils": "3.0.0"
+    "@vercel/build-utils": "7.2.5",
+    "@vercel/routing-utils": "3.1.0"
   },
   "devDependencies": {
     "@vercel-internals/tsconfig": "1.0.0",

package.json

@@ -11,11 +11,12 @@
     "@typescript-eslint/eslint-plugin": "5.21.0",
     "@typescript-eslint/parser": "5.21.0",
     "@vercel/build-utils": "*",
-    "@vercel/ncc": "0.24.0",
+    "@vercel/style-guide": "4.0.2",
     "async-retry": "1.2.3",
     "buffer-replace": "1.0.0",
     "create-svelte": "2.0.1",
     "dot": "1.1.3",
+    "esbuild": "0.19.2",
     "eslint": "8.14.0",
     "eslint-config-prettier": "8.5.0",
     "eslint-plugin-jest": "26.1.5",
@@ -32,7 +33,7 @@
     "source-map-support": "0.5.12",
     "ts-eager": "2.0.2",
     "ts-jest": "29.1.0",
-    "turbo": "1.10.12",
+    "turbo": "1.10.16",
     "typescript": "4.9.5"
   },
   "scripts": {
@@ -49,7 +50,8 @@
     "prepare": "husky install",
     "pack": "cd utils && node -r ts-eager/register ./pack.ts",
     "ci:version": "changeset version && pnpm install --no-frozen-lockfile",
-    "ci:publish": "pnpm publish -r && changeset tag"
+    "ci:publish": "pnpm publish -r && node utils/update-canary-tags.mjs && changeset tag",
+    "type-check": "turbo type-check --concurrency=12 --output-logs=errors-only --summarize --continue"
   },
   "lint-staged": {
     "./{*,{api,packages,test,utils}/**/*}.{js,ts}": [

packages/build-utils/CHANGELOG.md

@@ -1,5 +1,61 @@
 # @vercel/build-utils
 
+## 7.2.5
+
+### Patch Changes
+
+- Remove Node.js v20 env var check ([#10834](https://github.com/vercel/vercel/pull/10834))
+
+## 7.2.4
+
+### Patch Changes
+
+- Select Node.js version based on what's available in build-container ([#10822](https://github.com/vercel/vercel/pull/10822))
+
+## 7.2.3
+
+### Patch Changes
+
+- Add experimental flag to allow Node.js v20 ([#10802](https://github.com/vercel/vercel/pull/10802))
+
+## 7.2.2
+
+### Patch Changes
+
+- [cli] Update bun detection and add tests for projects with both bunlock binary and yarn.lock text files ([#10583](https://github.com/vercel/vercel/pull/10583))
+
+## 7.2.1
+
+### Patch Changes
+
+- Internal variants ([#10549](https://github.com/vercel/vercel/pull/10549))
+
+## 7.2.0
+
+### Minor Changes
+
+- Add new optional prerender field: experimentalStreamingLambdaPath ([#10476](https://github.com/vercel/vercel/pull/10476))
+
+- [build-utils] Add zero config detection for bun package manager ([#10486](https://github.com/vercel/vercel/pull/10486))
+
+### Patch Changes
+
+- add `experimentalBypassFor` field to Prerender ([#10481](https://github.com/vercel/vercel/pull/10481))
+
+## 7.1.1
+
+### Patch Changes
+
+- add descriptions to NodeVersion properties ([#10403](https://github.com/vercel/vercel/pull/10403))
+
+- Updated semver dependency ([#10411](https://github.com/vercel/vercel/pull/10411))
+
+## 7.1.0
+
+### Minor Changes
+
+- Support serverless function architecture ([#10392](https://github.com/vercel/vercel/pull/10392))
+
 ## 7.0.0
 
 ### Major Changes

packages/build-utils/build.js

@@ -1,30 +0,0 @@
-#!/usr/bin/env node
-const fs = require('fs-extra');
-const execa = require('execa');
-const { join } = require('path');
-
-async function main() {
-  const outDir = join(__dirname, 'dist');
-
-  // Start fresh
-  await fs.remove(outDir);
-
-  // Compile TypeScript
-  await execa('tsc', [], { stdio: 'inherit' });
-
-  // Run `ncc`
-  const mainDir = join(outDir, 'main');
-  await execa('ncc', ['build', 'src/index.ts', '-o', mainDir], {
-    stdio: 'inherit',
-  });
-  // Move compiled ncc file to out dir
-  await fs.rename(join(mainDir, 'index.js'), join(outDir, 'index.js'));
-
-  // Delete leftover "main" dir
-  await fs.remove(mainDir);
-}
-
-main().catch(err => {
-  console.error(err);
-  process.exit(1);
-});

packages/build-utils/build.mjs

@@ -0,0 +1,3 @@
+import { tsc, esbuild } from '../../utils/build.mjs';
+
+await Promise.all([tsc(), esbuild().then(() => esbuild({ bundle: true }))]);

packages/build-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "7.0.0",
+  "version": "7.2.5",
   "license": "Apache-2.0",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",
@@ -11,10 +11,11 @@
     "directory": "packages/now-build-utils"
   },
   "scripts": {
-    "build": "node build",
+    "build": "node build.mjs",
     "test": "jest --reporters=default --reporters=jest-junit --env node --verbose --runInBand --bail",
     "test-unit": "pnpm test test/unit.*test.*",
-    "test-e2e": "pnpm test test/integration.test.ts"
+    "test-e2e": "pnpm test test/integration.test.ts",
+    "type-check": "tsc --noEmit"
   },
   "devDependencies": {
     "@iarna/toml": "2.2.3",
@@ -32,8 +33,7 @@
     "@types/node-fetch": "^2.1.6",
     "@types/semver": "6.0.0",
     "@types/yazl": "2.4.2",
-    "@vercel/error-utils": "2.0.1",
-    "@vercel/ncc": "0.24.0",
+    "@vercel/error-utils": "2.0.2",
     "aggregate-error": "3.0.1",
     "async-retry": "1.2.3",
     "async-sema": "2.1.4",
@@ -49,7 +49,7 @@
     "minimatch": "3.1.2",
     "multistream": "2.1.1",
     "node-fetch": "2.6.7",
-    "semver": "6.1.1",
+    "semver": "6.3.1",
     "typescript": "4.9.5",
     "yazl": "2.5.1"
   }

packages/build-utils/src/fs/node-version.ts

@@ -1,10 +1,14 @@
+import { statSync } from 'fs';
 import { intersects, validRange } from 'semver';
 import { NodeVersion } from '../types';
 import { NowBuildError } from '../errors';
 import debug from '../debug';
 
+export type NodeVersionMajor = ReturnType<typeof getOptions>[number]['major'];
+
 function getOptions() {
   const options = [
+    { major: 20, range: '20.x', runtime: 'nodejs20.x' },
     { major: 18, range: '18.x', runtime: 'nodejs18.x' },
     {
       major: 16,
@@ -40,15 +44,44 @@ function getOptions() {
   return options;
 }
 
-function getHint(isAuto = false) {
-  const { major, range } = getLatestNodeVersion();
+function isNodeVersionAvailable(version: NodeVersion): boolean {
+  try {
+    return statSync(`/node${version.major}`).isDirectory();
+  } catch {
+    // ENOENT, or any other error, we don't care about
+  }
+  return false;
+}
+
+export function getAvailableNodeVersions(): NodeVersionMajor[] {
+  return getOptions()
+    .filter(isNodeVersionAvailable)
+    .map(n => n.major);
+}
+
+function getHint(isAuto = false, availableVersions?: NodeVersionMajor[]) {
+  const { major, range } = getLatestNodeVersion(availableVersions);
   return isAuto
     ? `Please set Node.js Version to ${range} in your Project Settings to use Node.js ${major}.`
     : `Please set "engines": { "node": "${range}" } in your \`package.json\` file to use Node.js ${major}.`;
 }
 
-export function getLatestNodeVersion() {
-  return getOptions()[0];
+export function getLatestNodeVersion(availableVersions?: NodeVersionMajor[]) {
+  const all = getOptions();
+  if (availableVersions) {
+    // Return the first node version that is definitely
+    // available in the build-container.
+    for (const version of all) {
+      for (const major of availableVersions) {
+        if (version.major === major) {
+          return version;
+        }
+      }
+    }
+  }
+  // As a fallback for local `vc build` and the tests,
+  // return the first node version if none is found.
+  return all[0];
 }
 
 export function getDiscontinuedNodeVersions(): NodeVersion[] {
@@ -57,9 +90,10 @@ export function getDiscontinuedNodeVersions(): NodeVersion[] {
 
 export async function getSupportedNodeVersion(
   engineRange: string | undefined,
-  isAuto = false
+  isAuto = false,
+  availableVersions?: NodeVersionMajor[]
 ): Promise<NodeVersion> {
-  let selection: NodeVersion = getLatestNodeVersion();
+  let selection: NodeVersion | undefined;
 
   if (engineRange) {
     const found =
@@ -68,19 +102,29 @@ export async function getSupportedNodeVersion(
         // the array is already in order so return the first
         // match which will be the newest version of node
         selection = o;
-        return intersects(o.range, engineRange);
+        return (
+          intersects(o.range, engineRange) &&
+          (availableVersions?.length
+            ? availableVersions.includes(o.major)
+            : true)
+        );
       });
     if (!found) {
       throw new NowBuildError({
         code: 'BUILD_UTILS_NODE_VERSION_INVALID',
         link: 'http://vercel.link/node-version',
         message: `Found invalid Node.js Version: "${engineRange}". ${getHint(
-          isAuto
+          isAuto,
+          availableVersions
         )}`,
       });
     }
   }
 
+  if (!selection) {
+    selection = getLatestNodeVersion(availableVersions);
+  }
+
   if (isDiscontinued(selection)) {
     const intro = `Node.js Version "${selection.range}" is discontinued and must be upgraded.`;
     throw new NowBuildError({

packages/build-utils/src/fs/run-user-scripts.ts

@@ -9,14 +9,18 @@ import { deprecate } from 'util';
 import debug from '../debug';
 import { NowBuildError } from '../errors';
 import { Meta, PackageJson, NodeVersion, Config } from '../types';
-import { getSupportedNodeVersion, getLatestNodeVersion } from './node-version';
+import {
+  getSupportedNodeVersion,
+  getLatestNodeVersion,
+  getAvailableNodeVersions,
+} from './node-version';
 import { readConfigFile } from './read-config-file';
 import { cloneEnv } from '../clone-env';
 
 // Only allow one `runNpmInstall()` invocation to run concurrently
 const runNpmInstallSema = new Sema(1);
 
-export type CliType = 'yarn' | 'npm' | 'pnpm';
+export type CliType = 'yarn' | 'npm' | 'pnpm' | 'bun';
 
 export interface ScanParentDirsResult {
   /**
@@ -238,9 +242,10 @@ export async function getNodeVersion(
   destPath: string,
   nodeVersionFallback = process.env.VERCEL_PROJECT_SETTINGS_NODE_VERSION,
   config: Config = {},
-  meta: Meta = {}
+  meta: Meta = {},
+  availableVersions = getAvailableNodeVersions()
 ): Promise<NodeVersion> {
-  const latest = getLatestNodeVersion();
+  const latest = getLatestNodeVersion(availableVersions);
   if (meta.isDev) {
     // Use the system-installed version of `node` in PATH for `vercel dev`
     return { ...latest, runtime: 'nodejs' };
@@ -266,7 +271,7 @@ export async function getNodeVersion(
     nodeVersion = node;
     isAuto = false;
   }
-  return getSupportedNodeVersion(nodeVersion, isAuto);
+  return getSupportedNodeVersion(nodeVersion, isAuto, availableVersions);
 }
 
 export async function scanParentDirs(
@@ -284,27 +289,40 @@ export async function scanParentDirs(
     readPackageJson && pkgJsonPath
       ? JSON.parse(await fs.readFile(pkgJsonPath, 'utf8'))
       : undefined;
-  const [yarnLockPath, npmLockPath, pnpmLockPath] = await walkParentDirsMulti({
-    base: '/',
-    start: destPath,
-    filenames: ['yarn.lock', 'package-lock.json', 'pnpm-lock.yaml'],
-  });
+  const [yarnLockPath, npmLockPath, pnpmLockPath, bunLockPath] =
+    await walkParentDirsMulti({
+      base: '/',
+      start: destPath,
+      filenames: [
+        'yarn.lock',
+        'package-lock.json',
+        'pnpm-lock.yaml',
+        'bun.lockb',
+      ],
+    });
   let lockfilePath: string | undefined;
   let lockfileVersion: number | undefined;
   let cliType: CliType = 'yarn';
 
-  const [hasYarnLock, packageLockJson, pnpmLockYaml] = await Promise.all([
-    Boolean(yarnLockPath),
-    npmLockPath
-      ? readConfigFile<{ lockfileVersion: number }>(npmLockPath)
-      : null,
-    pnpmLockPath
-      ? readConfigFile<{ lockfileVersion: number }>(pnpmLockPath)
-      : null,
-  ]);
+  const [hasYarnLock, packageLockJson, pnpmLockYaml, bunLockBin] =
+    await Promise.all([
+      Boolean(yarnLockPath),
+      npmLockPath
+        ? readConfigFile<{ lockfileVersion: number }>(npmLockPath)
+        : null,
+      pnpmLockPath
+        ? readConfigFile<{ lockfileVersion: number }>(pnpmLockPath)
+        : null,
+      bunLockPath ? fs.readFile(bunLockPath, 'utf8') : null,
+    ]);
 
-  // Priority order is Yarn > pnpm > npm
-  if (hasYarnLock) {
+  // Priority order is bun with yarn lock > yarn > pnpm > npm > bun
+  if (bunLockBin && hasYarnLock) {
+    cliType = 'bun';
+    lockfilePath = bunLockPath;
+    // TODO: read "bun-lockfile-format-v0"
+    lockfileVersion = 0;
+  } else if (hasYarnLock) {
     cliType = 'yarn';
     lockfilePath = yarnLockPath;
   } else if (pnpmLockYaml) {
@@ -315,6 +333,11 @@ export async function scanParentDirs(
     cliType = 'npm';
     lockfilePath = npmLockPath;
     lockfileVersion = packageLockJson.lockfileVersion;
+  } else if (bunLockBin) {
+    cliType = 'bun';
+    lockfilePath = bunLockPath;
+    // TODO: read "bun-lockfile-format-v0"
+    lockfileVersion = 0;
   }
 
   const packageJsonPath = pkgJsonPath || undefined;
@@ -451,6 +474,10 @@ export async function runNpmInstall(
       commandArgs = args
         .filter(a => a !== '--prefer-offline')
         .concat(['install', '--unsafe-perm']);
+    } else if (cliType === 'bun') {
+      // @see options https://bun.sh/docs/cli/install
+      opts.prettyCommand = 'bun install';
+      commandArgs = ['install', ...args];
     } else {
       opts.prettyCommand = 'yarn install';
       commandArgs = ['install', ...args];
@@ -505,6 +532,7 @@ export function getEnvForPackageManager({
   const npm7 = '/node16/bin-npm7';
   const pnpm7 = '/pnpm7/node_modules/.bin';
   const pnpm8 = '/pnpm8/node_modules/.bin';
+  const bun1 = '/bun1';
   const corepackEnabled = env.ENABLE_EXPERIMENTAL_COREPACK === '1';
   if (cliType === 'npm') {
     if (
@@ -516,7 +544,7 @@ export function getEnvForPackageManager({
     ) {
       // Ensure that npm 7 is at the beginning of the `$PATH`
       newEnv.PATH = `${npm7}${path.delimiter}${oldPath}`;
-      console.log('Detected `package-lock.json` generated by npm 7+...');
+      console.log('Detected `package-lock.json` generated by npm 7+');
     }
   } else if (cliType === 'pnpm') {
     if (
@@ -528,7 +556,7 @@ export function getEnvForPackageManager({
       // Ensure that pnpm 7 is at the beginning of the `$PATH`
       newEnv.PATH = `${pnpm7}${path.delimiter}${oldPath}`;
       console.log(
-        `Detected \`pnpm-lock.yaml\` version ${lockfileVersion} generated by pnpm 7...`
+        `Detected \`pnpm-lock.yaml\` version ${lockfileVersion} generated by pnpm 7`
       );
     } else if (
       typeof lockfileVersion === 'number' &&
@@ -539,7 +567,16 @@ export function getEnvForPackageManager({
       // Ensure that pnpm 8 is at the beginning of the `$PATH`
       newEnv.PATH = `${pnpm8}${path.delimiter}${oldPath}`;
       console.log(
-        `Detected \`pnpm-lock.yaml\` version ${lockfileVersion} generated by pnpm 8...`
+        `Detected \`pnpm-lock.yaml\` version ${lockfileVersion} generated by pnpm 8`
+      );
+    }
+  } else if (cliType === 'bun') {
+    if (!oldPath.includes(bun1) && !corepackEnabled) {
+      // Ensure that Bun 1 is at the beginning of the `$PATH`
+      newEnv.PATH = `${bun1}${path.delimiter}${oldPath}`;
+      console.log('Detected `bun.lockb` generated by Bun');
+      console.warn(
+        'Warning: Bun is used as a package manager at build time only, not at runtime with Functions'
       );
     }
   } else {
@@ -548,7 +585,6 @@ export function getEnvForPackageManager({
       newEnv.YARN_NODE_LINKER = 'node-modules';
     }
   }
-
   return newEnv;
 }
 
@@ -614,6 +650,8 @@ export async function runPackageJsonScript(
     opts.prettyCommand = `npm run ${scriptName}`;
   } else if (cliType === 'pnpm') {
     opts.prettyCommand = `pnpm run ${scriptName}`;
+  } else if (cliType === 'bun') {
+    opts.prettyCommand = `bun run ${scriptName}`;
   } else {
     opts.prettyCommand = `yarn run ${scriptName}`;
   }

packages/build-utils/src/lambda.ts

@@ -13,9 +13,12 @@ interface Environment {
 
 export type LambdaOptions = LambdaOptionsWithFiles | LambdaOptionsWithZipBuffer;
 
+export type LambdaArchitecture = 'x86_64' | 'arm64';
+
 export interface LambdaOptionsBase {
   handler: string;
   runtime: string;
+  architecture?: LambdaArchitecture;
   memory?: number;
   maxDuration?: number;
   environment?: Environment;
@@ -62,6 +65,7 @@ export class Lambda {
   files?: Files;
   handler: string;
   runtime: string;
+  architecture?: LambdaArchitecture;
   memory?: number;
   maxDuration?: number;
   environment: Environment;
@@ -81,6 +85,7 @@ export class Lambda {
       handler,
       runtime,
       maxDuration,
+      architecture,
       memory,
       environment = {},
       allowQuery,
@@ -102,6 +107,13 @@ export class Lambda {
     assert(typeof runtime === 'string', '"runtime" is not a string');
     assert(typeof environment === 'object', '"environment" is not an object');
 
+    if (architecture !== undefined) {
+      assert(
+        architecture === 'x86_64' || architecture === 'arm64',
+        '"architecture" must be either "x86_64" or "arm64"'
+      );
+    }
+
     if (memory !== undefined) {
       assert(typeof memory === 'number', '"memory" is not a number');
     }
@@ -159,6 +171,7 @@ export class Lambda {
     this.files = 'files' in opts ? opts.files : undefined;
     this.handler = handler;
     this.runtime = runtime;
+    this.architecture = architecture;
     this.memory = memory;
     this.maxDuration = maxDuration;
     this.environment = environment;

packages/build-utils/src/prerender.ts

@@ -1,4 +1,4 @@
-import { File } from './types';
+import type { File, HasField } from './types';
 import { Lambda } from './lambda';
 
 interface PrerenderOptions {
@@ -12,6 +12,8 @@ interface PrerenderOptions {
   initialStatus?: number;
   passQuery?: boolean;
   sourcePath?: string;
+  experimentalBypassFor?: HasField;
+  experimentalStreamingLambdaPath?: string;
 }
 
 export class Prerender {
@@ -26,6 +28,8 @@ export class Prerender {
   public initialStatus?: number;
   public passQuery?: boolean;
   public sourcePath?: string;
+  public experimentalBypassFor?: HasField;
+  public experimentalStreamingLambdaPath?: string;
 
   constructor({
     expiration,
@@ -38,6 +42,8 @@ export class Prerender {
     initialStatus,
     passQuery,
     sourcePath,
+    experimentalBypassFor,
+    experimentalStreamingLambdaPath,
   }: PrerenderOptions) {
     this.type = 'Prerender';
     this.expiration = expiration;
@@ -86,6 +92,26 @@ export class Prerender {
       );
     }
 
+    if (experimentalBypassFor !== undefined) {
+      if (
+        !Array.isArray(experimentalBypassFor) ||
+        experimentalBypassFor.some(
+          field =>
+            typeof field !== 'object' ||
+            // host doesn't need a key
+            (field.type !== 'host' && typeof field.key !== 'string') ||
+            typeof field.type !== 'string' ||
+            (field.value !== undefined && typeof field.value !== 'string')
+        )
+      ) {
+        throw new Error(
+          'The `experimentalBypassFor` argument for `Prerender` must be Array of objects with fields `type`, `key` and optionally `value`.'
+        );
+      }
+
+      this.experimentalBypassFor = experimentalBypassFor;
+    }
+
     if (typeof fallback === 'undefined') {
       throw new Error(
         'The `fallback` argument for `Prerender` needs to be a `FileBlob`, `FileFsRef`, `FileRef`, or null.'
@@ -130,5 +156,14 @@ export class Prerender {
       }
       this.allowQuery = allowQuery;
     }
+
+    if (experimentalStreamingLambdaPath !== undefined) {
+      if (typeof experimentalStreamingLambdaPath !== 'string') {
+        throw new Error(
+          'The `experimentalStreamingLambdaPath` argument for `Prerender` must be a string.'
+        );
+      }
+      this.experimentalStreamingLambdaPath = experimentalStreamingLambdaPath;
+    }
   }
 }