Publish Stable

- vercel@28.4.6 - @vercel/client@12.2.11 - @vercel/next@3.2.2
[next] Allow revalidating ISR 404 path itself (#8663 )
2025-12-25 03:39:14 +00:00 · 2022-10-03 10:07:07 -04:00 · 2022-10-02 13:09:24 +00:00 · 2022-09-30 18:29:39 +00:00 · 2022-09-30 15:25:33 +00:00 · 2022-09-28 13:24:01 -07:00
38 changed files with 429 additions and 109 deletions
--- a/packages/build-utils/package.json
+++ b/packages/build-utils/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/build-utils",
-  "version": "5.5.1",
+  "version": "5.5.3",
  "license": "MIT",
  "main": "./dist/index.js",
  "types": "./dist/index.d.js",
--- a/packages/build-utils/src/fs/run-user-scripts.ts
+++ b/packages/build-utils/src/fs/run-user-scripts.ts
@@ -461,7 +461,8 @@ export async function runNpmInstall(
    let commandArgs: string[];
    const isPotentiallyBrokenNpm =
      cliType === 'npm' &&
-      nodeVersion?.major === 16 &&
+      (nodeVersion?.major === 16 ||
+        opts.env.PATH?.includes('/node16/bin-npm7')) &&
      !args.includes('--legacy-peer-deps') &&
      spawnOpts?.env?.ENABLE_EXPERIMENTAL_COREPACK !== '1';

--- a/packages/build-utils/test/fixtures/14-npm-6-legacy-peer-deps/.gitignore
+++ b/packages/build-utils/test/fixtures/14-npm-6-legacy-peer-deps/.gitignore
@@ -0,0 +1,2 @@
+node_modules
+.vercel
--- a/packages/build-utils/test/fixtures/14-npm-6-legacy-peer-deps/package-lock.json
+++ b/packages/build-utils/test/fixtures/14-npm-6-legacy-peer-deps/package-lock.json
@@ -0,0 +1,64 @@
+{
+  "requires": true,
+  "lockfileVersion": 1,
+  "dependencies": {
+    "js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
+    },
+    "loose-envify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "requires": {
+        "js-tokens": "^3.0.0 || ^4.0.0"
+      }
+    },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="
+    },
+    "prop-types": {
+      "version": "15.8.1",
+      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
+      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
+      "requires": {
+        "loose-envify": "^1.4.0",
+        "object-assign": "^4.1.1",
+        "react-is": "^16.13.1"
+      }
+    },
+    "react": {
+      "version": "16.8.0",
+      "resolved": "https://registry.npmjs.org/react/-/react-16.8.0.tgz",
+      "integrity": "sha512-g+nikW2D48kqgWSPwNo0NH9tIGG3DsQFlrtrQ1kj6W77z5ahyIHG0w8kPpz4Sdj6gyLnz0lEd/xsjOoGge2MYQ==",
+      "requires": {
+        "loose-envify": "^1.1.0",
+        "object-assign": "^4.1.1",
+        "prop-types": "^15.6.2",
+        "scheduler": "^0.13.0"
+      }
+    },
+    "react-is": {
+      "version": "16.13.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
+    },
+    "scheduler": {
+      "version": "0.13.6",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.13.6.tgz",
+      "integrity": "sha512-IWnObHt413ucAYKsD9J1QShUKkbKLQQHdxRyw73sw4FN26iWr3DY/H34xGPe4nmL1DwXyWmSWmMrA9TfQbE/XQ==",
+      "requires": {
+        "loose-envify": "^1.1.0",
+        "object-assign": "^4.1.1"
+      }
+    },
+    "swr": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/swr/-/swr-1.3.0.tgz",
+      "integrity": "sha512-dkghQrOl2ORX9HYrMDtPa7LTVHJjCTeZoB1dqTbnnEDlSvN8JEKpYIYurDfvbQFUUS8Cg8PceFVZNkW0KNNYPw=="
+    }
+  }
+}
--- a/packages/build-utils/test/fixtures/14-npm-6-legacy-peer-deps/package.json
+++ b/packages/build-utils/test/fixtures/14-npm-6-legacy-peer-deps/package.json
@@ -0,0 +1,11 @@
+{
+  "private": true,
+  "scripts": {
+    "build": "mkdir -p public && echo 'legacy peer deps' > public/index.txt"
+  },
+  "packageManager": "npm@6.14.17",
+  "dependencies": {
+    "swr": "1.3.0",
+    "react": "16.8.0"
+  }
+}
--- a/packages/build-utils/test/fixtures/14-npm-6-legacy-peer-deps/probes.json
+++ b/packages/build-utils/test/fixtures/14-npm-6-legacy-peer-deps/probes.json
@@ -0,0 +1,3 @@
+{
+  "probes": [{ "path": "/", "mustContain": "legacy peer deps" }]
+}
--- a/packages/build-utils/test/unit.run-npm-install.test.ts
+++ b/packages/build-utils/test/unit.run-npm-install.test.ts
@@ -34,7 +34,7 @@ it('should not include peer dependencies when missing VERCEL_NPM_LEGACY_PEER_DEP
  const fixture = path.join(__dirname, 'fixtures', '20-npm-7');
  const meta: Meta = {};
  const spawnOpts = getTestSpawnOpts({});
-  const nodeVersion = { major: 16 } as any;
+  const nodeVersion = getNodeVersion(16);
  await runNpmInstall(fixture, [], spawnOpts, meta, nodeVersion);
  expect(spawnMock.mock.calls.length).toBe(1);
  const args = spawnMock.mock.calls[0];
@@ -71,10 +71,35 @@ it('should include peer dependencies when VERCEL_NPM_LEGACY_PEER_DEPS=1 on node1
  });
 });

