Publish Stable

- @vercel/build-utils@5.5.0 - vercel@28.4.2 - @vercel/client@12.2.7 - @vercel/go@2.2.8 - @vercel/hydrogen@0.0.21 - @vercel/next@3.1.29 - @vercel/node@2.5.18 - @vercel/python@3.1.17 - @vercel/redwood@1.0.26 - @vercel/remix@1.0.27 - @vercel/ruby@1.3.34 - @vercel/static-build@1.0.26
[next] Update to route app rsc paths correctly (#8611 )
2025-12-12 12:57:47 +00:00 · 2022-09-22 16:50:27 -04:00 · 2022-09-22 20:44:40 +00:00 · 2022-09-22 16:07:43 -04:00 · 2022-09-22 14:42:48 +00:00 · 2022-09-22 14:38:33 +03:00
58 changed files with 713 additions and 150 deletions
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -37,6 +37,8 @@ jobs:
    - name: Setup Node
      if: ${{ steps.check-release.outputs.IS_RELEASE == 'true' }}
      uses: actions/setup-node@v3
+      env:
+        SEGMENT_DOWNLOAD_TIMEOUT_MIN: 5 # https://github.com/actions/cache/issues/810
      with:
        node-version: 14
        cache: 'yarn'
--- a/.github/workflows/test-integration-cli.yml
+++ b/.github/workflows/test-integration-cli.yml
@@ -31,6 +31,8 @@ jobs:
        with:
          go-version: '1.13.15'
      - uses: actions/setup-node@v3
+        env:
+          SEGMENT_DOWNLOAD_TIMEOUT_MIN: 5 # https://github.com/actions/cache/issues/810
        with:
          node-version: ${{ matrix.node }}
          cache: 'yarn'
@@ -38,5 +40,5 @@ jobs:
      - run: yarn run build
      - run: yarn test-integration-cli
        env:
-          VERCEL_TEAM_TOKEN: ${{ secrets.VERCEL_TEAM_TOKEN }}
-          VERCEL_REGISTRATION_URL: ${{ secrets.VERCEL_REGISTRATION_URL }}
+          VERCEL_TEST_TOKEN: ${{ secrets.VERCEL_TEST_TOKEN }}
+          VERCEL_TEST_REGISTRATION_URL: ${{ secrets.VERCEL_TEST_REGISTRATION_URL }}
--- a/.github/workflows/test-unit.yml
+++ b/.github/workflows/test-unit.yml
@@ -31,6 +31,8 @@ jobs:
        with:
            fetch-depth: 2
      - uses: actions/setup-node@v3
+        env:
+          SEGMENT_DOWNLOAD_TIMEOUT_MIN: 5 # https://github.com/actions/cache/issues/810
        with:
            node-version: ${{ matrix.node }}
            cache: 'yarn'
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -29,6 +29,8 @@ jobs:
        with:
          go-version: '1.13.15'
      - uses: actions/setup-node@v3
+        env:
+          SEGMENT_DOWNLOAD_TIMEOUT_MIN: 5 # https://github.com/actions/cache/issues/810
        with:
          node-version: ${{ env.NODE_VERSION }}
          cache: 'yarn'
@@ -65,6 +67,8 @@ jobs:
        with:
          go-version: '1.13.15'
      - uses: actions/setup-node@v3
+        env:
+          SEGMENT_DOWNLOAD_TIMEOUT_MIN: 5 # https://github.com/actions/cache/issues/810
        with:
          node-version: ${{ env.NODE_VERSION }}
          cache: 'yarn'
@@ -84,8 +88,8 @@ jobs:
        shell: bash
        env:
          VERCEL_CLI_VERSION: ${{ needs.setup.outputs.dplUrl }}/tarballs/vercel.tgz
-          VERCEL_TEAM_TOKEN: ${{ secrets.VERCEL_TEAM_TOKEN }}
-          VERCEL_REGISTRATION_URL: ${{ secrets.VERCEL_REGISTRATION_URL }}
+          VERCEL_TEST_TOKEN: ${{ secrets.VERCEL_TEST_TOKEN }}
+          VERCEL_TEST_REGISTRATION_URL: ${{ secrets.VERCEL_TEST_REGISTRATION_URL }}
          FORCE_COLOR: '1'

  conclusion:
--- a/packages/build-utils/package.json
+++ b/packages/build-utils/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/build-utils",
-  "version": "5.4.4",
+  "version": "5.5.0",
  "license": "MIT",
  "main": "./dist/index.js",
  "types": "./dist/index.d.js",
--- a/packages/build-utils/src/edge-function.ts
+++ b/packages/build-utils/src/edge-function.ts
@@ -38,6 +38,9 @@ export class EdgeFunction {
   */
  assets?: { name: string; path: string }[];

+  /** The regions where the edge function will be executed on */
+  regions?: 'auto' | string[] | 'all' | 'default';
+
  constructor(params: Omit<EdgeFunction, 'type'>) {
    this.type = 'EdgeFunction';
    this.name = params.name;
@@ -46,5 +49,6 @@ export class EdgeFunction {
    this.files = params.files;
    this.envVarsInUse = params.envVarsInUse;
    this.assets = params.assets;
+    this.regions = params.regions;
  }
 }
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
  "name": "vercel",
-  "version": "28.4.0",
+  "version": "28.4.2",
  "preferGlobal": true,
  "license": "Apache-2.0",
  "description": "The command-line interface for Vercel",
@@ -41,16 +41,16 @@
    "node": ">= 14"
  },
  "dependencies": {
-    "@vercel/build-utils": "5.4.4",
-    "@vercel/go": "2.2.7",
-    "@vercel/hydrogen": "0.0.20",
-    "@vercel/next": "3.1.27",
-    "@vercel/node": "2.5.16",
-    "@vercel/python": "3.1.16",
-    "@vercel/redwood": "1.0.25",
-    "@vercel/remix": "1.0.26",
-    "@vercel/ruby": "1.3.33",
-    "@vercel/static-build": "1.0.25",
+    "@vercel/build-utils": "5.5.0",
+    "@vercel/go": "2.2.8",
+    "@vercel/hydrogen": "0.0.21",
+    "@vercel/next": "3.1.29",
+    "@vercel/node": "2.5.18",
+    "@vercel/python": "3.1.17",
+    "@vercel/redwood": "1.0.26",
+    "@vercel/remix": "1.0.27",
+    "@vercel/ruby": "1.3.34",
+    "@vercel/static-build": "1.0.26",
    "update-notifier": "5.1.0"
  },
  "devDependencies": {
@@ -95,9 +95,9 @@
    "@types/which": "1.3.2",
    "@types/write-json-file": "2.2.1",
    "@types/yauzl-promise": "2.1.0",
-    "@vercel/client": "12.2.6",
+    "@vercel/client": "12.2.7",
    "@vercel/frameworks": "1.1.6",
-    "@vercel/fs-detectors": "3.3.0",
+    "@vercel/fs-detectors": "3.4.0",
    "@vercel/fun": "1.0.4",
    "@vercel/ncc": "0.24.0",
    "@zeit/source-map-support": "0.6.2",
--- a/packages/cli/src/util/create-git-meta.ts
+++ b/packages/cli/src/util/create-git-meta.ts
@@ -78,7 +78,13 @@ function getLastCommit(directory: string): Promise<git.Commit> {

 export function isDirty(directory: string, output: Output): Promise<boolean> {
  return new Promise(resolve => {
-    exec('git status -s', { cwd: directory }, function (err, stdout, stderr) {
+    // note: we specify the `--no-optional-locks` git flag so that `git status`
+    // does not perform any "optional" operations such as optimizing the index
+    // in the background: https://git-scm.com/docs/git-status#_background_refresh
+    exec(
+      'git --no-optional-locks status -s',
+      { cwd: directory },
+      function (err, stdout, stderr) {
        let debugMessage = `Failed to determine if Git repo has been modified:`;
        if (err || stderr) {
          if (err) debugMessage += `\n${err}`;
@@ -87,7 +93,8 @@ export function isDirty(directory: string, output: Output): Promise<boolean> {
          return resolve(false);
        }
        resolve(stdout.trim().length > 0);
-    });
+      }
+    );
  });
 }

--- a/packages/cli/src/util/projects/project-settings.ts
+++ b/packages/cli/src/util/projects/project-settings.ts
@@ -28,6 +28,16 @@ export async function writeProjectSettings(
  project: Project,
  org: Org
 ) {
+  let analyticsId: string | undefined;
+  if (
+    project.analytics?.id &&
+    (!project.analytics.disabledAt ||
+      (project.analytics.enabledAt &&
+        project.analytics.enabledAt > project.analytics.disabledAt))
+  ) {
+    analyticsId = project.analytics.id;
+  }
+
  const projectLinkAndSettings: ProjectLinkAndSettings = {
    projectId: project.id,
    orgId: org.id,
@@ -41,7 +51,7 @@ export async function writeProjectSettings(
      rootDirectory: project.rootDirectory,
      directoryListing: project.directoryListing,
      nodeVersion: project.nodeVersion,
-      analyticsId: project.analytics?.id,
+      analyticsId,
    },
  };
  const path = join(cwd, VERCEL_DIR, VERCEL_DIR_PROJECT);
--- a/packages/cli/test/dev/fixtures/edge-function/api/edge-import-browser.js
+++ b/packages/cli/test/dev/fixtures/edge-function/api/edge-import-browser.js
@@ -0,0 +1,13 @@
+import generateUUID from '../vendor/generate-uuid';
+
+export const config = {
+  runtime: 'experimental-edge',
+};
+
+export default async function edge(request, event) {
+  return new Response(
+    JSON.stringify({
+      randomString: generateUUID(),
+    })
+  );
+}
--- a/packages/cli/test/dev/fixtures/edge-function/vendor/generate-uuid/index-browser.js
+++ b/packages/cli/test/dev/fixtures/edge-function/vendor/generate-uuid/index-browser.js
@@ -0,0 +1,6 @@
+// This uses the `crypto` globaly,
+// which will work fine in a browser or Edge Runtime environment
+
+export default function generateUUID(message) {
+  return crypto.randomUUID();
+}
--- a/packages/cli/test/dev/fixtures/edge-function/vendor/generate-uuid/index-node.js
+++ b/packages/cli/test/dev/fixtures/edge-function/vendor/generate-uuid/index-node.js
@@ -0,0 +1,8 @@
+import crypto from 'crypto';
+
+// this uses a core Node library,
+// which will fail to execute in a browser or Edge Runtime context
+
+export default function say(message) {
+  return crypto.generateUUID();
+}
--- a/packages/cli/test/dev/fixtures/edge-function/vendor/generate-uuid/package.json
+++ b/packages/cli/test/dev/fixtures/edge-function/vendor/generate-uuid/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "generate-uuid",
+  "private": true,
+  "main": "index-node.js",
+  "browser": "index-browser.js"
+}
--- a/packages/cli/test/dev/integration-1.test.ts
+++ b/packages/cli/test/dev/integration-1.test.ts
@@ -86,6 +86,7 @@ test(
  testFixtureStdio('edge-function', async (testPath: any) => {
    await testPath(500, '/api/edge-500-response');
    await testPath(200, '/api/edge-success');
+    await testPath(200, '/api/edge-import-browser');
  })
 );

--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/client",
-  "version": "12.2.6",
+  "version": "12.2.7",
  "main": "dist/index.js",
  "typings": "dist/index.d.ts",
  "homepage": "https://vercel.com",
@@ -43,7 +43,7 @@
    ]
  },
  "dependencies": {
-    "@vercel/build-utils": "5.4.4",
+    "@vercel/build-utils": "5.5.0",
    "@vercel/routing-utils": "2.0.2",
    "@zeit/fetch": "5.2.0",
    "async-retry": "1.2.3",
--- a/packages/fs-detectors/package.json
+++ b/packages/fs-detectors/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/fs-detectors",
-  "version": "3.3.0",
+  "version": "3.4.0",
  "description": "Vercel filesystem detectors",
  "main": "./dist/index.js",
  "types": "./dist/index.d.ts",
--- a/packages/fs-detectors/src/detectors/filesystem.ts
+++ b/packages/fs-detectors/src/detectors/filesystem.ts
@@ -89,6 +89,7 @@ export abstract class DetectorFilesystem {
    if (!p) {
      p = this._readdir(dirPath);
      this.readdirCache.set(dirPath, p);
+    }

    const directoryContent = await p;
    const directoryFiles = new Set<string>();
@@ -115,7 +116,7 @@ export abstract class DetectorFilesystem {
        this.pathCache.set(fullFilePath, Promise.resolve(false));
      }
    }
-    }
+
    return p;
  };

--- a/packages/fs-detectors/src/workspaces/get-workspace-package-paths.ts
+++ b/packages/fs-detectors/src/workspaces/get-workspace-package-paths.ts
@@ -36,6 +36,9 @@ export async function getWorkspacePackagePaths({
    case 'nx':
      results = await getNxWorkspacePackagePaths({ fs: workspaceFs });
      break;
+    case 'rush':
+      results = await getRushWorkspacePackagePaths({ fs: workspaceFs });
+      break;
    default:
      throw new Error(`Unknown workspace implementation: ${type}`);
  }
@@ -58,6 +61,14 @@ type PnpmWorkspaces = {
  packages?: string[];
 };

+type RushWorkspaces = {
+  projects: [
+    {
+      projectFolder: string;
+    }
+  ];
+};
+
 const isWin = process.platform === 'win32';
 const normalizePath = (p: string) => (isWin ? p.replace(/\\/g, '/') : p);

@@ -127,3 +138,23 @@ async function getPnpmWorkspacePackagePaths({

  return getPackagePaths(packages, fs);
 }
+
+async function getRushWorkspacePackagePaths({
+  fs,
+}: GetPackagePathOptions): Promise<string[]> {
+  const rushWorkspaceAsBuffer = await fs.readFile('rush.json');
+
+  const { projects = [] } = JSON.parse(
+    rushWorkspaceAsBuffer.toString()
+  ) as RushWorkspaces;
+
+  if (Array.isArray(projects)) {
+    const packages = projects
+      .filter(proj => proj.projectFolder)
+      .map(project => project.projectFolder);
+
+    return getPackagePaths(packages, fs);
+  } else {
+    return [];
+  }
+}
--- a/packages/fs-detectors/src/workspaces/get-workspaces.ts
+++ b/packages/fs-detectors/src/workspaces/get-workspaces.ts
@@ -12,7 +12,7 @@ export interface GetWorkspaceOptions {
  cwd?: string;
 }

-export type WorkspaceType = 'yarn' | 'pnpm' | 'npm' | 'nx';
+export type WorkspaceType = 'yarn' | 'pnpm' | 'npm' | 'nx' | 'rush';

 export type Workspace = {
  type: WorkspaceType;
--- a/packages/fs-detectors/src/workspaces/workspace-managers.ts
+++ b/packages/fs-detectors/src/workspaces/workspace-managers.ts
@@ -71,6 +71,17 @@ export const workspaceManagers: Array<
      ],
    },
  },
+  {
+    name: 'rush',
+    slug: 'rush',
+    detectors: {
+      every: [
+        {
+          path: 'rush.json',
+        },
+      ],
+    },
+  },
  {
    name: 'default',
    slug: 'yarn',
--- a/packages/fs-detectors/test/fixtures/40-rush-monorepo/apps/my-app/package.json
+++ b/packages/fs-detectors/test/fixtures/40-rush-monorepo/apps/my-app/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "my-app",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "debug": "^4.3.2"
+  }
+}
--- a/packages/fs-detectors/test/fixtures/40-rush-monorepo/apps/my-second-app/package.json
+++ b/packages/fs-detectors/test/fixtures/40-rush-monorepo/apps/my-second-app/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "my-second-app",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "debug": "^4.3.2"
+  }
+}
--- a/packages/fs-detectors/test/fixtures/40-rush-monorepo/rush.json
+++ b/packages/fs-detectors/test/fixtures/40-rush-monorepo/rush.json
@@ -23,5 +23,14 @@
    "postRushBuild": []
  },
  "variants": [],
