Merge branch 'vercel:main' into main

.changeset/clever-mirrors-battle.md

@@ -0,0 +1,5 @@
+---
+"vercel": patch
+---
+
+[cli] Remove incorrect `--json` flag on `vercel alias`

.changeset/config.json

@@ -10,5 +10,7 @@
   "access": "public",
   "baseBranch": "main",
   "updateInternalDependencies": "patch",
-  "ignore": []
+  "ignore": [
+    "@vercel/sdk"
+  ]
 }

.changeset/dirty-eels-vanish.md

@@ -0,0 +1,4 @@
+---
+---
+
+Clean up test matcher types

.changeset/fluffy-dodos-wink.md

@@ -0,0 +1,5 @@
+---
+"vercel": patch
+---
+
+Standardize most error output through `output.error`

.changeset/itchy-books-switch.md

@@ -0,0 +1,5 @@
+---
+'vercel': patch
+---
+
+Replace `psl` with `tldts` for domain parsing

.changeset/little-parrots-fry.md

@@ -0,0 +1,5 @@
+---
+"vercel": patch
+---
+
+[cli] add telemetry tracking to `alias ls`

.changeset/giant-sloths-impress.md → .changeset/next-14-2-14.md

@@ -1,2 +1,3 @@
 ---
 ---
+

.changeset/plenty-donkeys-exercise.md

@@ -0,0 +1,5 @@
+---
+"vercel": patch
+---
+
+Add support for tracking Continuous Integration vendors with telemetry

.changeset/red-toys-raise.md

@@ -0,0 +1,5 @@
+---
+'@vercel/client': patch
+---
+
+Replace `@zeit/fetch` usage with `node-fetch`

.changeset/selfish-bats-grow.md

@@ -0,0 +1,5 @@
+---
+"vercel": patch
+---
+
+Add session id to events

.changeset/shaggy-masks-marry.md

@@ -0,0 +1,4 @@
+---
+---
+
+Add tests for all routing/erroring base command invocations

.changeset/wild-bobcats-wonder.md

@@ -0,0 +1,4 @@
+---
+---
+
+Update more codeowners

.eslintignore

@@ -43,3 +43,6 @@ packages/remix/test/fixtures-*
 
 # gatsby-plugin-vercel-analytics
 packages/gatsby-plugin-vercel-analytics
+
+# sdk
+packages/sdk

.github/CODEOWNERS

@@ -5,15 +5,22 @@
 *                                        @TooTallNate @EndangeredMassa @trek @onsclom @jeffsee55 @erikareads
 /.github/workflows                       @TooTallNate @EndangeredMassa @trek @onsclom @jeffsee55 @erikareads @ijjk
 /packages/fs-detectors                   @TooTallNate @EndangeredMassa @trek @onsclom @jeffsee55 @erikareads @agadzik @chloetedder
-/packages/next                           @TooTallNate @EndangeredMassa @trek @onsclom @jeffsee55 @erikareads @timneutkens @ijjk @ztanner @huozhi
+/packages/next                           @timneutkens @ijjk @ztanner @huozhi
 /packages/routing-utils                  @TooTallNate @EndangeredMassa @trek @onsclom @jeffsee55 @erikareads @ijjk
 /packages/static-build                   @TooTallNate @EndangeredMassa @trek @onsclom @jeffsee55 @erikareads
-/packages/edge                           @TooTallNate @EndangeredMassa @trek @onsclom @jeffsee55 @erikareads @vercel/compute
-/packages/functions                      @TooTallNate @EndangeredMassa @trek @onsclom @jeffsee55 @erikareads @vercel/compute
+/packages/edge                           @vercel/compute
+/packages/functions                      @vercel/compute
+/packages/firewall                       @cramforce @sueplex
 /examples                                @TooTallNate @EndangeredMassa @trek @onsclom @jeffsee55 @erikareads @leerob
 /examples/create-react-app               @TooTallNate @EndangeredMassa @trek @onsclom @jeffsee55 @erikareads @Timer
-/examples/nextjs                         @TooTallNate @EndangeredMassa @trek @onsclom @jeffsee55 @erikareads @timneutkens @ijjk @ztanner @huozhi
+/examples/nextjs                         @ijjk @ztanner @huozhi
 /packages/node                           @TooTallNate @EndangeredMassa @trek @onsclom @jeffsee55 @erikareads @Kikobeats
 