-it('should not include peer dependencies when VERCEL_NPM_LEGACY_PEER_DEPS=1 on node14', async () => {
+it('should include peer dependencies when VERCEL_NPM_LEGACY_PEER_DEPS=1 on node14 and npm7+', async () => {
  const fixture = path.join(__dirname, 'fixtures', '20-npm-7');
  const meta: Meta = {};
  const spawnOpts = getTestSpawnOpts({ VERCEL_NPM_LEGACY_PEER_DEPS: '1' });
+
+  const nodeVersion = getNodeVersion(14);
+  await runNpmInstall(fixture, [], spawnOpts, meta, nodeVersion);
+  expect(spawnMock.mock.calls.length).toBe(1);
+  const args = spawnMock.mock.calls[0];
+  expect(args[0]).toEqual('npm');
+  expect(args[1]).toEqual([
+    'install',
+    '--no-audit',
+    '--unsafe-perm',
+    '--legacy-peer-deps',
+  ]);
+  expect(args[2]).toEqual({
+    cwd: fixture,
+    prettyCommand: 'npm install',
+    stdio: 'inherit',
+    env: expect.any(Object),
+  });
+});
+
+it('should not include peer dependencies when VERCEL_NPM_LEGACY_PEER_DEPS=1 on node14 and npm6', async () => {
+  const fixture = path.join(__dirname, 'fixtures', '14-npm-6-legacy-peer-deps');
+  const meta: Meta = {};
+  const spawnOpts = getTestSpawnOpts({ VERCEL_NPM_LEGACY_PEER_DEPS: '1' });
+
  const nodeVersion = getNodeVersion(14);
  await runNpmInstall(fixture, [], spawnOpts, meta, nodeVersion);
  expect(spawnMock.mock.calls.length).toBe(1);
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
  "name": "vercel",
-  "version": "28.4.3",
+  "version": "28.4.6",
  "preferGlobal": true,
  "license": "Apache-2.0",
  "description": "The command-line interface for Vercel",
@@ -41,16 +41,16 @@
    "node": ">= 14"
  },
  "dependencies": {
-    "@vercel/build-utils": "5.5.1",
-    "@vercel/go": "2.2.9",
-    "@vercel/hydrogen": "0.0.22",
-    "@vercel/next": "3.1.30",
-    "@vercel/node": "2.5.19",
-    "@vercel/python": "3.1.18",
-    "@vercel/redwood": "1.0.27",
-    "@vercel/remix": "1.0.28",
-    "@vercel/ruby": "1.3.35",
-    "@vercel/static-build": "1.0.27",
+    "@vercel/build-utils": "5.5.3",
+    "@vercel/go": "2.2.11",
+    "@vercel/hydrogen": "0.0.24",
+    "@vercel/next": "3.2.2",
+    "@vercel/node": "2.5.21",
+    "@vercel/python": "3.1.20",
+    "@vercel/redwood": "1.0.29",
+    "@vercel/remix": "1.0.30",
+    "@vercel/ruby": "1.3.37",
+    "@vercel/static-build": "1.0.29",
    "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.8",
+    "@vercel/client": "12.2.11",
    "@vercel/frameworks": "1.1.6",
-    "@vercel/fs-detectors": "3.4.0",
+    "@vercel/fs-detectors": "3.4.1",
    "@vercel/fun": "1.0.4",
    "@vercel/ncc": "0.24.0",
    "@zeit/source-map-support": "0.6.2",
--- a/packages/cli/src/util/deploy/process-deployment.ts
+++ b/packages/cli/src/util/deploy/process-deployment.ts
@@ -115,29 +115,39 @@ export default async function processDeployment({
          .reduce((a: number, b: number) => a + b, 0);
        const totalSizeHuman = bytes.format(missingSize, { decimalPlaces: 1 });

-        uploads.forEach((e: any) =>
-          e.on('progress', () => {
-            const uploadedBytes = uploads.reduce((acc: number, e: any) => {
-              return acc + e.bytesUploaded;
-            }, 0);
+        // When stderr is not a TTY then we only want to
+        // print upload progress in 25% increments
+        let nextStep = 0;
+        const stepSize = now._client.stderr.isTTY ? 0 : 0.25;

-            const bar = progress(uploadedBytes, missingSize);
-            if (!bar || uploadedBytes === missingSize) {
-              output.spinner(deployingSpinnerVal, 0);
-            } else {
-              const uploadedHuman = bytes.format(uploadedBytes, {
-                decimalPlaces: 1,
-                fixedDecimals: true,
-              });
+        const updateProgress = () => {
+          const uploadedBytes = uploads.reduce((acc: number, e: any) => {
+            return acc + e.bytesUploaded;
+          }, 0);
+
+          const bar = progress(uploadedBytes, missingSize);
+          if (!bar) {
+            output.spinner(deployingSpinnerVal, 0);
+          } else {
+            const uploadedHuman = bytes.format(uploadedBytes, {
+              decimalPlaces: 1,
+              fixedDecimals: true,
+            });
+            const percent = uploadedBytes / missingSize;
+            if (percent >= nextStep) {
              output.spinner(
                `Uploading ${chalk.reset(
                  `[${bar}] (${uploadedHuman}/${totalSizeHuman})`
                )}`,
                0
              );
+              nextStep += stepSize;
            }
-          })
-        );
+          }
+        };
+
+        uploads.forEach((e: any) => e.on('progress', updateProgress));
+        updateProgress();
      }

      if (event.type === 'file-uploaded') {
--- a/packages/cli/src/util/output/create-output.ts
+++ b/packages/cli/src/util/output/create-output.ts
@@ -4,6 +4,8 @@ import wait, { StopSpinner } from './wait';
 import type { WritableTTY } from '../../types';
 import { errorToString } from '../is-error';

+const IS_TEST = process.env.NODE_ENV === 'test';
+
 export interface OutputOptions {
  debug?: boolean;
 }
@@ -108,12 +110,15 @@ export class Output {
  };

  spinner = (message: string, delay: number = 300): void => {
-    this.spinnerMessage = message;
    if (this.debugEnabled) {
      this.debug(`Spinner invoked (${message}) with a ${delay}ms delay`);
      return;
    }
-    if (this.stream.isTTY) {
+    if (IS_TEST || !this.stream.isTTY) {
+      this.print(`${message}\n`);
+    } else {
+      this.spinnerMessage = message;
+
      if (this._spinner) {
        this._spinner.text = message;
      } else {
@@ -125,8 +130,6 @@ export class Output {
          delay
        );
      }
-    } else {
-      this.print(`${message}\n`);
    }
  };

--- a/packages/cli/test/unit/commands/deploy.test.ts
+++ b/packages/cli/test/unit/commands/deploy.test.ts
@@ -1,4 +1,7 @@
+import bytes from 'bytes';
+import fs from 'fs-extra';
 import { join } from 'path';
+import { randomBytes } from 'crypto';
 import { fileNameSymbol } from '@vercel/client';
 import { client } from '../../mocks/client';
 import deploy from '../../../src/commands/deploy';
@@ -199,4 +202,119 @@ describe('deploy', () => {
      process.chdir(originalCwd);
    }
  });
+
+  it('should upload missing files', async () => {
+    const cwd = setupFixture('commands/deploy/archive');
+    const originalCwd = process.cwd();
+
+    // Add random 1mb file
+    await fs.writeFile(join(cwd, 'data'), randomBytes(bytes('1mb')));
+
+    try {
+      process.chdir(cwd);
+
+      const user = useUser();
+      useTeams('team_dummy');
+      useProject({
+        ...defaultProject,
+        name: 'archive',
+        id: 'archive',
+      });
+
+      let body: any;
+      let fileUploaded = false;
+      client.scenario.post(`/v13/deployments`, (req, res) => {
+        if (fileUploaded) {
+          body = req.body;
+          res.json({
+            creator: {
+              uid: user.id,
+              username: user.username,
+            },
+            id: 'dpl_archive_test',
+          });
+        } else {
+          const sha = req.body.files[0].sha;
+          res.status(400).json({
+            error: {
+              code: 'missing_files',
+              message: 'Missing files',
+              missing: [sha],
+            },
+          });
+        }
+      });
+      client.scenario.post('/v2/files', (req, res) => {
+        // Wait for file to be finished uploading
+        req.on('data', () => {
+          // Noop
+        });
+        req.on('end', () => {
+          fileUploaded = true;
+          res.end();
+        });
+      });
+      client.scenario.get(`/v13/deployments/dpl_archive_test`, (req, res) => {
+        res.json({
+          creator: {
+            uid: user.id,
+            username: user.username,
+          },
+          id: 'dpl_archive_test',
+          readyState: 'READY',
+          aliasAssigned: true,
+          alias: [],
+        });
+      });
+      client.scenario.get(
+        `/v10/now/deployments/dpl_archive_test`,
+        (req, res) => {
+          res.json({
+            creator: {
+              uid: user.id,
+              username: user.username,
+            },
+            id: 'dpl_archive_test',
+            readyState: 'READY',
+            aliasAssigned: true,
+            alias: [],
+          });
+        }
+      );
+
+      // When stderr is not a TTY we expect 5 progress lines to be printed
+      client.stderr.isTTY = false;
+
+      client.setArgv('deploy', '--archive=tgz');
+      const uploadingLines: string[] = [];
+      client.stderr.on('data', data => {
+        if (data.startsWith('Uploading [')) {
+          uploadingLines.push(data);
+        }
+      });
+      client.stderr.resume();
+      const exitCode = await deploy(client);
+      expect(exitCode).toEqual(0);
+      expect(body?.files?.length).toEqual(1);
+      expect(body?.files?.[0].file).toEqual('.vercel/source.tgz');
+      expect(uploadingLines.length).toEqual(5);
+      expect(
+        uploadingLines[0].startsWith('Uploading [--------------------]')
+      ).toEqual(true);
+      expect(
+        uploadingLines[1].startsWith('Uploading [=====---------------]')
+      ).toEqual(true);
+      expect(
+        uploadingLines[2].startsWith('Uploading [==========----------]')
+      ).toEqual(true);
+      expect(
+        uploadingLines[3].startsWith('Uploading [===============-----]')
+      ).toEqual(true);
+      expect(
+        uploadingLines[4].startsWith('Uploading [====================]')
+      ).toEqual(true);
+    } finally {
+      process.chdir(originalCwd);
+    }
+  });
 });
--- a/packages/cli/test/unit/commands/list.test.ts
+++ b/packages/cli/test/unit/commands/list.test.ts
@@ -38,11 +38,11 @@ describe('list', () => {

      await list(client);

-      const output = await readOutputStream(client, 4);
+      const output = await readOutputStream(client, 6);

-      const { org } = pluckIdentifiersFromDeploymentList(output.split('\n')[0]);
-      const header: string[] = parseSpacedTableRow(output.split('\n')[3]);
-      const data: string[] = parseSpacedTableRow(output.split('\n')[4]);
+      const { org } = pluckIdentifiersFromDeploymentList(output.split('\n')[2]);
+      const header: string[] = parseSpacedTableRow(output.split('\n')[5]);
+      const data: string[] = parseSpacedTableRow(output.split('\n')[6]);
      data.shift();

      expect(org).toEqual(team[0].slug);
@@ -81,11 +81,11 @@ describe('list', () => {
      client.setArgv('-S', user.username);
      await list(client);

-      const output = await readOutputStream(client, 4);
+      const output = await readOutputStream(client, 6);

-      const { org } = pluckIdentifiersFromDeploymentList(output.split('\n')[0]);
-      const header: string[] = parseSpacedTableRow(output.split('\n')[3]);
-      const data: string[] = parseSpacedTableRow(output.split('\n')[4]);
+      const { org } = pluckIdentifiersFromDeploymentList(output.split('\n')[2]);
+      const header: string[] = parseSpacedTableRow(output.split('\n')[5]);
+      const data: string[] = parseSpacedTableRow(output.split('\n')[6]);
      data.shift();

      expect(org).toEqual(user.username);
@@ -116,11 +116,11 @@ describe('list', () => {
      client.setArgv(deployment.name);
      await list(client);

-      const output = await readOutputStream(client, 4);
+      const output = await readOutputStream(client, 6);

-      const { org } = pluckIdentifiersFromDeploymentList(output.split('\n')[0]);
-      const header: string[] = parseSpacedTableRow(output.split('\n')[3]);
-      const data: string[] = parseSpacedTableRow(output.split('\n')[4]);
+      const { org } = pluckIdentifiersFromDeploymentList(output.split('\n')[2]);
+      const header: string[] = parseSpacedTableRow(output.split('\n')[5]);
+      const data: string[] = parseSpacedTableRow(output.split('\n')[6]);
      data.shift();

      expect(org).toEqual(teamSlug || team[0].slug);
--- a/packages/cli/test/unit/commands/project.test.ts
+++ b/packages/cli/test/unit/commands/project.test.ts
@@ -22,10 +22,10 @@ describe('project', () => {
      client.setArgv('project', 'ls');
      await projects(client);

-      const output = await readOutputStream(client, 2);
-      const { org } = pluckIdentifiersFromDeploymentList(output.split('\n')[0]);
-      const header: string[] = parseSpacedTableRow(output.split('\n')[2]);
-      const data: string[] = parseSpacedTableRow(output.split('\n')[3]);
+      const output = await readOutputStream(client, 3);
+      const { org } = pluckIdentifiersFromDeploymentList(output.split('\n')[1]);
+      const header: string[] = parseSpacedTableRow(output.split('\n')[3]);
+      const data: string[] = parseSpacedTableRow(output.split('\n')[4]);
      data.pop();

      expect(org).toEqual(user.username);
@@ -47,10 +47,10 @@ describe('project', () => {
      client.setArgv('project', 'ls');
      await projects(client);

-      const output = await readOutputStream(client, 2);
-      const { org } = pluckIdentifiersFromDeploymentList(output.split('\n')[0]);
-      const header: string[] = parseSpacedTableRow(output.split('\n')[2]);
-      const data: string[] = parseSpacedTableRow(output.split('\n')[3]);
+      const output = await readOutputStream(client, 3);
+      const { org } = pluckIdentifiersFromDeploymentList(output.split('\n')[1]);
+      const header: string[] = parseSpacedTableRow(output.split('\n')[3]);
+      const data: string[] = parseSpacedTableRow(output.split('\n')[4]);
      data.pop();

      expect(org).toEqual(user.username);
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/client",
-  "version": "12.2.8",
+  "version": "12.2.11",
  "main": "dist/index.js",
  "typings": "dist/index.d.ts",
  "homepage": "https://vercel.com",
@@ -43,7 +43,7 @@
    ]
  },
  "dependencies": {
-    "@vercel/build-utils": "5.5.1",
+    "@vercel/build-utils": "5.5.3",
    "@vercel/routing-utils": "2.0.2",
    "@zeit/fetch": "5.2.0",
    "async-retry": "1.2.3",
--- a/packages/client/src/upload.ts
+++ b/packages/client/src/upload.ts
@@ -1,4 +1,5 @@
-import { Agent } from 'https';
+import http from 'http';
+import https from 'https';
 import { Readable } from 'stream';
 import { EventEmitter } from 'events';
 import retry from 'async-retry';
@@ -78,7 +79,9 @@ export async function* upload(
  debug('Building an upload list...');

  const semaphore = new Sema(50, { capacity: 50 });
-  const agent = new Agent({ keepAlive: true });
+  const agent = apiUrl?.startsWith('https://')
+    ? new https.Agent({ keepAlive: true })
+    : new http.Agent({ keepAlive: true });

  shas.forEach((sha, index) => {
    const uploadProgress = uploads[index];
--- a/packages/fs-detectors/package.json
+++ b/packages/fs-detectors/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/fs-detectors",
-  "version": "3.4.0",
+  "version": "3.4.1",
  "description": "Vercel filesystem detectors",
  "main": "./dist/index.js",
  "types": "./dist/index.d.ts",
@@ -23,6 +23,7 @@
    "@vercel/routing-utils": "2.0.2",
    "glob": "8.0.3",
    "js-yaml": "4.1.0",
+    "json5": "2.2.1",
    "minimatch": "3.0.4",
    "semver": "6.1.1"
  },
--- a/packages/fs-detectors/src/workspaces/get-workspace-package-paths.ts
+++ b/packages/fs-detectors/src/workspaces/get-workspace-package-paths.ts
@@ -1,6 +1,7 @@
 import _path from 'path';
 import yaml from 'js-yaml';
 import glob from 'glob';
+import json5 from 'json5';
 import { DetectorFilesystem } from '../detectors/filesystem';
 import { Workspace } from './get-workspaces';
 import { getGlobFs } from './get-glob-fs';
@@ -144,7 +145,7 @@ async function getRushWorkspacePackagePaths({
 }: GetPackagePathOptions): Promise<string[]> {
  const rushWorkspaceAsBuffer = await fs.readFile('rush.json');

-  const { projects = [] } = JSON.parse(
+  const { projects = [] } = json5.parse(
    rushWorkspaceAsBuffer.toString()
  ) as RushWorkspaces;

--- a/packages/fs-detectors/test/fixtures/40-rush-monorepo/rush.json
+++ b/packages/fs-detectors/test/fixtures/40-rush-monorepo/rush.json
@@ -2,7 +2,6 @@
  "$schema": "https://developer.microsoft.com/json-schemas/rush/v5/rush.schema.json",

  "rushVersion": "5.76.1",
-
  "pnpmVersion": "6.7.1",

  "pnpmOptions": {
@@ -22,6 +21,7 @@

    "postRushBuild": []
  },
+  // comment
  "variants": [],
  "projects": [
    {
--- a/packages/fs-detectors/test/fixtures/42-rush-json-invalid/rush.json
+++ b/packages/fs-detectors/test/fixtures/42-rush-json-invalid/rush.json
@@ -12,7 +12,9 @@
  "nodeSupportedVersionRange": ">=12.13.0 <13.0.0 || >=14.15.0 <15.0.0 || >=16.13.0 <17.0.0",

  "gitPolicy": {},
-
+  /* 
+  this is a comment
+  */
  "repository": {},
  "eventHooks": {
    "preRushInstall": [],
--- a/packages/go/package.json
+++ b/packages/go/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/go",
-  "version": "2.2.9",
+  "version": "2.2.11",
  "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.5.1",
+    "@vercel/build-utils": "5.5.3",
    "@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.22",
+  "version": "0.0.24",
  "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.5.1",
+    "@vercel/build-utils": "5.5.3",
    "typescript": "4.6.4"
  }
 }
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/next",
-  "version": "3.1.30",
+  "version": "3.2.2",
  "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.5.1",
+    "@vercel/build-utils": "5.5.3",
    "@vercel/nft": "0.22.1",
    "@vercel/routing-utils": "2.0.2",
    "async-sema": "3.0.1",
--- a/packages/next/src/server-build.ts
+++ b/packages/next/src/server-build.ts
@@ -633,7 +633,7 @@ export async function serverBuild({
        const curPagesDir = isAppPath && appDir ? appDir : pagesDir;
        const pageDir = path.dirname(path.join(curPagesDir, originalPagePath));
        const normalizedBaseDir = `${baseDir}${
-          baseDir.endsWith('/') ? '' : '/'
+          baseDir.endsWith(path.sep) ? '' : path.sep
        }`;
        files.forEach((file: string) => {
          const absolutePath = path.join(pageDir, file);
@@ -1134,7 +1134,7 @@ 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
+    // __rsc__ header is present
    const edgeFunctions = middleware.edgeFunctions;

    for (let route of Object.values(appPathRoutesManifest)) {
@@ -1343,6 +1343,12 @@ export async function serverBuild({
                .join('|')})?[/]?404/?`,
              status: 404,
              continue: true,
+              missing: [
+                {
+                  type: 'header',
+                  key: 'x-prerender-revalidate',
+                },
+              ],
            },
          ]
        : [
@@ -1350,6 +1356,12 @@ export async function serverBuild({
              src: path.posix.join('/', entryDirectory, '404/?'),
              status: 404,
              continue: true,
+              missing: [
+                {
+                  type: 'header',
+                  key: 'x-prerender-revalidate',
+                },
+              ],
            },
          ]),

@@ -1393,7 +1405,7 @@ export async function serverBuild({
              has: [
                {
                  type: 'header',
-                  key: '__flight__',
+                  key: '__rsc__',
                },
              ],
              dest: path.posix.join('/', entryDirectory, '/$1.rsc'),
--- a/packages/next/src/utils.ts
+++ b/packages/next/src/utils.ts
@@ -1698,7 +1698,6 @@ export const onPrerenderRoute =
    const {
      appDir,
      pagesDir,
-      hasPages404,
      static404Page,
      entryDirectory,
      prerenderManifest,
@@ -1896,11 +1895,9 @@ export const onPrerenderRoute =
        });
      }

-      // If revalidate isn't enabled we force the /404 route to be static
-      // to match next start behavior otherwise getStaticProps would be
-      // recalled for each 404 URL path since Prerender is cached based
-      // on the URL path
-      if (!canUsePreviewMode || (hasPages404 && routeKey === '/404')) {
+      // if preview mode/On-Demand ISR can't be leveraged
+      // we can output pure static outputs instead of prerenders
+      if (!canUsePreviewMode) {
        htmlFsRef.contentType = htmlContentType;
        prerenders[outputPathPage] = htmlFsRef;
        prerenders[outputPathData] = jsonFsRef;
@@ -2202,6 +2199,7 @@ interface BaseEdgeFunctionInfo {
  page: string;
  wasm?: { filePath: string; name: string }[];
  assets?: { filePath: string; name: string }[];
+  regions?: 'auto' | string[] | 'all' | 'default';
 }

 interface EdgeFunctionInfoV1 extends BaseEdgeFunctionInfo {
@@ -2341,6 +2339,7 @@ export async function getMiddlewareBundle({
                  ...wasmFiles,
                  ...assetFiles,
                },
+                regions: edgeFunction.regions,
                entrypoint: 'index.js',
                envVarsInUse: edgeFunction.env,
                assets: (edgeFunction.assets ?? []).map(({ name }) => {
--- a/packages/next/test/fixtures/00-app-dir/vercel.json
+++ b/packages/next/test/fixtures/00-app-dir/vercel.json
@@ -15,7 +15,7 @@
      "path": "/dashboard",
      "status": 200,
      "headers": {
-        "__flight__": "1"
+        "__rsc__": "1"
      },
      "mustContain": "M1:{",
      "mustNotContain": "<html"
--- a/packages/next/test/fixtures/00-server-build/index.test.js
+++ b/packages/next/test/fixtures/00-server-build/index.test.js
@@ -1,7 +1,7 @@
 /* eslint-env jest */
 const path = require('path');
 const cheerio = require('cheerio');
-const { deployAndTest, check, waitFor } = require('../../utils');
+const { deployAndTest, check } = require('../../utils');
 const fetch = require('../../../../../test/lib/deployment/fetch-retry');

 async function checkForChange(url, initialValue, getNewValue) {
@@ -141,4 +141,30 @@ describe(`${__dirname.split(path.sep).pop()}`, () => {
    expect(preRevalidateRandom).toBeDefined();
    expect(preRevalidateRandomData).toBeDefined();
  });
+
+  it('should revalidate 404 page itself correctly', async () => {
+    const initial404 = await fetch(`${ctx.deploymentUrl}/404`);
+    const initial404Html = await initial404.text();
+    const initial404Props = JSON.parse(
+      cheerio.load(initial404Html)('#props').text()
+    );
+    expect(initial404.status).toBe(404);
+    expect(initial404Props.is404).toBe(true);
+
+    const revalidateRes = await fetch(
+      `${ctx.deploymentUrl}/api/revalidate?urlPath=/404`
+    );
+    expect(revalidateRes.status).toBe(200);
+    expect(await revalidateRes.json()).toEqual({ revalidated: true });
+
+    await check(async () => {
+      const res = await fetch(`${ctx.deploymentUrl}/404`);
+      const resHtml = await res.text();
+      const resProps = JSON.parse(cheerio.load(resHtml)('#props').text());
+      expect(res.status).toBe(404);
+      expect(resProps.is404).toBe(true);
+      expect(resProps.time).not.toEqual(initial404Props.time);
+      return 'success';
+    }, 'success');
+  });
 });
--- a/packages/next/test/fixtures/00-server-build/pages/404.js
+++ b/packages/next/test/fixtures/00-server-build/pages/404.js
@@ -1,3 +1,18 @@
-export default function Page() {
-  return <p>custom 404</p>;
+export default function Page(props) {
+  return (
+    <>
+      <p>custom 404</p>
+      <p id="props">{JSON.stringify(props)}</p>
+    </>
+  );
+}
+
+export function getStaticProps() {
+  console.log('pages/404 getStaticProps');
+  return {
+    props: {
+      is404: true,
+      time: Date.now(),
+    },
+  };
 }
--- a/packages/next/test/integration/index.test.js
+++ b/packages/next/test/integration/index.test.js
@@ -36,7 +36,10 @@ it('should build with app-dir correctly', async () => {
  );
 });

-it('should build with app-dir in edg runtime correctly', async () => {
+// TODO: re-enable after edge build failure is fixed in Next.js
+// Disabled Oct, 1st 2022
+// eslint-disable-next-line jest/no-disabled-tests
+it.skip('should build with app-dir in edge runtime correctly', async () => {
  const { buildResult } = await runBuildLambda(
    path.join(__dirname, '../fixtures/00-app-dir-edge')
  );
@@ -315,9 +318,9 @@ it('Should build the gip-gsp-404 example', async () => {
  expect(routes[handleErrorIdx + 1].dest).toBe('/404');
  expect(routes[handleErrorIdx + 1].headers).toBe(undefined);
  expect(output['404']).toBeDefined();
-  expect(output['404'].type).toBe('FileFsRef');
+  expect(output['404'].type).toBe('Prerender');
  expect(output['_next/data/testing-build-id/404.json']).toBeDefined();
-  expect(output['_next/data/testing-build-id/404.json'].type).toBe('FileFsRef');
+  expect(output['_next/data/testing-build-id/404.json'].type).toBe('Prerender');
  const filePaths = Object.keys(output);
  const serverlessError = filePaths.some(filePath => filePath.match(/_error/));
  const hasUnderScoreAppStaticFile = filePaths.some(filePath =>
--- a/packages/next/test/unit/fixtures/01-normalize-paths/data/strings.json
+++ b/packages/next/test/unit/fixtures/01-normalize-paths/data/strings.json
@@ -0,0 +1,3 @@
+{
+  "foo": "bar"
+}
--- a/packages/next/test/unit/fixtures/01-normalize-paths/index.test.js
+++ b/packages/next/test/unit/fixtures/01-normalize-paths/index.test.js
@@ -1,7 +1,7 @@
 const fs = require('fs-extra');
 const ms = require('ms');
 const path = require('path');
-const { build } = require('../../../../src');
+const { build } = require('../../../../dist');
 const { FileFsRef } = require('@vercel/build-utils');

 jest.setTimeout(ms('6m'));
@@ -12,6 +12,7 @@ describe(`${__dirname.split(path.sep).pop()}`, () => {
      'index.test.js',
      'next.config.js',
      'package.json',
+      'data/strings.json',
      'pages/foo/bar/index.js',
      'pages/foo/index.js',
      'pages/index.js',
@@ -38,9 +39,15 @@ describe(`${__dirname.split(path.sep).pop()}`, () => {

    for (const page of pages) {
      expect(output).toHaveProperty(page);
-      expect(path.resolve(output[page].fsPath)).toEqual(
-        path.join(pagesDir, `${page}.html`)
-      );
+      if (page === 'index') {
+        const { files, type } = output[page];
+        expect(type).toEqual('Lambda');
+        expect(files).toHaveProperty([path.join('data', 'strings.json')]);
+      } else {
+        expect(path.resolve(output[page].fsPath)).toEqual(
+          path.join(pagesDir, `${page}.html`)
+        );
+      }
    }

    for (const route of routes) {
--- a/packages/next/test/unit/fixtures/01-normalize-paths/pages/index.js
+++ b/packages/next/test/unit/fixtures/01-normalize-paths/pages/index.js
@@ -1,7 +1,18 @@
-export default function Page() {
+import fs from 'fs';
+import path from 'path';
+
+export default function Page({ foo }) {
  return (
    <>
-      <p>hello from pages</p>
+      <p>hello from pages {foo}</p>
    </>
  );
 }
+
+export async function getServerSideProps() {
+  const dataFile = path.join(process.cwd(), 'data', 'strings.json');
+  const strings = JSON.parse(fs.readFileSync(dataFile));
+  return {
+    props: strings,
+  };
+}
--- a/packages/node/package.json
+++ b/packages/node/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/node",
-  "version": "2.5.19",
+  "version": "2.5.21",
  "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.5.1",
+    "@vercel/build-utils": "5.5.3",
    "@vercel/node-bridge": "3.0.0",
    "@vercel/static-config": "2.0.3",
    "edge-runtime": "1.1.0-beta.32",
--- a/packages/python/package.json
+++ b/packages/python/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/python",
-  "version": "3.1.18",
+  "version": "3.1.20",
  "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.5.1",
+    "@vercel/build-utils": "5.5.3",
    "@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.27",
+  "version": "1.0.29",
  "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.5.1"
+    "@vercel/build-utils": "5.5.3"
  }
 }
--- a/packages/remix/package.json
+++ b/packages/remix/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/remix",
-  "version": "1.0.28",
+  "version": "1.0.30",
  "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.5.1",
+    "@vercel/build-utils": "5.5.3",
    "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.35",
+  "version": "1.3.37",
  "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.5.1",
+    "@vercel/build-utils": "5.5.3",
    "@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.27",
+  "version": "1.0.29",
  "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.5.1",
+    "@vercel/build-utils": "5.5.3",
    "@vercel/frameworks": "1.1.6",
    "@vercel/ncc": "0.24.0",
    "@vercel/routing-utils": "2.0.2",
--- a/yarn.lock
+++ b/yarn.lock
@@ -8480,6 +8480,11 @@ json5@2.1.1:
  dependencies:
    minimist "^1.2.0"

+json5@2.2.1, json5@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c"
+  integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
+
 json5@^2.1.0, json5@^2.1.2:
  version "2.1.3"
  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"
@@ -8487,11 +8492,6 @@ json5@^2.1.0, json5@^2.1.2:
  dependencies:
    minimist "^1.2.5"

-json5@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c"
-  integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
-
 jsonc-parser@^3.0.0:
  version "3.1.0"
  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.1.0.tgz#73b8f0e5c940b83d03476bc2e51a20ef0932615d"
Author	SHA1	Message	Date
Steven	053c185481	Publish Stable - vercel@28.4.6 - @vercel/client@12.2.11 - @vercel/next@3.2.2	2022-10-03 10:07:07 -04:00
JJ Kasper	8805b586ea	[next] Allow revalidating ISR 404 path itself (#8663 ) ### Related Issues Fixes: https://vercel.slack.com/archives/C03S8ED1DKM/p1664521958768189 ### 📋 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-10-02 13:09:24 +00:00
Chris Barber	681070ffa0	[tests] Adding test for next builder OS path separator for serverless file refs (#8661 ) Here's the test for https://github.com/vercel/vercel/pull/8657. #### 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-30 18:29:39 +00:00
Chris Barber	362b17d60a	[next] Use OS path separator to match serverless file references (#8657 ) When running `vc build` for a Next.js app, the Next builder will execute the server build which performs several steps. One of the steps is to trace each serverless function for any referenced files, then the raw list of files is scrubbed and filtered. The filtering uses OS specific file path comparisons to see if a file is of interest. Since it's comparing OS specific paths, we need to use OS specific path separators. During testing on Windows, the traced serverless functions file list was always empty. ### 📋 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 - [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-30 15:25:33 +00:00
JJ Kasper	c7c9b1a791	[next] Update RSC header in has routes (#8651 ) ### Related Issues x-ref: https://github.com/vercel/next.js/pull/40979 ### 📋 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-28 13:24:01 -07:00
Nathan Rajlich	c42f309463	[cli] Print upload progress in increments of 25% when non-TTY (#8650 ) When running `vc deploy` in a non-TTY context (i.e. CI), limit the number of progress updates to 25% increments (for a total of 5). ``` Uploading [--------------------] (0.0B/71.9MB) Uploading [=====---------------] (18.0MB/71.9MB) Uploading [==========----------] (36.0MB/71.9MB) Uploading [===============-----] (54.0MB/71.9MB) Uploading [====================] (71.9MB/71.9MB) ``` This avoids spamming the user logs with many progress updates.	2022-09-28 19:33:33 +00:00
Sean Massa	a0ead28369	[tests] replace spinner messages with normal output during tests (#8634 ) Convert spinner output to simple prints during test runs. This makes it easier to write tests against the output of commands.	2022-09-28 17:52:40 +00:00
chloetedder	8814fc1515	Publish Stable - @vercel/build-utils@5.5.3 - vercel@28.4.5 - @vercel/client@12.2.10 - @vercel/fs-detectors@3.4.1 - @vercel/go@2.2.11 - @vercel/hydrogen@0.0.24 - @vercel/next@3.2.1 - @vercel/node@2.5.21 - @vercel/python@3.1.20 - @vercel/redwood@1.0.29 - @vercel/remix@1.0.30 - @vercel/ruby@1.3.37 - @vercel/static-build@1.0.29	2022-09-28 10:14:27 -05:00
chloetedder	0d044b4eac	[fs-detectors] Use json5 parser for Rush to have valid json parsing (#8645 ) ### Related Issues Parse `rush.json` files with `json5` because it is very common for these to have comments in them [Template for people to clone for Rush](https://rushjs.io/pages/configs/rush_json/) which has comments in it as a default which most people will clone Docs of Rush showing to not use `JSON.parse` https://rushjs.io/pages/help/faq/#why-do-rushs-json-config-files-contain--comments-that-github-shows-in-red Added in tests with block comments and single line comments ### 📋 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 Co-authored-by: Sean Massa <EndangeredMassa@gmail.com>	2022-09-28 06:38:25 -05:00
Steven	f6bd1aa8c0	[tests] Remove console.log() from test (#8647 ) Remove `console.log()` from test	2022-09-27 23:38:49 +00:00
Steven	8cd84ec066	Publish Stable - @vercel/build-utils@5.5.2 - vercel@28.4.4 - @vercel/client@12.2.9 - @vercel/go@2.2.10 - @vercel/hydrogen@0.0.23 - @vercel/next@3.2.0 - @vercel/node@2.5.20 - @vercel/python@3.1.19 - @vercel/redwood@1.0.28 - @vercel/remix@1.0.29 - @vercel/ruby@1.3.36 - @vercel/static-build@1.0.28	2022-09-27 16:35:00 -04:00
Steven	a8df231e4c	[build-utils] Fix npm version detection for `--legacy-peer-deps` (#8646 ) There was a case where the npm version wasn't decided base on Node.js version but instead based on the lockfile. This PR fixes the case when a newer npm version is detected base on the lockfile. - Follow up to #8598 - Follow up to #8550	2022-09-27 16:33:24 -04:00
Gal Schlezinger	f674842bed	[next] read `regions` from middleware-manifest output (#8629 ) ### Related Issues - Needs https://github.com/vercel/next.js/pull/40881 for this to be useful - Resolves EC-238 ### 📋 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 Co-authored-by: Steven <steven@ceriously.com> Co-authored-by: JJ Kasper <jj@jjsweb.site>	2022-09-27 10:46:02 -07:00