-  "projects": []
+  "projects": [
+    {
+      "packageName": "my-app",
+      "projectFolder": "apps/my-app"
+    },
+    {
+      "packageName": "my-second-app",
+      "projectFolder": "apps/my-second-app"
+    }
+  ]
 }
--- a/packages/fs-detectors/test/fixtures/41-nx-workspace/apps/app-one/package.json
+++ b/packages/fs-detectors/test/fixtures/41-nx-workspace/apps/app-one/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "b",
+  "name": "app-one",
  "version": "1.0.0",
  "description": "",
  "main": "index.js",
--- a/packages/fs-detectors/test/fixtures/41-nx-workspace/apps/app-two/package.json
+++ b/packages/fs-detectors/test/fixtures/41-nx-workspace/apps/app-two/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "b",
+  "name": "app-two",
  "version": "1.0.0",
  "description": "",
  "main": "index.js",
--- a/packages/fs-detectors/test/fixtures/41-rush-monorepo-empty/rush.json
+++ b/packages/fs-detectors/test/fixtures/41-rush-monorepo-empty/rush.json
@@ -0,0 +1,27 @@
+{
+  "$schema": "https://developer.microsoft.com/json-schemas/rush/v5/rush.schema.json",
+
+  "rushVersion": "5.76.1",
+
+  "pnpmVersion": "6.7.1",
+
+  "pnpmOptions": {
+    "useWorkspaces": true
+  },
+
+  "nodeSupportedVersionRange": ">=12.13.0 <13.0.0 || >=14.15.0 <15.0.0 || >=16.13.0 <17.0.0",
+
+  "gitPolicy": {},
+
+  "repository": {},
+  "eventHooks": {
+    "preRushInstall": [],
+
+    "postRushInstall": [],
+    "preRushBuild": [],
+
+    "postRushBuild": []
+  },
+  "variants": [],
+  "projects": []
+}
--- a/packages/fs-detectors/test/fixtures/42-npm-workspace-with-nx/apps/app-one/package.json
+++ b/packages/fs-detectors/test/fixtures/42-npm-workspace-with-nx/apps/app-one/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "b",
+  "name": "app-one",
  "version": "1.0.0",
  "description": "",
  "main": "index.js",
