Version Packages (#10832)

This PR was opened by the [Changesets release](https://github.com/changesets/action) GitHub action. When you're ready to do a release, you can merge this and the packages will be published to npm automatically. If you're not ready to do a release yet, that's fine, whenever you add more changesets to main, this PR will be updated.


# Releases
## @vercel/build-utils@7.2.4

### Patch Changes

-   Select Node.js version based on what's available in build-container ([#10822](https://github.com/vercel/vercel/pull/10822))

## vercel@32.5.4

### Patch Changes

-   Updated dependencies \[[`65dec5b7e`](65dec5b7e7)]:
    -   @vercel/build-utils@7.2.4
    -   @vercel/node@3.0.10
    -   @vercel/static-build@2.0.11

## @vercel/client@13.0.8

### Patch Changes

-   Updated dependencies \[[`65dec5b7e`](65dec5b7e7)]:
    -   @vercel/build-utils@7.2.4

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

### Patch Changes

-   Updated dependencies \[[`65dec5b7e`](65dec5b7e7)]:
    -   @vercel/build-utils@7.2.4

## @vercel/node@3.0.10

### Patch Changes

-   Updated dependencies \[[`65dec5b7e`](65dec5b7e7)]:
    -   @vercel/build-utils@7.2.4

## @vercel/static-build@2.0.11

### Patch Changes

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

## @vercel-internals/types@1.0.15

### Patch Changes

-   Updated dependencies \[[`65dec5b7e`](65dec5b7e7)]:
    -   @vercel/build-utils@7.2.4

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)

internals/types/CHANGELOG.md

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

internals/types/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "@vercel-internals/types",
-  "version": "1.0.14",
+  "version": "1.0.15",
   "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.2.3",
+    "@vercel/build-utils": "7.2.4",
     "@vercel/routing-utils": "3.1.0"
   },
   "devDependencies": {

packages/build-utils/CHANGELOG.md

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

packages/build-utils/package.json

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

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

@@ -1,8 +1,11 @@
+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: 18, range: '18.x', runtime: 'nodejs18.x' },
@@ -46,6 +49,21 @@ function getOptions() {
   return options;
 }
 