+# SDK Geneneration
+/packages/sdk                            @leerob @molebox
+/open-api.yaml                           @leerob @molebox
+/.github/workflows/sdk_generation.yaml   @leerob @molebox
+/.github/workflows/sdk_publish.yaml      @leerob @molebox
+
 # Unrestricted Paths
 .changeset/

.github/workflows/release.yml

@@ -45,7 +45,6 @@ jobs:
       - name: Build Packages
         run: pnpm build
         env:
-          GA_TRACKING_ID: ${{ secrets.GA_TRACKING_ID }}
           SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
 
       - name: Create Release Pull Request or Publish to npm
@@ -58,7 +57,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN_PULL_REQUESTS }}
           NPM_CONFIG_PROVENANCE: 'true'
           NPM_TOKEN: ${{ secrets.NPM_TOKEN_ELEVATED }}
-          GA_TRACKING_ID: ${{ secrets.GA_TRACKING_ID }}
           SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
 
       - name: Trigger Update (if a Publish Happened)

.github/workflows/sdk_generation.yaml

@@ -0,0 +1,32 @@
+name: Generate
+permissions:
+  checks: write
+  contents: write
+  pull-requests: write
+  statuses: write
+'on':
+  workflow_dispatch:
+    inputs:
+      force:
+        description: Force generation of SDKs
+        type: boolean
+        default: false
+      set_version:
+        description: optionally set a specific SDK version
+        type: string
+  # schedule:
+  #   - cron: 0 0 * * *
+jobs:
+  generate:
+    uses: speakeasy-api/sdk-generation-action/.github/workflows/workflow-executor.yaml@v15
+    with:
+      force: ${{ github.event.inputs.force }}
+      mode: pr
+      set_version: ${{ github.event.inputs.set_version }}
+      speakeasy_version: latest
+      working_directory: packages/sdk
+      pnpm_version: '8.3.1'
+    secrets:
+      github_access_token: ${{ secrets.GITHUB_TOKEN }}
+      npm_token: ${{ secrets.NPM_TOKEN_ELEVATED }}
+      speakeasy_api_key: ${{ secrets.SPEAKEASY_API_KEY }}

.github/workflows/sdk_publish.yaml

@@ -0,0 +1,21 @@
+name: Publish
+permissions:
+  checks: write
+  contents: write
+  pull-requests: write
+  statuses: write
+'on':
+  push:
+    branches:
+      - main
+    paths:
+      - packages/sdk/RELEASES.md
+jobs:
+  publish:
+    uses: speakeasy-api/sdk-generation-action/.github/workflows/sdk-publish.yaml@v15
+    with:
+      working_directory: packages/sdk
+    secrets:
+      github_access_token: ${{ secrets.GITHUB_TOKEN }}
+      npm_token: ${{ secrets.NPM_TOKEN_ELEVATED }}
+      speakeasy_api_key: ${{ secrets.SPEAKEASY_API_KEY }}

.github/workflows/test-18.yml

@@ -102,7 +102,7 @@ jobs:
           echo "misses=$TURBO_MISS_COUNT" >> $GITHUB_OUTPUT
       - name: 'Upload Test Report to Datadog'
         if: ${{ steps['turbo-summary'].outputs.misses != '0' && !cancelled() }}
-        run: 'npx @datadog/datadog-ci@2.18.1 junit upload --service vercel-cli .junit-reports'
+        run: 'npx @datadog/datadog-ci@2.36.0 junit upload --service vercel-cli .junit-reports'
         env:
           DATADOG_API_KEY: ${{secrets.DATADOG_API_KEY_CLI}}
           DD_ENV: ci

.github/workflows/test.yml

@@ -1,4 +1,4 @@
-name: Tests Node.js v16
+name: Tests
 
 on:
   push:
@@ -9,7 +9,6 @@ on:
   pull_request:
 
 env:
-  NODE_VERSION: '16'
   TURBO_REMOTE_ONLY: 'true'
   TURBO_TEAM: 'vercel'
   TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
@@ -33,7 +32,7 @@ jobs:
           token: ${{ secrets.GH_TOKEN_PULL_REQUESTS }}
       - uses: actions/setup-node@v4
         with:
-          node-version: ${{ env.NODE_VERSION }}
+          node-version: 16
       - name: install [email protected]
         run: npm i -g [email protected]
       - run: pnpm install
