Version Packages (#11015)

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.5.0

### Minor Changes

- Deprecate `EdgeFunction#name` property
([#11010](https://github.com/vercel/vercel/pull/11010))

## vercel@33.1.0

### Minor Changes

- Serialize duplicate `EdgeFunction` references as symlinks in `vc
build` ([#11027](https://github.com/vercel/vercel/pull/11027))

### Patch Changes

- Handle rate limit response when fetching /teams
([#11013](https://github.com/vercel/vercel/pull/11013))

- Display actual deployment's 'target'
([#11025](https://github.com/vercel/vercel/pull/11025))

- Updated dependencies
\[[`98040ec24`](98040ec24e)]:
    -   @vercel/build-utils@7.5.0
    -   @vercel/static-build@2.0.17
    -   @vercel/hydrogen@1.0.2
    -   @vercel/remix-builder@2.0.17
    -   @vercel/node@3.0.16

## @vercel/client@13.0.13

### Patch Changes

- Updated dependencies
\[[`98040ec24`](98040ec24e)]:
    -   @vercel/build-utils@7.5.0

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

### Patch Changes

- Updated dependencies
\[[`98040ec24`](98040ec24e)]:
    -   @vercel/build-utils@7.5.0

## @vercel/hydrogen@1.0.2

### Patch Changes

- Deprecate `EdgeFunction#name` property
([#11010](https://github.com/vercel/vercel/pull/11010))

## @vercel/node@3.0.16

### Patch Changes

- Deprecate `EdgeFunction#name` property
([#11010](https://github.com/vercel/vercel/pull/11010))

- Updated dependencies
\[[`98040ec24`](98040ec24e)]:
    -   @vercel/build-utils@7.5.0

## @vercel/remix-builder@2.0.17

### Patch Changes

- Deprecate `EdgeFunction#name` property
([#11010](https://github.com/vercel/vercel/pull/11010))

## @vercel/static-build@2.0.17

### Patch Changes

- Deprecate `EdgeFunction#name` property
([#11010](https://github.com/vercel/vercel/pull/11010))

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

## @vercel-internals/types@1.0.20

### Patch Changes

- Updated dependencies
\[[`98040ec24`](98040ec24e)]:
    -   @vercel/build-utils@7.5.0

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

.github/workflows/release.yml

@@ -76,3 +76,12 @@ jobs:
           script: |
             const script = require('./utils/update-latest-release.js')
             await script({ github, context })
+  summary:
+    name: Summary
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    needs:
+      - release
+    steps:
+      - name: Check All
+        run: echo OK

examples/ionic-react/package.json

@@ -23,7 +23,7 @@
     "react-router": "^5.1.2",
     "react-router-dom": "^5.1.2",
     "react-scripts": "3.3.0",
-    "typescript": "3.8.3"
+    "typescript": "4.9.5"
   },
   "scripts": {
     "start": "react-scripts start",

examples/package.json

@@ -9,7 +9,7 @@
   },
   "devDependencies": {
     "@types/jest": "27.4.1",
-    "@vercel/frameworks": "2.0.5"
+    "@vercel/frameworks": "2.0.6"
   },
   "version": null
 }

examples/sveltekit-1/package.json

@@ -15,21 +15,21 @@
 	"devDependencies": {
 		"@fontsource/fira-mono": "^4.5.10",
 		"@neoconfetti/svelte": "^1.0.0",
-		"@playwright/test": "^1.28.1",
-		"@sveltejs/adapter-vercel": "^3.0.0",
-		"@sveltejs/kit": "^1.5.0",
-		"@types/cookie": "^0.5.1",
-		"eslint": "^8.28.0",
-		"eslint-config-prettier": "^8.5.0",
-		"eslint-plugin-svelte": "^2.26.0",
-		"prettier": "^2.8.0",
-		"prettier-plugin-svelte": "^2.8.1",
-		"svelte": "^3.54.0",
-		"svelte-check": "^3.0.1",
-		"typescript": "^5.0.0",
-		"vite": "^4.3.0",
-		"vitest": "^0.25.3",
-		"web-vitals": "^3.3.1"
+		"@playwright/test": "^1.40.1",
+		"@sveltejs/adapter-vercel": "^3.1.0",
+		"@sveltejs/kit": "^1.30.3",
+		"@types/cookie": "^0.5.4",
+		"eslint": "^8.55.0",
+		"eslint-config-prettier": "^8.10.0",
+		"eslint-plugin-svelte": "^2.35.1",
+		"prettier": "^2.8.8",
+		"prettier-plugin-svelte": "^2.10.1",
+		"svelte": "^3.59.2",
+		"svelte-check": "^3.6.2",
+		"typescript": "^5.3.3",
+		"vite": "^4.5.1",
+		"vitest": "^0.25.8",
+		"web-vitals": "^3.5.0"
 	},
 	"type": "module"
 }

internals/types/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @vercel-internals/types
 
+## 1.0.20
+
+### Patch Changes
+
+- Updated dependencies [[`98040ec24`](https://github.com/vercel/vercel/commit/98040ec24e1ee585865d11eb216b6525d39d209e)]:
+  - @vercel/build-utils@7.5.0
+
+## 1.0.19
+
+### Patch Changes
+
+- Updated dependencies [[`67fa2f3dd`](https://github.com/vercel/vercel/commit/67fa2f3dd6a6d5a3504b7f9081e56deff7b36eab)]:
+  - @vercel/build-utils@7.4.1
+
+## 1.0.18
+
+### Patch Changes
+
+- Updated dependencies [[`4d63d9e95`](https://github.com/vercel/vercel/commit/4d63d9e954549d811063d259250d1865b7de2ba1)]:
+  - @vercel/build-utils@7.4.0
+
 ## 1.0.17
 
 ### Patch Changes

internals/types/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "@vercel-internals/types",
-  "version": "1.0.17",
+  "version": "1.0.20",
   "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.3.0",
+    "@vercel/build-utils": "7.5.0",
     "@vercel/routing-utils": "3.1.0"
   },
   "devDependencies": {

package.json

@@ -17,7 +17,7 @@
     "create-svelte": "2.0.1",
     "dot": "1.1.3",
     "esbuild": "0.19.2",
-    "eslint": "8.14.0",
+    "eslint": "8.24.0",
     "eslint-config-prettier": "8.5.0",
     "eslint-plugin-jest": "26.1.5",
     "execa": "3.2.0",
@@ -29,11 +29,11 @@
     "lint-staged": "9.2.5",
     "node-fetch": "2.6.7",
     "npm-package-arg": "6.1.0",
-    "prettier": "2.6.2",
+    "prettier": "2.7.0",
     "source-map-support": "0.5.12",
     "ts-eager": "2.0.2",
     "ts-jest": "29.1.0",
-    "turbo": "1.10.16",
+    "turbo": "1.11.2",
     "typescript": "4.9.5"
   },
   "scripts": {

packages/build-utils/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @vercel/build-utils
 
+## 7.5.0
+
+### Minor Changes
+
+- Deprecate `EdgeFunction#name` property ([#11010](https://github.com/vercel/vercel/pull/11010))
+
+## 7.4.1
+
+### Patch Changes
+
+- Extend Node v16 discontinue date to 2024-06-15 ([#10967](https://github.com/vercel/vercel/pull/10967))
+
+## 7.4.0
+
+### Minor Changes
+
+- Adds new helper `getPathForPackageManager()` ([#10918](https://github.com/vercel/vercel/pull/10918))
+
 ## 7.3.0
 
 ### Minor Changes

packages/build-utils/package.json

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

packages/build-utils/src/edge-function.ts

@@ -8,12 +8,13 @@ export class EdgeFunction {
 
   /**
    * A display name for the edge function.
+   * @deprecated This property should no longer be used. The name is inferred from the URL path of the function.
    */
-  name: string;
+  name?: string;
 
   /**
    * The deployment target.
-   * Only v8-worker is currently supported.
+   * Only `v8-worker` is currently supported.
    */
   deploymentTarget: 'v8-worker';
 

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

@@ -13,7 +13,7 @@ export const NODE_VERSIONS: NodeVersion[] = [
     major: 16,
     range: '16.x',
     runtime: 'nodejs16.x',
-    discontinueDate: new Date('2024-02-06'),
+    discontinueDate: new Date('2024-06-15'),
   },
   {
     major: 14,

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

@@ -516,6 +516,10 @@ export async function runNpmInstall(
   }
 }
 
+/**
+ * Prepares the input environment based on the used package manager and lockfile
+ * versions.
+ */
 export function getEnvForPackageManager({
   cliType,
   lockfileVersion,
@@ -527,7 +531,90 @@ export function getEnvForPackageManager({
   nodeVersion: NodeVersion | undefined;
   env: { [x: string]: string | undefined };
 }) {
-  const newEnv: { [x: string]: string | undefined } = { ...env };
+  const {
+    detectedLockfile,
+    detectedPackageManager,
+    path: newPath,
+    yarnNodeLinker,
+  } = getPathForPackageManager({
+    cliType,
+    lockfileVersion,
+    nodeVersion,
+    env,
+  });
+
+  const newEnv: { [x: string]: string | undefined } = {
+    ...env,
+  };
+
+  if (newPath) {
+    // Ensure that the binaries of the detected package manager are at the
+    // beginning of the `$PATH`.
+    const oldPath = env.PATH + '';
+    newEnv.PATH = `${newPath}${path.delimiter}${oldPath}`;
+  }
+
+  if (yarnNodeLinker) {
+    newEnv.YARN_NODE_LINKER = yarnNodeLinker;
+  }
+
+  if (detectedLockfile && detectedPackageManager) {
+    // For pnpm we also show the version of the lockfile we found
+    const versionString =
+      cliType === 'pnpm' ? `version ${lockfileVersion} ` : '';
+
+    console.log(
+      `Detected \`${detectedLockfile}\` ${versionString}generated by ${detectedPackageManager}`
+    );
+
+    if (cliType === 'bun') {
+      console.warn(
+        'Warning: Bun is used as a package manager at build time only, not at runtime with Functions'
+      );
+    }
+  }
+
+  return newEnv;
+}
+
+/**
+ * Helper to get the binary paths that link to the used package manager.
+ * Note: Make sure it doesn't contain any `console.log` calls.
+ */
+export function getPathForPackageManager({
+  cliType,
+  lockfileVersion,
+  nodeVersion,
+  env,
+}: {
+  cliType: CliType;
+  lockfileVersion: number | undefined;
+  nodeVersion: NodeVersion | undefined;
+  env: { [x: string]: string | undefined };
+}): {
+  /**
+   * Which lockfile was detected.
+   */
+  detectedLockfile: string | undefined;
+  /**
+   * Detected package manager that generated the found lockfile.
+   */
+  detectedPackageManager: string | undefined;
+  /**
+   * Value of $PATH that includes the binaries for the detected package manager.
+   * Undefined if no $PATH are necessary.
+   */
+  path: string | undefined;
+  /**
+   * Set if yarn was identified as package manager and `YARN_NODE_LINKER`
+   * environment variable was not found on the input environment.
+   */
+  yarnNodeLinker: string | undefined;
+} {
+  let detectedLockfile: string | undefined;
+  let detectedPackageManager: string | undefined;
+  let pathValue: string | undefined;
+  let yarnNodeLinker: string | undefined;
   const oldPath = env.PATH + '';
   const npm7 = '/node16/bin-npm7';
   const pnpm7 = '/pnpm7/node_modules/.bin';
@@ -542,9 +629,10 @@ export function getEnvForPackageManager({
       !oldPath.includes(npm7) &&
       !corepackEnabled
     ) {
-      // 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+');
+      // npm 7
+      pathValue = npm7;
+      detectedLockfile = 'package-lock.json';
+      detectedPackageManager = 'npm 7+';
     }
   } else if (cliType === 'pnpm') {
     if (
@@ -553,39 +641,40 @@ export function getEnvForPackageManager({
       !oldPath.includes(pnpm7) &&
       !corepackEnabled
     ) {
-      // 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`
-      );
+      // pnpm 7
+      pathValue = pnpm7;
+      detectedLockfile = 'pnpm-lock.yaml';
+      detectedPackageManager = 'pnpm 7';
     } else if (
       typeof lockfileVersion === 'number' &&
       lockfileVersion >= 6 &&
       !oldPath.includes(pnpm8) &&
       !corepackEnabled
     ) {
-      // 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`
-      );
+      // pnpm 8
+      pathValue = pnpm8;
+      detectedLockfile = 'pnpm-lock.yaml';
+      detectedPackageManager = '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'
-      );
+      // Bun 1
+      pathValue = bun1;
+      detectedLockfile = 'bun.lockb';
+      detectedPackageManager = 'Bun';
     }
   } else {
     // Yarn v2 PnP mode may be activated, so force "node-modules" linker style
     if (!env.YARN_NODE_LINKER) {
-      newEnv.YARN_NODE_LINKER = 'node-modules';
+      yarnNodeLinker = 'node-modules';
     }
   }
-  return newEnv;
+  return {
+    detectedLockfile,
+    detectedPackageManager,
+    path: pathValue,
+    yarnNodeLinker,
+  };
 }
 
 export async function runCustomInstallCommand({

packages/build-utils/src/index.ts

@@ -28,6 +28,7 @@ import {
   runCustomInstallCommand,
   getEnvForPackageManager,
   getNodeVersion,
+  getPathForPackageManager,
   getSpawnOptions,
   getNodeBinPath,
   getNodeBinPaths,
@@ -78,6 +79,7 @@ export {
   runCustomInstallCommand,
   getEnvForPackageManager,
   getNodeVersion,
+  getPathForPackageManager,
   getLatestNodeVersion,
   getDiscontinuedNodeVersions,
   getSpawnOptions,

packages/build-utils/src/types.ts

@@ -196,6 +196,12 @@ export interface StartDevServerSuccess {
    * shut down the dev server once an HTTP request has been fulfilled.
    */
   pid: number;
+
+  /**
+   * An optional function to shut down the dev server. If not provided, the
+   * dev server will forcefully be killed.
+   */
+  shutdown?: () => Promise<void>;
 }
 
 /**

packages/build-utils/test/unit.get-env-for-package-manager.test.ts

@@ -1,13 +1,34 @@
-import assert from 'assert';
 import { delimiter } from 'path';
-import { getEnvForPackageManager } from '../src';
+import { getEnvForPackageManager, getPathForPackageManager } from '../src';
 
 describe('Test `getEnvForPackageManager()`', () => {
-  const cases: Array<{
+  let consoleLogSpy: jest.SpyInstance;
+  let consoleWarnSpy: jest.SpyInstance;
+
+  beforeEach(() => {
+    consoleLogSpy = jest.spyOn(console, 'log');
+    consoleWarnSpy = jest.spyOn(console, 'warn');
+  });
+
+  afterEach(() => {
+    jest.restoreAllMocks();
+  });
+
+  test.each<{
     name: string;
     args: Parameters<typeof getEnvForPackageManager>[0];
     want: unknown;
-  }> = [
+    /**
+     * Expected output on `console.log`. Set to `null` when no output is
+     * expected.
+     */
+    consoleLogOutput?: string | null;
+    /**
+     * Expected output on `console.warn`. Set to `null` when no output is
+     * expected.
+     */
+    consoleWarnOutput?: string | null;
+  }>([
     {
       name: 'should do nothing to env for npm < 6 and node < 16',
       args: {
@@ -21,6 +42,8 @@ describe('Test `getEnvForPackageManager()`', () => {
       want: {
         FOO: 'bar',
       },
+      consoleLogOutput: null,
+      consoleWarnOutput: null,
     },
     {
       name: 'should set path if npm 7+ is detected and node < 16',
@@ -37,6 +60,8 @@ describe('Test `getEnvForPackageManager()`', () => {
         FOO: 'bar',
         PATH: `/node16/bin-npm7${delimiter}foo`,
       },
+      consoleLogOutput: 'Detected `package-lock.json` generated by npm 7+',
+      consoleWarnOutput: null,
     },
     {
       name: 'should not set npm path if corepack enabled',
@@ -53,6 +78,8 @@ describe('Test `getEnvForPackageManager()`', () => {
         FOO: 'bar',
         ENABLE_EXPERIMENTAL_COREPACK: '1',
       },
+      consoleLogOutput: null,
+      consoleWarnOutput: null,
     },
     {
       name: 'should not prepend npm path again if already detected',
@@ -69,6 +96,8 @@ describe('Test `getEnvForPackageManager()`', () => {
         FOO: 'bar',
         PATH: `/node16/bin-npm7${delimiter}foo`,
       },
+      consoleLogOutput: null,
+      consoleWarnOutput: null,
     },
     {
       name: 'should not set path if node is 16 and npm 7+ is detected',
@@ -85,6 +114,8 @@ describe('Test `getEnvForPackageManager()`', () => {
         FOO: 'bar',
         PATH: 'foo',
       },
+      consoleLogOutput: null,
+      consoleWarnOutput: null,
     },
     {
       name: 'should set YARN_NODE_LINKER w/yarn if it is not already defined',
@@ -100,6 +131,8 @@ describe('Test `getEnvForPackageManager()`', () => {
         FOO: 'bar',
         YARN_NODE_LINKER: 'node-modules',
       },
+      consoleLogOutput: null,
+      consoleWarnOutput: null,
     },
     {
       name: 'should not set YARN_NODE_LINKER if it already exists',
@@ -116,6 +149,8 @@ describe('Test `getEnvForPackageManager()`', () => {
         FOO: 'bar',
         YARN_NODE_LINKER: 'exists',
       },
+      consoleLogOutput: null,
+      consoleWarnOutput: null,
     },
     {
       name: 'should set path if pnpm 7+ is detected',
@@ -132,6 +167,9 @@ describe('Test `getEnvForPackageManager()`', () => {
         FOO: 'bar',
         PATH: `/pnpm7/node_modules/.bin${delimiter}foo`,
       },
+      consoleLogOutput:
+        'Detected `pnpm-lock.yaml` version 5.4 generated by pnpm 7',
+      consoleWarnOutput: null,
     },
     {
       name: 'should set path if bun v1 is detected',
@@ -148,6 +186,9 @@ describe('Test `getEnvForPackageManager()`', () => {
         FOO: 'bar',
         PATH: `/bun1${delimiter}/usr/local/bin`,
       },
+      consoleLogOutput: 'Detected `bun.lockb` generated by Bun',
+      consoleWarnOutput:
+        'Warning: Bun is used as a package manager at build time only, not at runtime with Functions',
     },
     {
       name: 'should not set pnpm path if corepack is enabled',
@@ -164,6 +205,8 @@ describe('Test `getEnvForPackageManager()`', () => {
         FOO: 'bar',
         ENABLE_EXPERIMENTAL_COREPACK: '1',
       },
+      consoleLogOutput: null,
+      consoleWarnOutput: null,
     },
     {
       name: 'should not prepend pnpm path again if already detected',
@@ -180,6 +223,8 @@ describe('Test `getEnvForPackageManager()`', () => {
         FOO: 'bar',
         PATH: `/pnpm7/node_modules/.bin${delimiter}foo`,
       },
+      consoleLogOutput: null,
+      consoleWarnOutput: null,
     },
     {
       name: 'should not set path if pnpm 6 is detected',
@@ -194,20 +239,262 @@ describe('Test `getEnvForPackageManager()`', () => {
       want: {
         FOO: 'bar',
       },
+      consoleLogOutput: null,
+      consoleWarnOutput: null,
     },
-  ];
+  ])('$name', ({ args, want, consoleLogOutput, consoleWarnOutput }) => {
+    expect(
+      getEnvForPackageManager({
+        cliType: args.cliType,
+        lockfileVersion: args.lockfileVersion,
+        nodeVersion: args.nodeVersion,
+        env: args.env,
+      })
+    ).toStrictEqual(want);
 
-  for (const { name, want, args } of cases) {
-    it(name, () => {
-      assert.deepStrictEqual(
-        getEnvForPackageManager({
-          cliType: args.cliType,
-          lockfileVersion: args.lockfileVersion,
-          nodeVersion: args.nodeVersion,
-          env: args.env,
-        }),
-        want
-      );
-    });
-  }
+    // Check console.log output
+    if (typeof consoleLogOutput === 'string') {
+      expect(consoleLogSpy).toHaveBeenCalledWith(consoleLogOutput);
+    } else if (consoleLogOutput === null) {
+      expect(consoleLogSpy).not.toHaveBeenCalled();
+    }
+
+    // Check console.warn output
+    if (typeof consoleWarnOutput === 'string') {
+      expect(consoleWarnSpy).toHaveBeenCalledWith(consoleWarnOutput);
+    } else if (consoleLogOutput === null) {
+      expect(consoleWarnSpy).not.toHaveBeenCalled();
+    }
+  });
+});
+
+describe('Test `getPathForPackageManager()`', () => {
+  test.each<{
+    name: string;
+    args: Parameters<typeof getEnvForPackageManager>[0];
+    want: unknown;
+  }>([
+    {
+      name: 'should do nothing to env for npm < 6 and node < 16',
+      args: {
+        cliType: 'npm',
+        nodeVersion: { major: 14, range: '14.x', runtime: 'nodejs14.x' },
+        lockfileVersion: 1,
+        env: {
+          FOO: 'bar',
+        },
+      },
+      want: {
+        detectedLockfile: undefined,
+        detectedPackageManager: undefined,
+        path: undefined,
+        yarnNodeLinker: undefined,
+      },
+    },
+    {
+      name: 'should set path if npm 7+ is detected and node < 16',
+      args: {
+        cliType: 'npm',
+        nodeVersion: { major: 14, range: '14.x', runtime: 'nodejs14.x' },
+        lockfileVersion: 2,
+        env: {
+          FOO: 'bar',
+          PATH: 'foo',
+        },
+      },
+      want: {
+        detectedLockfile: 'package-lock.json',
+        detectedPackageManager: 'npm 7+',
+        path: '/node16/bin-npm7',
+        yarnNodeLinker: undefined,
+      },
+    },
+    {
+      name: 'should not set npm path if corepack enabled',
+      args: {
+        cliType: 'npm',
+        nodeVersion: { major: 14, range: '14.x', runtime: 'nodejs14.x' },
+        lockfileVersion: 2,
+        env: {
+          FOO: 'bar',
+          ENABLE_EXPERIMENTAL_COREPACK: '1',
+        },
+      },
+      want: {
+        detectedLockfile: undefined,
+        detectedPackageManager: undefined,
+        path: undefined,
+        yarnNodeLinker: undefined,
+      },
+    },
+    {
+      name: 'should not prepend npm path again if already detected',
+      args: {
+        cliType: 'npm',
+        nodeVersion: { major: 14, range: '14.x', runtime: 'nodejs14.x' },
+        lockfileVersion: 2,
+        env: {
+          FOO: 'bar',
+          PATH: `/node16/bin-npm7${delimiter}foo`,
+        },
+      },
+      want: {
+        detectedLockfile: undefined,
+        detectedPackageManager: undefined,
+        path: undefined,
+        yarnNodeLinker: undefined,
+      },
+    },
+    {
+      name: 'should not set path if node is 16 and npm 7+ is detected',
+      args: {
+        cliType: 'npm',
+        nodeVersion: { major: 16, range: '16.x', runtime: 'nodejs16.x' },
+        lockfileVersion: 2,
+        env: {
+          FOO: 'bar',
+          PATH: 'foo',
+        },
+      },
+      want: {
+        detectedLockfile: undefined,
+        detectedPackageManager: undefined,
+        path: undefined,
+        yarnNodeLinker: undefined,
+      },
+    },
+    {
+      name: 'should set YARN_NODE_LINKER w/yarn if it is not already defined',
+      args: {
+        cliType: 'yarn',
+        nodeVersion: { major: 16, range: '16.x', runtime: 'nodejs16.x' },
+        lockfileVersion: 2,
+        env: {
+          FOO: 'bar',
+        },
+      },
+      want: {
+        detectedLockfile: undefined,
+        detectedPackageManager: undefined,
+        path: undefined,
+        yarnNodeLinker: 'node-modules',
+      },
+    },
+    {
+      name: 'should not set YARN_NODE_LINKER if it already exists',
+      args: {
+        cliType: 'yarn',
+        nodeVersion: { major: 16, range: '16.x', runtime: 'nodejs16.x' },
+        lockfileVersion: 2,
+        env: {
+          FOO: 'bar',
+          YARN_NODE_LINKER: 'exists',
+        },
+      },
+      want: {
+        detectedLockfile: undefined,
+        detectedPackageManager: undefined,
+        path: undefined,
+        yarnNodeLinker: undefined,
+      },
+    },
+    {
+      name: 'should set path if pnpm 7+ is detected',
+      args: {
+        cliType: 'pnpm',
+        nodeVersion: { major: 16, range: '16.x', runtime: 'nodejs16.x' },
+        lockfileVersion: 5.4,
+        env: {
+          FOO: 'bar',
+          PATH: 'foo',
+        },
+      },
+      want: {
+        detectedLockfile: 'pnpm-lock.yaml',
+        detectedPackageManager: 'pnpm 7',
+        path: '/pnpm7/node_modules/.bin',
+        yarnNodeLinker: undefined,
+      },
+    },
+    {
+      name: 'should set path if bun v1 is detected',
+      args: {
+        cliType: 'bun',
+        nodeVersion: { major: 18, range: '18.x', runtime: 'nodejs18.x' },
+        lockfileVersion: 0,
+        env: {
+          FOO: 'bar',
+          PATH: '/usr/local/bin',
+        },
+      },
+      want: {
+        detectedLockfile: 'bun.lockb',
+        detectedPackageManager: 'Bun',
+        path: '/bun1',
+        yarnNodeLinker: undefined,
+      },
+    },
+    {
+      name: 'should not set pnpm path if corepack is enabled',
+      args: {
+        cliType: 'pnpm',
+        nodeVersion: { major: 16, range: '16.x', runtime: 'nodejs16.x' },
+        lockfileVersion: 5.4,
+        env: {
+          FOO: 'bar',
+          ENABLE_EXPERIMENTAL_COREPACK: '1',
+        },
+      },
+      want: {
+        detectedLockfile: undefined,
+        detectedPackageManager: undefined,
+        path: undefined,
+        yarnNodeLinker: undefined,
+      },
+    },
+    {
+      name: 'should not prepend pnpm path again if already detected',
+      args: {
+        cliType: 'pnpm',
+        nodeVersion: { major: 16, range: '16.x', runtime: 'nodejs16.x' },
+        lockfileVersion: 5.4,
+        env: {
+          FOO: 'bar',
+          PATH: `/pnpm7/node_modules/.bin${delimiter}foo`,
+        },
+      },
+      want: {
+        detectedLockfile: undefined,
+        detectedPackageManager: undefined,
+        path: undefined,
+        yarnNodeLinker: undefined,
+      },
+    },
+    {
+      name: 'should not set path if pnpm 6 is detected',
+      args: {
+        cliType: 'pnpm',
+        nodeVersion: { major: 14, range: '14.x', runtime: 'nodejs14.x' },
+        lockfileVersion: 5.3,
+        env: {
+          FOO: 'bar',
+        },
+      },
+      want: {
+        detectedLockfile: undefined,
+        detectedPackageManager: undefined,
+        path: undefined,
+        yarnNodeLinker: undefined,
+      },
+    },
+  ])('$name', ({ args, want }) => {
+    expect(
+      getPathForPackageManager({
+        cliType: args.cliType,
+        lockfileVersion: args.lockfileVersion,
+        nodeVersion: args.nodeVersion,
+        env: args.env,
+      })
+    ).toStrictEqual(want);
+  });
 });

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

@@ -268,81 +268,85 @@ it('should get latest node version with Node 20.x in build-container', async ()
 });
 
 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);
-  global.Date.now = () => new Date('2024-02-13').getTime();
+  // Mock a future date so that Node 16 becomes discontinued
+  const realDateNow = Date.now;
+  try {
+    global.Date.now = () => new Date('2024-07-16').getTime();
 
-  expect(getSupportedNodeVersion('8.10.x', false)).rejects.toThrow();
-  expect(getSupportedNodeVersion('8.10.x', true)).rejects.toThrow();
-  expect(getSupportedNodeVersion('10.x', false)).rejects.toThrow();
-  expect(getSupportedNodeVersion('10.x', true)).rejects.toThrow();
-  expect(getSupportedNodeVersion('12.x', false)).rejects.toThrow();
-  expect(getSupportedNodeVersion('12.x', true)).rejects.toThrow();
-  expect(getSupportedNodeVersion('14.x', false)).rejects.toThrow();
-  expect(getSupportedNodeVersion('14.x', true)).rejects.toThrow();
-  expect(getSupportedNodeVersion('16.x', false)).rejects.toThrow();
-  expect(getSupportedNodeVersion('16.x', true)).rejects.toThrow();
+    expect(getSupportedNodeVersion('8.10.x', false)).rejects.toThrow();
+    expect(getSupportedNodeVersion('8.10.x', true)).rejects.toThrow();
+    expect(getSupportedNodeVersion('10.x', false)).rejects.toThrow();
+    expect(getSupportedNodeVersion('10.x', true)).rejects.toThrow();
+    expect(getSupportedNodeVersion('12.x', false)).rejects.toThrow();
+    expect(getSupportedNodeVersion('12.x', true)).rejects.toThrow();
+    expect(getSupportedNodeVersion('14.x', false)).rejects.toThrow();
+    expect(getSupportedNodeVersion('14.x', true)).rejects.toThrow();
+    expect(getSupportedNodeVersion('16.x', false)).rejects.toThrow();
+    expect(getSupportedNodeVersion('16.x', true)).rejects.toThrow();
 
-  const discontinued = getDiscontinuedNodeVersions();
-  expect(discontinued.length).toBe(5);
-  expect(discontinued[0]).toHaveProperty('range', '16.x');
-  expect(discontinued[1]).toHaveProperty('range', '14.x');
-  expect(discontinued[2]).toHaveProperty('range', '12.x');
-  expect(discontinued[3]).toHaveProperty('range', '10.x');
-  expect(discontinued[4]).toHaveProperty('range', '8.10.x');
-
-  global.Date.now = realDateNow;
+    const discontinued = getDiscontinuedNodeVersions();
+    expect(discontinued.length).toBe(5);
+    expect(discontinued[0]).toHaveProperty('range', '16.x');
+    expect(discontinued[1]).toHaveProperty('range', '14.x');
+    expect(discontinued[2]).toHaveProperty('range', '12.x');
+    expect(discontinued[3]).toHaveProperty('range', '10.x');
+    expect(discontinued[4]).toHaveProperty('range', '8.10.x');
+  } finally {
+    global.Date.now = realDateNow;
+  }
 });
 
 it('should warn for deprecated versions, soon to be discontinued', async () => {
-  // Mock a future date so that Node 10 warns
-  const realDateNow = Date.now.bind(global.Date);
-  global.Date.now = () => new Date('2021-02-23').getTime();
+  // Mock a future date so that Node 16 warns
+  const realDateNow = Date.now;
+  try {
+    global.Date.now = () => new Date('2021-02-23').getTime();
 
-  expect(await getSupportedNodeVersion('10.x', false)).toHaveProperty(
-    'major',
-    10
-  );
-  expect(await getSupportedNodeVersion('10.x', true)).toHaveProperty(
-    'major',
-    10
-  );
-  expect(await getSupportedNodeVersion('12.x', false)).toHaveProperty(
-    'major',
-    12
-  );
-  expect(await getSupportedNodeVersion('12.x', true)).toHaveProperty(
-    'major',
-    12
-  );
-  expect(await getSupportedNodeVersion('14.x', false)).toHaveProperty(
-    'major',
-    14
-  );
-  expect(await getSupportedNodeVersion('14.x', true)).toHaveProperty(
-    'major',
-    14
-  );
-  expect(await getSupportedNodeVersion('16.x', false)).toHaveProperty(
-    'major',
-    16
-  );
-  expect(await getSupportedNodeVersion('16.x', true)).toHaveProperty(
-    'major',
-    16
-  );
-  expect(warningMessages).toStrictEqual([
-    'Error: Node.js version 10.x has reached End-of-Life. Deployments created on or after 2021-04-20 will fail to build. Please set "engines": { "node": "20.x" } in your `package.json` file to use Node.js 20.',
-    'Error: Node.js version 10.x has reached End-of-Life. Deployments created on or after 2021-04-20 will fail to build. Please set Node.js Version to 20.x in your Project Settings to use Node.js 20.',
-    'Error: Node.js version 12.x has reached End-of-Life. Deployments created on or after 2022-10-03 will fail to build. Please set "engines": { "node": "20.x" } in your `package.json` file to use Node.js 20.',
-    'Error: Node.js version 12.x has reached End-of-Life. Deployments created on or after 2022-10-03 will fail to build. Please set Node.js Version to 20.x in your Project Settings to use Node.js 20.',
-    'Error: Node.js version 14.x has reached End-of-Life. Deployments created on or after 2023-08-15 will fail to build. Please set "engines": { "node": "20.x" } in your `package.json` file to use Node.js 20.',
-    'Error: Node.js version 14.x has reached End-of-Life. Deployments created on or after 2023-08-15 will fail to build. Please set Node.js Version to 20.x in your Project Settings to use Node.js 20.',
-    'Error: Node.js version 16.x has reached End-of-Life. Deployments created on or after 2024-02-06 will fail to build. Please set "engines": { "node": "20.x" } in your `package.json` file to use Node.js 20.',
-    'Error: Node.js version 16.x has reached End-of-Life. Deployments created on or after 2024-02-06 will fail to build. Please set Node.js Version to 20.x in your Project Settings to use Node.js 20.',
-  ]);
-
-  global.Date.now = realDateNow;
+    expect(await getSupportedNodeVersion('10.x', false)).toHaveProperty(
+      'major',
+      10
+    );
+    expect(await getSupportedNodeVersion('10.x', true)).toHaveProperty(
+      'major',
+      10
+    );
+    expect(await getSupportedNodeVersion('12.x', false)).toHaveProperty(
+      'major',
+      12
+    );
+    expect(await getSupportedNodeVersion('12.x', true)).toHaveProperty(
+      'major',
+      12
+    );
+    expect(await getSupportedNodeVersion('14.x', false)).toHaveProperty(
+      'major',
+      14
+    );
+    expect(await getSupportedNodeVersion('14.x', true)).toHaveProperty(
+      'major',
+      14
+    );
+    expect(await getSupportedNodeVersion('16.x', false)).toHaveProperty(
+      'major',
+      16
+    );
+    expect(await getSupportedNodeVersion('16.x', true)).toHaveProperty(
+      'major',
+      16
+    );
+    expect(warningMessages).toStrictEqual([
+      'Error: Node.js version 10.x has reached End-of-Life. Deployments created on or after 2021-04-20 will fail to build. Please set "engines": { "node": "20.x" } in your `package.json` file to use Node.js 20.',
+      'Error: Node.js version 10.x has reached End-of-Life. Deployments created on or after 2021-04-20 will fail to build. Please set Node.js Version to 20.x in your Project Settings to use Node.js 20.',
+      'Error: Node.js version 12.x has reached End-of-Life. Deployments created on or after 2022-10-03 will fail to build. Please set "engines": { "node": "20.x" } in your `package.json` file to use Node.js 20.',
+      'Error: Node.js version 12.x has reached End-of-Life. Deployments created on or after 2022-10-03 will fail to build. Please set Node.js Version to 20.x in your Project Settings to use Node.js 20.',
+      'Error: Node.js version 14.x has reached End-of-Life. Deployments created on or after 2023-08-15 will fail to build. Please set "engines": { "node": "20.x" } in your `package.json` file to use Node.js 20.',
+      'Error: Node.js version 14.x has reached End-of-Life. Deployments created on or after 2023-08-15 will fail to build. Please set Node.js Version to 20.x in your Project Settings to use Node.js 20.',
+      'Error: Node.js version 16.x has reached End-of-Life. Deployments created on or after 2024-06-15 will fail to build. Please set "engines": { "node": "20.x" } in your `package.json` file to use Node.js 20.',
+      'Error: Node.js version 16.x has reached End-of-Life. Deployments created on or after 2024-06-15 will fail to build. Please set Node.js Version to 20.x in your Project Settings to use Node.js 20.',
+    ]);
+  } finally {
+    global.Date.now = realDateNow;
+  }
 });
 
 it('should support initialHeaders and initialStatus correctly', async () => {

packages/cli/CHANGELOG.md

@@ -1,5 +1,78 @@
 # vercel
 
+## 33.1.0
+
+### Minor Changes
+
+- Serialize duplicate `EdgeFunction` references as symlinks in `vc build` ([#11027](https://github.com/vercel/vercel/pull/11027))
+
+### Patch Changes
+
+- Handle rate limit response when fetching /teams ([#11013](https://github.com/vercel/vercel/pull/11013))
+
+- Display actual deployment's 'target' ([#11025](https://github.com/vercel/vercel/pull/11025))
+
+- Updated dependencies [[`98040ec24`](https://github.com/vercel/vercel/commit/98040ec24e1ee585865d11eb216b6525d39d209e)]:
+  - @vercel/build-utils@7.5.0
+  - @vercel/static-build@2.0.17
+  - @vercel/hydrogen@1.0.2
+  - @vercel/remix-builder@2.0.17
+  - @vercel/node@3.0.16
+
+## 33.0.2
+
+### Patch Changes
+
+- Log extension execution failures ([#10937](https://github.com/vercel/vercel/pull/10937))
+
+- Updated dependencies [[`fbe08fe57`](https://github.com/vercel/vercel/commit/fbe08fe57eededc0bcd2409692b23d185c70069d), [`77585013d`](https://github.com/vercel/vercel/commit/77585013dec5fc406b8b7ea00918e49fdb8f10ec), [`c536a74bc`](https://github.com/vercel/vercel/commit/c536a74bc9e7188a87b292615fa88d6fc506b105), [`91f8763ed`](https://github.com/vercel/vercel/commit/91f8763edce672a3c05b6096db6084f1e6741384), [`7f8f5f865`](https://github.com/vercel/vercel/commit/7f8f5f86516934acb0c4b936ea601433c8d30c5c)]:
+  - @vercel/next@4.0.17
+  - @vercel/go@3.0.5
+  - @vercel/node@3.0.15
+  - @vercel/redwood@2.0.6
+  - @vercel/remix-builder@2.0.16
+
+## 33.0.1
+
+### Patch Changes
+
+- Updated dependencies [[`67fa2f3dd`](https://github.com/vercel/vercel/commit/67fa2f3dd6a6d5a3504b7f9081e56deff7b36eab), [`7b0adf371`](https://github.com/vercel/vercel/commit/7b0adf371bae64d33ed0a1b966fc50b1f7c9639b)]:
+  - @vercel/build-utils@7.4.1
+  - @vercel/next@4.0.16
+  - @vercel/static-build@2.0.16
+  - @vercel/node@3.0.14
+
+## 33.0.0
+
+### Major Changes
+
+- [cli] replace `--deprecated` with `--update-required` in `vc project ls` ([#10965](https://github.com/vercel/vercel/pull/10965))
+
+### Patch Changes
+
+- Fix `vercel bisect` selecting too many deployments ([#10956](https://github.com/vercel/vercel/pull/10956))
+
+- Updated dependencies [[`6a9002f22`](https://github.com/vercel/vercel/commit/6a9002f2296c5ccce4522c0fa9a8938c3d7a4849), [`4d63d9e95`](https://github.com/vercel/vercel/commit/4d63d9e954549d811063d259250d1865b7de2ba1)]:
+  - @vercel/remix-builder@2.0.15
+  - @vercel/build-utils@7.4.0
+  - @vercel/static-build@2.0.15
+  - @vercel/node@3.0.13
+
+## 32.7.2
+
+### Patch Changes
+
+- [cli] Use new `deprecated` query param in projects api for `vc project ls --deprecated` ([#10938](https://github.com/vercel/vercel/pull/10938))
+
+## 32.7.1
+
+### Patch Changes
+
+- [cli] double page limit for vc project ls --deprecated ([#10932](https://github.com/vercel/vercel/pull/10932))
+
+- Updated dependencies [[`d09dd1794`](https://github.com/vercel/vercel/commit/d09dd1794b5ffa28c15d3ad2880b90db2f4c06f0)]:
+  - @vercel/remix-builder@2.0.14
+
 ## 32.7.0
 
 ### Minor Changes

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vercel",
-  "version": "32.7.0",
+  "version": "33.1.0",
   "preferGlobal": true,
   "license": "Apache-2.0",
   "description": "The command-line interface for Vercel",
@@ -31,17 +31,17 @@
     "node": ">= 16"
   },
   "dependencies": {
-    "@vercel/build-utils": "7.3.0",
+    "@vercel/build-utils": "7.5.0",
     "@vercel/fun": "1.1.0",
-    "@vercel/go": "3.0.4",
-    "@vercel/hydrogen": "1.0.1",
-    "@vercel/next": "4.0.15",
-    "@vercel/node": "3.0.12",
+    "@vercel/go": "3.0.5",
+    "@vercel/hydrogen": "1.0.2",
+    "@vercel/next": "4.0.17",
+    "@vercel/node": "3.0.16",
     "@vercel/python": "4.1.0",
-    "@vercel/redwood": "2.0.5",
-    "@vercel/remix-builder": "2.0.13",
+    "@vercel/redwood": "2.0.6",
+    "@vercel/remix-builder": "2.0.17",
     "@vercel/ruby": "2.0.4",
-    "@vercel/static-build": "2.0.14",
+    "@vercel/static-build": "2.0.17",
     "chokidar": "3.3.1"
   },
   "devDependencies": {
@@ -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.17",
-    "@vercel/client": "13.0.10",
+    "@vercel-internals/types": "1.0.20",
+    "@vercel/client": "13.0.13",
     "@vercel/error-utils": "2.0.2",
-    "@vercel/frameworks": "2.0.5",
-    "@vercel/fs-detectors": "5.1.5",
+    "@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",

packages/cli/src/commands/bisect/index.ts

@@ -188,15 +188,18 @@ export default async function bisect(client: Client): Promise<number> {
     let newDeployments = chunk.deployments;
 
     // If we have the "good" deployment in this chunk, then we're done
+    let hasGood = false;
     for (let i = 0; i < newDeployments.length; i++) {
       if (newDeployments[i].url === good) {
         // grab all deployments up until the good one
         newDeployments = newDeployments.slice(0, i);
+        hasGood = true;
         break;
       }
     }
 
     deployments = deployments.concat(newDeployments);
+    if (hasGood) break;
   }
 
   if (!deployments.length) {

packages/cli/src/commands/project/command.ts

@@ -17,9 +17,9 @@ export const projectCommand: Command = {
       arguments: [],
       options: [
         {
-          name: 'deprecated',
-          description: 'A list of projects affected by a deprecation',
-          argument: 'deprecated',
+          name: 'update-required',
+          description: 'A list of projects affected by an upcoming deprecation',
+          argument: 'update-required',
           shorthand: null,
           type: 'boolean',
           deprecated: false,

packages/cli/src/commands/project/index.ts

@@ -23,7 +23,7 @@ export default async function main(client: Client) {
     argv = getArgs(client.argv.slice(2), {
       '--next': Number,
       '-N': '--next',
-      '--deprecated': Boolean,
+      '--update-required': Boolean,
     });
   } catch (error) {
     handleError(error);

packages/cli/src/commands/project/list.ts

@@ -28,15 +28,18 @@ export default async function list(
 
   output.spinner(`Fetching projects in ${chalk.bold(contextName)}`);
 
-  let projectsUrl = '/v4/projects/?limit=20';
+  let projectsUrl = `/v4/projects/?limit=20`;
+
+  const deprecated = argv['--update-required'] || false;
+  if (deprecated) {
+    projectsUrl += `&deprecated=${deprecated}`;
+  }
 
   const next = argv['--next'] || false;
   if (next) {
     projectsUrl += `&until=${next}`;
   }
 
-  const deprecated = argv['--deprecated'] || false;
-
   let {
     projects: projectList,
     pagination,
@@ -52,24 +55,21 @@ export default async function list(
   const elapsed = ms(Date.now() - start);
 
   if (deprecated) {
-    const upcomingDeprecationVersions = NODE_VERSIONS.filter(
-      nodeVersion =>
+    const upcomingDeprecationVersionsList = [];
+
+    for (const nodeVersion of NODE_VERSIONS) {
+      if (
         nodeVersion.discontinueDate &&
         nodeVersion.discontinueDate.valueOf() > Date.now()
-    );
-    const upcomingDeprecationVersionsList = upcomingDeprecationVersions.map(
-      nodeVersion => nodeVersion.range
-    );
-    projectList = projectList.filter(
-      project =>
-        project.nodeVersion &&
-        upcomingDeprecationVersionsList.includes(project.nodeVersion)
-    );
+      ) {
+        upcomingDeprecationVersionsList.push(nodeVersion.range);
+      }
+    }
 
     output.warn(
       `The following Node.js versions will be deprecated soon: ${upcomingDeprecationVersionsList.join(
         ', '
-      )}. Upgrade your projects immediately.`
+      )}. Please upgrade your projects immediately.`
     );
     output.log(
       `For more information visit: https://vercel.com/docs/functions/serverless-functions/runtimes/node-js#node.js-version`

packages/cli/src/index.ts

@@ -465,6 +465,15 @@ const main = async () => {
           return 1;
         }
 
+        if (isErrnoException(err) && err.code === 'rate_limited') {
+          output.prettyError({
+            message:
+              'Rate limited. Too many requests to the same endpoint: /teams',
+          });
+
+          return 1;
+        }
+
         console.error(error('Not able to load teams'));
         return 1;
       }

packages/cli/src/util/build/write-build-result.ts

@@ -129,13 +129,19 @@ async function writeBuildResultV2(
     );
   }
 
-  const lambdas = new Map<Lambda, string>();
+  const existingFunctions = new Map<Lambda | EdgeFunction, string>();
   const overrides: Record<string, PathOverride> = {};
 
   for (const [path, output] of Object.entries(buildResult.output)) {
     const normalizedPath = stripDuplicateSlashes(path);
     if (isLambda(output)) {
-      await writeLambda(outputDir, output, normalizedPath, undefined, lambdas);
+      await writeLambda(
+        outputDir,
+        output,
+        normalizedPath,
+        undefined,
+        existingFunctions
+      );
     } else if (isPrerender(output)) {
       if (!output.lambda) {
         throw new Error(
@@ -148,7 +154,7 @@ async function writeBuildResultV2(
         output.lambda,
         normalizedPath,
         undefined,
-        lambdas
+        existingFunctions
       );
 
       // Write the fallback file alongside the Lambda directory
@@ -203,7 +209,12 @@ async function writeBuildResultV2(
         vercelConfig?.cleanUrls
       );
     } else if (isEdgeFunction(output)) {
-      await writeEdgeFunction(outputDir, output, normalizedPath);
+      await writeEdgeFunction(
+        outputDir,
+        output,
+        normalizedPath,
+        existingFunctions
+      );
     } else {
       throw new Error(
         `Unsupported output type: "${
@@ -315,19 +326,65 @@ async function writeStaticFile(
   await downloadFile(file, dest);
 }
 
+/**
+ * If the `fn` Lambda or Edge function has already been written to
+ * the filesystem at a different location, then create a symlink
+ * to the previous location instead of copying the files again.
+ *
+ * @param outputPath The path of the `.vercel/output` directory
+ * @param dest The path of destination function's `.func` directory
+ * @param fn The Lambda or EdgeFunction instance to create the symlink for
+ * @param existingFunctions Map of `Lambda`/`EdgeFunction` instances that have previously been written
+ */
+async function writeFunctionSymlink(
+  outputDir: string,
+  dest: string,
+  fn: Lambda | EdgeFunction,
+  existingFunctions: Map<Lambda | EdgeFunction, string>
+) {
+  const existingPath = existingFunctions.get(fn);
+
+  // Function has not been written to the filesystem, so bail
+  if (!existingPath) return false;
+
+  const destDir = dirname(dest);
+  const targetDest = join(outputDir, 'functions', `${existingPath}.func`);
+  const target = relative(destDir, targetDest);
+  await fs.mkdirp(destDir);
+  await fs.symlink(target, dest);
+  return true;
+}
+
 /**
  * Serializes the `EdgeFunction` instance to the file system.
  *
+ * @param outputPath The path of the `.vercel/output` directory
  * @param edgeFunction The `EdgeFunction` instance
  * @param path The URL path where the `EdgeFunction` can be accessed from
+ * @param existingFunctions (optional) Map of `Lambda`/`EdgeFunction` instances that have previously been written
  */
 async function writeEdgeFunction(
   outputDir: string,
   edgeFunction: EdgeFunction,
-  path: string
+  path: string,
+  existingFunctions?: Map<Lambda | EdgeFunction, string>
 ) {
   const dest = join(outputDir, 'functions', `${path}.func`);
 
+  if (existingFunctions) {
+    if (
+      await writeFunctionSymlink(
+        outputDir,
+        dest,
+        edgeFunction,
+        existingFunctions
+      )
+    ) {
+      return;
+    }
+    existingFunctions.set(edgeFunction, path);
+  }
+
   await fs.mkdirp(dest);
   const ops: Promise<any>[] = [];
   ops.push(download(edgeFunction.files, dest));
@@ -351,36 +408,29 @@ async function writeEdgeFunction(
 /**
  * Writes the file references from the `Lambda` instance to the file system.
  *
+ * @param outputPath The path of the `.vercel/output` directory
  * @param lambda The `Lambda` instance
  * @param path The URL path where the `Lambda` can be accessed from
- * @param lambdas (optional) Map of `Lambda` instances that have previously been written
+ * @param functionConfiguration (optional) Extra configuration to apply to the function's `.vc-config.json` file
+ * @param existingFunctions (optional) Map of `Lambda`/`EdgeFunction` instances that have previously been written
  */
 async function writeLambda(
   outputDir: string,
   lambda: Lambda,
   path: string,
   functionConfiguration?: FunctionConfiguration,
-  lambdas?: Map<Lambda, string>
+  existingFunctions?: Map<Lambda | EdgeFunction, string>
 ) {
   const dest = join(outputDir, 'functions', `${path}.func`);
 
-  // If the `lambda` has already been written to the filesystem at a different
-  // location then create a symlink to the previous location instead of copying
-  // the files again.
-  const existingLambdaPath = lambdas?.get(lambda);
-  if (existingLambdaPath) {
-    const destDir = dirname(dest);
-    const targetDest = join(
-      outputDir,
-      'functions',
-      `${existingLambdaPath}.func`
-    );
-    const target = relative(destDir, targetDest);
-    await fs.mkdirp(destDir);
-    await fs.symlink(target, dest);
-    return;
+  if (existingFunctions) {
+    if (
+      await writeFunctionSymlink(outputDir, dest, lambda, existingFunctions)
+    ) {
+      return;
+    }
+    existingFunctions.set(lambda, path);
   }
-  lambdas?.set(lambda, path);
 
   await fs.mkdirp(dest);
   const ops: Promise<any>[] = [];

packages/cli/src/util/config/get-default.ts

@@ -4,12 +4,12 @@ export const defaultGlobalConfig: GlobalConfig = {
   '// Note':
     'This is your Vercel config file. For more information see the global configuration documentation.',
   '// Docs':
-    'https://vercel.com/docs/project-configuration#global-configuration/config-json',
+    'https://vercel.com/docs/projects/project-configuration/global-configuration#config.json',
   collectMetrics: true,
 };
 
 export const defaultAuthConfig: AuthConfig = {
   '// Note': 'This is your Vercel credentials file. DO NOT SHARE!',
   '// Docs':
-    'https://vercel.com/docs/project-configuration#global-configuration/auth-json',
+    'https://vercel.com/docs/projects/project-configuration/global-configuration#auth.json',
 };

packages/cli/src/util/deploy/process-deployment.ts

@@ -185,7 +185,7 @@ export default async function processDeployment({
 
         printInspectUrl(output, deployment.inspectorUrl, deployStamp);
 
-        const isProdDeployment = requestBody.target === 'production';
+        const isProdDeployment = deployment.target === 'production';
         const previewUrl = `https://${deployment.url}`;
 
         output.print(

packages/cli/src/util/dev/server.ts

@@ -158,7 +158,10 @@ export default class DevServer {
   private podId: string;
   private devProcess?: ChildProcess;
   private devProcessOrigin?: string;
-  private devServerPids: Set<number>;
+  private shutdownCallbacks: Map<
+    number /* PID */,
+    undefined | (() => Promise<void>)
+  >;
   private originalProjectSettings?: ProjectSettings;
   private projectSettings?: ProjectSettings;
 
@@ -211,7 +214,7 @@ export default class DevServer {
     this.filter = path => Boolean(path);
     this.podId = Math.random().toString(32).slice(-5);
 
-    this.devServerPids = new Set();
+    this.shutdownCallbacks = new Map();
   }
 
   async exit(code = 1) {
@@ -1006,7 +1009,7 @@ export default class DevServer {
       ops.push(this.watcher.close());
     }
 
-    for (const pid of this.devServerPids) {
+    for (const pid of this.shutdownCallbacks.keys()) {
       ops.push(this.killBuilderDevServer(pid));
     }
 
@@ -1024,7 +1027,15 @@ export default class DevServer {
   async killBuilderDevServer(pid: number) {
     const { debug } = this.output;
     debug(`Killing builder dev server with PID ${pid}`);
-    this.devServerPids.delete(pid);
+    const shutdownCb = this.shutdownCallbacks.get(pid);
+    this.shutdownCallbacks.delete(pid);
+
+    if (shutdownCb) {
+      debug(`Running shutdown callback for PID ${pid}`);
+      await shutdownCb();
+      return;
+    }
+
     try {
       await treeKill(pid);
       debug(`Killed builder dev server with PID ${pid}`);
@@ -1432,9 +1443,9 @@ export default class DevServer {
         }
 
         if (startMiddlewareResult) {
-          const { port, pid } = startMiddlewareResult;
+          const { port, pid, shutdown } = startMiddlewareResult;
           middlewarePid = pid;
-          this.devServerPids.add(pid);
+          this.shutdownCallbacks.set(pid, shutdown);
 
           const middlewareReqHeaders = nodeHeadersToFetchHeaders(req.headers);
 
@@ -1899,8 +1910,8 @@ export default class DevServer {
         // is also included in the request ID. So use the same `dev1` fake region.
         requestId = generateRequestId(this.podId, true);
 
-        const { port, pid } = devServerResult;
-        this.devServerPids.add(pid);
+        const { port, pid, shutdown } = devServerResult;
+        this.shutdownCallbacks.set(pid, shutdown);
 
         res.once('close', () => {
           this.killBuilderDevServer(pid);

packages/cli/src/util/extension/exec.ts

@@ -21,7 +21,7 @@ export async function execExtension(
   args: string[],
   cwd: string
 ): Promise<number> {
-  const { debug } = client.output;
+  const { debug, log } = client.output;
   const extensionCommand = `vercel-${name}`;
 
   const { packageJsonPath, lockfilePath } = await scanParentDirs(cwd);
@@ -76,7 +76,7 @@ export async function execExtension(
   proxy.close();
 
   if (result instanceof Error) {
-    debug(`error running extension: ${result.message}`);
+    log(`Error running extension ${extensionCommand}: ${result.message}`);
   }
 
   return result.exitCode;

packages/cli/test/fixtures/unit/commands/build/functions-symlink/.vercel/builders/.gitignore

@@ -0,0 +1 @@
+!node_modules

packages/cli/test/fixtures/unit/commands/build/functions-symlink/.vercel/builders/node_modules/functions-symlink/main.js

@@ -0,0 +1,21 @@
+const { Lambda, EdgeFunction } = require('@vercel/build-utils');
+
+exports.build = async () => {
+    const lambda = new Lambda({
+        files: {},
+        runtime: 'provided',
+        handler: 'example.js'
+    });
+    const edge = new EdgeFunction({
+      files: {},
+      deploymentTarget: 'v8-worker',
+      entrypoint: 'example.js'
+    });
+    const output = {
+      lambda,
+      lambda2: lambda,
+      edge,
+      edge2: edge
+    };
+    return { output };
+};

packages/cli/test/fixtures/unit/commands/build/functions-symlink/.vercel/builders/node_modules/functions-symlink/package.json

@@ -0,0 +1,6 @@
+{
+  "name": "functions-symlink",
+  "private": true,
+  "version": "0.0.0",
+  "main": "main.js"
+}

packages/cli/test/fixtures/unit/commands/build/functions-symlink/.vercel/project.json

@@ -0,0 +1,7 @@
+{
+  "orgId": ".",
+  "projectId": ".",
+  "settings": {
+    "framework": null
+  }
+}

packages/cli/test/fixtures/unit/commands/build/functions-symlink/package.json

@@ -0,0 +1,4 @@
+{
+  "name": "functions-symlink-test",
+  "private": true
+}

packages/cli/test/fixtures/unit/commands/build/functions-symlink/vercel.json

@@ -0,0 +1,3 @@
+{
+  "builds": [{ "src": "package.json", "use": "functions-symlink@0.0.0" }]
+}

packages/cli/test/integration-2.test.ts

@@ -750,7 +750,7 @@ test('deploys with only vercel.json and README.md', async () => {
 
   // assert timing order of showing URLs vs status updates
   expect(stderr).toMatch(
-    /Inspect.*\nPreview.*\nQueued.*\nBuilding.*\nCompleting/
+    /Inspect.*\nProduction.*\nQueued.*\nBuilding.*\nCompleting/
   );
 
   const { host } = new URL(stdout);

packages/cli/test/unit/commands/build/index.test.ts

@@ -1248,3 +1248,42 @@ describe('build', () => {
     ).toEqual('marketing');
   });
 });
+
+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'
+  );
+});

packages/cli/test/unit/commands/project.test.ts

@@ -55,7 +55,7 @@ describe('project', () => {
         nodeVersion: '16.x',
       });
 
-      client.setArgv('project', 'ls', '--deprecated');
+      client.setArgv('project', 'ls', '--update-required');
       await projects(client);
 
       const lines = createLineIterator(client.stderr);
@@ -65,7 +65,7 @@ describe('project', () => {
 
       line = await lines.next();
       expect(line.value).toEqual(
-        'WARN! The following Node.js versions will be deprecated soon: 16.x. Upgrade your projects immediately.'
+        'WARN! The following Node.js versions will be deprecated soon: 16.x. Please upgrade your projects immediately.'
       );
       line = await lines.next();
       expect(line.value).toEqual(

packages/client/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @vercel/client
 
+## 13.0.13
+
+### Patch Changes
+
+- Updated dependencies [[`98040ec24`](https://github.com/vercel/vercel/commit/98040ec24e1ee585865d11eb216b6525d39d209e)]:
+  - @vercel/build-utils@7.5.0
+
+## 13.0.12
+
+### Patch Changes
+
+- Updated dependencies [[`67fa2f3dd`](https://github.com/vercel/vercel/commit/67fa2f3dd6a6d5a3504b7f9081e56deff7b36eab)]:
+  - @vercel/build-utils@7.4.1
+
+## 13.0.11
+
+### Patch Changes
+
+- Updated dependencies [[`4d63d9e95`](https://github.com/vercel/vercel/commit/4d63d9e954549d811063d259250d1865b7de2ba1)]:
+  - @vercel/build-utils@7.4.0
+
 ## 13.0.10
 
 ### Patch Changes

packages/client/package.json

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

packages/edge/docs/README.md

@@ -70,7 +70,7 @@ Unicode characters for emoji flags start at this number, and run up to 127469.
 
 • `Const` **IP_HEADER_NAME**: `"x-real-ip"`
 
-Client IP as calcualted by Vercel Proxy.
+Client IP as calculated by Vercel Proxy.
 
 #### Defined in
 

packages/edge/src/edge-headers.ts

@@ -7,7 +7,7 @@ export const CITY_HEADER_NAME = 'x-vercel-ip-city';
  */
 export const COUNTRY_HEADER_NAME = 'x-vercel-ip-country';
 /**
- * Client IP as calcualted by Vercel Proxy.
+ * Client IP as calculated by Vercel Proxy.
  */
 export const IP_HEADER_NAME = 'x-real-ip';
 /**

packages/frameworks/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @vercel/frameworks
 
+## 2.0.6
+
+### Patch Changes
+
+- Update nuxt logo ([#10977](https://github.com/vercel/vercel/pull/10977))
+
 ## 2.0.5
 
 ### Patch Changes

packages/frameworks/logos/nuxt.svg

@@ -1,5 +1,3 @@
-<svg width="48" height="38" viewBox="0 0 48 38" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M14.7599 35.9199L14.6399 35.7999C14.3999 35.3199 14.3999 34.8399 14.3999 34.3599H2.99992L20.0399 4.11988L27.1199 16.9599L29.3999 15.2799L22.3199 2.43988C22.1999 2.19988 21.3599 0.879883 19.9199 0.879883C19.3199 0.879883 18.3599 1.11988 17.6399 2.43988L0.479919 33.0399C0.359919 33.2799 -0.360081 34.7199 0.359919 35.9199C0.599919 36.5199 1.31992 37.1199 2.87992 37.1199H17.2799C15.7199 37.1199 14.9999 36.5199 14.7599 35.9199Z" fill="#00C58E"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M47.3999 33.1598L33.5999 8.31977C33.3599 8.07977 32.6399 6.75977 31.1999 6.75977C30.5999 6.75977 29.7599 6.99977 28.9199 8.31977L27.1199 11.1998V16.9598L31.1999 9.87977L44.8799 34.3598H39.7199C39.7913 34.853 39.7075 35.3563 39.4799 35.7998V35.9198C38.7599 37.1198 37.1999 37.1198 36.9599 37.1198H45.1199C45.3599 37.1198 46.9199 37.1198 47.6399 35.9198C47.8799 35.3198 48.1199 34.3598 47.3999 33.1598Z" fill="#108775"/>
-<path d="M39.84 35.9199V35.7999L39.96 35.5599C40.08 35.1999 40.2 34.7199 40.08 34.3599L39.6 33.0399L28.8 14.08L27.24 11.2H27.12L25.56 14.08L14.64 33.0399L14.28 34.3599C14.1908 34.8922 14.275 35.4391 14.52 35.9199C14.88 36.5199 15.6 37.1199 17.04 37.1199H37.2C37.56 37.1199 39.12 37.1199 39.84 35.9199ZM27.12 16.96L37.08 34.3599H17.28L27.12 16.96Z" fill="#2F495E"/>
+<svg width="61" height="40" viewBox="0 0 61 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path d="M33.997 39.539h22.528c.715 0 1.418-.183 2.038-.53a4.014 4.014 0 0 0 1.492-1.447 3.861 3.861 0 0 0 .545-1.977 3.86 3.86 0 0 0-.547-1.977L44.923 8.19a4.016 4.016 0 0 0-1.49-1.447 4.172 4.172 0 0 0-2.038-.53c-.716 0-1.418.183-2.038.53a4.016 4.016 0 0 0-1.492 1.447l-3.868 6.504-7.563-12.718A4.018 4.018 0 0 0 24.942.53 4.175 4.175 0 0 0 22.904 0c-.716 0-1.419.183-2.039.53a4.018 4.018 0 0 0-1.492 1.446L.547 33.608A3.861 3.861 0 0 0 0 35.585c0 .694.188 1.376.545 1.977.358.601.873 1.1 1.492 1.447.62.347 1.323.53 2.038.53h14.141c5.603 0 9.735-2.387 12.578-7.044l6.902-11.596 3.698-6.205 11.096 18.64H37.695l-3.699 6.205Zm-16.011-6.212-9.869-.002L22.91 8.474l7.381 12.425-4.942 8.305c-1.888 3.022-4.033 4.123-7.363 4.123Z" fill="#00DC82"/>
 </svg>

packages/frameworks/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/frameworks",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "main": "./dist/frameworks.js",
   "types": "./dist/frameworks.d.ts",
   "files": [

packages/fs-detectors/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @vercel/fs-detectors
 
+## 5.1.6
+
+### Patch Changes
+
+- Updated dependencies [[`471bdd5b4`](https://github.com/vercel/vercel/commit/471bdd5b4506f1410afd7bca6efae3bc696cd939)]:
+  - @vercel/frameworks@2.0.6
+
 ## 5.1.5
 
 ### Patch Changes

packages/fs-detectors/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/fs-detectors",
-  "version": "5.1.5",
+  "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": "2.0.5",
+    "@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.3.0",
+    "@vercel/build-utils": "7.5.0",
     "jest-junit": "16.0.0",
     "typescript": "4.9.5"
   }

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

@@ -1,5 +1,28 @@
 # @vercel/gatsby-plugin-vercel-builder
 
+## 2.0.15
+
+### Patch Changes
+
+- Updated dependencies [[`98040ec24`](https://github.com/vercel/vercel/commit/98040ec24e1ee585865d11eb216b6525d39d209e)]:
+  - @vercel/build-utils@7.5.0
+
+## 2.0.14
+
+### Patch Changes
+
+- Updated dependencies [[`67fa2f3dd`](https://github.com/vercel/vercel/commit/67fa2f3dd6a6d5a3504b7f9081e56deff7b36eab)]:
+  - @vercel/build-utils@7.4.1
+
+## 2.0.13
+
+### Patch Changes
+
+- Add support for "rewrites" ([#10954](https://github.com/vercel/vercel/pull/10954))
+
+- Updated dependencies [[`4d63d9e95`](https://github.com/vercel/vercel/commit/4d63d9e954549d811063d259250d1865b7de2ba1)]:
+  - @vercel/build-utils@7.4.0
+
 ## 2.0.12
 
 ### Patch Changes

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

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

packages/gatsby-plugin-vercel-builder/src/index.ts

@@ -1,4 +1,8 @@
-import { getTransformedRoutes } from '@vercel/routing-utils';
+import {
+  getTransformedRoutes,
+  type Redirect,
+  type Rewrite,
+} from '@vercel/routing-utils';
 import { writeJson } from 'fs-extra';
 import { validateGatsbyState } from './schemas';
 import {
@@ -31,7 +35,7 @@ export async function generateVercelBuildOutputAPI3Output({
   if (validateGatsbyState.Check(state)) {
     console.log('▲ Creating Vercel build output');
 
-    const { pages, redirects, functions, config: gatsbyConfig } = state;
+    const { pages, functions, config: gatsbyConfig } = state;
     const { pathPrefix = '' } = gatsbyConfig;
 
     const ssrRoutes = pages
@@ -60,14 +64,36 @@ export async function generateVercelBuildOutputAPI3Output({
       trailingSlash = false;
     }
 
-    const routes =
-      getTransformedRoutes({
-        trailingSlash,
-        redirects: redirects.map(({ fromPath, toPath, isPermanent }) => ({
+    const redirects: Redirect[] = [];
+    const rewrites: Rewrite[] = [];
+
+    for (const {
+      fromPath,
+      toPath,
+      isPermanent,
+      statusCode,
+    } of state.redirects) {
+      if (statusCode === 200) {
+        // A `statusCode` of 200 on `createRedirect()` creates a rewrite (i.e. a reverse proxy)
+        // https://www.gatsbyjs.com/docs/how-to/cloud/working-with-redirects-and-rewrites/#rewrites-and-reverse-proxies
+        rewrites.push({
+          source: fromPath,
+          destination: toPath,
+        });
+      } else {
+        redirects.push({
           source: fromPath,
           destination: toPath,
           permanent: isPermanent,
-        })),
+        });
+      }
+    }
+
+    const routes =
+      getTransformedRoutes({
+        trailingSlash,
+        redirects,
+        rewrites,
       }).routes || [];
 
     routes.push({

packages/gatsby-plugin-vercel-builder/src/schemas.ts

@@ -31,6 +31,7 @@ const GatsbyRedirectSchema = Type.Object({
   fromPath: Type.String(),
   toPath: Type.String(),
   isPermanent: Type.Optional(Type.Boolean()),
+  statusCode: Type.Optional(Type.Number()),
 });
 export type GatsbyRedirect = Static<typeof GatsbyRedirectSchema>;
 

packages/go/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @vercel/go
 
+## 3.0.5
+
+### Patch Changes
+
+- Remove `VERCEL_USE_GO_PROVIDED_RUNTIME` env var check ([#10968](https://github.com/vercel/vercel/pull/10968))
+
 ## 3.0.4
 
 ### Patch Changes

packages/go/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/go",
-  "version": "3.0.4",
+  "version": "3.0.5",
   "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/go",
@@ -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.3.0",
+    "@vercel/build-utils": "7.5.0",
     "async-retry": "1.3.3",
     "execa": "^1.0.0",
     "fs-extra": "^7.0.0",

packages/go/src/index.ts

@@ -249,10 +249,7 @@ export async function build({
       await buildHandlerWithGoMod(buildOptions);
     }
 
-    const runtime =
-      process.env.VERCEL_USE_GO_PROVIDED_RUNTIME === '1'
-        ? 'provided.al2'
-        : 'go1.x';
+    const runtime = 'provided.al2';
     const lambda = new Lambda({
       files: { ...(await glob('**', outDir)), ...includedFiles },
       handler: HANDLER_FILENAME,

packages/hydrogen/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @vercel/hydrogen
 
+## 1.0.2
+
+### Patch Changes
+
+- Deprecate `EdgeFunction#name` property ([#11010](https://github.com/vercel/vercel/pull/11010))
+
 ## 1.0.1
 
 ### Patch Changes

packages/hydrogen/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/hydrogen",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "license": "Apache-2.0",
   "main": "./dist/index.js",
   "homepage": "https://vercel.com/docs",
@@ -26,7 +26,7 @@
   "devDependencies": {
     "@types/jest": "27.5.1",
     "@types/node": "14.18.33",
-    "@vercel/build-utils": "7.3.0",
+    "@vercel/build-utils": "7.5.0",
     "execa": "3.2.0",
     "fs-extra": "11.1.0",
     "jest-junit": "16.0.0"

packages/hydrogen/src/build.ts

@@ -126,7 +126,6 @@ export const build: BuildV2 = async ({
   ]);
 
   const edgeFunction = new EdgeFunction({
-    name: 'hydrogen',
     deploymentTarget: 'v8-worker',
     entrypoint: 'index.js',
     files: edgeFunctionFiles,

packages/next/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @vercel/next
 
+## 4.0.17
+
+### Patch Changes
+
+- Ensure rewrites handle RSC requests ([#11005](https://github.com/vercel/vercel/pull/11005))
+
+- [next][node][redwood][remix] Bump `@vercel/nft@0.26.1` ([#11009](https://github.com/vercel/vercel/pull/11009))
+
+## 4.0.16
+
+### Patch Changes
+
+- Entries in the `prerender-manifest.json` without a `dataRoute` but with a `prefetchDataRoute` will be treated as an App Page. App Route's that do not have ([#10978](https://github.com/vercel/vercel/pull/10978))
+  a body will not cause a build error.
+
 ## 4.0.15
 
 ### Patch Changes

packages/next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "4.0.15",
+  "version": "4.0.17",
   "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.24.2"
+    "@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.3.0",
+    "@vercel/build-utils": "7.5.0",
     "@vercel/routing-utils": "3.1.0",
     "async-sema": "3.0.1",
     "buffer-crc32": "0.2.13",

packages/next/src/server-build.ts

@@ -213,6 +213,25 @@ export async function serverBuild({
         value.contentType = rscContentTypeHeader;
       }
     }
+
+    for (const rewrite of afterFilesRewrites) {
+      if (rewrite.src && rewrite.dest) {
+        rewrite.src = rewrite.src.replace(
+          '(?:/)?',
+          '(?<rscsuff>(\\.prefetch)?\\.rsc)?(?:/)?'
+        );
+        let destQueryIndex = rewrite.dest.indexOf('?');
+
+        if (destQueryIndex === -1) {
+          destQueryIndex = rewrite.dest.length;
+        }
+
+        rewrite.dest =
+          rewrite.dest.substring(0, destQueryIndex) +
+          '$rscsuff' +
+          rewrite.dest.substring(destQueryIndex);
+      }
+    }
   }
 
   const isCorrectNotFoundRoutes = semver.gte(
@@ -1857,6 +1876,26 @@ export async function serverBuild({
       // with that routing section
       ...afterFilesRewrites,
 
+      // ensure non-normalized /.rsc from rewrites is handled
+      ...(appPathRoutesManifest
+        ? [
+            {
+              src: path.posix.join('/', entryDirectory, '/\\.prefetch\\.rsc$'),
+              dest: path.posix.join(
+                '/',
+                entryDirectory,
+                `/__index${RSC_PREFETCH_SUFFIX}`
+              ),
+              check: true,
+            },
+            {
+              src: path.posix.join('/', entryDirectory, '/\\.rsc$'),
+              dest: path.posix.join('/', entryDirectory, `/index.rsc`),
+              check: true,
+            },
+          ]
+        : []),
+
       { handle: 'resource' },
 
       ...fallbackRewrites,

packages/next/src/utils.ts

@@ -2059,7 +2059,7 @@ export const onPrerenderRoute =
     }
 
     const isOmittedOrNotFound = isOmitted || isNotFound;
-    let htmlFsRef: File | null;
+    let htmlFsRef: File | null = null;
 
     // If enabled, try to get the postponed route information from the file
     // system and use it to assemble the prerender.
@@ -2108,14 +2108,22 @@ export const onPrerenderRoute =
     } else if (
       appDir &&
       !dataRoute &&
+      !prefetchDataRoute &&
       isAppPathRoute &&
       !(isBlocking || isFallback)
     ) {
       const contentType = initialHeaders?.['content-type'];
-      htmlFsRef = new FileFsRef({
-        fsPath: path.join(appDir, `${routeFileNoExt}.body`),
-        contentType: contentType || 'text/html;charset=utf-8',
-      });
+
+      // If the route has a body file, use it as the fallback, otherwise it may
+      // not have an associated fallback. This could be the case for routes that
+      // have dynamic segments.
+      const fsPath = path.join(appDir, `${routeFileNoExt}.body`);
+      if (fs.existsSync(fsPath)) {
+        htmlFsRef = new FileFsRef({
+          fsPath,
+          contentType: contentType || 'text/html;charset=utf-8',
+        });
+      }
     } else {
       htmlFsRef =
         isBlocking || (isNotFound && !static404Page)

packages/next/test/fixtures/00-app-dir-no-ppr/next.config.js

@@ -9,6 +9,10 @@ module.exports = {
         source: '/rewritten-to-dashboard',
         destination: '/dashboard',
       },
+      {
+        source: '/rewritten-to-index',
+        destination: '/?fromRewrite=1',
+      },
     ];
   },
 };

packages/next/test/fixtures/00-app-dir-no-ppr/vercel.json

@@ -18,6 +18,54 @@
     }
   ],
   "probes": [
+     {
+      "path": "/rewritten-to-dashboard",
+      "status": 200,
+      "mustContain": "html"
+    },
+    {
+      "path": "/rewritten-to-dashboard",
+      "status": 200,
+      "mustContain": ":",
+      "mustNotContain": "<html",
+      "headers": {
+        "RSC": 1,
+        "Next-Router-Prefetch": 1
+      }
+    },
+    {
+      "path": "/rewritten-to-dashboard",
+      "status": 200,
+      "mustContain": ":",
+      "mustNotContain": "<html",
+      "headers": {
+        "RSC": 1
+      }
+    },
+    {
+      "path": "/rewritten-to-index",
+      "status": 200,
+      "mustContain": "html"
+    },
+    {
+      "path": "/rewritten-to-index",
+      "status": 200,
+      "mustContain": ":",
+      "mustNotContain": "<html",
+      "headers": {
+        "RSC": 1,
+        "Next-Router-Prefetch": 1
+      }
+    },
+    {
+      "path": "/rewritten-to-index",
+      "status": 200,
+      "mustContain": ":",
+      "mustNotContain": "<html",
+      "headers": {
+        "RSC": 1
+      }
+    },
     {
       "path": "/catch-all",
       "status": 200,

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

@@ -10,6 +10,10 @@ module.exports = {
         source: '/rewritten-to-dashboard',
         destination: '/dashboard',
       },
+      {
+        source: '/rewritten-to-index',
+        destination: '/?fromRewrite=1',
+      },
     ];
   },
 };

packages/next/test/fixtures/00-app-dir-ppr/vercel.json

@@ -18,6 +18,54 @@
     }
   ],
   "probes": [
+    {
+      "path": "/rewritten-to-dashboard",
+      "status": 200,
+      "mustContain": "html"
+    },
+    {
+      "path": "/rewritten-to-dashboard",
+      "status": 200,
+      "mustContain": ":",
+      "mustNotContain": "<html",
+      "headers": {
+        "RSC": 1,
+        "Next-Router-Prefetch": 1
+      }
+    },
+    {
+      "path": "/rewritten-to-dashboard",
+      "status": 200,
+      "mustContain": ":",
+      "mustNotContain": "<html",
+      "headers": {
+        "RSC": 1
+      }
+    },
+    {
+      "path": "/rewritten-to-index",
+      "status": 200,
+      "mustContain": "html"
+    },
+    {
+      "path": "/rewritten-to-index",
+      "status": 200,
+      "mustContain": ":",
+      "mustNotContain": "<html",
+      "headers": {
+        "RSC": 1,
+        "Next-Router-Prefetch": 1
+      }
+    },
+    {
+      "path": "/rewritten-to-index",
+      "status": 200,
+      "mustContain": ":",
+      "mustNotContain": "<html",
+      "headers": {
+        "RSC": 1
+      }
+    },
     {
       "path": "/catch-all",
       "status": 200,

packages/next/test/fixtures/23-custom-routes-verbose/vercel.json

@@ -171,7 +171,7 @@
     // should match /_next file after rewrite
     {
       "path": "/hidden/_next/__NEXT_SCRIPT__(/hello)",
-      "mustContain": "createElement"
+      "status": 200
     },
     // should allow redirecting to external resource
     {

packages/node/CHANGELOG.md

@@ -1,5 +1,36 @@
 # @vercel/node
 
+## 3.0.16
+
+### Patch Changes
+
+- Deprecate `EdgeFunction#name` property ([#11010](https://github.com/vercel/vercel/pull/11010))
+
+- Updated dependencies [[`98040ec24`](https://github.com/vercel/vercel/commit/98040ec24e1ee585865d11eb216b6525d39d209e)]:
+  - @vercel/build-utils@7.5.0
+
+## 3.0.15
+
+### Patch Changes
+
+- Await waitUntil promises to resolve before exiting ([#10915](https://github.com/vercel/vercel/pull/10915))
+
+- [next][node][redwood][remix] Bump `@vercel/nft@0.26.1` ([#11009](https://github.com/vercel/vercel/pull/11009))
+
+## 3.0.14
+
+### Patch Changes
+
+- Updated dependencies [[`67fa2f3dd`](https://github.com/vercel/vercel/commit/67fa2f3dd6a6d5a3504b7f9081e56deff7b36eab)]:
+  - @vercel/build-utils@7.4.1
+
+## 3.0.13
+
+### Patch Changes
+
+- Updated dependencies [[`4d63d9e95`](https://github.com/vercel/vercel/commit/4d63d9e954549d811063d259250d1865b7de2ba1)]:
+  - @vercel/build-utils@7.4.0
+
 ## 3.0.12
 
 ### Patch Changes

packages/node/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/node",
-  "version": "3.0.12",
+  "version": "3.0.16",
   "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/node-js",
@@ -24,15 +24,14 @@
     "@edge-runtime/primitives": "4.0.5",
     "@edge-runtime/vm": "3.1.7",
     "@types/node": "14.18.33",
-    "@vercel/build-utils": "7.3.0",
+    "@vercel/build-utils": "7.5.0",
     "@vercel/error-utils": "2.0.2",
-    "@vercel/nft": "0.24.2",
+    "@vercel/nft": "0.26.2",
     "@vercel/static-config": "3.0.0",
     "async-listen": "3.0.0",
     "edge-runtime": "2.5.7",
     "esbuild": "0.14.47",
     "etag": "1.8.1",
-    "exit-hook": "2.2.1",
     "node-fetch": "2.6.9",
     "path-to-regexp": "6.2.1",
     "ts-morph": "12.0.0",
@@ -55,6 +54,7 @@
     "execa": "3.2.0",
     "fs-extra": "11.1.0",
     "jest-junit": "16.0.0",
-    "source-map-support": "0.5.12"
+    "source-map-support": "0.5.12",
+    "tree-kill": "1.2.2"
   }
 }

packages/node/src/dev-server.mts

@@ -24,7 +24,10 @@ async function createEventHandler(
   entrypoint: string,
   config: Config,
   options: { shouldAddHelpers: boolean }
-): Promise<(request: IncomingMessage) => Promise<VercelProxyResponse>> {
+): Promise<{
+  handler: (request: IncomingMessage) => Promise<VercelProxyResponse>;
+  onExit: (() => Promise<void>) | undefined;
+}> {
   const entrypointPath = join(process.cwd(), entrypoint!);
   const staticConfig = parseConfig(entrypointPath);
 
@@ -51,6 +54,7 @@ async function createEventHandler(
 
 let handleEvent: (request: IncomingMessage) => Promise<VercelProxyResponse>;
 let handlerEventError: Error;
+let onExit: (() => Promise<void>) | undefined;
 
 async function main() {
   const config = JSON.parse(process.env.VERCEL_DEV_CONFIG || '{}');
@@ -67,9 +71,11 @@ async function main() {
   await listen(proxyServer, { host: '127.0.0.1', port: 0 });
 
   try {
-    handleEvent = await createEventHandler(entrypoint!, config, {
+    const result = await createEventHandler(entrypoint!, config, {
       shouldAddHelpers,
     });
+    handleEvent = result.handler;
+    onExit = result.onExit;
   } catch (error: any) {
     logError(error);
     handlerEventError = error;
@@ -129,3 +135,17 @@ main().catch(err => {
   logError(err);
   process.exit(1);
 });
+
+process.on('message', async m => {
+  switch (m) {
+    case 'shutdown':
+      if (onExit) {
+        await onExit();
+      }
+
+      process.exit(0);
+    default:
+      console.error(`unknown IPC message from parent:`, m);
+      break;
+  }
+});

packages/node/src/edge-functions/edge-handler.mts

@@ -9,11 +9,11 @@ import { isError } from '@vercel/error-utils';
 import { readFileSync } from 'fs';
 import { serializeBody, entrypointToOutputPath, logError } from '../utils.js';
 import esbuild from 'esbuild';
-import exitHook from 'exit-hook';
 import { buildToHeaders } from '@edge-runtime/node-utils';
 import type { VercelProxyResponse } from '../types.js';
 import type { IncomingMessage } from 'http';
 import { fileURLToPath } from 'url';
+import { EdgeRuntimeServer } from 'edge-runtime/dist/server/run-server.js';
 
 const NODE_VERSION_MAJOR = process.version.match(/^v(\d+)\.\d+/)?.[1];
 const NODE_VERSION_IDENTIFIER = `node${NODE_VERSION_MAJOR}`;
@@ -127,7 +127,9 @@ async function createEdgeRuntimeServer(params?: {
   userCode: string;
   wasmAssets: WasmAssets;
   nodeCompatBindings: NodeCompatBindings;
-}) {
+}): Promise<
+  { server: EdgeRuntimeServer; onExit: () => Promise<void> } | undefined
+> {
   try {
     if (!params) {
       return undefined;
@@ -162,8 +164,34 @@ async function createEdgeRuntimeServer(params?: {
     });
 
     const server = await runServer({ runtime });
-    exitHook(() => server.close());
-    return server;
+
+    const onExit = async () => {
+      // When exiting this process, wait for the Edge Runtime server to finish
+      // all its work, especially waitUntil promises before exiting this process.
+      //
+      // Here we use a short timeout (10 seconds) to let the user know that
+      // it has a long-running waitUntil promise.
+      const WAIT_UNTIL_TIMEOUT = 10 * 1000;
+      const waitUntil = server.close();
+      return new Promise<void>((resolve, reject) => {
+        const timeout = setTimeout(() => {
+          console.warn(
+            `Edge Runtime server is still running after ${WAIT_UNTIL_TIMEOUT} ms` +
+              ` (hint: do you have a long-running waitUntil() promise?)`
+          );
+          resolve();
+        }, WAIT_UNTIL_TIMEOUT);
+
+        waitUntil
+          .then(() => resolve())
+          .catch(reject)
+          .finally(() => {
+            clearTimeout(timeout);
+          });
+      });
+    };
+
+    return { server, onExit };
   } catch (error: any) {
     // We can't easily show a meaningful stack trace from esbuild -> edge-runtime.
     // So, stick with just the message for now.
@@ -178,15 +206,22 @@ export async function createEdgeEventHandler(
   entrypointRelativePath: string,
   isMiddleware: boolean,
   isZeroConfig?: boolean
-): Promise<(request: IncomingMessage) => Promise<VercelProxyResponse>> {
+): Promise<{
+  handler: (request: IncomingMessage) => Promise<VercelProxyResponse>;
+  onExit: (() => Promise<void>) | undefined;
+}> {
   const userCode = await compileUserCode(
     entrypointFullPath,
     entrypointRelativePath,
     isMiddleware
   );
-  const server = await createEdgeRuntimeServer(userCode);
+  const result = await createEdgeRuntimeServer(userCode);
+  const server = result?.server;
+  const onExit = result?.onExit;
 
-  return async function (request: IncomingMessage) {
+  const handler = async function (
+    request: IncomingMessage
+  ): Promise<VercelProxyResponse> {
     if (!server) {
       // this error state is already logged, but we have to wait until here to exit the process
       // this matches the serverless function bridge launcher's behavior when
@@ -234,6 +269,11 @@ export async function createEdgeEventHandler(
       encoding: 'utf8',
     };
   };
+
+  return {
+    handler,
+    onExit,
+  };
 }
 
 function entrypointToRequestPath(

packages/node/src/index.ts

@@ -64,6 +64,8 @@ import {
   forkDevServer,
   readMessage as readDevServerMessage,
 } from './fork-dev-server';
+import _treeKill from 'tree-kill';
+import { promisify } from 'util';
 
 export { shouldServe };
 
@@ -84,6 +86,8 @@ const tscPath = resolve(dirname(require_.resolve('typescript')), '../bin/tsc');
 // eslint-disable-next-line no-useless-escape
 const libPathRegEx = /^node_modules|[\/\\]node_modules[\/\\]/;
 
+const treeKill = promisify(_treeKill);
+
 async function downloadInstallAndBundle({
   files,
   entrypoint,
@@ -479,9 +483,6 @@ export const build: BuildV3 = async ({
       entrypoint: handler,
       files: preparedFiles,
       regions: staticConfig?.regions,
-
-      // TODO: remove - these two properties should not be required
-      name: outputPath,
       deploymentTarget: 'v8-worker',
     });
   } else {
@@ -653,7 +654,21 @@ export const startDevServer: StartDevServer = async opts => {
       });
     }
 
-    return { port: message.value.port, pid };
+    // An optional callback for graceful shutdown.
+    const shutdown = async () => {
+      // Send a "shutdown" message to the child process. Ideally we'd use a signal
+      // (SIGTERM) here, but that doesn't work on Windows. This is a portable way
+      // to tell the child process to exit gracefully.
+      child.send('shutdown', async err => {
+        if (err) {
+          // The process might have already exited, for example, if the application
+          // handler threw an error. Try terminating the process to be sure.
+          await treeKill(pid);
+        }
+      });
+    };
+
+    return { port: message.value.port, pid, shutdown };
   } else {
     // Got "exit" event from child process
     const [exitCode, signal] = message.value;

packages/node/src/serverless-functions/serverless-handler.mts

@@ -1,7 +1,6 @@
 import { addHelpers } from './helpers.js';
 import { createServer } from 'http';
 import { serializeBody } from '../utils.js';
-import exitHook from 'exit-hook';
 import { type Dispatcher, Headers, request as undiciRequest } from 'undici';
 import { listen } from 'async-listen';
 import { isAbsolute } from 'path';
@@ -38,10 +37,16 @@ const HTTP_METHODS = [
   'PATCH',
 ];
 
-async function createServerlessServer(userCode: ServerlessFunctionSignature) {
+async function createServerlessServer(
+  userCode: ServerlessFunctionSignature
+): Promise<{ url: URL; onExit: () => Promise<void> }> {
   const server = createServer(userCode);
-  exitHook(() => server.close());
-  return { url: await listen(server) };
+  return {
+    url: await listen(server),
+    onExit: async () => {
+      server.close();
+    },
+  };
 }
 
 async function compileUserCode(
@@ -79,12 +84,17 @@ async function compileUserCode(
 export async function createServerlessEventHandler(
   entrypointPath: string,
   options: ServerlessServerOptions
-): Promise<(request: IncomingMessage) => Promise<VercelProxyResponse>> {
+): Promise<{
+  handler: (request: IncomingMessage) => Promise<VercelProxyResponse>;
+  onExit: () => Promise<void>;
+}> {
   const userCode = await compileUserCode(entrypointPath, options);
   const server = await createServerlessServer(userCode);
   const isStreaming = options.mode === 'streaming';
 
-  return async function (request: IncomingMessage) {
+  const handler = async function (
+    request: IncomingMessage
+  ): Promise<VercelProxyResponse> {
     const url = new URL(request.url ?? '/', server.url);
     const response = await undiciRequest(url, {
       body: await serializeBody(request),
@@ -111,4 +121,9 @@ export async function createServerlessEventHandler(
       encoding: 'utf8',
     };
   };
+
+  return {
+    handler,
+    onExit: server.onExit,
+  };
 }

packages/node/test/dev-fixtures/edge-waituntil.js

@@ -0,0 +1,24 @@
+/* global Response */
+
+export const config = { runtime: 'edge' };
+
+async function sleep(ms) {
+  return new Promise(resolve => setTimeout(resolve, ms));
+}
+
+async function doSlowWork(pingUrl) {
+  // Wait for 1 second: if this waitUntil promise is not awaited before
+  // exiting dev server, the pingUrl won't be fetched.
+  await sleep(1000);
+  await fetch(pingUrl);
+}
+
+export default async (req, ctx) => {
+  const pingUrl = req.headers.get('x-ping-url');
+  if (!pingUrl) {
+    throw new Error('x-ping-url is not set');
+  }
+
+  ctx.waitUntil(doSlowWork(pingUrl));
+  return new Response('running waitUntil promises asynchronously...');
+};

packages/node/test/unit/dev.test.ts

@@ -307,3 +307,88 @@ test('allow setting multiple cookies with same name', async () => {
     child.kill(9);
   }
 });
+
+test('dev server waits for waitUntil promises to resolve', async () => {
+  async function startPingServer() {
+    let resolve: (value: any) => void;
+    const promise = new Promise<void>(resolve_ => {
+      resolve = resolve_;
+    });
+
+    const pingServer = createServer((req, res) => {
+      res.end('pong');
+      resolve('got a fetch from waitUntil');
+    });
+
+    const pingUrl = (await listen(pingServer)).toString();
+    return {
+      pingUrl,
+      pingServer,
+      promise,
+    };
+  }
+
+  async function withTimeout(
+    promise: Promise<unknown>,
+    name: string,
+    ms: number
+  ) {
+    return await Promise.race([
+      promise,
+      new Promise(resolve =>
+        setTimeout(
+          () => resolve(`${name} promise was not resolved in ${ms} ms`),
+          ms
+        )
+      ),
+    ]);
+  }
+
+  const { promise: pingPromise, pingServer, pingUrl } = await startPingServer();
+  const child = testForkDevServer('./edge-waituntil.js');
+  const exitPromise = new Promise(resolve => {
+    child.on('exit', code => {
+      resolve(`child has exited with ${code}`);
+    });
+  });
+
+  try {
+    const result = await readMessage(child);
+    if (result.state !== 'message') {
+      throw new Error('Exited. error: ' + JSON.stringify(result.value));
+    }
+
+    const { address, port } = result.value;
+    const response = await fetch(
+      `http://${address}:${port}/api/edge-waituntil`,
+      {
+        headers: {
+          'x-ping-url': pingUrl,
+        },
+      }
+    );
+
+    expect({
+      status: response.status,
+      body: await response.text(),
+    }).toEqual({
+      status: 200,
+      body: 'running waitUntil promises asynchronously...',
+    });
+
+    // Dev server should keep running until waitUntil promise resolves...
+    child.send('shutdown');
+
+    // Wait for waitUntil promise to resolve...
+    expect(await withTimeout(pingPromise, 'ping server', 3000)).toBe(
+      'got a fetch from waitUntil'
+    );
+    // Make sure child process has exited.
+    expect(await withTimeout(exitPromise, 'child exit', 5000)).toBe(
+      'child has exited with 0'
+    );
+  } finally {
+    child.kill(9);
+    pingServer.close();
+  }
+});

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.3.0",
+    "@vercel/build-utils": "7.5.0",
     "execa": "^1.0.0",
     "fs-extra": "11.1.1",
     "jest-junit": "16.0.0",

packages/redwood/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @vercel/redwood
 
+## 2.0.6
+
+### Patch Changes
+
+- [next][node][redwood][remix] Bump `@vercel/nft@0.26.1` ([#11009](https://github.com/vercel/vercel/pull/11009))
+
 ## 2.0.5
 
 ### Patch Changes

packages/redwood/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/redwood",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "main": "./dist/index.js",
   "license": "Apache-2.0",
   "homepage": "https://vercel.com/docs",
@@ -20,7 +20,7 @@
     "type-check": "tsc --noEmit"
   },
   "dependencies": {
-    "@vercel/nft": "0.24.2",
+    "@vercel/nft": "0.26.2",
     "@vercel/routing-utils": "3.1.0",
     "semver": "6.3.1"
   },
@@ -28,7 +28,7 @@
     "@types/aws-lambda": "8.10.19",
     "@types/node": "14.18.33",
     "@types/semver": "6.0.0",
-    "@vercel/build-utils": "7.3.0",
+    "@vercel/build-utils": "7.5.0",
     "execa": "3.2.0",
     "fs-extra": "11.1.0",
     "jest-junit": "16.0.0"

packages/remix/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @vercel/remix-builder
 
+## 2.0.17
+
+### Patch Changes
+
+- Deprecate `EdgeFunction#name` property ([#11010](https://github.com/vercel/vercel/pull/11010))
+
+## 2.0.16
+
+### Patch Changes
+
+- [next][node][redwood][remix] Bump `@vercel/nft@0.26.1` ([#11009](https://github.com/vercel/vercel/pull/11009))
+
+- Update `@remix-run/dev` fork to v2.4.1 ([#10992](https://github.com/vercel/vercel/pull/10992))
+
+## 2.0.15
+
+### Patch Changes
+
+- Update `@remix-run/dev` fork to v2.4.0 ([#10943](https://github.com/vercel/vercel/pull/10943))
+
+## 2.0.14
+
+### Patch Changes
+
+- Reinstall dependencies during `prepareCache()` ([#10922](https://github.com/vercel/vercel/pull/10922))
+
 ## 2.0.13
 
 ### Patch Changes

packages/remix/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/remix-builder",
-  "version": "2.0.13",
+  "version": "2.0.17",
   "license": "Apache-2.0",
   "main": "./dist/index.js",
   "homepage": "https://vercel.com/docs",
@@ -21,16 +21,16 @@
     "defaults"
   ],
   "dependencies": {
-    "@vercel/nft": "0.24.2",
+    "@vercel/nft": "0.26.2",
     "@vercel/static-config": "3.0.0",
     "ts-morph": "12.0.0"
   },
   "devDependencies": {
-    "@remix-run/dev": "npm:@vercel/remix-run-dev@2.3.1",
+    "@remix-run/dev": "npm:@vercel/remix-run-dev@2.4.1",
     "@types/jest": "27.5.1",
     "@types/node": "14.18.33",
     "@types/semver": "7.3.13",
-    "@vercel/build-utils": "7.3.0",
+    "@vercel/build-utils": "7.5.0",
     "jest-junit": "16.0.0",
     "path-to-regexp": "6.2.1",
     "semver": "7.5.2"

packages/remix/src/build.ts

@@ -104,15 +104,17 @@ export const build: BuildV2 = async ({
     meta
   );
 
-  const { cliType, packageJsonPath, lockfileVersion } = await scanParentDirs(
-    entrypointFsDirname
-  );
+  const { cliType, packageJsonPath, lockfileVersion, lockfilePath } =
+    await scanParentDirs(entrypointFsDirname);
 
   if (!packageJsonPath) {
     throw new Error('Failed to locate `package.json` file in your project');
   }
 
-  const pkgRaw = await fs.readFile(packageJsonPath, 'utf8');
+  const [lockfileRaw, pkgRaw] = await Promise.all([
+    lockfilePath ? fs.readFile(lockfilePath) : null,
+    fs.readFile(packageJsonPath, 'utf8'),
+  ]);
   const pkg = JSON.parse(pkgRaw);
 
   const spawnOpts = getSpawnOptions(meta, nodeVersion);
@@ -423,9 +425,7 @@ module.exports = config;`;
       cleanupOps.push(
         fs
           .rename(renamedRemixConfigPath, remixConfigPath)
-          .then(() =>
-            debug(`Restored original "${basename(remixConfigPath)}" file`)
-          )
+          .then(() => debug(`Restored original "${remixConfigPath}" file`))
       );
     }
     // Restore original server entrypoint if it was modified (for Hydrogen v2)
@@ -433,11 +433,24 @@ module.exports = config;`;
       cleanupOps.push(
         fs
           .writeFile(serverEntryPointAbs, originalServerEntryPoint)
-          .then(() =>
-            debug(`Restored original "${basename(serverEntryPointAbs!)}" file`)
-          )
+          .then(() => debug(`Restored original "${serverEntryPointAbs}" file`))
       );
     }
+    // Restore original `package.json` file and lockfile
+    if (depsModified) {
+      cleanupOps.push(
+        fs
+          .writeFile(packageJsonPath, pkgRaw)
+          .then(() => debug(`Restored original "${packageJsonPath}" file`))
+      );
+      if (lockfilePath && lockfileRaw) {
+        cleanupOps.push(
+          fs
+            .writeFile(lockfilePath, lockfileRaw)
+            .then(() => debug(`Restored original "${lockfilePath}" file`))
+        );
+      }
+    }
     await Promise.all(cleanupOps);
   }
 
@@ -527,17 +540,7 @@ module.exports = config;`;
       throw new Error(`Could not determine server bundle for "${route.id}"`);
     }
 
-    output[path] =
-      func instanceof EdgeFunction
-        ? // `EdgeFunction` currently requires the "name" property to be set.
-          // Ideally this property will be removed, at which point we can
-          // return the same `edgeFunction` instance instead of creating a
-          // new one for each page.
-          new EdgeFunction({
-            ...func,
-            name: path,
-          })
-        : func;
+    output[path] = func;
 
     // If this is a dynamic route then add a Vercel route
     const re = getRegExpFromPath(rePath);
@@ -560,10 +563,7 @@ module.exports = config;`;
     );
     const func =
       edgeFunctionIndex !== -1 ? functions[edgeFunctionIndex] : functions[0];
-    output['404'] =
-      func instanceof EdgeFunction
-        ? new EdgeFunction({ ...func, name: '404' })
-        : func;
+    output['404'] = func;
   }
   routes.push({
     src: '/(.*)',
@@ -754,7 +754,6 @@ async function createRenderEdgeFunction(
   const fn = new EdgeFunction({
     files,
     deploymentTarget: 'v8-worker',
-    name: 'render',
     entrypoint: handler,
     regions: config.regions,
     framework: {

packages/remix/src/prepare-cache.ts

@@ -1,4 +1,9 @@
-import { glob } from '@vercel/build-utils';
+import {
+  getNodeVersion,
+  getSpawnOptions,
+  glob,
+  runNpmInstall,
+} from '@vercel/build-utils';
 import { dirname, join, relative } from 'path';
 import { require_, chdirAndReadConfig } from './utils';
 import type { PrepareCache } from '@vercel/build-utils';
@@ -7,10 +12,32 @@ export const prepareCache: PrepareCache = async ({
   entrypoint,
   repoRootPath,
   workPath,
+  config,
 }) => {
   const root = repoRootPath || workPath;
   const mountpoint = dirname(entrypoint);
   const entrypointFsDirname = join(workPath, mountpoint);
+
+  // Because the `node_modules` directory was modified to install
+  // the forked Remix compiler, re-install to the "fresh" dependencies
+  // state before the cache gets created.
+  const nodeVersion = await getNodeVersion(
+    entrypointFsDirname,
+    undefined,
+    config
+  );
+  const spawnOpts = getSpawnOptions({}, nodeVersion);
+  await runNpmInstall(
+    entrypointFsDirname,
+    [],
+    {
+      ...spawnOpts,
+      stdio: 'ignore',
+    },
+    undefined,
+    nodeVersion
+  );
+
   const packageJsonPath = join(entrypointFsDirname, 'package.json');
   const remixRunDevPath = dirname(
     require_.resolve('@remix-run/dev/package.json', {

packages/ruby/package.json

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

packages/static-build/CHANGELOG.md

@@ -1,5 +1,28 @@
 # @vercel/static-build
 
+## 2.0.17
+
+### Patch Changes
+
+- Deprecate `EdgeFunction#name` property ([#11010](https://github.com/vercel/vercel/pull/11010))
+
+- Updated dependencies []:
+  - @vercel/gatsby-plugin-vercel-builder@2.0.15
+
+## 2.0.16
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @vercel/gatsby-plugin-vercel-builder@2.0.14
+
+## 2.0.15
+
+### Patch Changes
+
+- Updated dependencies [[`652a31275`](https://github.com/vercel/vercel/commit/652a3127533974c426ea8e5b1047af1aecddb57e)]:
+  - @vercel/gatsby-plugin-vercel-builder@2.0.13
+
 ## 2.0.14
 
 ### Patch Changes

packages/static-build/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/static-build",
-  "version": "2.0.14",
+  "version": "2.0.17",
   "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.12",
+    "@vercel/gatsby-plugin-vercel-builder": "2.0.15",
     "@vercel/static-config": "3.0.0",
     "ts-morph": "12.0.0"
   },
@@ -35,10 +35,10 @@
     "@types/node-fetch": "2.5.4",
     "@types/promise-timeout": "1.3.0",
     "@types/semver": "7.3.13",
-    "@vercel/build-utils": "7.3.0",
+    "@vercel/build-utils": "7.5.0",
     "@vercel/error-utils": "2.0.2",
-    "@vercel/frameworks": "2.0.5",
-    "@vercel/fs-detectors": "5.1.5",
+    "@vercel/frameworks": "2.0.6",
+    "@vercel/fs-detectors": "5.1.6",
     "@vercel/routing-utils": "3.1.0",
     "execa": "3.2.0",
     "fs-extra": "10.0.0",

packages/static-build/src/utils/build-output-v2.ts

@@ -80,7 +80,6 @@ export async function readBuildOutputDirectory({
       files: {
         '_middleware.js': middleware.file,
       },
-      name: 'middleware',
       regions: (() => {
         try {
           const project = new Project();

packages/static-build/test/fixtures/angular-v17/.editorconfig

@@ -0,0 +1,16 @@
+# Editor configuration, see https://editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.ts]
+quote_type = single
+
+[*.md]
+max_line_length = off
+trim_trailing_whitespace = false

packages/static-build/test/fixtures/angular-v17/.gitignore

@@ -0,0 +1,42 @@
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+
+# Compiled output
+/dist
+/tmp
+/out-tsc
+/bazel-out
+
+# Node
+/node_modules
+npm-debug.log
+yarn-error.log
+
+# IDEs and editors
+.idea/
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+*.sublime-workspace
+
+# Visual Studio Code
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+.history/*
+
+# Miscellaneous
+/.angular/cache
+.sass-cache/
+/connect.lock
+/coverage
+/libpeerconnection.log
+testem.log
+/typings
+
+# System files
+.DS_Store
+Thumbs.db

packages/static-build/test/fixtures/angular-v17/README.md

@@ -0,0 +1,27 @@
+# AngularV17
+
+This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 17.0.7.
+
+## Development server
+
+Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The application will automatically reload if you change any of the source files.
+
+## Code scaffolding
+
+Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module`.
+
+## Build
+
+Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory.
+
+## Running unit tests
+
+Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
+
+## Running end-to-end tests
+
+Run `ng e2e` to execute the end-to-end tests via a platform of your choice. To use this command, you need to first add a package that implements end-to-end testing capabilities.
+
+## Further help
+
+To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI Overview and Command Reference](https://angular.io/cli) page.

packages/static-build/test/fixtures/angular-v17/angular.json

@@ -0,0 +1,95 @@
+{
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "version": 1,
+  "newProjectRoot": "projects",
+  "projects": {
+    "angular-v17": {
+      "projectType": "application",
+      "schematics": {},
+      "root": "",
+      "sourceRoot": "src",
+      "prefix": "app",
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-angular:application",
+          "options": {
+            "outputPath": "dist/angular-v17",
+            "index": "src/index.html",
+            "browser": "src/main.ts",
+            "polyfills": [
+              "zone.js"
+            ],
+            "tsConfig": "tsconfig.app.json",
+            "assets": [
+              "src/favicon.ico",
+              "src/assets"
+            ],
+            "styles": [
+              "src/styles.css"
+            ],
+            "scripts": []
+          },
+          "configurations": {
+            "production": {
+              "budgets": [
+                {
+                  "type": "initial",
+                  "maximumWarning": "500kb",
+                  "maximumError": "1mb"
+                },
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "2kb",
+                  "maximumError": "4kb"
+                }
+              ],
+              "outputHashing": "all"
+            },
+            "development": {
+              "optimization": false,
+              "extractLicenses": false,
+              "sourceMap": true
+            }
+          },
+          "defaultConfiguration": "production"
+        },
+        "serve": {
+          "builder": "@angular-devkit/build-angular:dev-server",
+          "configurations": {
+            "production": {
+              "buildTarget": "angular-v17:build:production"
+            },
+            "development": {
+              "buildTarget": "angular-v17:build:development"
+            }
+          },
+          "defaultConfiguration": "development"
+        },
+        "extract-i18n": {
+          "builder": "@angular-devkit/build-angular:extract-i18n",
+          "options": {
+            "buildTarget": "angular-v17:build"
+          }
+        },
+        "test": {
+          "builder": "@angular-devkit/build-angular:karma",
+          "options": {
+            "polyfills": [
+              "zone.js",
+              "zone.js/testing"
+            ],
+            "tsConfig": "tsconfig.spec.json",
+            "assets": [
+              "src/favicon.ico",
+              "src/assets"
+            ],
+            "styles": [
+              "src/styles.css"
+            ],
+            "scripts": []
+          }
+        }
+      }
+    }
+  }
+}

packages/static-build/test/fixtures/angular-v17/package.json

@@ -0,0 +1,38 @@
+{
+  "name": "angular-v17",
+  "version": "0.0.0",
+  "scripts": {
+    "ng": "ng",
+    "start": "ng serve",
+    "build": "ng build",
+    "watch": "ng build --watch --configuration development",
+    "test": "ng test"
+  },
+  "private": true,
+  "dependencies": {
+    "@angular/animations": "^17.0.0",
+    "@angular/common": "^17.0.0",
+    "@angular/compiler": "^17.0.0",
+    "@angular/core": "^17.0.0",
+    "@angular/forms": "^17.0.0",
+    "@angular/platform-browser": "^17.0.0",
+    "@angular/platform-browser-dynamic": "^17.0.0",
+    "@angular/router": "^17.0.0",
+    "rxjs": "~7.8.0",
+    "tslib": "^2.3.0",
+    "zone.js": "~0.14.2"
+  },
+  "devDependencies": {
+    "@angular-devkit/build-angular": "^17.0.7",
+    "@angular/cli": "^17.0.7",
+    "@angular/compiler-cli": "^17.0.0",
+    "@types/jasmine": "~5.1.0",
+    "jasmine-core": "~5.1.0",
+    "karma": "~6.4.0",
+    "karma-chrome-launcher": "~3.2.0",
+    "karma-coverage": "~2.2.0",
+    "karma-jasmine": "~5.1.0",
+    "karma-jasmine-html-reporter": "~2.1.0",
+    "typescript": "~5.2.2"
+  }
+}

packages/static-build/test/fixtures/angular-v17/probes.json

@@ -0,0 +1,5 @@
+{
+  "probes": [
+    { "path": "/", "mustContain": "Angular V17" }
+  ]
+}

packages/static-build/test/fixtures/angular-v17/src/app/app.component.html

@@ -0,0 +1,336 @@
+<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
+<!-- * * * * * * * * * * * The content below * * * * * * * * * * * -->
+<!-- * * * * * * * * * * is only a placeholder * * * * * * * * * * -->
+<!-- * * * * * * * * * * and can be replaced.  * * * * * * * * * * -->
+<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
+<!-- * * * * * * * * * Delete the template below * * * * * * * * * -->
+<!-- * * * * * * * to get started with your project! * * * * * * * -->
+<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
+
+<style>
+  :host {
+    --bright-blue: oklch(51.01% 0.274 263.83);
+    --electric-violet: oklch(53.18% 0.28 296.97);
+    --french-violet: oklch(47.66% 0.246 305.88);
+    --vivid-pink: oklch(69.02% 0.277 332.77);
+    --hot-red: oklch(61.42% 0.238 15.34);
+    --orange-red: oklch(63.32% 0.24 31.68);
+
+    --gray-900: oklch(19.37% 0.006 300.98);
+    --gray-700: oklch(36.98% 0.014 302.71);
+    --gray-400: oklch(70.9% 0.015 304.04);
+
+    --red-to-pink-to-purple-vertical-gradient: linear-gradient(
+      180deg,
+      var(--orange-red) 0%,
+      var(--vivid-pink) 50%,
+      var(--electric-violet) 100%
+    );
+
+    --red-to-pink-to-purple-horizontal-gradient: linear-gradient(
+      90deg,
+      var(--orange-red) 0%,
+      var(--vivid-pink) 50%,
+      var(--electric-violet) 100%
+    );
+
+    --pill-accent: var(--bright-blue);
+
+    font-family: "Inter", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
+      Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji",
+      "Segoe UI Symbol";
+    box-sizing: border-box;
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
+  }
+
+  h1 {
+    font-size: 3.125rem;
+    color: var(--gray-900);
+    font-weight: 500;
+    line-height: 100%;
+    letter-spacing: -0.125rem;
+    margin: 0;
+    font-family: "Inter Tight", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
+      Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji",
+      "Segoe UI Symbol";
+  }
+
+  p {
+    margin: 0;
+    color: var(--gray-700);
+  }
+
+  main {
+    width: 100%;
+    min-height: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    padding: 1rem;
+    box-sizing: inherit;
+    position: relative;
+  }
+
+  .angular-logo {
+    max-width: 9.2rem;
+  }
+
+  .content {
+    display: flex;
+    justify-content: space-around;
+    width: 100%;
+    max-width: 700px;
+    margin-bottom: 3rem;
+  }
+
+  .content h1 {
+    margin-top: 1.75rem;
+  }
+
+  .content p {
+    margin-top: 1.5rem;
+  }
+
+  .divider {
+    width: 1px;
+    background: var(--red-to-pink-to-purple-vertical-gradient);
+    margin-inline: 0.5rem;
+  }
+
+  .pill-group {
+    display: flex;
+    flex-direction: column;
+    align-items: start;
+    flex-wrap: wrap;
+    gap: 1.25rem;
+  }
+
+  .pill {
+    display: flex;
+    align-items: center;
+    --pill-accent: var(--bright-blue);
+    background: color-mix(in srgb, var(--pill-accent) 5%, transparent);
+    color: var(--pill-accent);
+    padding-inline: 0.75rem;
+    padding-block: 0.375rem;
+    border-radius: 2.75rem;
+    border: 0;
+    transition: background 0.3s ease;
+    font-family: var(--inter-font);
+    font-size: 0.875rem;
+    font-style: normal;
+    font-weight: 500;
+    line-height: 1.4rem;
+    letter-spacing: -0.00875rem;
+    text-decoration: none;
+  }
+
+  .pill:hover {
+    background: color-mix(in srgb, var(--pill-accent) 15%, transparent);
+  }
+
+  .pill-group .pill:nth-child(6n + 1) {
+    --pill-accent: var(--bright-blue);
+  }
+  .pill-group .pill:nth-child(6n + 2) {
+    --pill-accent: var(--french-violet);
+  }
+  .pill-group .pill:nth-child(6n + 3),
+  .pill-group .pill:nth-child(6n + 4),
+  .pill-group .pill:nth-child(6n + 5) {
+    --pill-accent: var(--hot-red);
+  }
+
+  .pill-group svg {
+    margin-inline-start: 0.25rem;
+  }
+
+  .social-links {
+    display: flex;
+    align-items: center;
+    gap: 0.73rem;
+    margin-top: 1.5rem;
+  }
+
+  .social-links path {
+    transition: fill 0.3s ease;
+    fill: var(--gray-400);
+  }
+
+  .social-links a:hover svg path {
+    fill: var(--gray-900);
+  }
+
+  @media screen and (max-width: 650px) {
+    .content {
+      flex-direction: column;
+      width: max-content;
+    }
+
+    .divider {
+      height: 1px;
+      width: 100%;
+      background: var(--red-to-pink-to-purple-horizontal-gradient);
+      margin-block: 1.5rem;
+    }
+  }
+</style>
+
+<main class="main">
+  <div class="content">
+    <div class="left-side">
+      <svg
+        xmlns="http://www.w3.org/2000/svg"
+        viewBox="0 0 982 239"
+        fill="none"
+        class="angular-logo"
+      >
+        <g clip-path="url(#a)">
+          <path
+            fill="url(#b)"
+            d="M388.676 191.625h30.849L363.31 31.828h-35.758l-56.215 159.797h30.848l13.174-39.356h60.061l13.256 39.356Zm-65.461-62.675 21.602-64.311h1.227l21.602 64.311h-44.431Zm126.831-7.527v70.202h-28.23V71.839h27.002v20.374h1.392c2.782-6.71 7.2-12.028 13.255-15.956 6.056-3.927 13.584-5.89 22.503-5.89 8.264 0 15.465 1.8 21.684 5.318 6.137 3.518 10.964 8.673 14.319 15.382 3.437 6.71 5.074 14.81 4.992 24.383v76.175h-28.23v-71.92c0-8.019-2.046-14.237-6.219-18.819-4.173-4.5-9.819-6.791-17.102-6.791-4.91 0-9.328 1.063-13.174 3.272-3.846 2.128-6.792 5.237-9.001 9.328-2.046 4.009-3.191 8.918-3.191 14.728ZM589.233 239c-10.147 0-18.82-1.391-26.103-4.091-7.282-2.7-13.092-6.382-17.511-10.964-4.418-4.582-7.528-9.655-9.164-15.219l25.448-6.136c1.145 2.372 2.782 4.663 4.991 6.954 2.209 2.291 5.155 4.255 8.837 5.81 3.683 1.554 8.428 2.291 14.074 2.291 8.019 0 14.647-1.964 19.884-5.81 5.237-3.845 7.856-10.227 7.856-19.064v-22.665h-1.391c-1.473 2.946-3.601 5.892-6.383 9.001-2.782 3.109-6.464 5.645-10.965 7.691-4.582 2.046-10.228 3.109-17.101 3.109-9.165 0-17.511-2.209-25.039-6.545-7.446-4.337-13.42-10.883-17.757-19.474-4.418-8.673-6.628-19.473-6.628-32.565 0-13.091 2.21-24.301 6.628-33.383 4.419-9.082 10.311-15.955 17.839-20.7 7.528-4.746 15.874-7.037 25.039-7.037 7.037 0 12.846 1.145 17.347 3.518 4.582 2.373 8.182 5.236 10.883 8.51 2.7 3.272 4.746 6.382 6.137 9.327h1.554v-19.8h27.821v121.749c0 10.228-2.454 18.737-7.364 25.447-4.91 6.709-11.538 11.7-20.048 15.055-8.509 3.355-18.165 4.991-28.884 4.991Zm.245-71.266c5.974 0 11.047-1.473 15.302-4.337 4.173-2.945 7.446-7.118 9.573-12.519 2.21-5.482 3.274-12.027 3.274-19.637 0-7.609-1.064-14.155-3.274-19.8-2.127-5.646-5.318-10.064-9.491-13.255-4.174-3.11-9.329-4.746-15.384-4.746s-11.537 1.636-15.792 4.91c-4.173 3.272-7.365 7.772-9.492 13.418-2.128 5.727-3.191 12.191-3.191 19.392 0 7.2 1.063 13.745 3.273 19.228 2.127 5.482 5.318 9.736 9.573 12.764 4.174 3.027 9.41 4.582 15.629 4.582Zm141.56-26.51V71.839h28.23v119.786h-27.412v-21.273h-1.227c-2.7 6.709-7.119 12.191-13.338 16.446-6.137 4.255-13.747 6.382-22.748 6.382-7.855 0-14.81-1.718-20.783-5.237-5.974-3.518-10.72-8.591-14.075-15.382-3.355-6.709-5.073-14.891-5.073-24.464V71.839h28.312v71.921c0 7.609 2.046 13.664 6.219 18.083 4.173 4.5 9.655 6.709 16.365 6.709 4.173 0 8.183-.982 12.111-3.028 3.927-2.045 7.118-5.072 9.655-9.082 2.537-4.091 3.764-9.164 3.764-15.218Zm65.707-109.395v159.796h-28.23V31.828h28.23Zm44.841 162.169c-7.61 0-14.402-1.391-20.457-4.091-6.055-2.7-10.883-6.791-14.32-12.109-3.518-5.319-5.237-11.946-5.237-19.801 0-6.791 1.228-12.355 3.765-16.773 2.536-4.419 5.891-7.937 10.228-10.637 4.337-2.618 9.164-4.664 14.647-6.055 5.4-1.391 11.046-2.373 16.856-3.027 7.037-.737 12.683-1.391 17.102-1.964 4.337-.573 7.528-1.555 9.574-2.782 1.963-1.309 3.027-3.273 3.027-5.973v-.491c0-5.891-1.718-10.391-5.237-13.664-3.518-3.191-8.51-4.828-15.056-4.828-6.955 0-12.356 1.473-16.447 4.5-4.009 3.028-6.71 6.546-8.183 10.719l-26.348-3.764c2.046-7.282 5.483-13.336 10.31-18.328 4.746-4.909 10.638-8.59 17.511-11.045 6.955-2.455 14.565-3.682 22.912-3.682 5.809 0 11.537.654 17.265 2.045s10.965 3.6 15.711 6.71c4.746 3.109 8.51 7.282 11.455 12.6 2.864 5.318 4.337 11.946 4.337 19.883v80.184h-27.166v-16.446h-.9c-1.719 3.355-4.092 6.464-7.201 9.328-3.109 2.864-6.955 5.237-11.619 6.955-4.828 1.718-10.229 2.536-16.529 2.536Zm7.364-20.701c5.646 0 10.556-1.145 14.729-3.354 4.173-2.291 7.364-5.237 9.655-9.001 2.292-3.763 3.355-7.854 3.355-12.273v-14.155c-.9.737-2.373 1.391-4.5 2.046-2.128.654-4.419 1.145-7.037 1.636-2.619.491-5.155.9-7.692 1.227-2.537.328-4.746.655-6.628.901-4.173.572-8.019 1.472-11.292 2.781-3.355 1.31-5.973 3.11-7.855 5.401-1.964 2.291-2.864 5.318-2.864 8.918 0 5.237 1.882 9.164 5.728 11.782 3.682 2.782 8.51 4.091 14.401 4.091Zm64.643 18.328V71.839h27.412v19.965h1.227c2.21-6.955 5.974-12.274 11.292-16.038 5.319-3.763 11.456-5.645 18.329-5.645 1.555 0 3.355.082 5.237.163 1.964.164 3.601.328 4.91.573v25.938c-1.227-.41-3.109-.819-5.646-1.146a58.814 58.814 0 0 0-7.446-.49c-5.155 0-9.738 1.145-13.829 3.354-4.091 2.209-7.282 5.236-9.655 9.164-2.373 3.927-3.519 8.427-3.519 13.5v70.448h-28.312ZM222.077 39.192l-8.019 125.923L137.387 0l84.69 39.192Zm-53.105 162.825-57.933 33.056-57.934-33.056 11.783-28.556h92.301l11.783 28.556ZM111.039 62.675l30.357 73.803H80.681l30.358-73.803ZM7.937 165.115 0 39.192 84.69 0 7.937 165.115Z"
+          />
+          <path
+            fill="url(#c)"
+            d="M388.676 191.625h30.849L363.31 31.828h-35.758l-56.215 159.797h30.848l13.174-39.356h60.061l13.256 39.356Zm-65.461-62.675 21.602-64.311h1.227l21.602 64.311h-44.431Zm126.831-7.527v70.202h-28.23V71.839h27.002v20.374h1.392c2.782-6.71 7.2-12.028 13.255-15.956 6.056-3.927 13.584-5.89 22.503-5.89 8.264 0 15.465 1.8 21.684 5.318 6.137 3.518 10.964 8.673 14.319 15.382 3.437 6.71 5.074 14.81 4.992 24.383v76.175h-28.23v-71.92c0-8.019-2.046-14.237-6.219-18.819-4.173-4.5-9.819-6.791-17.102-6.791-4.91 0-9.328 1.063-13.174 3.272-3.846 2.128-6.792 5.237-9.001 9.328-2.046 4.009-3.191 8.918-3.191 14.728ZM589.233 239c-10.147 0-18.82-1.391-26.103-4.091-7.282-2.7-13.092-6.382-17.511-10.964-4.418-4.582-7.528-9.655-9.164-15.219l25.448-6.136c1.145 2.372 2.782 4.663 4.991 6.954 2.209 2.291 5.155 4.255 8.837 5.81 3.683 1.554 8.428 2.291 14.074 2.291 8.019 0 14.647-1.964 19.884-5.81 5.237-3.845 7.856-10.227 7.856-19.064v-22.665h-1.391c-1.473 2.946-3.601 5.892-6.383 9.001-2.782 3.109-6.464 5.645-10.965 7.691-4.582 2.046-10.228 3.109-17.101 3.109-9.165 0-17.511-2.209-25.039-6.545-7.446-4.337-13.42-10.883-17.757-19.474-4.418-8.673-6.628-19.473-6.628-32.565 0-13.091 2.21-24.301 6.628-33.383 4.419-9.082 10.311-15.955 17.839-20.7 7.528-4.746 15.874-7.037 25.039-7.037 7.037 0 12.846 1.145 17.347 3.518 4.582 2.373 8.182 5.236 10.883 8.51 2.7 3.272 4.746 6.382 6.137 9.327h1.554v-19.8h27.821v121.749c0 10.228-2.454 18.737-7.364 25.447-4.91 6.709-11.538 11.7-20.048 15.055-8.509 3.355-18.165 4.991-28.884 4.991Zm.245-71.266c5.974 0 11.047-1.473 15.302-4.337 4.173-2.945 7.446-7.118 9.573-12.519 2.21-5.482 3.274-12.027 3.274-19.637 0-7.609-1.064-14.155-3.274-19.8-2.127-5.646-5.318-10.064-9.491-13.255-4.174-3.11-9.329-4.746-15.384-4.746s-11.537 1.636-15.792 4.91c-4.173 3.272-7.365 7.772-9.492 13.418-2.128 5.727-3.191 12.191-3.191 19.392 0 7.2 1.063 13.745 3.273 19.228 2.127 5.482 5.318 9.736 9.573 12.764 4.174 3.027 9.41 4.582 15.629 4.582Zm141.56-26.51V71.839h28.23v119.786h-27.412v-21.273h-1.227c-2.7 6.709-7.119 12.191-13.338 16.446-6.137 4.255-13.747 6.382-22.748 6.382-7.855 0-14.81-1.718-20.783-5.237-5.974-3.518-10.72-8.591-14.075-15.382-3.355-6.709-5.073-14.891-5.073-24.464V71.839h28.312v71.921c0 7.609 2.046 13.664 6.219 18.083 4.173 4.5 9.655 6.709 16.365 6.709 4.173 0 8.183-.982 12.111-3.028 3.927-2.045 7.118-5.072 9.655-9.082 2.537-4.091 3.764-9.164 3.764-15.218Zm65.707-109.395v159.796h-28.23V31.828h28.23Zm44.841 162.169c-7.61 0-14.402-1.391-20.457-4.091-6.055-2.7-10.883-6.791-14.32-12.109-3.518-5.319-5.237-11.946-5.237-19.801 0-6.791 1.228-12.355 3.765-16.773 2.536-4.419 5.891-7.937 10.228-10.637 4.337-2.618 9.164-4.664 14.647-6.055 5.4-1.391 11.046-2.373 16.856-3.027 7.037-.737 12.683-1.391 17.102-1.964 4.337-.573 7.528-1.555 9.574-2.782 1.963-1.309 3.027-3.273 3.027-5.973v-.491c0-5.891-1.718-10.391-5.237-13.664-3.518-3.191-8.51-4.828-15.056-4.828-6.955 0-12.356 1.473-16.447 4.5-4.009 3.028-6.71 6.546-8.183 10.719l-26.348-3.764c2.046-7.282 5.483-13.336 10.31-18.328 4.746-4.909 10.638-8.59 17.511-11.045 6.955-2.455 14.565-3.682 22.912-3.682 5.809 0 11.537.654 17.265 2.045s10.965 3.6 15.711 6.71c4.746 3.109 8.51 7.282 11.455 12.6 2.864 5.318 4.337 11.946 4.337 19.883v80.184h-27.166v-16.446h-.9c-1.719 3.355-4.092 6.464-7.201 9.328-3.109 2.864-6.955 5.237-11.619 6.955-4.828 1.718-10.229 2.536-16.529 2.536Zm7.364-20.701c5.646 0 10.556-1.145 14.729-3.354 4.173-2.291 7.364-5.237 9.655-9.001 2.292-3.763 3.355-7.854 3.355-12.273v-14.155c-.9.737-2.373 1.391-4.5 2.046-2.128.654-4.419 1.145-7.037 1.636-2.619.491-5.155.9-7.692 1.227-2.537.328-4.746.655-6.628.901-4.173.572-8.019 1.472-11.292 2.781-3.355 1.31-5.973 3.11-7.855 5.401-1.964 2.291-2.864 5.318-2.864 8.918 0 5.237 1.882 9.164 5.728 11.782 3.682 2.782 8.51 4.091 14.401 4.091Zm64.643 18.328V71.839h27.412v19.965h1.227c2.21-6.955 5.974-12.274 11.292-16.038 5.319-3.763 11.456-5.645 18.329-5.645 1.555 0 3.355.082 5.237.163 1.964.164 3.601.328 4.91.573v25.938c-1.227-.41-3.109-.819-5.646-1.146a58.814 58.814 0 0 0-7.446-.49c-5.155 0-9.738 1.145-13.829 3.354-4.091 2.209-7.282 5.236-9.655 9.164-2.373 3.927-3.519 8.427-3.519 13.5v70.448h-28.312ZM222.077 39.192l-8.019 125.923L137.387 0l84.69 39.192Zm-53.105 162.825-57.933 33.056-57.934-33.056 11.783-28.556h92.301l11.783 28.556ZM111.039 62.675l30.357 73.803H80.681l30.358-73.803ZM7.937 165.115 0 39.192 84.69 0 7.937 165.115Z"
+          />
+        </g>
+        <defs>
+          <radialGradient
+            id="c"
+            cx="0"
+            cy="0"
+            r="1"
+            gradientTransform="rotate(118.122 171.182 60.81) scale(205.794)"
+            gradientUnits="userSpaceOnUse"
+          >
+            <stop stop-color="#FF41F8" />
+            <stop offset=".707" stop-color="#FF41F8" stop-opacity=".5" />
+            <stop offset="1" stop-color="#FF41F8" stop-opacity="0" />
+          </radialGradient>
+          <linearGradient
+            id="b"
+            x1="0"
+            x2="982"
+            y1="192"
+            y2="192"
+            gradientUnits="userSpaceOnUse"
+          >
+            <stop stop-color="#F0060B" />
+            <stop offset="0" stop-color="#F0070C" />
+            <stop offset=".526" stop-color="#CC26D5" />
+            <stop offset="1" stop-color="#7702FF" />
+          </linearGradient>
+          <clipPath id="a"><path fill="#fff" d="M0 0h982v239H0z" /></clipPath>
+        </defs>
+      </svg>
+      <h1>Hello, {{ title }}</h1>
+      <p>Congratulations! Your app is running. 🎉</p>
+    </div>
+    <div class="divider" role="separator" aria-label="Divider"></div>
+    <div class="right-side">
+      <div class="pill-group">
+        @for (item of [
+          { title: 'Explore the Docs', link: 'https://angular.dev' },
+          { title: 'Learn with Tutorials', link: 'https://angular.dev/tutorials' },
+          { title: 'CLI Docs', link: 'https://angular.dev/tools/cli' },
+          { title: 'Angular Language Service', link: 'https://angular.dev/tools/language-service' },
+          { title: 'Angular DevTools', link: 'https://angular.dev/tools/devtools' },
+        ]; track item.title) {
+          <a
+            class="pill"
+            [href]="item.link"
+            target="_blank"
+            rel="noopener"
+          >
+            <span>{{ item.title }}</span>
+            <svg
+              xmlns="http://www.w3.org/2000/svg"
+              height="14"
+              viewBox="0 -960 960 960"
+              width="14"
+              fill="currentColor"
+            >
+              <path
+                d="M200-120q-33 0-56.5-23.5T120-200v-560q0-33 23.5-56.5T200-840h280v80H200v560h560v-280h80v280q0 33-23.5 56.5T760-120H200Zm188-212-56-56 372-372H560v-80h280v280h-80v-144L388-332Z"
+              />
+            </svg>
+          </a>
+        }
+      </div>
+      <div class="social-links">
+        <a
+          href="https://github.com/angular/angular"
+          aria-label="Github"
+          target="_blank"
+          rel="noopener"
+        >
+          <svg
+            width="25"
+            height="24"
+            viewBox="0 0 25 24"
+            fill="none"
+            xmlns="http://www.w3.org/2000/svg"
+            alt="Github"
+          >
+            <path
+              d="M12.3047 0C5.50634 0 0 5.50942 0 12.3047C0 17.7423 3.52529 22.3535 8.41332 23.9787C9.02856 24.0946 9.25414 23.7142 9.25414 23.3871C9.25414 23.0949 9.24389 22.3207 9.23876 21.2953C5.81601 22.0377 5.09414 19.6444 5.09414 19.6444C4.53427 18.2243 3.72524 17.8449 3.72524 17.8449C2.61064 17.082 3.81137 17.0973 3.81137 17.0973C5.04697 17.1835 5.69604 18.3647 5.69604 18.3647C6.79321 20.2463 8.57636 19.7029 9.27978 19.3881C9.39052 18.5924 9.70736 18.0499 10.0591 17.7423C7.32641 17.4347 4.45429 16.3765 4.45429 11.6618C4.45429 10.3185 4.9311 9.22133 5.72065 8.36C5.58222 8.04931 5.16694 6.79833 5.82831 5.10337C5.82831 5.10337 6.85883 4.77319 9.2121 6.36459C10.1965 6.09082 11.2424 5.95546 12.2883 5.94931C13.3342 5.95546 14.3801 6.09082 15.3644 6.36459C17.7023 4.77319 18.7328 5.10337 18.7328 5.10337C19.3942 6.79833 18.9789 8.04931 18.8559 8.36C19.6403 9.22133 20.1171 10.3185 20.1171 11.6618C20.1171 16.3888 17.2409 17.4296 14.5031 17.7321C14.9338 18.1012 15.3337 18.8559 15.3337 20.0084C15.3337 21.6552 15.3183 22.978 15.3183 23.3779C15.3183 23.7009 15.5336 24.0854 16.1642 23.9623C21.0871 22.3484 24.6094 17.7341 24.6094 12.3047C24.6094 5.50942 19.0999 0 12.3047 0Z"
+            />
+          </svg>
+        </a>
+        <a
+          href="https://twitter.com/angular"
+          aria-label="Twitter"
+          target="_blank"
+          rel="noopener"
+        >
+          <svg
+            width="25"
+            height="20"
+            viewBox="0 0 25 20"
+            fill="none"
+            xmlns="http://www.w3.org/2000/svg"
+            alt="Twitter"
+          >
+            <path
+              d="M8.04524 20C17.3335 20 22.4138 12.3047 22.4138 5.63144C22.4138 5.41287 22.4138 5.19529 22.399 4.97869C23.3874 4.26381 24.2405 3.37867 24.9185 2.3647C23.9969 2.77329 23.0192 3.04112 22.018 3.15923C23.0723 2.52818 23.8613 1.53552 24.2382 0.366057C23.2469 0.954335 22.1624 1.36889 21.0315 1.59182C20.2701 0.782212 19.2631 0.246107 18.1663 0.0664704C17.0695 -0.113166 15.9441 0.0736804 14.9642 0.598096C13.9843 1.12251 13.2046 1.95526 12.7457 2.96748C12.2868 3.9797 12.1742 5.11495 12.4255 6.19756C10.4178 6.09685 8.45366 5.57507 6.66064 4.66609C4.86763 3.75712 3.28579 2.48127 2.01781 0.921344C1.37203 2.03306 1.17424 3.34911 1.46472 4.60154C1.75519 5.85397 2.51208 6.9486 3.58128 7.66257C2.77759 7.63903 1.9914 7.42221 1.28924 7.03049V7.09449C1.28956 8.26041 1.69316 9.39034 2.4316 10.2926C3.17003 11.1949 4.19783 11.8139 5.34067 12.0448C4.59721 12.2476 3.81715 12.2772 3.06045 12.1315C3.38327 13.1348 4.01156 14.0122 4.85746 14.641C5.70337 15.2698 6.72461 15.6185 7.77842 15.6384C6.73139 16.4614 5.53237 17.0699 4.24995 17.4291C2.96753 17.7882 1.62687 17.891 0.304688 17.7316C2.61411 19.2136 5.30121 19.9997 8.04524 19.9961"
+            />
+          </svg>
+        </a>
+        <a
+          href="https://www.youtube.com/channel/UCbn1OgGei-DV7aSRo_HaAiw"
+          aria-label="Youtube"
+          target="_blank"
+          rel="noopener"
+        >
+          <svg
+            width="29"
+            height="20"
+            viewBox="0 0 29 20"
+            fill="none"
+            xmlns="http://www.w3.org/2000/svg"
+            alt="Youtube"
+          >
+            <path
+              fill-rule="evenodd"
+              clip-rule="evenodd"
+              d="M27.4896 1.52422C27.9301 1.96749 28.2463 2.51866 28.4068 3.12258C29.0004 5.35161 29.0004 10 29.0004 10C29.0004 10 29.0004 14.6484 28.4068 16.8774C28.2463 17.4813 27.9301 18.0325 27.4896 18.4758C27.0492 18.9191 26.5 19.2389 25.8972 19.4032C23.6778 20 14.8068 20 14.8068 20C14.8068 20 5.93586 20 3.71651 19.4032C3.11363 19.2389 2.56449 18.9191 2.12405 18.4758C1.68361 18.0325 1.36732 17.4813 1.20683 16.8774C0.613281 14.6484 0.613281 10 0.613281 10C0.613281 10 0.613281 5.35161 1.20683 3.12258C1.36732 2.51866 1.68361 1.96749 2.12405 1.52422C2.56449 1.08095 3.11363 0.76113 3.71651 0.596774C5.93586 0 14.8068 0 14.8068 0C14.8068 0 23.6778 0 25.8972 0.596774C26.5 0.76113 27.0492 1.08095 27.4896 1.52422ZM19.3229 10L11.9036 5.77905V14.221L19.3229 10Z"
+            />
+          </svg>
+        </a>
+      </div>
+    </div>
+  </div>
+</main>
+
+<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
+<!-- * * * * * * * * * * * The content above * * * * * * * * * * * * -->
+<!-- * * * * * * * * * * is only a placeholder * * * * * * * * * * * -->
+<!-- * * * * * * * * * * and can be replaced.  * * * * * * * * * * * -->
+<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
+<!-- * * * * * * * * * * End of Placeholder  * * * * * * * * * * * * -->
+<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
+
+
+<router-outlet></router-outlet>

packages/static-build/test/fixtures/angular-v17/src/app/app.component.ts

@@ -0,0 +1,14 @@
+import { Component } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { RouterOutlet } from '@angular/router';
+
+@Component({
+  selector: 'app-root',
+  standalone: true,
+  imports: [CommonModule, RouterOutlet],
+  templateUrl: './app.component.html',
+  styleUrl: './app.component.css'
+})
+export class AppComponent {
+  title = 'angular-v17';
+}

packages/static-build/test/fixtures/angular-v17/src/app/app.config.ts

@@ -0,0 +1,8 @@
+import { ApplicationConfig } from '@angular/core';
+import { provideRouter } from '@angular/router';
+
+import { routes } from './app.routes';
+
+export const appConfig: ApplicationConfig = {
+  providers: [provideRouter(routes)]
+};

packages/static-build/test/fixtures/angular-v17/src/app/app.routes.ts

@@ -0,0 +1,3 @@
+import { Routes } from '@angular/router';
+
+export const routes: Routes = [];