+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) {
   const { major, range } = getLatestNodeVersion();
   return isAuto
@@ -53,8 +71,22 @@ function getHint(isAuto = false) {
     : `Please set "engines": { "node": "${range}" } in your \`package.json\` file to use Node.js ${major}.`;
 }
 
-export function getLatestNodeVersion() {
+export function getLatestNodeVersion(availableVersions?: NodeVersionMajor[]) {
-  return getOptions()[0];
+  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[] {
@@ -63,9 +95,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 =
@@ -74,7 +107,12 @@ 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({
@@ -87,6 +125,10 @@ export async function getSupportedNodeVersion(
     }
   }
 
+  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,7 +9,11 @@ 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';
 
@@ -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(

packages/build-utils/test/unit.test.ts

@@ -127,6 +127,27 @@ it('should allow nodejs18.x', async () => {
   expect(await getSupportedNodeVersion('>=16')).toHaveProperty('major', 18);
 });
 
+it('should not allow nodejs20.x when not available', async () => {
+  // Simulates AL2 build-container
+  await expect(
+    getSupportedNodeVersion('20.x', true, [14, 16, 18])
+  ).rejects.toThrow(
+    'Found invalid Node.js Version: "20.x". Please set Node.js Version to 18.x in your Project Settings to use Node.js 18.'
+  );
+});
+
+it('should not allow nodejs18.x when not available', async () => {
+  // Simulates AL2023 build-container
+  try {
+    process.env.VERCEL_ALLOW_NODEJS20 = '1';
+    await expect(getSupportedNodeVersion('18.x', true, [20])).rejects.toThrow(
+      'Found invalid Node.js Version: "18.x". Please set Node.js Version to 20.x in your Project Settings to use Node.js 20.'
+    );
+  } finally {
+    delete process.env.VERCEL_ALLOW_NODEJS20;
+  }
+});
+
 it('should ignore node version in vercel dev getNodeVersion()', async () => {
   expect(
     await getNodeVersion(
@@ -235,6 +256,21 @@ it('should get latest node version', async () => {
   expect(getLatestNodeVersion()).toHaveProperty('major', 18);
 });
 
+it('should get latest node version with Node 18.x in build-container', async () => {
+  // Simulates AL2 build-container
+  expect(getLatestNodeVersion([14, 16, 18])).toHaveProperty('major', 18);
+});
+
+it('should get latest node version with Node 20.x in build-container', async () => {
+  // Simulates AL2023 build-container
+  try {
+    process.env.VERCEL_ALLOW_NODEJS20 = '1';
+    expect(getLatestNodeVersion([20])).toHaveProperty('major', 20);
+  } finally {
+    delete process.env.VERCEL_ALLOW_NODEJS20;
+  }
+});
+
 it('should throw for discontinued versions', async () => {
   // Mock a future date so that Node 8 and 10 become discontinued
   const realDateNow = Date.now.bind(global.Date);

packages/cli/CHANGELOG.md

@@ -1,5 +1,14 @@
 # vercel
 
+## 32.5.4
+
+### Patch Changes
+
+- Updated dependencies [[`65dec5b7e`](https://github.com/vercel/vercel/commit/65dec5b7e752f4da8fe0ffdb25215170453f6f8b)]:
+  - @vercel/build-utils@7.2.4
+  - @vercel/node@3.0.10
+  - @vercel/static-build@2.0.11
+
 ## 32.5.3
 
 ### Patch Changes

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vercel",
-  "version": "32.5.3",
+  "version": "32.5.4",
   "preferGlobal": true,
   "license": "Apache-2.0",
   "description": "The command-line interface for Vercel",
@@ -31,17 +31,17 @@
     "node": ">= 16"
   },
   "dependencies": {
-    "@vercel/build-utils": "7.2.3",
+    "@vercel/build-utils": "7.2.4",
     "@vercel/fun": "1.1.0",
     "@vercel/go": "3.0.3",
     "@vercel/hydrogen": "1.0.1",
     "@vercel/next": "4.0.14",
-    "@vercel/node": "3.0.9",
+    "@vercel/node": "3.0.10",
     "@vercel/python": "4.1.0",
     "@vercel/redwood": "2.0.5",
     "@vercel/remix-builder": "2.0.11",
     "@vercel/ruby": "2.0.2",
-    "@vercel/static-build": "2.0.10",
+    "@vercel/static-build": "2.0.11",
     "chokidar": "3.3.1"
   },
   "devDependencies": {
@@ -88,8 +88,8 @@
     "@types/yauzl-promise": "2.1.0",
     "@vercel-internals/constants": "1.0.4",
     "@vercel-internals/get-package-json": "1.0.0",
-    "@vercel-internals/types": "1.0.14",
+    "@vercel-internals/types": "1.0.15",
-    "@vercel/client": "13.0.7",
+    "@vercel/client": "13.0.8",
     "@vercel/error-utils": "2.0.2",
     "@vercel/frameworks": "2.0.3",
     "@vercel/fs-detectors": "5.1.3",

packages/client/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @vercel/client
 
+## 13.0.8
+
+### Patch Changes
+
+- Updated dependencies [[`65dec5b7e`](https://github.com/vercel/vercel/commit/65dec5b7e752f4da8fe0ffdb25215170453f6f8b)]:
+  - @vercel/build-utils@7.2.4
+
 ## 13.0.7
 
 ### Patch Changes

packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/client",
-  "version": "13.0.7",
+  "version": "13.0.8",
   "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.2.3",
+    "@vercel/build-utils": "7.2.4",
     "@vercel/routing-utils": "3.1.0",
     "@zeit/fetch": "5.2.0",
     "async-retry": "1.2.3",

packages/fs-detectors/package.json

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

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

@@ -1,5 +1,12 @@
 # @vercel/gatsby-plugin-vercel-builder
 
+## 2.0.10
+
+### Patch Changes
+
+- Updated dependencies [[`65dec5b7e`](https://github.com/vercel/vercel/commit/65dec5b7e752f4da8fe0ffdb25215170453f6f8b)]:
+  - @vercel/build-utils@7.2.4
+
 ## 2.0.9
 
 ### Patch Changes

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

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

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.2.3",
+    "@vercel/build-utils": "7.2.4",
     "async-retry": "1.3.3",
     "execa": "^1.0.0",
     "fs-extra": "^7.0.0",

packages/hydrogen/package.json

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

packages/next/package.json

@@ -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.2.3",
+    "@vercel/build-utils": "7.2.4",
     "@vercel/routing-utils": "3.1.0",
     "async-sema": "3.0.1",
     "buffer-crc32": "0.2.13",

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

@@ -1,22 +1,4 @@
-import React from 'react'
+import { Links } from '../components/links';
-import Link from 'next/link'
-
-const links = [
-  { href: '/', tag: 'pre-generated' },
-  { href: '/nested/a', tag: 'pre-generated' },
-  { href: '/nested/b', tag: 'on-demand' },
-  { href: '/nested/c', tag: 'on-demand' },
-  { href: '/on-demand/a', tag: 'on-demand, no-gsp' },
-  { href: '/on-demand/b', tag: 'on-demand, no-gsp' },
-  { href: '/on-demand/c', tag: 'on-demand, no-gsp' },
-  { href: '/static', tag: 'static' },
-  { href: '/no-suspense', tag: 'no suspense' },
-  { href: '/no-suspense/nested/a', tag: 'no suspense, pre-generated' },
-  { href: '/no-suspense/nested/b', tag: 'no suspense, on-demand' },
-  { href: '/no-suspense/nested/c', tag: 'no suspense, on-demand' },
-  { href: '/dynamic/force-dynamic', tag: "dynamic = 'force-dynamic'" },
-  { href: '/dynamic/force-static', tag: "dynamic = 'force-static'" },
-]
 
 export default ({ children }) => {
   return (
@@ -28,16 +10,10 @@ export default ({ children }) => {
           partially prerender
         </p>
         <aside>
-          <ul>
+          <Links />
-            {links.map(({ href, tag }) => (
-              <li key={href}>
-                <Link href={href}>{href}</Link> <span>{tag}</span>
-              </li>
-            ))}
-          </ul>
         </aside>
         <main>{children}</main>
       </body>
     </html>
-  )
+  );
-}
+};

packages/next/test/fixtures/00-app-dir-ppr-full/app/loading/[slug]/page.jsx

@@ -0,0 +1,16 @@
+import React, { Suspense } from 'react'
+import { Dynamic } from '../../../components/dynamic'
+
+export const revalidate = 60
+
+export default ({ params: { slug } }) => {
+  return (
+    <Suspense fallback={<Dynamic pathname={`/loading/${slug}`} fallback />}>
+      <Dynamic pathname={`/loading/${slug}`} />
+    </Suspense>
+  )
+}
+
+export const generateStaticParams = async () => {
+  return [{ slug: 'a' }]
+}

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

@@ -0,0 +1,3 @@
+export default () => {
+  return <code>loading.jsx</code>
+}

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

@@ -6,16 +6,16 @@ export const Dynamic = ({ pathname, fallback }) => {
     return <div>Loading...</div>
   }
 
-  const messages = []
+  const messages = [];
-  const names = ['x-test-input', 'user-agent']
+  const names = ['x-test-input', 'user-agent'];
-  const list = headers()
+  const list = headers();
 
   for (const name of names) {
-    messages.push({ name, value: list.get(name) })
+    messages.push({ name, value: list.get(name) });
   }
 
   return (
-    <div>
+    <div id="needle">
       <dl>
         {pathname && (
           <>
@@ -33,5 +33,5 @@ export const Dynamic = ({ pathname, fallback }) => {
         ))}
       </dl>
     </div>
-  )
+  );
-}
+};

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

@@ -0,0 +1,42 @@
+import React from 'react';
+import Link from 'next/link';
+
+const links = [
+  { href: '/', tag: 'pre-generated' },
+  { href: '/nested/a', tag: 'pre-generated' },
+  { href: '/nested/b', tag: 'on-demand' },
+  { href: '/nested/c', tag: 'on-demand' },
+  { href: '/on-demand/a', tag: 'on-demand, no-gsp' },
+  { href: '/on-demand/b', tag: 'on-demand, no-gsp' },
+  { href: '/on-demand/c', tag: 'on-demand, no-gsp' },
+  { href: '/loading/a', tag: 'loading.jsx, pre-generated' },
+  { href: '/loading/b', tag: 'loading.jsx, on-demand' },
+  { href: '/loading/c', tag: 'loading.jsx, on-demand' },
+  { href: '/static', tag: 'static' },
+  { href: '/no-suspense', tag: 'no suspense' },
+  { href: '/no-suspense/nested/a', tag: 'no suspense, pre-generated' },
+  { href: '/no-suspense/nested/b', tag: 'no suspense, on-demand' },
+  { href: '/no-suspense/nested/c', tag: 'no suspense, on-demand' },
+  { href: '/dynamic/force-dynamic', tag: "dynamic = 'force-dynamic'" },
+  { href: '/dynamic/force-static', tag: "dynamic = 'force-static'" },
+  { href: '/edge/suspense', tag: 'edge, pre-generated' },
+  { href: '/edge/suspense/a', tag: 'edge, pre-generated' },
+  { href: '/edge/suspense/b', tag: 'edge, on-demand' },
+  { href: '/edge/suspense/c', tag: 'edge, on-demand' },
+  { href: '/edge/no-suspense', tag: 'edge, no suspense, pre-generated' },
+  { href: '/edge/no-suspense/a', tag: 'edge, no suspense, pre-generated' },
+  { href: '/edge/no-suspense/b', tag: 'edge, no suspense, on-demand' },
+  { href: '/edge/no-suspense/c', tag: 'edge, no suspense, on-demand' },
+];
+
+export const Links = () => {
+  return (
+    <ul>
+      {links.map(({ href, tag }) => (
+        <li key={href}>
+          <Link href={href}>{href}</Link> <span>{tag}</span>
+        </li>
+      ))}
+    </ul>
+  );
+};

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

@@ -11,6 +11,9 @@ const pages = [
   { pathname: '/on-demand/a', dynamic: true },
   { pathname: '/on-demand/b', dynamic: true },
   { pathname: '/on-demand/c', dynamic: true },
+  { pathname: '/loading/a', dynamic: true },
+  { pathname: '/loading/b', dynamic: true },
+  { pathname: '/loading/c', dynamic: true },
   { pathname: '/static', dynamic: false },
   { pathname: '/no-suspense', dynamic: true },
   { pathname: '/no-suspense/nested/a', dynamic: true },
@@ -18,7 +21,7 @@ const pages = [
   { pathname: '/no-suspense/nested/c', dynamic: true },
   // TODO: uncomment when we've fixed the 404 case for force-dynamic pages
   // { pathname: '/dynamic/force-dynamic', dynamic: 'force-dynamic' },
-  { pathname: '/dynamic/force-static', dynamic: false },
+  { pathname: '/dynamic/force-static', dynamic: 'force-static' },
 ];
 
 const ctx = {};
@@ -30,7 +33,7 @@ describe(`${__dirname.split(path.sep).pop()}`, () => {
   });
 
   describe('dynamic pages should resume', () => {
-    it.each(pages.filter(p => p.dynamic))(
+    it.each(pages.filter(p => p.dynamic === true))(
       'should resume $pathname',
       async ({ pathname }) => {
         const expected = `${Date.now()}:${Math.random()}`;
@@ -62,19 +65,27 @@ describe(`${__dirname.split(path.sep).pop()}`, () => {
         });
         expect(res.status).toEqual(200);
         expect(res.headers.get('content-type')).toEqual('text/x-component');
-        console.log(
+
-          'X-NextJS-Postponed-Reason',
+        const cache = res.headers.get('cache-control');
-          res.headers.get('X-NextJS-Postponed-Reason')
+        expect(cache).toContain('public');
-        );
+        expect(cache).toContain('must-revalidate');
-        if (dynamic) {
-          expect(res.headers.get('X-NextJS-Postponed')).toEqual('1');
-        } else {
-          expect(res.headers.has('X-NextJS-Postponed')).toEqual(false);
-        }
 
         // Expect that static RSC prefetches do not contain the dynamic text.
         const text = await res.text();
         expect(text).not.toContain(unexpected);
+
+        if (dynamic === true) {
+          // The dynamic component will contain the text "needle" if it was
+          // rendered using dynamic content.
+          expect(text).not.toContain('needle');
+          expect(res.headers.get('X-NextJS-Postponed')).toEqual('1');
+        } else {
+          if (dynamic !== false) {
+            expect(text).toContain('needle');
+          }
+
+          expect(res.headers.has('X-NextJS-Postponed')).toEqual(false);
+        }
       }
     );
   });
@@ -89,8 +100,20 @@ describe(`${__dirname.split(path.sep).pop()}`, () => {
       expect(res.headers.get('content-type')).toEqual('text/x-component');
       expect(res.headers.has('X-NextJS-Postponed')).toEqual(false);
 
+      const cache = res.headers.get('cache-control');
+      expect(cache).toContain('private');
+      expect(cache).toContain('no-store');
+      expect(cache).toContain('no-cache');
+      expect(cache).toContain('max-age=0');
+      expect(cache).toContain('must-revalidate');
+
       const text = await res.text();
-      if (dynamic) {
+
+      if (dynamic !== false) {
+        expect(text).toContain('needle');
+      }
+
+      if (dynamic === true) {
         // Expect that dynamic RSC prefetches do contain the dynamic text.
         expect(text).toContain(expected);
       } else {

packages/node/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @vercel/node
 
+## 3.0.10
+
+### Patch Changes
+
+- Updated dependencies [[`65dec5b7e`](https://github.com/vercel/vercel/commit/65dec5b7e752f4da8fe0ffdb25215170453f6f8b)]:
+  - @vercel/build-utils@7.2.4
+
 ## 3.0.9
 
 ### Patch Changes

packages/node/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/node",
-  "version": "3.0.9",
+  "version": "3.0.10",
   "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/node-js",
@@ -24,7 +24,7 @@
     "@edge-runtime/primitives": "4.0.5",
     "@edge-runtime/vm": "3.1.7",
     "@types/node": "14.18.33",
-    "@vercel/build-utils": "7.2.3",
+    "@vercel/build-utils": "7.2.4",
     "@vercel/error-utils": "2.0.2",
     "@vercel/nft": "0.24.2",
     "@vercel/static-config": "3.0.0",

packages/python/package.json

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

packages/redwood/package.json

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

packages/remix/package.json

@@ -30,7 +30,7 @@
     "@types/jest": "27.5.1",
     "@types/node": "14.18.33",
     "@types/semver": "7.3.13",
-    "@vercel/build-utils": "7.2.3",
+    "@vercel/build-utils": "7.2.4",
     "jest-junit": "16.0.0",
     "path-to-regexp": "6.2.1",
     "semver": "7.5.2"

packages/ruby/package.json

@@ -23,7 +23,7 @@
   "devDependencies": {
     "@types/fs-extra": "8.0.0",
     "@types/semver": "6.0.0",
-    "@vercel/build-utils": "7.2.3",
+    "@vercel/build-utils": "7.2.4",
     "execa": "2.0.4",
     "fs-extra": "^7.0.1",
     "jest-junit": "16.0.0",

packages/static-build/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @vercel/static-build
 
+## 2.0.11
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @vercel/gatsby-plugin-vercel-builder@2.0.10
+
 ## 2.0.10
 
 ### Patch Changes

packages/static-build/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/static-build",
-  "version": "2.0.10",
+  "version": "2.0.11",
   "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/build-step",
@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "@vercel/gatsby-plugin-vercel-analytics": "1.0.11",
-    "@vercel/gatsby-plugin-vercel-builder": "2.0.9",
+    "@vercel/gatsby-plugin-vercel-builder": "2.0.10",
     "@vercel/static-config": "3.0.0",
     "ts-morph": "12.0.0"
   },
@@ -35,7 +35,7 @@
     "@types/node-fetch": "2.5.4",
     "@types/promise-timeout": "1.3.0",
     "@types/semver": "7.3.13",
-    "@vercel/build-utils": "7.2.3",
+    "@vercel/build-utils": "7.2.4",
     "@vercel/error-utils": "2.0.2",
     "@vercel/frameworks": "2.0.3",
     "@vercel/fs-detectors": "5.1.3",

pnpm-lock.yaml

@@ -186,7 +186,7 @@ importers:
         specifier: 1.0.4
         version: link:../constants
       '@vercel/build-utils':
-        specifier: 7.2.3
+        specifier: 7.2.4
         version: link:../../packages/build-utils
       '@vercel/routing-utils':
         specifier: 3.1.0
@@ -310,7 +310,7 @@ importers:
   packages/cli:
     dependencies:
       '@vercel/build-utils':
-        specifier: 7.2.3
+        specifier: 7.2.4
         version: link:../build-utils
       '@vercel/fun':
         specifier: 1.1.0
@@ -325,7 +325,7 @@ importers:
         specifier: 4.0.14
         version: link:../next
       '@vercel/node':
-        specifier: 3.0.9
+        specifier: 3.0.10
         version: link:../node
       '@vercel/python':
         specifier: 4.1.0
@@ -340,7 +340,7 @@ importers:
         specifier: 2.0.2
         version: link:../ruby
       '@vercel/static-build':
-        specifier: 2.0.10
+        specifier: 2.0.11
         version: link:../static-build
       chokidar:
         specifier: 3.3.1
@@ -476,10 +476,10 @@ importers:
         specifier: 1.0.0
         version: link:../../internals/get-package-json
       '@vercel-internals/types':
-        specifier: 1.0.14
+        specifier: 1.0.15
         version: link:../../internals/types
       '@vercel/client':
-        specifier: 13.0.7
+        specifier: 13.0.8
         version: link:../client
       '@vercel/error-utils':
         specifier: 2.0.2
@@ -722,7 +722,7 @@ importers:
   packages/client:
     dependencies:
       '@vercel/build-utils':
-        specifier: 7.2.3
+        specifier: 7.2.4
         version: link:../build-utils
       '@vercel/routing-utils':
         specifier: 3.1.0
@@ -923,7 +923,7 @@ importers:
         specifier: 7.3.10
         version: 7.3.10
       '@vercel/build-utils':
-        specifier: 7.2.3
+        specifier: 7.2.4
         version: link:../build-utils
       jest-junit:
         specifier: 16.0.0
@@ -948,7 +948,7 @@ importers:
         specifier: 0.25.24
         version: 0.25.24
       '@vercel/build-utils':
-        specifier: 7.2.3
+        specifier: 7.2.4
         version: link:../build-utils
       '@vercel/routing-utils':
         specifier: 3.1.0
@@ -1015,7 +1015,7 @@ importers:
         specifier: 2.1.0
         version: 2.1.0
       '@vercel/build-utils':
-        specifier: 7.2.3
+        specifier: 7.2.4
         version: link:../build-utils
       async-retry:
         specifier: 1.3.3
@@ -1064,7 +1064,7 @@ importers:
         specifier: 14.18.33
         version: 14.18.33
       '@vercel/build-utils':
-        specifier: 7.2.3
+        specifier: 7.2.4
         version: link:../build-utils
       execa:
         specifier: 3.2.0
@@ -1125,7 +1125,7 @@ importers:
         specifier: 3.2.0
         version: 3.2.0
       '@vercel/build-utils':
-        specifier: 7.2.3
+        specifier: 7.2.4
         version: link:../build-utils
       '@vercel/routing-utils':
         specifier: 3.1.0
@@ -1212,7 +1212,7 @@ importers:
         specifier: 14.18.33
         version: 14.18.33
       '@vercel/build-utils':
-        specifier: 7.2.3
+        specifier: 7.2.4
         version: link:../build-utils
       '@vercel/error-utils':
         specifier: 2.0.2
@@ -1321,7 +1321,7 @@ importers:
         specifier: 3.0.0
         version: 3.0.0
       '@vercel/build-utils':
-        specifier: 7.2.3
+        specifier: 7.2.4
         version: link:../build-utils
       execa:
         specifier: ^1.0.0
@@ -1358,7 +1358,7 @@ importers:
         specifier: 6.0.0
         version: 6.0.0
       '@vercel/build-utils':
-        specifier: 7.2.3
+        specifier: 7.2.4
         version: link:../build-utils
       execa:
         specifier: 3.2.0
@@ -1395,7 +1395,7 @@ importers:
         specifier: 7.3.13
         version: 7.3.13
       '@vercel/build-utils':
-        specifier: 7.2.3
+        specifier: 7.2.4
         version: link:../build-utils
       jest-junit:
         specifier: 16.0.0
@@ -1439,7 +1439,7 @@ importers:
         specifier: 6.0.0
         version: 6.0.0
       '@vercel/build-utils':
-        specifier: 7.2.3
+        specifier: 7.2.4
         version: link:../build-utils
       execa:
         specifier: 2.0.4
@@ -1460,7 +1460,7 @@ importers:
         specifier: 1.0.11
         version: link:../gatsby-plugin-vercel-analytics
       '@vercel/gatsby-plugin-vercel-builder':
-        specifier: 2.0.9
+        specifier: 2.0.10
         version: link:../gatsby-plugin-vercel-builder
       '@vercel/static-config':
         specifier: 3.0.0
@@ -1497,7 +1497,7 @@ importers:
         specifier: 7.3.13
         version: 7.3.13
       '@vercel/build-utils':
-        specifier: 7.2.3
+        specifier: 7.2.4
         version: link:../build-utils
       '@vercel/error-utils':
         specifier: 2.0.2