Merge branch 'main' into revert-12267-trek/zero-2616-check-into-skipped-test-in-packagenode

EndangeredMassa · web-flow · commit 577e3cc954c0 · 2024-10-22T19:49:31.000-05:00
diff --git a/.changeset/gold-insects-type.md b/.changeset/gold-insects-type.md
@@ -0,0 +1,5 @@
+---
+'vercel': minor
+---
+
+[cli] add telemetry tracking to `project list`
diff --git a/.changeset/next-15-0-1.md b/.changeset/next-15-0-1.md
@@ -0,0 +1,3 @@
+---
+---
+
diff --git a/examples/nextjs/package-lock.json b/examples/nextjs/package-lock.json
diff --git a/examples/nextjs/package.json b/examples/nextjs/package.json
@@ -9,9 +9,9 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "react": "19.0.0-rc-65a56d0e-20241020",
-    "react-dom": "19.0.0-rc-65a56d0e-20241020",
-    "next": "15.0.0"
+    "react": "19.0.0-rc-69d4b800-20241021",
+    "react-dom": "19.0.0-rc-69d4b800-20241021",
+    "next": "15.0.1"
   },
   "devDependencies": {
     "typescript": "^5",
@@ -21,6 +21,6 @@
     "postcss": "^8",
     "tailwindcss": "^3.4.1",
     "eslint": "^8",
-    "eslint-config-next": "15.0.0"
+    "eslint-config-next": "15.0.1"
   }
 }
diff --git a/packages/cli/src/commands/project/index.ts b/packages/cli/src/commands/project/index.ts
@@ -55,7 +55,7 @@ export default async function main(client: Client) {
   switch (subcommand) {
     case 'ls':
     case 'list':
-      telemetryClient.trackCliSubcommandLs(subcommand);
+      telemetryClient.trackCliSubcommandList(subcommand);
       return await list(client, parsedArgs.flags, args, contextName);
     case 'add':
       telemetryClient.trackCliSubcommandAdd(subcommand);
diff --git a/packages/cli/src/commands/project/list.ts b/packages/cli/src/commands/project/list.ts
@@ -6,13 +6,21 @@ import Client from '../../util/client';
 import getCommandFlags from '../../util/get-command-flags';
 import { getCommandName } from '../../util/pkg-name';
 import { NODE_VERSIONS } from '@vercel/build-utils';
+import { ProjectListTelemetryClient } from '../../util/telemetry/commands/project/list';
 
 export default async function list(
   client: Client,
   argv: any,
   args: string[],
   contextName: string
 ) {
+  const telemetryClient = new ProjectListTelemetryClient({
+    opts: {
+      output: client.output,
+      store: client.telemetryEventStore,
+    },
+  });
+
   const { output } = client;
   if (args.length !== 0) {
     output.error(
@@ -30,11 +38,13 @@ export default async function list(
   let projectsUrl = `/v9/projects?limit=20`;
 
   const deprecated = argv['--update-required'] || false;
+  telemetryClient.trackCliFlagUpdateRequired(deprecated);
   if (deprecated) {
     projectsUrl += `&deprecated=${deprecated}`;
   }
 
   const next = argv['--next'] || false;
+  telemetryClient.trackCliOptionNext(next);
   if (next) {
     projectsUrl += `&until=${next}`;
   }
diff --git a/packages/cli/src/util/telemetry/commands/project/index.ts b/packages/cli/src/util/telemetry/commands/project/index.ts
@@ -1,9 +1,9 @@
 import { TelemetryClient } from '../..';
 
 export class ProjectTelemetryClient extends TelemetryClient {
-  trackCliSubcommandLs(actual: string) {
+  trackCliSubcommandList(actual: string) {
     this.trackCliSubcommand({
-      subcommand: 'ls',
+      subcommand: 'list',
       value: actual,
     });
   }
diff --git a/packages/cli/src/util/telemetry/commands/project/list.ts b/packages/cli/src/util/telemetry/commands/project/list.ts
@@ -0,0 +1,18 @@
+import { TelemetryClient } from '../..';
+
+export class ProjectListTelemetryClient extends TelemetryClient {
+  trackCliFlagUpdateRequired(updateRequired: boolean) {
+    if (updateRequired) {
+      this.trackCliFlag('update-required');
+    }
+  }
+
+  trackCliOptionNext(next?: number) {
+    if (next) {
+      this.trackCliOption({
+        option: 'next',
+        value: this.redactedValue,
+      });
+    }
+  }
+}
diff --git a/packages/cli/test/unit/commands/project/list.test.ts b/packages/cli/test/unit/commands/project/list.test.ts

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +'vercel': minor
 +---
++
 +[cli] add telemetry tracking to `project list`