--- a/packages/fs-detectors/test/fixtures/42-npm-workspace-with-nx/apps/app-two/package.json
+++ b/packages/fs-detectors/test/fixtures/42-npm-workspace-with-nx/apps/app-two/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "b",
+  "name": "app-two",
  "version": "1.0.0",
  "description": "",
  "main": "index.js",
--- a/packages/fs-detectors/test/fixtures/42-rush-json-invalid/rush.json
+++ b/packages/fs-detectors/test/fixtures/42-rush-json-invalid/rush.json
@@ -0,0 +1,27 @@
+{
+  "$schema": "https://developer.microsoft.com/json-schemas/rush/v5/rush.schema.json",
+
+  "rushVersion": "5.76.1",
+
+  "pnpmVersion": "6.7.1",
+
+  "pnpmOptions": {
+    "useWorkspaces": true
+  },
+
+  "nodeSupportedVersionRange": ">=12.13.0 <13.0.0 || >=14.15.0 <15.0.0 || >=16.13.0 <17.0.0",
+
+  "gitPolicy": {},
+
+  "repository": {},
+  "eventHooks": {
+    "preRushInstall": [],
+
+    "postRushInstall": [],
+    "preRushBuild": [],
+
+    "postRushBuild": []
+  },
+  "variants": [],
+  "projects": "projects"
+}
--- a/packages/fs-detectors/test/fixtures/43-nx-json-misshaped/apps/app-one/package.json
+++ b/packages/fs-detectors/test/fixtures/43-nx-json-misshaped/apps/app-one/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "b",
+  "name": "app-one",
  "version": "1.0.0",
  "description": "",
  "main": "index.js",
--- a/packages/fs-detectors/test/fixtures/43-nx-json-misshaped/apps/app-two/package.json
+++ b/packages/fs-detectors/test/fixtures/43-nx-json-misshaped/apps/app-two/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "b",
+  "name": "app-two",
  "version": "1.0.0",
  "description": "",
  "main": "index.js",
--- a/packages/fs-detectors/test/fixtures/44-nx-json-string/apps/app-one/package.json
+++ b/packages/fs-detectors/test/fixtures/44-nx-json-string/apps/app-one/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "b",
+  "name": "app-one",
  "version": "1.0.0",
  "description": "",
  "main": "index.js",
--- a/packages/fs-detectors/test/fixtures/44-nx-json-string/apps/app-two/package.json
+++ b/packages/fs-detectors/test/fixtures/44-nx-json-string/apps/app-two/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "b",
+  "name": "app-two",
  "version": "1.0.0",
  "description": "",
  "main": "index.js",