@@ -53,7 +52,7 @@ jobs:
   test:
     timeout-minutes: 120
     runs-on: ${{ matrix.runner }}
-    name: ${{matrix.scriptName}} (${{matrix.packageName}}, ${{matrix.chunkNumber}}, ${{ matrix.runner }})
+    name: ${{matrix.scriptName}} (${{matrix.packageName}}, ${{matrix.chunkNumber}}, ${{ matrix.runner }}, Node v${{ matrix.nodeVersion }})
     if: ${{ needs.setup.outputs['tests'] != '[]' }}
     needs:
       - setup
@@ -67,7 +66,7 @@ jobs:
           fetch-depth: 2
       - uses: actions/setup-node@v4
         with:
-          node-version: ${{ matrix.nodeVersion || env.NODE_VERSION }}
+          node-version: ${{ matrix.nodeVersion }}
 
       # yarn 1.22.21 introduced a Corepack bug when running tests.
       # this can be removed once https://github.com/yarnpkg/yarn/issues/9015 is resolved
@@ -108,7 +107,7 @@ jobs:
           DD_ENV: ci
 
   summary:
-    name: Summary (Node 16)
+    name: Summary
     runs-on: ubuntu-latest
     timeout-minutes: 5
     if: always()

.prettierignore

@@ -24,6 +24,7 @@ pnpm-lock.yaml
 .vercel
 coverage
 turbo-cache-key.json
+open-api.yaml
 /examples
 /public
 packages/*/dist
@@ -34,3 +35,4 @@ packages/**/test/dev/fixtures
 packages/**/test/build-fixtures
 packages/**/test/cache-fixtures
 packages/cli/src/util/dev/templates/*.ts
+packages/sdk/**

api/_lib/script/build.ts

@@ -1,10 +1,14 @@
+import { createWriteStream } from 'fs';
 import fs from 'fs/promises';
+import tar from 'tar-fs';
+import { pipeline } from 'stream/promises';
 import { join, dirname } from 'path';
 import { getExampleList } from '../examples/example-list';
 import { mapOldToNew } from '../examples/map-old-to-new';
 
 const repoRoot = join(__dirname, '..', '..', '..');
 const pubDir = join(repoRoot, 'public');
+const ignoredPackages = ['sdk'];
 
 async function main() {
   console.log(`Building static frontend ${repoRoot}...`);
@@ -28,7 +32,8 @@ async function main() {
   const pathListAll = join(pubDir, 'list-all.json');
   await fs.writeFile(pathListAll, JSON.stringify(examples));
 
-  const exampleDirs = await fs.readdir(join(repoRoot, 'examples'), {
+  const exampleDirPath = join(repoRoot, 'examples');
+  const exampleDirs = await fs.readdir(exampleDirPath, {
     withFileTypes: true,
   });
 
@@ -61,6 +66,10 @@ async function main() {
   const packagesDir = join(repoRoot, 'packages');
   const packages = await fs.readdir(packagesDir);
   for (const pkg of packages) {
+    if (ignoredPackages.includes(pkg)) {
+      continue;
+    }
+
     const fullDir = join(packagesDir, pkg);
     const packageJsonRaw = await fs.readFile(
       join(fullDir, 'package.json'),
@@ -84,6 +93,17 @@ async function main() {
     await fs.copyFile(srcTarballPath, destTarballPath);
   }
 
+  // Create (ungzipped) tarballs of the examples / templates
+  const examplesOutputDir = join(pubDir, 'api/examples/download');
+  await fs.mkdir(examplesOutputDir, { recursive: true });
+  for (const dir of exampleDirs) {
+    const dirName = join(exampleDirPath, dir.name);
+    const stream = tar.pack(dirName);
+    const tarGzPath = join(examplesOutputDir, `${dir.name}.tar.gz`);
+    await pipeline(stream, createWriteStream(tarGzPath));
+    console.log(`Wrote "${tarGzPath}"`);
+  }
+
   console.log('Completed building static frontend.');
 }
 

api/_lib/util/error-handler.ts

@@ -22,7 +22,12 @@ function initSentry() {
 }
 
 export function errorHandler(error: Error, extras?: { [key: string]: any }) {
+  console.error(error);
+
   if (!process.env.SENTRY_DSN) {
+    console.log(
+      'Skipping Sentry error reporting because SENTRY_DSN is not set'
+    );
     return;
   }