Skip to content

Commit 2089ec5

Browse files
kodiakhq[bot]kodiakhq[bot]
authored
Merge branch 'main' into trek/zero-2528-remove-json-flag-from-vercel-alias
2 parents 1c68275 + 013ca1f commit 2089ec5

File tree

1,225 files changed

+5758
-4126
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,225 files changed

+5758
-4126
lines changed

‎.changeset/dirty-eels-vanish.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
---
3+
4+
Clean up test matcher types

‎.changeset/little-parrots-fry.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"vercel": patch
3+
---
4+
5+
[cli] add telemetry tracking to `alias ls`

‎.changeset/next-14-2-14.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
---
3+

‎.changeset/plenty-donkeys-exercise.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"vercel": patch
3+
---
4+
5+
Add support for tracking Continuous Integration vendors with telemetry

‎.changeset/wild-bobcats-wonder.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
---
3+
4+
Update more codeowners

‎.github/CODEOWNERS‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,16 @@
1111
/packages/edge @vercel/compute
1212
/packages/functions @vercel/compute
1313
/packages/firewall @cramforce @sueplex
14-
/packages/sdk @leerob @molebox
15-
/open-api.yaml @leerob @molebox
1614
/examples @TooTallNate @EndangeredMassa @trek @onsclom @jeffsee55 @erikareads @leerob
1715
/examples/create-react-app @TooTallNate @EndangeredMassa @trek @onsclom @jeffsee55 @erikareads @Timer
1816
/examples/nextjs @ijjk @ztanner @huozhi
1917
/packages/node @TooTallNate @EndangeredMassa @trek @onsclom @jeffsee55 @erikareads @Kikobeats
2018

19+
# SDK Geneneration
20+
/packages/sdk @leerob @molebox
21+
/open-api.yaml @leerob @molebox
22+
/.github/workflows/sdk_generation.yaml @leerob @molebox
23+
/.github/workflows/sdk_publish.yaml @leerob @molebox
24+
2125
# Unrestricted Paths
2226
.changeset/

‎examples/nextjs/package-lock.json‎

Lines changed: 112 additions & 112 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/nextjs/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"dependencies": {
1212
"react": "^18",
1313
"react-dom": "^18",
14-
"next": "14.2.13"
14+
"next": "14.2.14"
1515
},
1616
"devDependencies": {
1717
"typescript": "^5",
@@ -21,6 +21,6 @@
2121
"postcss": "^8",
2222
"tailwindcss": "^3.4.1",
2323
"eslint": "^8",
24-
"eslint-config-next": "14.2.13"
24+
"eslint-config-next": "14.2.14"
2525
}
2626
}

‎packages/cli/src/commands/alias/index.ts‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import rm from './rm';
88
import set from './set';
99
import { aliasCommand } from './command';
1010
import { getFlagsSpecification } from '../../util/get-flags-specification';
11+
import { AliasTelemetryClient } from '../../util/telemetry/commands/alias';
1112

1213
const COMMAND_CONFIG = {
1314
default: ['set'],
@@ -17,6 +18,13 @@ const COMMAND_CONFIG = {
1718
};
1819

1920
export default async function alias(client: Client) {
21+
let telemetryClient = new AliasTelemetryClient({
22+
opts: {
23+
output: client.output,
24+
store: client.telemetryEventStore,
25+
},
26+
});
27+
2028
let parsedArguments;
2129

2230
const flagsSpecification = getFlagsSpecification(aliasCommand.options);
@@ -33,13 +41,14 @@ export default async function alias(client: Client) {
3341
return 2;
3442
}
3543

36-
const { subcommand, args } = getSubcommand(
44+
const { subcommand, args, subcommandOriginal } = getSubcommand(
3745
parsedArguments.args.slice(1),
3846
COMMAND_CONFIG
3947
);
4048

4149
switch (subcommand) {
4250
case 'ls':
51+
telemetryClient.trackCliSubcommandLs(subcommandOriginal);
4352
return ls(client, parsedArguments.flags, args);
4453
case 'rm':
4554
return rm(client, parsedArguments.flags, args);

‎packages/cli/src/commands/alias/ls.ts‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ import {
1111
import stamp from '../../util/output/stamp';
1212
import getCommandFlags from '../../util/get-command-flags';
1313
import { getCommandName } from '../../util/pkg-name';
14+
import { AliasLsTelemetryClient } from '../../util/telemetry/commands/alias/ls';
15+
1416
import type { Alias } from '@vercel-internals/types';
1517

1618
export default async function ls(
@@ -21,10 +23,20 @@ export default async function ls(
2123
const { output } = client;
2224
const { contextName } = await getScope(client);
2325

26+
const telemetryClient = new AliasLsTelemetryClient({
27+
opts: {
28+
output: client.output,
29+
store: client.telemetryEventStore,
30+
},
31+
});
2432
let paginationOptions;
2533

2634
try {
2735
paginationOptions = getPaginationOpts(opts);
36+
let [next, limit] = paginationOptions;
37+
38+
telemetryClient.trackCliOptionNext(next);
39+
telemetryClient.trackCliOptionLimit(limit);
2840
} catch (err: unknown) {
2941
output.prettyError(err);
3042
return 1;

0 commit comments

Comments
 (0)