Version Packages (#10939)

Uses the new `deprecated` query param for the GET /projects API instead of client-side filtering.

This enables a better UX so that results are properly paginated. 

Here are some example runs:

Pagination works as expected:
<img width="831" alt="Screenshot 2023-12-12 at 20 59 57" src="https://github.com/vercel/vercel/assets/16144158/c592752d-bf49-41a0-8dae-8b8e233052f8">

Usage without the flag results in different output (as expected!)
<img width="830" alt="Screenshot 2023-12-12 at 21 04 52" src="https://github.com/vercel/vercel/assets/16144158/c65461e0-b4a0-4725-aaae-a63739e6c8e9">

.github/workflows/release.yml

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

packages/cli/CHANGELOG.md

@@ -1,5 +1,20 @@
 # vercel
 
+## 32.7.2
+
+### Patch Changes
+
+- [cli] Use new `deprecated` query param in projects api for `vc project ls --deprecated` ([#10938](https://github.com/vercel/vercel/pull/10938))
+
+## 32.7.1
+
+### Patch Changes
+
+- [cli] double page limit for vc project ls --deprecated ([#10932](https://github.com/vercel/vercel/pull/10932))
+
+- Updated dependencies [[`d09dd1794`](https://github.com/vercel/vercel/commit/d09dd1794b5ffa28c15d3ad2880b90db2f4c06f0)]:
+  - @vercel/remix-builder@2.0.14
+
 ## 32.7.0
 
 ### Minor Changes

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vercel",
-  "version": "32.7.0",
+  "version": "32.7.2",
   "preferGlobal": true,
   "license": "Apache-2.0",
   "description": "The command-line interface for Vercel",
@@ -39,7 +39,7 @@
     "@vercel/node": "3.0.12",
     "@vercel/python": "4.1.0",
     "@vercel/redwood": "2.0.5",
-    "@vercel/remix-builder": "2.0.13",
+    "@vercel/remix-builder": "2.0.14",
     "@vercel/ruby": "2.0.4",
     "@vercel/static-build": "2.0.14",
     "chokidar": "3.3.1"

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

@@ -28,15 +28,18 @@ export default async function list(
 
   output.spinner(`Fetching projects in ${chalk.bold(contextName)}`);
 
-  let projectsUrl = '/v4/projects/?limit=20';
+  let projectsUrl = `/v4/projects/?limit=20`;
+
+  const deprecated = argv['--deprecated'] || false;
+  if (deprecated) {
+    projectsUrl += `&deprecated=${deprecated}`;
+  }
 
   const next = argv['--next'] || false;
   if (next) {
     projectsUrl += `&until=${next}`;
   }
 
-  const deprecated = argv['--deprecated'] || false;
-
   let {
     projects: projectList,
     pagination,
@@ -52,19 +55,16 @@ export default async function list(
   const elapsed = ms(Date.now() - start);
 
   if (deprecated) {
-    const upcomingDeprecationVersions = NODE_VERSIONS.filter(
-      nodeVersion =>
+    const upcomingDeprecationVersionsList = [];
+
+    for (const nodeVersion of NODE_VERSIONS) {
+      if (
         nodeVersion.discontinueDate &&
         nodeVersion.discontinueDate.valueOf() > Date.now()
-    );
-    const upcomingDeprecationVersionsList = upcomingDeprecationVersions.map(
-      nodeVersion => nodeVersion.range
-    );
-    projectList = projectList.filter(
-      project =>
-        project.nodeVersion &&
-        upcomingDeprecationVersionsList.includes(project.nodeVersion)
-    );
+      ) {
+        upcomingDeprecationVersionsList.push(nodeVersion.range);
+      }
+    }
 
     output.warn(
       `The following Node.js versions will be deprecated soon: ${upcomingDeprecationVersionsList.join(

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

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

packages/remix/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @vercel/remix-builder
 
+## 2.0.14
+
+### Patch Changes
+
+- Reinstall dependencies during `prepareCache()` ([#10922](https://github.com/vercel/vercel/pull/10922))
+
 ## 2.0.13
 
 ### Patch Changes

packages/remix/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/remix-builder",
-  "version": "2.0.13",
+  "version": "2.0.14",
   "license": "Apache-2.0",
   "main": "./dist/index.js",
   "homepage": "https://vercel.com/docs",

packages/remix/src/build.ts

@@ -104,15 +104,17 @@ export const build: BuildV2 = async ({
     meta
   );
 
-  const { cliType, packageJsonPath, lockfileVersion } = await scanParentDirs(
-    entrypointFsDirname
-  );
+  const { cliType, packageJsonPath, lockfileVersion, lockfilePath } =
+    await scanParentDirs(entrypointFsDirname);
 
   if (!packageJsonPath) {
     throw new Error('Failed to locate `package.json` file in your project');
   }
 
-  const pkgRaw = await fs.readFile(packageJsonPath, 'utf8');
+  const [lockfileRaw, pkgRaw] = await Promise.all([
+    lockfilePath ? fs.readFile(lockfilePath) : null,
+    fs.readFile(packageJsonPath, 'utf8'),
+  ]);
   const pkg = JSON.parse(pkgRaw);
 
   const spawnOpts = getSpawnOptions(meta, nodeVersion);
@@ -423,9 +425,7 @@ module.exports = config;`;
       cleanupOps.push(
         fs
           .rename(renamedRemixConfigPath, remixConfigPath)
-          .then(() =>
-            debug(`Restored original "${basename(remixConfigPath)}" file`)
-          )
+          .then(() => debug(`Restored original "${remixConfigPath}" file`))
       );
     }
     // Restore original server entrypoint if it was modified (for Hydrogen v2)
@@ -433,11 +433,24 @@ module.exports = config;`;
       cleanupOps.push(
         fs
           .writeFile(serverEntryPointAbs, originalServerEntryPoint)
-          .then(() =>
-            debug(`Restored original "${basename(serverEntryPointAbs!)}" file`)
-          )
+          .then(() => debug(`Restored original "${serverEntryPointAbs}" file`))
       );
     }
+    // Restore original `package.json` file and lockfile
+    if (depsModified) {
+      cleanupOps.push(
+        fs
+          .writeFile(packageJsonPath, pkgRaw)
+          .then(() => debug(`Restored original "${packageJsonPath}" file`))
+      );
+      if (lockfilePath && lockfileRaw) {
+        cleanupOps.push(
+          fs
+            .writeFile(lockfilePath, lockfileRaw)
+            .then(() => debug(`Restored original "${lockfilePath}" file`))
+        );
+      }
+    }
     await Promise.all(cleanupOps);
   }
 

packages/remix/src/prepare-cache.ts

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

packages/static-build/test/fixtures/gatsby-v5-pathPrefix/package-lock.json

@@ -8,7 +8,7 @@
       "name": "gatsby-v5-pathprefix",
       "version": "1.0.0",
       "dependencies": {
-        "gatsby": "5.12.11",
+        "gatsby": "5.12.12",
         "react": "^18.2.0",
         "react-dom": "^18.2.0"
       }
@@ -8609,9 +8609,9 @@
       }
     },
     "node_modules/gatsby": {
-      "version": "5.12.11",
-      "resolved": "https://registry.npmjs.org/gatsby/-/gatsby-5.12.11.tgz",
-      "integrity": "sha512-4XuN4bo6W6JnIYkvaCeV+5fKTzxv78aAgOTEW4doupP8/bD0bgLwuIHFwnvhEMHQiGdALoKukLkqhkgAShUK0w==",
+      "version": "5.12.12",
+      "resolved": "https://registry.npmjs.org/gatsby/-/gatsby-5.12.12.tgz",
+      "integrity": "sha512-+PdcY2d4iRpMlzErNJzfCk63ucfha9ft8dYF/J70coXNp/qBirWKkho9wBe6Io1RESzVm4BxY+uVzFp8U6P0ew==",
       "hasInstallScript": true,
       "dependencies": {
         "@babel/code-frame": "^7.18.6",

packages/static-build/test/fixtures/gatsby-v5-pathPrefix/package.json

@@ -15,7 +15,7 @@
     "clean": "gatsby clean"
   },
   "dependencies": {
-    "gatsby": "5.12.11",
+    "gatsby": "5.12.12",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   }

packages/static-build/test/fixtures/gatsby-v5/package-lock.json

@@ -5,7 +5,7 @@
   "packages": {
     "": {
       "dependencies": {
-        "gatsby": "5.12.11",
+        "gatsby": "5.12.12",
         "react": "^18.2.0",
         "react-dom": "^18.2.0"
       }
@@ -8606,9 +8606,9 @@
       }
     },
     "node_modules/gatsby": {
-      "version": "5.12.11",
-      "resolved": "https://registry.npmjs.org/gatsby/-/gatsby-5.12.11.tgz",
-      "integrity": "sha512-4XuN4bo6W6JnIYkvaCeV+5fKTzxv78aAgOTEW4doupP8/bD0bgLwuIHFwnvhEMHQiGdALoKukLkqhkgAShUK0w==",
+      "version": "5.12.12",
+      "resolved": "https://registry.npmjs.org/gatsby/-/gatsby-5.12.12.tgz",
+      "integrity": "sha512-+PdcY2d4iRpMlzErNJzfCk63ucfha9ft8dYF/J70coXNp/qBirWKkho9wBe6Io1RESzVm4BxY+uVzFp8U6P0ew==",
       "hasInstallScript": true,
       "dependencies": {
         "@babel/code-frame": "^7.18.6",
@@ -21814,9 +21814,9 @@
       "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ=="
     },
     "gatsby": {
-      "version": "5.12.11",
-      "resolved": "https://registry.npmjs.org/gatsby/-/gatsby-5.12.11.tgz",
-      "integrity": "sha512-4XuN4bo6W6JnIYkvaCeV+5fKTzxv78aAgOTEW4doupP8/bD0bgLwuIHFwnvhEMHQiGdALoKukLkqhkgAShUK0w==",
+      "version": "5.12.12",
+      "resolved": "https://registry.npmjs.org/gatsby/-/gatsby-5.12.12.tgz",
+      "integrity": "sha512-+PdcY2d4iRpMlzErNJzfCk63ucfha9ft8dYF/J70coXNp/qBirWKkho9wBe6Io1RESzVm4BxY+uVzFp8U6P0ew==",
       "requires": {
         "@babel/code-frame": "^7.18.6",
         "@babel/core": "^7.20.12",

packages/static-build/test/fixtures/gatsby-v5/package.json

@@ -8,7 +8,7 @@
     "clean": "gatsby clean"
   },
   "dependencies": {
-    "gatsby": "5.12.11",
+    "gatsby": "5.12.12",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   }

pnpm-lock.yaml

@@ -334,7 +334,7 @@ importers:
         specifier: 2.0.5
         version: link:../redwood
       '@vercel/remix-builder':
-        specifier: 2.0.13
+        specifier: 2.0.14
         version: link:../remix
       '@vercel/ruby':
         specifier: 2.0.4