--- a/packages/fs-detectors/test/fixtures/45-rush-no-project-folder/apps/my-app/package.json
+++ b/packages/fs-detectors/test/fixtures/45-rush-no-project-folder/apps/my-app/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "my-app",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "debug": "^4.3.2"
+  }
+}
--- a/packages/fs-detectors/test/fixtures/45-rush-no-project-folder/apps/my-second-app/package.json
+++ b/packages/fs-detectors/test/fixtures/45-rush-no-project-folder/apps/my-second-app/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "my-second-app",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "debug": "^4.3.2"
+  }
+}
--- a/packages/fs-detectors/test/fixtures/45-rush-no-project-folder/rush.json
+++ b/packages/fs-detectors/test/fixtures/45-rush-no-project-folder/rush.json
@@ -0,0 +1,35 @@
+{
+  "$schema": "https://developer.microsoft.com/json-schemas/rush/v5/rush.schema.json",
+
+  "rushVersion": "5.76.1",
+
+  "pnpmVersion": "6.7.1",
+
+  "pnpmOptions": {
+    "useWorkspaces": true
+  },
+
+  "nodeSupportedVersionRange": ">=12.13.0 <13.0.0 || >=14.15.0 <15.0.0 || >=16.13.0 <17.0.0",
+
+  "gitPolicy": {},
+
+  "repository": {},
+  "eventHooks": {
+    "preRushInstall": [],
+
+    "postRushInstall": [],
+    "preRushBuild": [],
+
+    "postRushBuild": []
+  },
+  "variants": [],
+  "projects": [
+    {
+      "packageName": "my-app"
+    },
+    {
+      "packageName": "my-second-app",
+      "projectFolder": "apps/my-second-app"
+    }
+  ]
+}
--- a/packages/fs-detectors/test/unit.framework-detector.test.ts
+++ b/packages/fs-detectors/test/unit.framework-detector.test.ts
@@ -172,6 +172,20 @@ describe('DetectorFilesystem', () => {
    hasPathSpy.mock.calls.length = 0;
    expect(await fs.hasPath('packages/app1/package.json')).toBe(true);
    expect(hasPathSpy).not.toHaveBeenCalled();
+
+    expect(
+      await fs.readdir('packages/app1', { potentialFiles: ['vercel.json'] })
+    ).toEqual([
+      {
+        name: 'package.json',
+        path: 'packages/app1/package.json',
+        type: 'file',
+      },
+    ]);
+
+    hasPathSpy.mock.calls.length = 0;
+    expect(await fs.hasPath('packages/app1/vercel.json')).toBe(false);
+    expect(hasPathSpy).not.toHaveBeenCalled();
  });

  it('should be able to write files', async () => {
--- a/packages/fs-detectors/test/unit.get-workspaces-package-paths.test.ts
+++ b/packages/fs-detectors/test/unit.get-workspaces-package-paths.test.ts
@@ -18,7 +18,11 @@ describe.each<[string, string[]]>([
  ['42-npm-workspace-with-nx', ['/apps/app-one', '/apps/app-two']],
  ['43-nx-json-misshaped', []],
  ['44-nx-json-string', []],
-])('`getWorkspacesPackagePaths()`', (fixturePath, packagePaths) => {
+  ['40-rush-monorepo', ['/apps/my-app', '/apps/my-second-app']],
+  ['41-rush-monorepo-empty', []],
+  ['42-rush-json-invalid', []],
+  ['45-rush-no-project-folder', ['/apps/my-second-app']],
+])('`getWorkspacePackagePaths()`', (fixturePath, packagePaths) => {
  const testName =
    packagePaths.length > 0
      ? `should detect ${packagePaths.join()} package${
--- a/packages/go/package.json
+++ b/packages/go/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/go",
-  "version": "2.2.7",
+  "version": "2.2.8",
  "license": "MIT",
  "main": "./dist/index",
  "homepage": "https://vercel.com/docs/runtimes#official-runtimes/go",
@@ -35,7 +35,7 @@
    "@types/jest": "28.1.6",
    "@types/node-fetch": "^2.3.0",
    "@types/tar": "^4.0.0",
-    "@vercel/build-utils": "5.4.4",
+    "@vercel/build-utils": "5.5.0",
    "@vercel/ncc": "0.24.0",
    "async-retry": "1.3.1",
    "execa": "^1.0.0",
--- a/packages/hydrogen/package.json
+++ b/packages/hydrogen/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/hydrogen",
-  "version": "0.0.20",
+  "version": "0.0.21",
  "license": "MIT",
  "main": "./dist/index.js",
  "homepage": "https://vercel.com/docs",
@@ -21,7 +21,7 @@
  "devDependencies": {
    "@types/jest": "27.5.1",
    "@types/node": "*",
-    "@vercel/build-utils": "5.4.4",
+    "@vercel/build-utils": "5.5.0",
    "typescript": "4.6.4"
  }
 }
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/next",
-  "version": "3.1.27",
+  "version": "3.1.29",
  "license": "MIT",
  "main": "./dist/index",
  "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",
@@ -44,7 +44,7 @@
    "@types/semver": "6.0.0",
    "@types/text-table": "0.2.1",
    "@types/webpack-sources": "3.2.0",
-    "@vercel/build-utils": "5.4.4",
+    "@vercel/build-utils": "5.5.0",
    "@vercel/nft": "0.22.1",
    "@vercel/routing-utils": "2.0.2",
    "async-sema": "3.0.1",
--- a/packages/next/src/index.ts
+++ b/packages/next/src/index.ts
@@ -1088,10 +1088,15 @@ export const build: BuildV2 = async ({
      'pages'
    );

+    let appDir: string | null = null;
    const appPathRoutesManifest = await readJSON(
      path.join(entryPath, outputDirectory, 'app-path-routes-manifest.json')
    ).catch(() => null);

+    if (appPathRoutesManifest) {
+      appDir = path.join(pagesDir, '../app');
+    }
+
    const { pages, appPaths: lambdaAppPaths } = await getServerlessPages({
      pagesDir,
      entryPath,
@@ -2032,9 +2037,10 @@ export const build: BuildV2 = async ({
      console.timeEnd(allLambdasLabel);
    }
    const prerenderRoute = onPrerenderRoute({
+      appDir,
+      pagesDir,
      hasPages404,
      static404Page,
-      pagesDir,
      pageLambdaMap,
      lambdas,
      isServerMode,
@@ -2042,6 +2048,7 @@ export const build: BuildV2 = async ({
      entryDirectory,
      routesManifest,
      prerenderManifest,
+      appPathRoutesManifest,
      isSharedLambdas,
      canUsePreviewMode,
    });
--- a/packages/next/src/server-build.ts
+++ b/packages/next/src/server-build.ts
@@ -881,6 +881,7 @@ export async function serverBuild({
  }

  const prerenderRoute = onPrerenderRoute({
+    appDir,
    pagesDir,
    pageLambdaMap: {},
    lambdas,
@@ -888,6 +889,7 @@ export async function serverBuild({
    entryDirectory,
    routesManifest,
    prerenderManifest,
+    appPathRoutesManifest,
    isServerMode: true,
    isSharedLambdas: false,
    canUsePreviewMode,
@@ -1129,6 +1131,23 @@ export async function serverBuild({
    });
  }

+  if (appPathRoutesManifest) {
+    // create .rsc variant for app lambdas and edge functions
+    // to match prerenders so we can route the same when the
+    // __flight__ header is present
+    const edgeFunctions = middleware.edgeFunctions;
+
+    for (let route of Object.values(appPathRoutesManifest)) {
+      route = path.posix.join('./', route === '/' ? '/index' : route);
+
+      if (lambdas[route]) {
+        lambdas[`${route}.rsc`] = lambdas[route];
+      } else if (edgeFunctions[route]) {
+        edgeFunctions[`${route}.rsc`] = edgeFunctions[route];
+      }
+    }
+  }
+
  return {
    wildcard: wildcardConfig,
    images:
@@ -1367,6 +1386,22 @@ export async function serverBuild({
      // to prevent a local/deploy mismatch
      ...(!isCorrectMiddlewareOrder ? middleware.staticRoutes : []),

+      ...(appDir
+        ? [
+            {
+              src: `^${path.posix.join('/', entryDirectory, '/(.*)$')}`,
+              has: [
+                {
+                  type: 'header',
+                  key: '__flight__',
+                },
+              ],
+              dest: path.posix.join('/', entryDirectory, '/$1.rsc'),
+              check: true,
+            },
+          ]
+        : []),
+
      // Next.js page lambdas, `static/` folder, reserved assets, and `public/`
      // folder
      { handle: 'filesystem' },
--- a/packages/next/src/utils.ts
+++ b/packages/next/src/utils.ts
@@ -1660,10 +1660,12 @@ export const onPrerenderRouteInitial = (
 };

 type OnPrerenderRouteArgs = {
+  appDir: string | null;
  pagesDir: string;
  static404Page?: string;
  hasPages404: boolean;
  entryDirectory: string;
+  appPathRoutesManifest?: Record<string, string>;
  prerenderManifest: NextPrerenderedRoutes;
  isSharedLambdas: boolean;
  isServerMode: boolean;
@@ -1694,6 +1696,7 @@ export const onPrerenderRoute =
    }
  ) => {
    const {
+      appDir,
      pagesDir,
      hasPages404,
      static404Page,
@@ -1760,44 +1763,6 @@ export const onPrerenderRoute =

    const isNotFound = prerenderManifest.notFoundRoutes.includes(routeKey);

-    const htmlFsRef =
-      isBlocking || (isNotFound && !static404Page)
-        ? // Blocking pages do not have an HTML fallback
-          null
-        : new FileFsRef({
-            fsPath: path.join(
-              pagesDir,
-              isFallback
-                ? // Fallback pages have a special file.
-                  addLocaleOrDefault(
-                    prerenderManifest.fallbackRoutes[routeKey].fallback,
-                    routesManifest,
-                    locale
-                  )
-                : // Otherwise, the route itself should exist as a static HTML
-                  // file.
-                  `${
-                    isOmitted || isNotFound
-                      ? addLocaleOrDefault('/404', routesManifest, locale)
-                      : routeFileNoExt
-                  }.html`
-            ),
-          });
-    const jsonFsRef =
-      // JSON data does not exist for fallback or blocking pages
-      isFallback || isBlocking || (isNotFound && !static404Page)
-        ? null
-        : new FileFsRef({
-            fsPath: path.join(
-              pagesDir,
-              `${
-                isOmitted || isNotFound
-                  ? addLocaleOrDefault('/404.html', routesManifest, locale)
-                  : routeFileNoExt + '.json'
-              }`
-            ),
-          });
-
    let initialRevalidate: false | number;
    let srcRoute: string | null;
    let dataRoute: string;
@@ -1826,6 +1791,52 @@ export const onPrerenderRoute =
      ({ initialRevalidate, srcRoute, dataRoute } = pr);
    }

+    let isAppPathRoute = false;
+    // TODO: leverage manifest to determine app paths more accurately
+    if (appDir && srcRoute && dataRoute.endsWith('.rsc')) {
+      isAppPathRoute = true;
+    }
+
+    const htmlFsRef =
+      isBlocking || (isNotFound && !static404Page)
+        ? // Blocking pages do not have an HTML fallback
+          null
+        : new FileFsRef({
+            fsPath: path.join(
+              isAppPathRoute && appDir ? appDir : pagesDir,
+              isFallback
+                ? // Fallback pages have a special file.
+                  addLocaleOrDefault(
+                    prerenderManifest.fallbackRoutes[routeKey].fallback,
+                    routesManifest,
+                    locale
+                  )
+                : // Otherwise, the route itself should exist as a static HTML
+                  // file.
+                  `${
+                    isOmitted || isNotFound
+                      ? addLocaleOrDefault('/404', routesManifest, locale)
+                      : routeFileNoExt
+                  }.html`
+            ),
+          });
+    const jsonFsRef =
+      // JSON data does not exist for fallback or blocking pages
+      isFallback || isBlocking || (isNotFound && !static404Page)
+        ? null
+        : new FileFsRef({
+            fsPath: path.join(
+              isAppPathRoute && appDir ? appDir : pagesDir,
+              `${
+                isOmitted || isNotFound
+                  ? addLocaleOrDefault('/404.html', routesManifest, locale)
+                  : isAppPathRoute
+                  ? dataRoute
+                  : routeFileNoExt + '.json'
+              }`
+            ),
+          });
+
    const outputPathPage = normalizeIndexOutput(
      path.posix.join(entryDirectory, routeFileNoExt),
      isServerMode
@@ -2218,7 +2229,11 @@ export async function getMiddlewareBundle({
  prerenderBypassToken: string;
  routesManifest: RoutesManifest;
  isCorrectMiddlewareOrder: boolean;
-}) {
+}): Promise<{
+  staticRoutes: Route[];
+  dynamicRouteMap: Map<string, RouteWithSrc>;
+  edgeFunctions: Record<string, EdgeFunction>;
+}> {
  const middlewareManifest = await getMiddlewareManifest(
    entryPath,
    outputDirectory
@@ -2409,7 +2424,6 @@ export async function getMiddlewareBundle({
        }
      }
    }
-
    return source;
  }

--- a/packages/next/test/fixtures/00-app-dir/app/layout.js
+++ b/packages/next/test/fixtures/00-app-dir/app/layout.js
@@ -8,7 +8,3 @@ export default function Root({ children }) {
    </html>
  );
 }
-
-export const config = {
-  revalidate: 0,
-};
--- a/packages/next/test/fixtures/00-app-dir/vercel.json
+++ b/packages/next/test/fixtures/00-app-dir/vercel.json
@@ -11,16 +11,27 @@
      "status": 200,
      "mustContain": "hello from app/dashboard"
    },
+    {
+      "path": "/dashboard",
+      "status": 200,
+      "headers": {
+        "__flight__": "1"
+      },
+      "mustContain": "M1:{",
+      "mustNotContain": "<html"
+    },
    {
      "path": "/dashboard/another",
      "status": 200,
      "mustContain": "hello from newroot/dashboard/another"
    },
-    {
-      "path": "/dashboard/deployments/123",
-      "status": 200,
-      "mustContain": "hello from app/dashboard/deployments/[id]. ID is: <!-- -->123"
-    },
+    // TODO: uncomment after this is fixed upstream
+    // x-ref: https://vercel.slack.com/archives/C035J346QQL/p1663820032810519?thread_ts=1663775935.504379&cid=C035J346QQL
+    // {
+    //   "path": "/dashboard/deployments/123",
+    //   "status": 200,
+    //   "mustContain": "hello from app/dashboard/deployments/[id]. ID is: <!-- -->123"
+    // },
    {
      "path": "/",
      "status": 200,
@@ -31,11 +42,12 @@
      "status": 200,
      "mustContain": "hello from pages/blog/[slug]"
    },
-    {
-      "path": "/dynamic/category-1/id-1",
-      "status": 200,
-      "mustContain": "{&quot;category&quot;:&quot;category-1&quot;,&quot;id&quot;:&quot;id-1&quot;}"
-    },
+    // TODO: uncomment after this is fixed upstream
+    // {
+    //   "path": "/dynamic/category-1/id-1",
+    //   "status": 200,
+    //   "mustContain": "{&quot;category&quot;:&quot;category-1&quot;,&quot;id&quot;:&quot;id-1&quot;}"
+    // },
    {
      "path": "/dashboard/changelog",
      "status": 200,
--- a/packages/next/test/integration/index.test.js
+++ b/packages/next/test/integration/index.test.js
@@ -24,6 +24,16 @@ it('should build with app-dir correctly', async () => {
  expect(buildResult.output['dashboard/another']).toBeDefined();
  expect(buildResult.output['dashboard/changelog']).toBeDefined();
  expect(buildResult.output['dashboard/deployments/[id]']).toBeDefined();
+
+  // prefixed static generation output with `/app` under dist server files
+  expect(buildResult.output['dashboard'].type).toBe('FileFsRef');
+  expect(buildResult.output['dashboard'].fsPath).toMatch(
+    /server\/app\/dashboard\.html$/
+  );
+  expect(buildResult.output['dashboard.rsc'].type).toBe('FileFsRef');
+  expect(buildResult.output['dashboard.rsc'].fsPath).toMatch(
+    /server\/app\/dashboard\.rsc$/
+  );
 });

 it('should build with app-dir in edg runtime correctly', async () => {
@@ -31,7 +41,6 @@ it('should build with app-dir in edg runtime correctly', async () => {
    path.join(__dirname, '../fixtures/00-app-dir-edge')
  );

-  console.log('buildResult', buildResult);
  const edgeFunctions = new Set();

  for (const key of Object.keys(buildResult.output)) {
--- a/packages/next/test/unit/fixtures/01-normalize-paths/index.test.js
+++ b/packages/next/test/unit/fixtures/01-normalize-paths/index.test.js
@@ -7,8 +7,6 @@ const { FileFsRef } = require('@vercel/build-utils');
 jest.setTimeout(ms('6m'));

 describe(`${__dirname.split(path.sep).pop()}`, () => {
-  afterEach(() => fs.remove(path.join(__dirname, 'yarn.lock')));
-
  it('should normalize routes in build results output', async () => {
    const files = [
      'index.test.js',
@@ -24,7 +22,7 @@ describe(`${__dirname.split(path.sep).pop()}`, () => {
      return filesMap;
    }, {});

-    const { output } = await build({
+    const { output, routes } = await build({
      config: {},
      entrypoint: 'package.json',
      files,
@@ -44,5 +42,16 @@ describe(`${__dirname.split(path.sep).pop()}`, () => {
        path.join(pagesDir, `${page}.html`)
      );
    }
+
+    for (const route of routes) {
+      if (typeof route.src === 'string') {
+        // src must start with a forward slash (or caret if a regex)
+        expect(route.src).toMatch(/^[/^]/);
+      }
+      if (typeof route.dest === 'string') {
+        // dest can be `/400` or `/.*` or `$0`, but not start with \
+        expect(route.dest).not.toMatch(/^\\/);
+      }
+    }
  });
 });
--- a/packages/next/test/unit/fixtures/01-normalize-paths/yarn.lock
+++ b/packages/next/test/unit/fixtures/01-normalize-paths/yarn.lock
@@ -0,0 +1,184 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@next/env@12.3.1":
+  version "12.3.1"
+  resolved "https://registry.yarnpkg.com/@next/env/-/env-12.3.1.tgz#18266bd92de3b4aa4037b1927aa59e6f11879260"
+  integrity sha512-9P9THmRFVKGKt9DYqeC2aKIxm8rlvkK38V1P1sRE7qyoPBIs8l9oo79QoSdPtOWfzkbDAVUqvbQGgTMsb8BtJg==
+
+"@next/swc-android-arm-eabi@12.3.1":
+  version "12.3.1"
+  resolved "https://registry.yarnpkg.com/@next/swc-android-arm-eabi/-/swc-android-arm-eabi-12.3.1.tgz#b15ce8ad376102a3b8c0f3c017dde050a22bb1a3"
+  integrity sha512-i+BvKA8tB//srVPPQxIQN5lvfROcfv4OB23/L1nXznP+N/TyKL8lql3l7oo2LNhnH66zWhfoemg3Q4VJZSruzQ==
+
+"@next/swc-android-arm64@12.3.1":
+  version "12.3.1"
+  resolved "https://registry.yarnpkg.com/@next/swc-android-arm64/-/swc-android-arm64-12.3.1.tgz#85d205f568a790a137cb3c3f720d961a2436ac9c"
+  integrity sha512-CmgU2ZNyBP0rkugOOqLnjl3+eRpXBzB/I2sjwcGZ7/Z6RcUJXK5Evz+N0ucOxqE4cZ3gkTeXtSzRrMK2mGYV8Q==
+
+"@next/swc-darwin-arm64@12.3.1":
+  version "12.3.1"
+  resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-12.3.1.tgz#b105457d6760a7916b27e46c97cb1a40547114ae"
+  integrity sha512-hT/EBGNcu0ITiuWDYU9ur57Oa4LybD5DOQp4f22T6zLfpoBMfBibPtR8XktXmOyFHrL/6FC2p9ojdLZhWhvBHg==
+
+"@next/swc-darwin-x64@12.3.1":
+  version "12.3.1"
+  resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-12.3.1.tgz#6947b39082271378896b095b6696a7791c6e32b1"
+  integrity sha512-9S6EVueCVCyGf2vuiLiGEHZCJcPAxglyckTZcEwLdJwozLqN0gtS0Eq0bQlGS3dH49Py/rQYpZ3KVWZ9BUf/WA==
+
+"@next/swc-freebsd-x64@12.3.1":
+  version "12.3.1"
+  resolved "https://registry.yarnpkg.com/@next/swc-freebsd-x64/-/swc-freebsd-x64-12.3.1.tgz#2b6c36a4d84aae8b0ea0e0da9bafc696ae27085a"
+  integrity sha512-qcuUQkaBZWqzM0F1N4AkAh88lLzzpfE6ImOcI1P6YeyJSsBmpBIV8o70zV+Wxpc26yV9vpzb+e5gCyxNjKJg5Q==
+
+"@next/swc-linux-arm-gnueabihf@12.3.1":
+  version "12.3.1"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm-gnueabihf/-/swc-linux-arm-gnueabihf-12.3.1.tgz#6e421c44285cfedac1f4631d5de330dd60b86298"
+  integrity sha512-diL9MSYrEI5nY2wc/h/DBewEDUzr/DqBjIgHJ3RUNtETAOB3spMNHvJk2XKUDjnQuluLmFMloet9tpEqU2TT9w==
+
+"@next/swc-linux-arm64-gnu@12.3.1":
+  version "12.3.1"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-12.3.1.tgz#8863f08a81f422f910af126159d2cbb9552ef717"
+  integrity sha512-o/xB2nztoaC7jnXU3Q36vGgOolJpsGG8ETNjxM1VAPxRwM7FyGCPHOMk1XavG88QZSQf+1r+POBW0tLxQOJ9DQ==
+
+"@next/swc-linux-arm64-musl@12.3.1":
+  version "12.3.1"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-12.3.1.tgz#0038f07cf0b259d70ae0c80890d826dfc775d9f3"
+  integrity sha512-2WEasRxJzgAmP43glFNhADpe8zB7kJofhEAVNbDJZANp+H4+wq+/cW1CdDi8DqjkShPEA6/ejJw+xnEyDID2jg==
+
+"@next/swc-linux-x64-gnu@12.3.1":
+  version "12.3.1"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-12.3.1.tgz#c66468f5e8181ffb096c537f0dbfb589baa6a9c1"
+  integrity sha512-JWEaMyvNrXuM3dyy9Pp5cFPuSSvG82+yABqsWugjWlvfmnlnx9HOQZY23bFq3cNghy5V/t0iPb6cffzRWylgsA==
+
+"@next/swc-linux-x64-musl@12.3.1":
+  version "12.3.1"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-12.3.1.tgz#c6269f3e96ac0395bc722ad97ce410ea5101d305"
+  integrity sha512-xoEWQQ71waWc4BZcOjmatuvPUXKTv6MbIFzpm4LFeCHsg2iwai0ILmNXf81rJR+L1Wb9ifEke2sQpZSPNz1Iyg==
+
+"@next/swc-win32-arm64-msvc@12.3.1":
+  version "12.3.1"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-12.3.1.tgz#83c639ee969cee36ce247c3abd1d9df97b5ecade"
+  integrity sha512-hswVFYQYIeGHE2JYaBVtvqmBQ1CppplQbZJS/JgrVI3x2CurNhEkmds/yqvDONfwfbttTtH4+q9Dzf/WVl3Opw==
+
+"@next/swc-win32-ia32-msvc@12.3.1":
+  version "12.3.1"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-12.3.1.tgz#52995748b92aa8ad053440301bc2c0d9fbcf27c2"
+  integrity sha512-Kny5JBehkTbKPmqulr5i+iKntO5YMP+bVM8Hf8UAmjSMVo3wehyLVc9IZkNmcbxi+vwETnQvJaT5ynYBkJ9dWA==
+
+"@next/swc-win32-x64-msvc@12.3.1":
+  version "12.3.1"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-12.3.1.tgz#27d71a95247a9eaee03d47adee7e3bd594514136"
+  integrity sha512-W1ijvzzg+kPEX6LAc+50EYYSEo0FVu7dmTE+t+DM4iOLqgGHoW9uYSz9wCVdkXOEEMP9xhXfGpcSxsfDucyPkA==
+
+"@swc/helpers@0.4.11":
+  version "0.4.11"
+  resolved "https://registry.yarnpkg.com/@swc/helpers/-/helpers-0.4.11.tgz#db23a376761b3d31c26502122f349a21b592c8de"
+  integrity sha512-rEUrBSGIoSFuYxwBYtlUFMlE2CwGhmW+w9355/5oduSw8e5h2+Tj4UrAGNNgP9915++wj5vkQo0UuOBqOAq4nw==
+  dependencies:
+    tslib "^2.4.0"
+
+caniuse-lite@^1.0.30001406:
+  version "1.0.30001409"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001409.tgz#6135da9dcab34cd9761d9cdb12a68e6740c5e96e"
+  integrity sha512-V0mnJ5dwarmhYv8/MzhJ//aW68UpvnQBXv8lJ2QUsvn2pHcmAuNtu8hQEDz37XnA1iE+lRR9CIfGWWpgJ5QedQ==
+
+"js-tokens@^3.0.0 || ^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
+  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
+
+loose-envify@^1.1.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
+  integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
+  dependencies:
+    js-tokens "^3.0.0 || ^4.0.0"
+
+nanoid@^3.3.4:
+  version "3.3.4"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab"
+  integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==
+
+next@latest:
+  version "12.3.1"
+  resolved "https://registry.yarnpkg.com/next/-/next-12.3.1.tgz#127b825ad2207faf869b33393ec8c75fe61e50f1"
+  integrity sha512-l7bvmSeIwX5lp07WtIiP9u2ytZMv7jIeB8iacR28PuUEFG5j0HGAPnMqyG5kbZNBG2H7tRsrQ4HCjuMOPnANZw==
+  dependencies:
+    "@next/env" "12.3.1"
+    "@swc/helpers" "0.4.11"
+    caniuse-lite "^1.0.30001406"
+    postcss "8.4.14"
+    styled-jsx "5.0.7"
+    use-sync-external-store "1.2.0"
+  optionalDependencies:
+    "@next/swc-android-arm-eabi" "12.3.1"
+    "@next/swc-android-arm64" "12.3.1"
+    "@next/swc-darwin-arm64" "12.3.1"
+    "@next/swc-darwin-x64" "12.3.1"
+    "@next/swc-freebsd-x64" "12.3.1"
+    "@next/swc-linux-arm-gnueabihf" "12.3.1"
+    "@next/swc-linux-arm64-gnu" "12.3.1"
+    "@next/swc-linux-arm64-musl" "12.3.1"
+    "@next/swc-linux-x64-gnu" "12.3.1"
+    "@next/swc-linux-x64-musl" "12.3.1"
+    "@next/swc-win32-arm64-msvc" "12.3.1"
+    "@next/swc-win32-ia32-msvc" "12.3.1"
+    "@next/swc-win32-x64-msvc" "12.3.1"
+
+picocolors@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
+  integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
+
+postcss@8.4.14:
+  version "8.4.14"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.14.tgz#ee9274d5622b4858c1007a74d76e42e56fd21caf"
+  integrity sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==
+  dependencies:
+    nanoid "^3.3.4"
+    picocolors "^1.0.0"
+    source-map-js "^1.0.2"
+
+react-dom@latest:
+  version "18.2.0"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.2.0.tgz#22aaf38708db2674ed9ada224ca4aa708d821e3d"
+  integrity sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==
+  dependencies:
+    loose-envify "^1.1.0"
+    scheduler "^0.23.0"
+
+react@latest:
+  version "18.2.0"
+  resolved "https://registry.yarnpkg.com/react/-/react-18.2.0.tgz#555bd98592883255fa00de14f1151a917b5d77d5"
+  integrity sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==
+  dependencies:
+    loose-envify "^1.1.0"
+
+scheduler@^0.23.0:
+  version "0.23.0"
+  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.0.tgz#ba8041afc3d30eb206a487b6b384002e4e61fdfe"
+  integrity sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==
+  dependencies:
+    loose-envify "^1.1.0"
+
+source-map-js@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
+  integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
+
+styled-jsx@5.0.7:
+  version "5.0.7"
+  resolved "https://registry.yarnpkg.com/styled-jsx/-/styled-jsx-5.0.7.tgz#be44afc53771b983769ac654d355ca8d019dff48"
+  integrity sha512-b3sUzamS086YLRuvnaDigdAewz1/EFYlHpYBP5mZovKEdQQOIIYq8lApylub3HHZ6xFjV051kkGU7cudJmrXEA==
+
+tslib@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3"
+  integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==
+
+use-sync-external-store@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz#7dbefd6ef3fe4e767a0cf5d7287aacfb5846928a"
+  integrity sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==
--- a/packages/node/package.json
+++ b/packages/node/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/node",
-  "version": "2.5.16",
+  "version": "2.5.18",
  "license": "MIT",
  "main": "./dist/index",
  "homepage": "https://vercel.com/docs/runtimes#official-runtimes/node-js",
@@ -31,7 +31,7 @@
  "dependencies": {
    "@edge-runtime/vm": "1.1.0-beta.32",
    "@types/node": "*",
-    "@vercel/build-utils": "5.4.4",
+    "@vercel/build-utils": "5.5.0",
    "@vercel/node-bridge": "3.0.0",
    "@vercel/static-config": "2.0.3",
    "edge-runtime": "1.1.0-beta.32",
--- a/packages/node/src/dev-server.ts
+++ b/packages/node/src/dev-server.ts
@@ -84,6 +84,14 @@ import esbuild from 'esbuild';
 import fetch from 'node-fetch';
 import { createEdgeWasmPlugin, WasmAssets } from './edge-wasm-plugin';

+const NODE_VERSION_MAJOR = process.version.match(/^v(\d+)\.\d+/)?.[1];
+const NODE_VERSION_IDENTIFIER = `node${NODE_VERSION_MAJOR}`;
+if (!NODE_VERSION_MAJOR) {
+  throw new Error(
+    `Unable to determine current node version: process.version=${process.version}`
+  );
+}
+
 function logError(error: Error) {
  console.error(error.message);
  if (error.stack) {
@@ -157,8 +165,12 @@ async function compileUserCode(
  const { wasmAssets, plugin: edgeWasmPlugin } = createEdgeWasmPlugin();
  try {
    const result = await esbuild.build({
-      platform: 'node',
-      target: 'node14',
+      // bundling behavior: use globals (like "browser") instead
+      // of "require" statements for core libraries (like "node")
+      platform: 'browser',
+      // target syntax: only use syntax available on the current
+      // version of node
+      target: NODE_VERSION_IDENTIFIER,
      sourcemap: 'inline',
      bundle: true,
      plugins: [edgeWasmPlugin],
--- a/packages/python/package.json
+++ b/packages/python/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/python",
-  "version": "3.1.16",
+  "version": "3.1.17",
  "main": "./dist/index.js",
  "license": "MIT",
  "homepage": "https://vercel.com/docs/runtimes#official-runtimes/python",
@@ -22,7 +22,7 @@
  "devDependencies": {
    "@types/execa": "^0.9.0",
    "@types/jest": "27.4.1",
-    "@vercel/build-utils": "5.4.4",
+    "@vercel/build-utils": "5.5.0",
    "@vercel/ncc": "0.24.0",
    "execa": "^1.0.0",
    "typescript": "4.3.4"
--- a/packages/redwood/package.json
+++ b/packages/redwood/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/redwood",
-  "version": "1.0.25",
+  "version": "1.0.26",
  "main": "./dist/index.js",
  "license": "MIT",
  "homepage": "https://vercel.com/docs",
@@ -27,6 +27,6 @@
    "@types/aws-lambda": "8.10.19",
    "@types/node": "*",
    "@types/semver": "6.0.0",
-    "@vercel/build-utils": "5.4.4"
+    "@vercel/build-utils": "5.5.0"
  }
 }
--- a/packages/remix/package.json
+++ b/packages/remix/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/remix",
-  "version": "1.0.26",
+  "version": "1.0.27",
  "license": "MIT",
  "main": "./dist/index.js",
  "homepage": "https://vercel.com/docs",
@@ -25,7 +25,7 @@
  "devDependencies": {
    "@types/jest": "27.5.1",
    "@types/node": "*",
-    "@vercel/build-utils": "5.4.4",
+    "@vercel/build-utils": "5.5.0",
    "typescript": "4.6.4"
  }
 }
--- a/packages/ruby/package.json
+++ b/packages/ruby/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@vercel/ruby",
  "author": "Nathan Cahill <nathan@nathancahill.com>",
-  "version": "1.3.33",
+  "version": "1.3.34",
  "license": "MIT",
  "main": "./dist/index",
  "homepage": "https://vercel.com/docs/runtimes#official-runtimes/ruby",
@@ -22,7 +22,7 @@
  "devDependencies": {
    "@types/fs-extra": "8.0.0",
    "@types/semver": "6.0.0",
-    "@vercel/build-utils": "5.4.4",
+    "@vercel/build-utils": "5.5.0",
    "@vercel/ncc": "0.24.0",
    "execa": "2.0.4",
    "fs-extra": "^7.0.1",
--- a/packages/static-build/package.json
+++ b/packages/static-build/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/static-build",
-  "version": "1.0.25",
+  "version": "1.0.26",
  "license": "MIT",
  "main": "./dist/index",
  "homepage": "https://vercel.com/docs/build-step",
@@ -36,7 +36,7 @@
    "@types/ms": "0.7.31",
    "@types/node-fetch": "2.5.4",
    "@types/promise-timeout": "1.3.0",
-    "@vercel/build-utils": "5.4.4",
+    "@vercel/build-utils": "5.5.0",
    "@vercel/frameworks": "1.1.6",
    "@vercel/ncc": "0.24.0",
    "@vercel/routing-utils": "2.0.2",
--- a/test/lib/deployment/now-deploy.js
+++ b/test/lib/deployment/now-deploy.js
@@ -200,8 +200,8 @@ async function fetchTokenWithRetry(retries = 5) {
    NOW_TOKEN,
    TEMP_TOKEN,
    VERCEL_TOKEN,
-    VERCEL_TEAM_TOKEN,
-    VERCEL_REGISTRATION_URL,
+    VERCEL_TEST_TOKEN,
+    VERCEL_TEST_REGISTRATION_URL,
  } = process.env;
  if (VERCEL_TOKEN || NOW_TOKEN || TEMP_TOKEN) {
    if (!TEMP_TOKEN) {
@@ -211,7 +211,7 @@ async function fetchTokenWithRetry(retries = 5) {
    }
    return VERCEL_TOKEN || NOW_TOKEN || TEMP_TOKEN;
  }
-  if (!VERCEL_TEAM_TOKEN || !VERCEL_REGISTRATION_URL) {
+  if (!VERCEL_TEST_TOKEN || !VERCEL_TEST_REGISTRATION_URL) {
    throw new Error(
      process.env.CI
        ? 'Failed to create test deployment. This is expected for 3rd-party Pull Requests. Please run tests locally.'
@@ -219,10 +219,10 @@ async function fetchTokenWithRetry(retries = 5) {
    );
  }
  try {
-    const res = await _fetch(VERCEL_REGISTRATION_URL, {
+    const res = await _fetch(VERCEL_TEST_REGISTRATION_URL, {
      method: 'POST',
      headers: {
-        Authorization: `Bearer ${VERCEL_TEAM_TOKEN}`,
+        Authorization: `Bearer ${VERCEL_TEST_TOKEN}`,
      },
    });
    if (!res.ok) {
--- a/test/lib/run-build-lambda.js
+++ b/test/lib/run-build-lambda.js
@@ -1,6 +1,7 @@
 const os = require('os');
 const path = require('path');
 const fs = require('fs-extra');
+const json5 = require('json5');
 const { glob } = require('@vercel/build-utils');

 function runAnalyze(wrapper, context) {
@@ -18,7 +19,7 @@ async function runBuildLambda(inputPath) {
  if (typeof expect !== 'undefined') {
    expect(nowJsonRef).toBeDefined();
  }
-  const nowJson = require(nowJsonRef.fsPath);
+  const nowJson = json5.parse(await fs.readFile(nowJsonRef.fsPath, 'utf8'));
  const build = nowJson.builds[0];

  if (typeof expect !== 'undefined') {
Author	SHA1	Message	Date
Steven	a825bc9540	Publish Stable - @vercel/build-utils@5.5.0 - vercel@28.4.2 - @vercel/client@12.2.7 - @vercel/go@2.2.8 - @vercel/hydrogen@0.0.21 - @vercel/next@3.1.29 - @vercel/node@2.5.18 - @vercel/python@3.1.17 - @vercel/redwood@1.0.26 - @vercel/remix@1.0.27 - @vercel/ruby@1.3.34 - @vercel/static-build@1.0.26	2022-09-22 16:50:27 -04:00
JJ Kasper	f5486a8297	[next] Update to route app rsc paths correctly (#8611 ) ### Related Issues x-ref: [slack thread](https://vercel.slack.com/archives/C035J346QQL/p1663799417151099) Failing probes are unrelated, more info can be seen in [this thread](https://vercel.slack.com/archives/C035J346QQL/p1663820032810519?thread_ts=1663775935.504379&cid=C035J346QQL)	2022-09-22 20:44:40 +00:00
Mark Glagola	225e0a4de3	[tests] Use new `VERCEL_TEST_TOKEN` for tests (#8614 ) Use `VERCEL_TEST_TOKEN` for tests	2022-09-22 16:07:43 -04:00
Steven	0ecfdc1325	[tests] Add timeout for broken `actions/setup-node@v3` (#8613 ) This PR will make sure that CI fails fast if there is a network issue when restoring the cache. This has been a known issue for 3 months and no resolution: - https://github.com/actions/cache/issues/810	2022-09-22 14:42:48 +00:00
Gal Schlezinger	628409d233	[build-utils] support providing execution regions in Edge Functions (#8612 )	2022-09-22 14:38:33 +03:00
Steven	51d968314f	Publish Stable - vercel@28.4.1 - @vercel/fs-detectors@3.4.0 - @vercel/next@3.1.28 - @vercel/node@2.5.17	2022-09-21 18:47:45 -04:00
Chris Barber	b4e2cbc6e5	[tests] Test route src and dest for normalized path (#8609 ) Adding assertions for normalized routes.	2022-09-21 18:44:52 -04:00
Jiachi Liu	7323beea8e	[next] fix app dir SSG deployment paths (#8608 ) ### Related Issues Seeing this while deploying appDir to production. The collecting path is not correct for generated dist from appDir ``` Collected static files (public/, static/, .next/static): 18.834ms Error: ENOENT: no such file or directory, open '/vercel/path0/.next/server/pages/route-groups/checkout.html' Error: An unexpected error occurred! Error: ENOENT: no such file or directory, open '/vercel/path0/.next/server/pages/route-groups/checkout.html' Error: Command "vercel build" exited with 1 ``` Fix the deployment of SSG, the output html/json paths should be prefixed with `/app` Adding a TODO now for how to determine the app path route, leveraging `.rsc` suffix in data route. Better to use app paths manifest to refactor it later. ### 📋 Checklist <!-- Please keep your PR as a Draft until the checklist is complete --> #### Tests - [x] The code changed/added as part of this PR has been covered with tests - [x] All tests pass locally with `yarn test-unit` #### Code Review - [x] This PR has a concise title and thorough description useful to a reviewer - [ ] Issue from task tracker has a link to this PR Co-authored-by: JJ Kasper <jj@jjsweb.site>	2022-09-21 15:40:38 -07:00
Chris Barber	e4bb311144	[cli] Disable git status background index refresh/optimization (#8569 ) The `create-git-meta` file contains a `isDirty()` function which calls `git status` and subsequently causes one of the test fixture's git index to be updated. Turns out that `git status` will update/optimize the index in the background when invoked: https://git-scm.com/docs/git-status#_background_refresh. By disabling this using the `--no-optional-locks` flag, `isDirty()` will no longer update the index when checking the status. From my testing, the `--no-optional-locks` flag must be set after `git` and before `status`. This PR is likely a better alternative to https://github.com/vercel/vercel/pull/8568 as this PR eliminates the problem all together. #### Tests - [x] The code changed/added as part of this PR has been covered with tests - [x] All tests pass locally with `yarn test-unit` #### Code Review - [ ] This PR has a concise title and thorough description useful to a reviewer - [ ] Issue from task tracker has a link to this PR	2022-09-21 21:47:10 +00:00
Andrew Gadzik	288546659d	[fs-detectors] ensure processing of potentialFiles for readdir cache hits (#8604 ) This is to fix the issue with processing new entries of `potentialFiles` when there was a `readdir` cache hit ### Related Issues Related to https://linear.app/vercel/issue/HIT-57/monorepo-detection-api-prevent-rate-limits ### 📋 Checklist <!-- Please keep your PR as a Draft until the checklist is complete --> #### Tests - [ ] The code changed/added as part of this PR has been covered with tests - [ ] All tests pass locally with `yarn test-unit` #### Code Review - [ ] This PR has a concise title and thorough description useful to a reviewer - [ ] Issue from task tracker has a link to this PR	2022-09-21 20:59:21 +00:00
Sean Massa	822224e212	[cli][dev] Use `browser` platform when bundling edge functions for `vc dev` (#8605 )	2022-09-21 15:50:22 -05:00
Nathan Rajlich	6b23950b65	[cli] Don't set `analyticsId` when Vercel Analytics are disabled in "vc pull" (#8607 ) The `disabledAt` and `enabledAt` properties need to be consulted in order to determine whether or not the Vercel Analytics feature has been enabled. Related to https://github.com/vercel/vercel/discussions/8575.	2022-09-21 19:54:34 +00:00
Chris Barber	1558f21e49	[tests] Added lock file for normalize paths test fixture (#8600 ) Added a lock file to the normalize paths text fixture to speed up install dependencies. #### Tests - [x] The code changed/added as part of this PR has been covered with tests - [x] All tests pass locally with `yarn test-unit` #### Code Review - [ ] This PR has a concise title and thorough description useful to a reviewer - [ ] Issue from task tracker has a link to this PR	2022-09-21 19:31:27 +00:00
chloetedder	a6aee8b904	[fs-detectors] Rush json workspace (#8603 ) ### Related Issues Add in getting the package paths for Rush workspaces. First get the contents of the `rush.json` file. If the `projects` property is an array, map through that array and return the `projectFolder` as the package path. ### 📋 Checklist <!-- Please keep your PR as a Draft until the checklist is complete --> #### Tests - [ ] The code changed/added as part of this PR has been covered with tests - [ ] All tests pass locally with `yarn test-unit` #### Code Review - [ ] This PR has a concise title and thorough description useful to a reviewer - [ ] Issue from task tracker has a link to this PR	2022-09-21 13:00:21 -05:00