Version Packages (#10576)

This PR was opened by the [Changesets
release](https://github.com/changesets/action) GitHub action. When
you're ready to do a release, you can merge this and the packages will
be published to npm automatically. If you're not ready to do a release
yet, that's fine, whenever you add more changesets to main, this PR will
be updated.


# Releases
## vercel@32.4.0

### Minor Changes

- Restore unsetting teamId for non-team accounts
([#10612](https://github.com/vercel/vercel/pull/10612))

### Patch Changes

- remove unused source map pkg
([#10577](https://github.com/vercel/vercel/pull/10577))

- disable source map for prod build
([#10575](https://github.com/vercel/vercel/pull/10575))

- Better rendering upon authentication error in `vc cert ls`
([#10551](https://github.com/vercel/vercel/pull/10551))

- Updated dependencies
\[[`e9026c7a6`](e9026c7a69),
[`ea5bc8806`](ea5bc88062),
[`a4996e1c5`](a4996e1c5a),
[`a18ed98f2`](a18ed98f2d),
[`2f5b0aeeb`](2f5b0aeeb1),
[`09f1bbfa4`](09f1bbfa41),
[`ce7e82fa7`](ce7e82fa7a)]:
    -   @vercel/next@4.0.9
    -   @vercel/go@3.0.3
    -   @vercel/build-utils@7.2.2
    -   @vercel/node@3.0.7
    -   @vercel/redwood@2.0.4
    -   @vercel/remix-builder@2.0.9
    -   @vercel/static-build@2.0.8

## @vercel/build-utils@7.2.2

### Patch Changes

- [cli] Update bun detection and add tests for projects with both
bunlock binary and yarn.lock text files
([#10583](https://github.com/vercel/vercel/pull/10583))

## @vercel/client@13.0.5

### Patch Changes

- Updated dependencies
\[[`2f5b0aeeb`](2f5b0aeeb1)]:
    -   @vercel/build-utils@7.2.2

## @vercel/fs-detectors@5.1.1

### Patch Changes

- [cli] Update bun detection and add tests for projects with both
bunlock binary and yarn.lock text files
([#10583](https://github.com/vercel/vercel/pull/10583))

## @vercel/gatsby-plugin-vercel-builder@2.0.7

### Patch Changes

- Updated dependencies
\[[`2f5b0aeeb`](2f5b0aeeb1)]:
    -   @vercel/build-utils@7.2.2

## @vercel/go@3.0.3

### Patch Changes

- Update broken documentation link
([#10579](https://github.com/vercel/vercel/pull/10579))

## @vercel/next@4.0.9

### Patch Changes

- Correct output file tracing and limit calculation
([#10631](https://github.com/vercel/vercel/pull/10631))

- Fix the instrumentation hook on Next.js Edge Functions
([#10608](https://github.com/vercel/vercel/pull/10608))

- [next] fix lambda creation for i18n edge pages
([#10630](https://github.com/vercel/vercel/pull/10630))

- Revert "[next][node][redwood][remix] Update @vercel/nft (#10540)"
([#10633](https://github.com/vercel/vercel/pull/10633))

- Update `@vercel/nft` to 0.24.2
([#10644](https://github.com/vercel/vercel/pull/10644))

## @vercel/node@3.0.7

### Patch Changes

- Revert "[next][node][redwood][remix] Update @vercel/nft (#10540)"
([#10633](https://github.com/vercel/vercel/pull/10633))

- Update `@vercel/nft` to 0.24.2
([#10644](https://github.com/vercel/vercel/pull/10644))

- Updated dependencies
\[[`2f5b0aeeb`](2f5b0aeeb1)]:
    -   @vercel/build-utils@7.2.2

## @vercel/redwood@2.0.4

### Patch Changes

- Revert "[next][node][redwood][remix] Update @vercel/nft (#10540)"
([#10633](https://github.com/vercel/vercel/pull/10633))

- Update `@vercel/nft` to 0.24.2
([#10644](https://github.com/vercel/vercel/pull/10644))

## @vercel/remix-builder@2.0.9

### Patch Changes

- Revert "[next][node][redwood][remix] Update @vercel/nft (#10540)"
([#10633](https://github.com/vercel/vercel/pull/10633))

- Update `@vercel/nft` to 0.24.2
([#10644](https://github.com/vercel/vercel/pull/10644))

## @vercel/static-build@2.0.8

### Patch Changes

-   Updated dependencies \[]:
    -   @vercel/gatsby-plugin-vercel-builder@2.0.7

## @vercel-internals/types@1.0.12

### Patch Changes

- Updated dependencies
\[[`2f5b0aeeb`](2f5b0aeeb1)]:
    -   @vercel/build-utils@7.2.2

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

.github/CODEOWNERS

@@ -5,12 +5,12 @@
 *                                        @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood @trek
 /.github/workflows                       @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood @trek @ijjk
 /packages/fs-detectors                   @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood @trek @agadzik @chloetedder
-/packages/next                           @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood @trek @ijjk
+/packages/next                           @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood @trek @ijjk @ztanner
 /packages/routing-utils                  @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood @trek @ijjk
 /packages/edge                           @vercel/compute
 /examples                                @leerob
 /examples/create-react-app               @Timer
-/examples/nextjs                         @timneutkens @ijjk @styfle
+/examples/nextjs                         @timneutkens @ijjk @styfle @ztanner @huozhi
 /examples/hugo                           @styfle
 /examples/jekyll                         @styfle
 /examples/zola                           @styfle

.github/workflows/test.yml

@@ -83,7 +83,7 @@ jobs:
         env:
           FORCE_COLOR: '1'
       - name: Test ${{matrix.packageName}}
-        run: node utils/gen.js && node_modules/.bin/turbo run test --cache-dir=".turbo" --log-order=stream --scope=${{matrix.packageName}} --no-deps -- ${{ join(matrix.testPaths, ' ') }}
+        run: node utils/gen.js && node_modules/.bin/turbo run test --summarize --cache-dir=".turbo" --log-order=stream --scope=${{matrix.packageName}} --no-deps -- ${{ join(matrix.testPaths, ' ') }}
         shell: bash
         env:
           JEST_JUNIT_OUTPUT_FILE: ${{github.workspace}}/.junit-reports/${{matrix.scriptName}}-${{matrix.packageName}}-${{matrix.chunkNumber}}-${{ matrix.runner }}.xml
@@ -91,13 +91,19 @@ jobs:
           VERCEL_TEST_TOKEN: ${{ secrets.VERCEL_TEST_TOKEN }}
           VERCEL_TEST_REGISTRATION_URL: ${{ secrets.VERCEL_TEST_REGISTRATION_URL }}
           FORCE_COLOR: '1'
-
+      - name: 'Determine Turbo HIT or MISS'
+        if: ${{ !cancelled() }}
+        id: turbo-summary
+        shell: bash
+        run: |
+          TURBO_MISS_COUNT=`node utils/determine-turbo-hit-or-miss.js`
+          echo "MISS COUNT: $TURBO_MISS_COUNT"
+          echo "misses=$TURBO_MISS_COUNT" >> $GITHUB_OUTPUT
       - name: fetch ssl certificate after tests (linux, os x)
         if: matrix.runner != 'windows-latest'
         run: echo | openssl s_client -showcerts -servername 'api.vercel.com' -connect 76.76.21.21:443
-
       - name: 'Upload Test Report to Datadog'
-        if: always()
+        if: ${{ steps['turbo-summary'].outputs.misses != '0' && !cancelled() }}
         run: 'npx @datadog/datadog-ci@2.18.1 junit upload --service vercel-cli .junit-reports'
         env:
           DATADOG_API_KEY: ${{secrets.DATADOG_API_KEY_CLI}}

examples/CHANGELOG.md

@@ -0,0 +1,7 @@
+# examples
+
+## null
+
+### Patch Changes
+
+- update examples to use at least node@16 ([#10395](https://github.com/vercel/vercel/pull/10395))

examples/astro/README.md

@@ -3,9 +3,10 @@
 This directory is a brief example of an [Astro](https://astro.build/) site that can be deployed to Vercel with zero configuration. This demo showcases:
 
 - `/` - A static page (pre-rendered)
-- `/ssr` - A page that uses server-side rendering (through Vercel Edge Functions)
-- `/ssr-with-swr-caching` - Similar to the previous page, but also caches the response on the Vercel Edge Network using `cache-control` headers
-- `/edge.json` - An Astro API Endpoint that returns JSON data using Vercel Edge Functions
+- `/ssr` - A page that uses server-side rendering (through [Vercel Edge Functions](https://vercel.com/docs/functions/edge-functions))
+- `/ssr-with-swr-caching` - Similar to the previous page, but also caches the response on the [Vercel Edge Network](https://vercel.com/docs/edge-network/overview) using `cache-control` headers
+- `/image` - Astro [Asset](https://docs.astro.build/en/guides/assets/) using Vercel [Image Optimization](https://vercel.com/docs/image-optimization)
+- `/edge.json` - An Astro API Endpoint that returns JSON data using [Vercel Edge Functions](https://vercel.com/docs/functions/edge-functions)
 
 Learn more about [Astro on Vercel](https://vercel.com/docs/frameworks/astro).
 

examples/astro/astro.config.mjs

@@ -1,7 +1,17 @@
 import { defineConfig } from 'astro/config';
+// Use Vercel Edge Functions (Recommended)
 import vercel from '@astrojs/vercel/edge';
+// Can also use Serverless Functions
+// import vercel from '@astrojs/vercel/serverless';
+// Or a completely static build
+// import vercel from '@astrojs/vercel/static';
 
 export default defineConfig({
   output: 'server',
-  adapter: vercel(),
+  experimental: {
+    assets: true
+   },
+  adapter: vercel({
+    imageService: true,
+  }),
 });

examples/astro/package.json

@@ -8,8 +8,8 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/vercel": "3.2.2",
-    "astro": "^2.2.1",
+    "@astrojs/vercel": "3.8.2",
+    "astro": "^2.10.14",
     "react": "18.2.0",
     "web-vitals": "^3.3.1"
   }

examples/astro/src/env.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="astro/client" />
+/// <reference types="astro/client-image" />
 
 interface ImportMetaEnv {
 	readonly PUBLIC_VERCEL_ANALYTICS_ID: string;

examples/astro/src/pages/image.astro

@@ -0,0 +1,6 @@
+---
+import { Image } from 'astro:assets';
+import astroLogo from '../assets/logo.png';
+---
+
+<Image src={astroLogo} alt="Astro Logo" width={50} quality={75} />

examples/ionic-angular/src/index.html

@@ -29,7 +29,7 @@
 
   <!-- Replace the API key with your own, see:
     https://developers.google.com/maps/documentation/javascript/get-api-key -->
-  <!-- <script async="" defer="" src="https://maps.googleapis.com/maps/api/js?key=AIzaSyB8pf6ZdFQj5qw7rc_HSGrhUwQKfIe9ICw"></script> -->
+  <!-- <script async="" defer="" src="https://maps.googleapis.com/maps/api/js?key=<YOUR_GOOGLE_MAPS_API_KEY>"></script> -->
 
   <noscript>Please enable JavaScript to continue using this application.</noscript>
 </body>

examples/nextjs/README.md

@@ -10,6 +10,8 @@ npm run dev
 yarn dev
 # or
 pnpm dev
+# or
+bun dev
 ```
 
 Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.

examples/nextjs/package.json

@@ -9,17 +9,19 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@types/node": "20.5.1",
-    "@types/react": "18.2.20",
-    "@types/react-dom": "18.2.7",
-    "autoprefixer": "10.4.15",
-    "eslint": "8.47.0",
-    "eslint-config-next": "13.4.19",
-    "next": "13.4.19",
-    "postcss": "8.4.28",
-    "react": "18.2.0",
-    "react-dom": "18.2.0",
-    "tailwindcss": "3.3.3",
-    "typescript": "5.1.6"
+    "react": "latest",
+    "react-dom": "latest",
+    "next": "latest"
+  },
+  "devDependencies": {
+    "typescript": "latest",
+    "@types/react": "latest",
+    "@types/node": "latest",
+    "@types/react-dom": "latest",
+    "autoprefixer": "latest",
+    "postcss": "latest",
+    "tailwindcss": "latest",
+    "eslint": "latest",
+    "eslint-config-next": "latest"
   }
 }

examples/package.json

@@ -9,6 +9,7 @@
   },
   "devDependencies": {
     "@types/jest": "27.4.1",
-    "@vercel/frameworks": "2.0.1"
-  }
+    "@vercel/frameworks": "2.0.2"
+  },
+  "version": null
 }

examples/polymer/package.json

@@ -30,6 +30,6 @@
     "wct-browser-legacy": "^1.0.0"
   },
   "engines": {
-    "node": ">=8.0"
+    "node": ">=16.0"
   }
 }

examples/redwoodjs/package.json

@@ -14,7 +14,7 @@
     "extends": "@redwoodjs/eslint-config"
   },
   "engines": {
-    "node": ">=12",
+    "node": "16.x",
     "yarn": ">=1.15"
   }
 }

examples/remix/.gitignore

@@ -4,9 +4,4 @@ node_modules
 /build
 /public/build
 .env
-
 .vercel
-.output
-
-/api/index.js
-/api/index.js.map

examples/remix/app/root.tsx

@@ -19,7 +19,7 @@ export default function App() {
     <html lang="en">
       <head>
         <meta charSet="utf-8" />
-        <meta name="viewport" content="width=device-width,initial-scale=1" />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
         <Meta />
         <Links />
       </head>

examples/remix/app/routes/_index.tsx

@@ -1,10 +1,15 @@
-import type { V2_MetaFunction } from "@vercel/remix";
+import type { MetaFunction } from "@vercel/remix";
 
-export const meta: V2_MetaFunction = () => [{ title: "New Remix App" }];
+export const meta: MetaFunction = () => {
+  return [
+    { title: "New Remix App" },
+    { name: "description", content: "Welcome to Remix!" },
+  ];
+};
 
 export default function Index() {
   return (
-    <div style={{ fontFamily: "system-ui, sans-serif", lineHeight: "1.4" }}>
+    <div style={{ fontFamily: "system-ui, sans-serif", lineHeight: "1.8" }}>
       <h1>Welcome to Remix</h1>
       <ul>
         <li>

examples/remix/app/routes/edge.tsx

@@ -1,8 +1,8 @@
-import type { V2_MetaFunction } from "@vercel/remix";
+import type { MetaFunction } from "@vercel/remix";
 
 export const config = { runtime: "edge" };
 
-export const meta: V2_MetaFunction = () => [{ title: "Remix@Edge | New Remix App" }];
+export const meta: MetaFunction = () => [{ title: "Remix@Edge | New Remix App" }];
 
 export default function Edge() {
   return (

examples/remix/package.json

@@ -1,32 +1,34 @@
 {
+  "name": "my-remix-app",
   "private": true,
   "sideEffects": false,
+  "type": "module",
   "scripts": {
     "build": "remix build",
-    "dev": "remix dev",
-    "start": "remix-serve build",
+    "dev": "remix dev --manual",
+    "start": "remix-serve ./build/index.js",
     "typecheck": "tsc"
   },
   "dependencies": {
-    "@remix-run/css-bundle": "^1.18.0",
-    "@remix-run/node": "^1.18.0",
-    "@remix-run/react": "^1.18.0",
-    "@remix-run/serve": "^1.18.0",
-    "@vercel/analytics": "^0.1.11",
-    "@vercel/remix": "^1.18.0",
+    "@remix-run/css-bundle": "^2.0.0",
+    "@remix-run/node": "^2.0.0",
+    "@remix-run/react": "^2.0.0",
+    "@remix-run/serve": "^2.0.0",
+    "@vercel/analytics": "^1.0.2",
+    "@vercel/remix": "^2.0.0",
     "isbot": "^3.6.8",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "@remix-run/dev": "^1.18.0",
-    "@remix-run/eslint-config": "^1.18.0",
-    "@types/react": "^18.0.25",
-    "@types/react-dom": "^18.0.11",
-    "eslint": "^8.28.0",
-    "typescript": "^5.1.3"
+    "@remix-run/dev": "^2.0.0",
+    "@remix-run/eslint-config": "^2.0.0",
+    "@types/react": "^18.2.20",
+    "@types/react-dom": "^18.2.7",
+    "eslint": "^8.38.0",
+    "typescript": "^5.1.6"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=18.0.0"
   }
 }

examples/remix/remix.config.js

@@ -1,17 +1,8 @@
 /** @type {import('@remix-run/dev').AppConfig} */
-module.exports = {
-  future: {
-    v2_dev: true,
-    v2_errorBoundary: true,
-    v2_headers: true,
-    v2_meta: true,
-    v2_normalizeFormMethod: true,
-    v2_routeConvention: true,
-  },
+export default {
   ignoredRouteFiles: ["**/.*"],
-  serverModuleFormat: "cjs",
   // appDirectory: "app",
   // assetsBuildDirectory: "public/build",
-  // serverBuildPath: "build/index.js",
   // publicPath: "/build/",
+  // serverBuildPath: "build/index.js",
 };

examples/remix/tsconfig.json

@@ -1,13 +1,13 @@
 {
   "include": ["remix.env.d.ts", "**/*.ts", "**/*.tsx"],
   "compilerOptions": {
-    "lib": ["DOM", "DOM.Iterable", "ES2019"],
+    "lib": ["DOM", "DOM.Iterable", "ES2022"],
     "isolatedModules": true,
     "esModuleInterop": true,
     "jsx": "react-jsx",
-    "moduleResolution": "node",
+    "moduleResolution": "Bundler",
     "resolveJsonModule": true,
-    "target": "ES2019",
+    "target": "ES2022",
     "strict": true,
     "allowJs": true,
     "forceConsistentCasingInFileNames": true,

examples/umijs/package.json

@@ -46,6 +46,6 @@
     ]
   },
   "engines": {
-    "node": ">=8.0.0 <17"
+    "node": "16.x"
   }
 }

examples/vuepress/package.json

@@ -5,7 +5,7 @@
     "build": "vuepress build src"
   },
   "engines": {
-    "node": ">=14.0.0 <18.0.0"
+    "node": ">=16.0.0 <18.0.0"
   },
   "devDependencies": {
     "vuepress": "1.9.7"

internals/get-package-json/package.json

@@ -8,7 +8,7 @@
     "dist"
   ],
   "scripts": {
-    "build": "tsc",
+    "build": "node ../../utils/build.mjs",
     "test": "jest --reporters=default --reporters=jest-junit --env node --verbose --runInBand --bail",
     "test-unit": "pnpm test tests/unit"
   },

internals/get-package-json/tsconfig.json

@@ -1,7 +1,9 @@
 {
   "extends": "@vercel-internals/tsconfig",
   "compilerOptions": {
-    "outDir": "dist"
+    "outDir": "dist",
+    "declaration": true,
+    "emitDeclarationOnly": true
   },
   "include": ["src/**/*"]
 }

internals/types/CHANGELOG.md

@@ -1,5 +1,40 @@
 # @vercel-internals/types
 
+## 1.0.12
+
+### Patch Changes
+
+- Updated dependencies [[`2f5b0aeeb`](https://github.com/vercel/vercel/commit/2f5b0aeeb183ed3ea8cbc68cb3bc3c949c486ada)]:
+  - @vercel/build-utils@7.2.2
+
+## 1.0.11
+
+### Patch Changes
+
+- Updated dependencies [[`decdf27fb`](https://github.com/vercel/vercel/commit/decdf27fb5ca914fe50a9320c4fd50ef79d2fbb3)]:
+  - @vercel/build-utils@7.2.1
+
+## 1.0.10
+
+### Patch Changes
+
+- Updated dependencies [[`50e04dd85`](https://github.com/vercel/vercel/commit/50e04dd8584664c842a86c15d92d654f4ea8dcbb), [`45b73c7e8`](https://github.com/vercel/vercel/commit/45b73c7e86458564dc0bab007f6f6365c4c4ab5d), [`d8bc570f6`](https://github.com/vercel/vercel/commit/d8bc570f604950d97156d4f33c8accecf3b3b28f)]:
+  - @vercel/build-utils@7.2.0
+
+## 1.0.9
+
+### Patch Changes
+
+- Updated dependencies [[`5609a1187`](https://github.com/vercel/vercel/commit/5609a1187be9d6cf8d5f16825690c5ea72f17dc5), [`1b4de4a98`](https://github.com/vercel/vercel/commit/1b4de4a986f7a612aac834ebae3ec7bb9e9b8cf8)]:
+  - @vercel/build-utils@7.1.1
+
+## 1.0.8
+
+### Patch Changes
+
+- Updated dependencies [[`9e3827c78`](https://github.com/vercel/vercel/commit/9e3827c785e1bc45f2bed421132167381481770f)]:
+  - @vercel/build-utils@7.1.0
+
 ## 1.0.7
 
 ### Patch Changes

internals/types/index.d.ts

@@ -65,6 +65,8 @@ export type User = {
   billing: Billing;
   name?: string;
   limited?: boolean;
+  version?: 'northstar';
+  defaultTeamId?: string;
 };
 
 export interface Team {

internals/types/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "@vercel-internals/types",
-  "version": "1.0.7",
+  "version": "1.0.12",
   "types": "index.d.ts",
   "main": "index.d.ts",
   "files": [
@@ -10,7 +10,7 @@
   "dependencies": {
     "@types/node": "14.14.31",
     "@vercel-internals/constants": "1.0.4",
-    "@vercel/build-utils": "7.0.0",
+    "@vercel/build-utils": "7.2.2",
     "@vercel/routing-utils": "3.0.0"
   },
   "devDependencies": {

package.json

@@ -11,11 +11,11 @@
     "@typescript-eslint/eslint-plugin": "5.21.0",
     "@typescript-eslint/parser": "5.21.0",
     "@vercel/build-utils": "*",
-    "@vercel/ncc": "0.24.0",
     "async-retry": "1.2.3",
     "buffer-replace": "1.0.0",
     "create-svelte": "2.0.1",
     "dot": "1.1.3",
+    "esbuild": "0.19.2",
     "eslint": "8.14.0",
     "eslint-config-prettier": "8.5.0",
     "eslint-plugin-jest": "26.1.5",
@@ -32,7 +32,7 @@
     "source-map-support": "0.5.12",
     "ts-eager": "2.0.2",
     "ts-jest": "29.1.0",
-    "turbo": "1.10.12",
+    "turbo": "1.10.14",
     "typescript": "4.9.5"
   },
   "scripts": {
@@ -49,7 +49,7 @@
     "prepare": "husky install",
     "pack": "cd utils && node -r ts-eager/register ./pack.ts",
     "ci:version": "changeset version && pnpm install --no-frozen-lockfile",
-    "ci:publish": "pnpm publish -r && changeset tag"
+    "ci:publish": "pnpm publish -r && node utils/update-canary-tags.mjs && changeset tag"
   },
   "lint-staged": {
     "./{*,{api,packages,test,utils}/**/*}.{js,ts}": [

packages/build-utils/CHANGELOG.md

@@ -1,5 +1,43 @@
 # @vercel/build-utils
 
+## 7.2.2
+
+### Patch Changes
+
+- [cli] Update bun detection and add tests for projects with both bunlock binary and yarn.lock text files ([#10583](https://github.com/vercel/vercel/pull/10583))
+
+## 7.2.1
+
+### Patch Changes
+
+- Internal variants ([#10549](https://github.com/vercel/vercel/pull/10549))
+
+## 7.2.0
+
+### Minor Changes
+
+- Add new optional prerender field: experimentalStreamingLambdaPath ([#10476](https://github.com/vercel/vercel/pull/10476))
+
+- [build-utils] Add zero config detection for bun package manager ([#10486](https://github.com/vercel/vercel/pull/10486))
+
+### Patch Changes
+
+- add `experimentalBypassFor` field to Prerender ([#10481](https://github.com/vercel/vercel/pull/10481))
+
+## 7.1.1
+
+### Patch Changes
+
+- add descriptions to NodeVersion properties ([#10403](https://github.com/vercel/vercel/pull/10403))
+
+- Updated semver dependency ([#10411](https://github.com/vercel/vercel/pull/10411))
+
+## 7.1.0
+
+### Minor Changes
+
+- Support serverless function architecture ([#10392](https://github.com/vercel/vercel/pull/10392))
+
 ## 7.0.0
 
 ### Major Changes

packages/build-utils/build.js

@@ -1,30 +0,0 @@
-#!/usr/bin/env node
-const fs = require('fs-extra');
-const execa = require('execa');
-const { join } = require('path');
-
-async function main() {
-  const outDir = join(__dirname, 'dist');
-
-  // Start fresh
-  await fs.remove(outDir);
-
-  // Compile TypeScript
-  await execa('tsc', [], { stdio: 'inherit' });
-
-  // Run `ncc`
-  const mainDir = join(outDir, 'main');
-  await execa('ncc', ['build', 'src/index.ts', '-o', mainDir], {
-    stdio: 'inherit',
-  });
-  // Move compiled ncc file to out dir
-  await fs.rename(join(mainDir, 'index.js'), join(outDir, 'index.js'));
-
-  // Delete leftover "main" dir
-  await fs.remove(mainDir);
-}
-
-main().catch(err => {
-  console.error(err);
-  process.exit(1);
-});

packages/build-utils/build.mjs

@@ -0,0 +1,3 @@
+import { tsc, esbuild } from '../../utils/build.mjs';
+
+await Promise.all([tsc(), esbuild().then(() => esbuild({ bundle: true }))]);

packages/build-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "7.0.0",
+  "version": "7.2.2",
   "license": "Apache-2.0",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",
@@ -11,7 +11,7 @@
     "directory": "packages/now-build-utils"
   },
   "scripts": {
-    "build": "node build",
+    "build": "node build.mjs",
     "test": "jest --reporters=default --reporters=jest-junit --env node --verbose --runInBand --bail",
     "test-unit": "pnpm test test/unit.*test.*",
     "test-e2e": "pnpm test test/integration.test.ts"
@@ -33,7 +33,6 @@
     "@types/semver": "6.0.0",
     "@types/yazl": "2.4.2",
     "@vercel/error-utils": "2.0.1",
-    "@vercel/ncc": "0.24.0",
     "aggregate-error": "3.0.1",
     "async-retry": "1.2.3",
     "async-sema": "2.1.4",
@@ -49,7 +48,7 @@
     "minimatch": "3.1.2",
     "multistream": "2.1.1",
     "node-fetch": "2.6.7",
-    "semver": "6.1.1",
+    "semver": "6.3.1",
     "typescript": "4.9.5",
     "yazl": "2.5.1"
   }

packages/build-utils/src/fs/run-user-scripts.ts

@@ -16,7 +16,7 @@ import { cloneEnv } from '../clone-env';
 // Only allow one `runNpmInstall()` invocation to run concurrently
 const runNpmInstallSema = new Sema(1);
 
-export type CliType = 'yarn' | 'npm' | 'pnpm';
+export type CliType = 'yarn' | 'npm' | 'pnpm' | 'bun';
 
 export interface ScanParentDirsResult {
   /**
@@ -284,27 +284,40 @@ export async function scanParentDirs(
     readPackageJson && pkgJsonPath
       ? JSON.parse(await fs.readFile(pkgJsonPath, 'utf8'))
       : undefined;
-  const [yarnLockPath, npmLockPath, pnpmLockPath] = await walkParentDirsMulti({
-    base: '/',
-    start: destPath,
-    filenames: ['yarn.lock', 'package-lock.json', 'pnpm-lock.yaml'],
-  });
+  const [yarnLockPath, npmLockPath, pnpmLockPath, bunLockPath] =
+    await walkParentDirsMulti({
+      base: '/',
+      start: destPath,
+      filenames: [
+        'yarn.lock',
+        'package-lock.json',
+        'pnpm-lock.yaml',
+        'bun.lockb',
+      ],
+    });
   let lockfilePath: string | undefined;
   let lockfileVersion: number | undefined;
   let cliType: CliType = 'yarn';
 
-  const [hasYarnLock, packageLockJson, pnpmLockYaml] = await Promise.all([
-    Boolean(yarnLockPath),
-    npmLockPath
-      ? readConfigFile<{ lockfileVersion: number }>(npmLockPath)
-      : null,
-    pnpmLockPath
-      ? readConfigFile<{ lockfileVersion: number }>(pnpmLockPath)
-      : null,
-  ]);
+  const [hasYarnLock, packageLockJson, pnpmLockYaml, bunLockBin] =
+    await Promise.all([
+      Boolean(yarnLockPath),
+      npmLockPath
+        ? readConfigFile<{ lockfileVersion: number }>(npmLockPath)
+        : null,
+      pnpmLockPath
+        ? readConfigFile<{ lockfileVersion: number }>(pnpmLockPath)
+        : null,
+      bunLockPath ? fs.readFile(bunLockPath, 'utf8') : null,
+    ]);
 
-  // Priority order is Yarn > pnpm > npm
-  if (hasYarnLock) {
+  // Priority order is bun with yarn lock > yarn > pnpm > npm > bun
+  if (bunLockBin && hasYarnLock) {
+    cliType = 'bun';
+    lockfilePath = bunLockPath;
+    // TODO: read "bun-lockfile-format-v0"
+    lockfileVersion = 0;
+  } else if (hasYarnLock) {
     cliType = 'yarn';
     lockfilePath = yarnLockPath;
   } else if (pnpmLockYaml) {
@@ -315,6 +328,11 @@ export async function scanParentDirs(
     cliType = 'npm';
     lockfilePath = npmLockPath;
     lockfileVersion = packageLockJson.lockfileVersion;
+  } else if (bunLockBin) {
+    cliType = 'bun';
+    lockfilePath = bunLockPath;
+    // TODO: read "bun-lockfile-format-v0"
+    lockfileVersion = 0;
   }
 
   const packageJsonPath = pkgJsonPath || undefined;
@@ -451,6 +469,10 @@ export async function runNpmInstall(
       commandArgs = args
         .filter(a => a !== '--prefer-offline')
         .concat(['install', '--unsafe-perm']);
+    } else if (cliType === 'bun') {
+      // @see options https://bun.sh/docs/cli/install
+      opts.prettyCommand = 'bun install';
+      commandArgs = ['install', ...args];
     } else {
       opts.prettyCommand = 'yarn install';
       commandArgs = ['install', ...args];
@@ -505,6 +527,7 @@ export function getEnvForPackageManager({
   const npm7 = '/node16/bin-npm7';
   const pnpm7 = '/pnpm7/node_modules/.bin';
   const pnpm8 = '/pnpm8/node_modules/.bin';
+  const bun1 = '/bun1';
   const corepackEnabled = env.ENABLE_EXPERIMENTAL_COREPACK === '1';
   if (cliType === 'npm') {
     if (
@@ -516,7 +539,7 @@ export function getEnvForPackageManager({
     ) {
       // Ensure that npm 7 is at the beginning of the `$PATH`
       newEnv.PATH = `${npm7}${path.delimiter}${oldPath}`;
-      console.log('Detected `package-lock.json` generated by npm 7+...');
+      console.log('Detected `package-lock.json` generated by npm 7+');
     }
   } else if (cliType === 'pnpm') {
     if (
@@ -528,7 +551,7 @@ export function getEnvForPackageManager({
       // Ensure that pnpm 7 is at the beginning of the `$PATH`
       newEnv.PATH = `${pnpm7}${path.delimiter}${oldPath}`;
       console.log(
-        `Detected \`pnpm-lock.yaml\` version ${lockfileVersion} generated by pnpm 7...`
+        `Detected \`pnpm-lock.yaml\` version ${lockfileVersion} generated by pnpm 7`
       );
     } else if (
       typeof lockfileVersion === 'number' &&
@@ -539,7 +562,16 @@ export function getEnvForPackageManager({
       // Ensure that pnpm 8 is at the beginning of the `$PATH`
       newEnv.PATH = `${pnpm8}${path.delimiter}${oldPath}`;
       console.log(
-        `Detected \`pnpm-lock.yaml\` version ${lockfileVersion} generated by pnpm 8...`
+        `Detected \`pnpm-lock.yaml\` version ${lockfileVersion} generated by pnpm 8`
+      );
+    }
+  } else if (cliType === 'bun') {
+    if (!oldPath.includes(bun1) && !corepackEnabled) {
+      // Ensure that Bun 1 is at the beginning of the `$PATH`
+      newEnv.PATH = `${bun1}${path.delimiter}${oldPath}`;
+      console.log('Detected `bun.lockb` generated by Bun');
+      console.warn(
+        'Warning: Bun is used as a package manager at build time only, not at runtime with Functions'
       );
     }
   } else {
@@ -548,7 +580,6 @@ export function getEnvForPackageManager({
       newEnv.YARN_NODE_LINKER = 'node-modules';
     }
   }
-
   return newEnv;
 }
 
@@ -614,6 +645,8 @@ export async function runPackageJsonScript(
     opts.prettyCommand = `npm run ${scriptName}`;
   } else if (cliType === 'pnpm') {
     opts.prettyCommand = `pnpm run ${scriptName}`;
+  } else if (cliType === 'bun') {
+    opts.prettyCommand = `bun run ${scriptName}`;
   } else {
     opts.prettyCommand = `yarn run ${scriptName}`;
   }

packages/build-utils/src/lambda.ts

@@ -13,9 +13,12 @@ interface Environment {
 
 export type LambdaOptions = LambdaOptionsWithFiles | LambdaOptionsWithZipBuffer;
 
+export type LambdaArchitecture = 'x86_64' | 'arm64';
+
 export interface LambdaOptionsBase {
   handler: string;
   runtime: string;
+  architecture?: LambdaArchitecture;
   memory?: number;
   maxDuration?: number;
   environment?: Environment;
@@ -62,6 +65,7 @@ export class Lambda {
   files?: Files;
   handler: string;
   runtime: string;
+  architecture?: LambdaArchitecture;
   memory?: number;
   maxDuration?: number;
   environment: Environment;
@@ -81,6 +85,7 @@ export class Lambda {
       handler,
       runtime,
       maxDuration,
+      architecture,
       memory,
       environment = {},
       allowQuery,
@@ -102,6 +107,13 @@ export class Lambda {
     assert(typeof runtime === 'string', '"runtime" is not a string');
     assert(typeof environment === 'object', '"environment" is not an object');
 
+    if (architecture !== undefined) {
+      assert(
+        architecture === 'x86_64' || architecture === 'arm64',
+        '"architecture" must be either "x86_64" or "arm64"'
+      );
+    }
+
     if (memory !== undefined) {
       assert(typeof memory === 'number', '"memory" is not a number');
     }
@@ -159,6 +171,7 @@ export class Lambda {
     this.files = 'files' in opts ? opts.files : undefined;
     this.handler = handler;
     this.runtime = runtime;
+    this.architecture = architecture;
     this.memory = memory;
     this.maxDuration = maxDuration;
     this.environment = environment;

packages/build-utils/src/prerender.ts

@@ -1,4 +1,4 @@
-import { File } from './types';
+import type { File, HasField } from './types';
 import { Lambda } from './lambda';
 
 interface PrerenderOptions {
@@ -12,6 +12,8 @@ interface PrerenderOptions {
   initialStatus?: number;
   passQuery?: boolean;
   sourcePath?: string;
+  experimentalBypassFor?: HasField;
+  experimentalStreamingLambdaPath?: string;
 }
 
 export class Prerender {
@@ -26,6 +28,8 @@ export class Prerender {
   public initialStatus?: number;
   public passQuery?: boolean;
   public sourcePath?: string;
+  public experimentalBypassFor?: HasField;
+  public experimentalStreamingLambdaPath?: string;
 
   constructor({
     expiration,
@@ -38,6 +42,8 @@ export class Prerender {
     initialStatus,
     passQuery,
     sourcePath,
+    experimentalBypassFor,
+    experimentalStreamingLambdaPath,
   }: PrerenderOptions) {
     this.type = 'Prerender';
     this.expiration = expiration;
@@ -86,6 +92,26 @@ export class Prerender {
       );
     }
 
+    if (experimentalBypassFor !== undefined) {
+      if (
+        !Array.isArray(experimentalBypassFor) ||
+        experimentalBypassFor.some(
+          field =>
+            typeof field !== 'object' ||
+            // host doesn't need a key
+            (field.type !== 'host' && typeof field.key !== 'string') ||
+            typeof field.type !== 'string' ||
+            (field.value !== undefined && typeof field.value !== 'string')
+        )
+      ) {
+        throw new Error(
+          'The `experimentalBypassFor` argument for `Prerender` must be Array of objects with fields `type`, `key` and optionally `value`.'
+        );
+      }
+
+      this.experimentalBypassFor = experimentalBypassFor;
+    }
+
     if (typeof fallback === 'undefined') {
       throw new Error(
         'The `fallback` argument for `Prerender` needs to be a `FileBlob`, `FileFsRef`, `FileRef`, or null.'
@@ -130,5 +156,14 @@ export class Prerender {
       }
       this.allowQuery = allowQuery;
     }
+
+    if (experimentalStreamingLambdaPath !== undefined) {
+      if (typeof experimentalStreamingLambdaPath !== 'string') {
+        throw new Error(
+          'The `experimentalStreamingLambdaPath` argument for `Prerender` must be a string.'
+        );
+      }
+      this.experimentalStreamingLambdaPath = experimentalStreamingLambdaPath;
+    }
   }
 }

packages/build-utils/src/types.ts

@@ -45,6 +45,18 @@ export interface Config {
   [key: string]: unknown;
 }
 
+export type HasField = Array<
+  | {
+      type: 'host';
+      value: string;
+    }
+  | {
+      type: 'header' | 'cookie' | 'query';
+      key: string;
+      value?: string;
+    }
+>;
+
 export interface Meta {
   isDev?: boolean;
   devCacheDir?: string;
@@ -300,9 +312,13 @@ export interface PackageJson {
 }
 
 export interface NodeVersion {
+  /** major version number: 18 */
   major: number;
+  /** major version range: "18.x" */
   range: string;
+  /** runtime descriptor: "nodejs18.x" */
   runtime: string;
+  /** date beyond which this version is discontinued: 2023-08-17T19:05:45.951Z */
   discontinueDate?: Date;
 }
 
@@ -418,6 +434,13 @@ export interface Cron {
   schedule: string;
 }
 
+// TODO: Proper description once complete
+export interface Flag {
+  key: string;
+  defaultValue?: unknown;
+  metadata: Record<string, unknown>;
+}
+
 /** The framework which created the function */
 export interface FunctionFramework {
   slug: string;
@@ -442,6 +465,7 @@ export interface BuildResultV2Typical {
   framework?: {
     version: string;
   };
+  flags?: Flag[];
 }
 
 export type BuildResultV2 = BuildResultV2Typical | BuildResultBuildOutput;

packages/build-utils/test/fixtures/30-bun-v1/.gitignore

@@ -0,0 +1,2 @@
+.vercel
+public

packages/build-utils/test/fixtures/30-bun-v1/build.js

@@ -0,0 +1,8 @@
+import { mkdir, rm, writeFile } from 'node:fs/promises'
+import { say } from 'cowsay'
+
+const text = say({ text: `bun version: ${process.versions.bun}` })
+const content = say({ text })
+await rm('./public', { recursive: true, force: true })
+await mkdir('./public', { recursive: true })
+await writeFile('./public/index.txt', content)

packages/build-utils/test/fixtures/30-bun-v1/package.json

@@ -0,0 +1,9 @@
+{
+  "private": true,
+  "scripts": {
+    "build": "bun build.js"
+  },
+  "dependencies": {
+    "cowsay": "1.5.0"
+  }
+}

packages/build-utils/test/fixtures/30-bun-v1/probes.json

@@ -0,0 +1,8 @@
+{
+  "probes": [
+    {
+      "path": "/",
+      "mustContain": "bun version: 1"
+    }
+  ]
+}

packages/build-utils/test/fixtures/31-bun-v1-with-yarn-lock/.gitignore

@@ -0,0 +1,2 @@
+.vercel
+public

packages/build-utils/test/fixtures/31-bun-v1-with-yarn-lock/build.js

@@ -0,0 +1,8 @@
+import { mkdir, rm, writeFile } from 'node:fs/promises'
+import { say } from 'cowsay'
+
+const text = say({ text: `bun version: ${process.versions.bun}` })
+const content = say({ text })
+await rm('./public', { recursive: true, force: true })
+await mkdir('./public', { recursive: true })
+await writeFile('./public/index.txt', content)

packages/build-utils/test/fixtures/31-bun-v1-with-yarn-lock/package.json

@@ -0,0 +1,9 @@
+{
+  "private": true,
+  "scripts": {
+    "build": "bun build.js"
+  },
+  "dependencies": {
+    "cowsay": "1.5.0"
+  }
+}

packages/build-utils/test/fixtures/31-bun-v1-with-yarn-lock/probes.json

@@ -0,0 +1,8 @@
+{
+  "probes": [
+    {
+      "path": "/",
+      "mustContain": "bun version: 1"
+    }
+  ]
+}

packages/build-utils/test/fixtures/31-bun-v1-with-yarn-lock/yarn.lock

@@ -0,0 +1,221 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+# bun ./bun.lockb --hash: CD5862D9DB80873E-24483eaa80ed0cc4-641E4430BAAAECB3-abebd38edad3b1b9
+
+
+ansi-regex@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz"
+  integrity sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==
+
+ansi-regex@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz"
+  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
+
+ansi-styles@^4.0.0:
+  version "4.3.0"
+  resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"
+  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
+  dependencies:
+    color-convert "^2.0.1"
+
+camelcase@^5.0.0:
+  version "5.3.1"
+  resolved "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz"
+  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
+
+cliui@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz"
+  integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.0"
+    wrap-ansi "^6.2.0"
+
+color-convert@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz"
+  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
+  dependencies:
+    color-name "~1.1.4"
+
+color-name@~1.1.4:
+  version "1.1.4"
+  resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"
+  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
+
+cowsay@1.5.0:
+  version "1.5.0"
+  resolved "https://registry.npmjs.org/cowsay/-/cowsay-1.5.0.tgz"
+  integrity sha512-8Ipzr54Z8zROr/62C8f0PdhQcDusS05gKTS87xxdji8VbWefWly0k8BwGK7+VqamOrkv3eGsCkPtvlHzrhWsCA==
+  dependencies:
+    get-stdin "8.0.0"
+    string-width "~2.1.1"
+    strip-final-newline "2.0.0"
+    yargs "15.4.1"
+
+decamelize@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"
+  integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==
+
+emoji-regex@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz"
+  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
+
+find-up@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz"
+  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
+  dependencies:
+    locate-path "^5.0.0"
+    path-exists "^4.0.0"
+
+get-caller-file@^2.0.1:
+  version "2.0.5"
+  resolved "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz"
+  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
+
+get-stdin@8.0.0:
+  version "8.0.0"
+  resolved "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz"
+  integrity sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==
+
+is-fullwidth-code-point@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"
+  integrity sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==
+
+is-fullwidth-code-point@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"
+  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
+
+locate-path@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz"
+  integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
+  dependencies:
+    p-locate "^4.1.0"
+
+p-limit@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz"
+  integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
+  dependencies:
+    p-try "^2.0.0"
+
+p-locate@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz"
+  integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
+  dependencies:
+    p-limit "^2.2.0"
+
+p-try@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz"
+  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
+
+path-exists@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz"
+  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
+
+require-directory@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"
+  integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
+
+require-main-filename@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz"
+  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
+
+set-blocking@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"
+  integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
+
+string-width@~2.1.1:
+  version "2.1.1"
+  resolved "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz"
+  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
+  dependencies:
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^4.0.0"
+
+string-width@^4.1.0, string-width@^4.2.0:
+  version "4.2.3"
+  resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+strip-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz"
+  integrity sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==
+  dependencies:
+    ansi-regex "^3.0.0"
+
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+strip-final-newline@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz"
+  integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
+
+which-module@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz"
+  integrity sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==
+
+wrap-ansi@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz"
+  integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
+y18n@^4.0.0:
+  version "4.0.3"
+  resolved "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz"
+  integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==
+
+yargs@15.4.1:
+  version "15.4.1"
+  resolved "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz"
+  integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==
+  dependencies:
+    cliui "^6.0.0"
+    decamelize "^1.2.0"
+    find-up "^4.1.0"
+    get-caller-file "^2.0.1"
+    require-directory "^2.1.1"
+    require-main-filename "^2.0.0"
+    set-blocking "^2.0.0"
+    string-width "^4.2.0"
+    which-module "^2.0.0"
+    y18n "^4.0.0"
+    yargs-parser "^18.1.2"
+
+yargs-parser@^18.1.2:
+  version "18.1.3"
+  resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz"
+  integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
+  dependencies:
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"

packages/build-utils/test/unit.get-env-for-package-manager.test.ts

@@ -133,6 +133,22 @@ describe('Test `getEnvForPackageManager()`', () => {
         PATH: `/pnpm7/node_modules/.bin${delimiter}foo`,
       },
     },
+    {
+      name: 'should set path if bun v1 is detected',
+      args: {
+        cliType: 'bun',
+        nodeVersion: { major: 18, range: '18.x', runtime: 'nodejs18.x' },
+        lockfileVersion: 0,
+        env: {
+          FOO: 'bar',
+          PATH: '/usr/local/bin',
+        },
+      },
+      want: {
+        FOO: 'bar',
+        PATH: `/bun1${delimiter}/usr/local/bin`,
+      },
+    },
     {
       name: 'should not set pnpm path if corepack is enabled',
       args: {

packages/build-utils/test/unit.test.ts

@@ -344,6 +344,70 @@ it('should support initialHeaders and initialStatus correctly', async () => {
   });
 });
 
+it('should support experimentalBypassFor correctly', async () => {
+  new Prerender({
+    expiration: 1,
+    fallback: null,
+    group: 1,
+    bypassToken: 'some-long-bypass-token-to-make-it-work',
+    experimentalBypassFor: [{ type: 'header', key: 'Next-Action' }],
+  });
+  new Prerender({
+    expiration: 1,
+    fallback: null,
+    group: 1,
+    bypassToken: 'some-long-bypass-token-to-make-it-work',
+    experimentalBypassFor: [
+      { type: 'header', key: 'Next-Action' },
+      {
+        type: 'cookie',
+        key: '__prerender_bypass',
+        value: 'some-long-bypass-token-to-make-it-work',
+      },
+    ],
+  });
+  new Prerender({
+    expiration: 1,
+    fallback: null,
+    group: 1,
+    bypassToken: 'some-long-bypass-token-to-make-it-work',
+    experimentalBypassFor: [{ type: 'query', key: 'bypass', value: '1' }],
+  });
+  new Prerender({
+    expiration: 1,
+    fallback: null,
+    group: 1,
+    bypassToken: 'some-long-bypass-token-to-make-it-work',
+    experimentalBypassFor: [{ type: 'host', value: 'vercel.com' }],
+  });
+
+  expect(() => {
+    new Prerender({
+      expiration: 1,
+      fallback: null,
+      group: 1,
+      bypassToken: 'some-long-bypass-token-to-make-it-work',
+      // @ts-expect-error: testing invalid args
+      experimentalBypassFor: 'foo',
+    });
+  }).toThrowError(
+    'The `experimentalBypassFor` argument for `Prerender` must be Array of objects with fields `type`, `key` and optionally `value`.'
+  );
+
+  expect(() => {
+    new Prerender({
+      expiration: 1,
+      fallback: null,
+      group: 1,
+      bypassToken: 'some-long-bypass-token-to-make-it-work',
+      // @ts-expect-error: testing invalid args
+      experimentalBypassFor: [{ type: 'header', value: { foo: 'bar' } }],
+    });
+  }).toThrowError(
+    'The `experimentalBypassFor` argument for `Prerender` must be Array of objects with fields `type`, `key` and optionally `value`.'
+  );
+});
+
 it('should support passQuery correctly', async () => {
   new Prerender({
     expiration: 1,
@@ -387,6 +451,42 @@ it('should support passQuery correctly', async () => {
   );
 });
 
+it('should support experimentalStreamingLambdaPath correctly', async () => {
+  new Prerender({
+    expiration: 1,
+    fallback: null,
+    group: 1,
+    bypassToken: 'some-long-bypass-token-to-make-it-work',
+    experimentalStreamingLambdaPath: undefined,
+  });
+  new Prerender({
+    expiration: 1,
+    fallback: null,
+    group: 1,
+    bypassToken: 'some-long-bypass-token-to-make-it-work',
+    experimentalStreamingLambdaPath: '/some/path/to/lambda',
+  });
+  new Prerender({
+    expiration: 1,
+    fallback: null,
+    group: 1,
+    bypassToken: 'some-long-bypass-token-to-make-it-work',
+  });
+
+  expect(() => {
+    new Prerender({
+      expiration: 1,
+      fallback: null,
+      group: 1,
+      bypassToken: 'some-long-bypass-token-to-make-it-work',
+      // @ts-expect-error testing invalid field
+      experimentalStreamingLambdaPath: 1,
+    });
+  }).toThrowError(
+    `The \`experimentalStreamingLambdaPath\` argument for \`Prerender\` must be a string.`
+  );
+});
+
 it('should support require by path for legacy builders', () => {
   const index = require('../');
 
@@ -440,6 +540,24 @@ it(
   ms('1m')
 );
 
+it('should return cliType bun and correct lock file for bun v1', async () => {
+  const fixture = path.join(__dirname, 'fixtures', '31-bun-v1-with-yarn-lock');
+  const result = await scanParentDirs(fixture);
+  expect(result.cliType).toEqual('bun');
+  expect(result.lockfileVersion).toEqual(0);
+  expect(result.lockfilePath).toEqual(path.join(fixture, 'bun.lockb'));
+  expect(result.packageJsonPath).toEqual(path.join(fixture, 'package.json'));
+});
+
+it('should return cliType bun and correct lock file for bun v1 with yarn.lock file', async () => {
+  const fixture = path.join(__dirname, 'fixtures', '30-bun-v1');
+  const result = await scanParentDirs(fixture);
+  expect(result.cliType).toEqual('bun');
+  expect(result.lockfileVersion).toEqual(0);
+  expect(result.lockfilePath).toEqual(path.join(fixture, 'bun.lockb'));
+  expect(result.packageJsonPath).toEqual(path.join(fixture, 'package.json'));
+});
+
 it('should return lockfileVersion 2 with npm7', async () => {
   const fixture = path.join(__dirname, 'fixtures', '20-npm-7');
   const result = await scanParentDirs(fixture);

packages/build-utils/tsconfig.json

@@ -1,6 +1,7 @@
 {
   "compilerOptions": {
     "declaration": true,
+    "emitDeclarationOnly": true,
     "esModuleInterop": true,
     "lib": ["ES2021"],
     "module": "commonjs",

packages/cli/CHANGELOG.md

@@ -1,5 +1,173 @@
 # vercel
 
+## 32.4.0
+
+### Minor Changes
+
+- Restore unsetting teamId for non-team accounts ([#10612](https://github.com/vercel/vercel/pull/10612))
+
+### Patch Changes
+
+- remove unused source map pkg ([#10577](https://github.com/vercel/vercel/pull/10577))
+
+- disable source map for prod build ([#10575](https://github.com/vercel/vercel/pull/10575))
+
+- Better rendering upon authentication error in `vc cert ls` ([#10551](https://github.com/vercel/vercel/pull/10551))
+
+- Updated dependencies [[`e9026c7a6`](https://github.com/vercel/vercel/commit/e9026c7a692937122e60e73b91100cf7009e022d), [`ea5bc8806`](https://github.com/vercel/vercel/commit/ea5bc8806276abf5ba14bdb4a966267497e5d14d), [`a4996e1c5`](https://github.com/vercel/vercel/commit/a4996e1c5a7e6986d5410b662014dc584c0f7c54), [`a18ed98f2`](https://github.com/vercel/vercel/commit/a18ed98f2df78fe1256410ea8676686564ed9b35), [`2f5b0aeeb`](https://github.com/vercel/vercel/commit/2f5b0aeeb183ed3ea8cbc68cb3bc3c949c486ada), [`09f1bbfa4`](https://github.com/vercel/vercel/commit/09f1bbfa41a87cf0063a3fb3022b7531d03862b5), [`ce7e82fa7`](https://github.com/vercel/vercel/commit/ce7e82fa7aa6cec5f5d7b4953353b297b7ad1694)]:
+  - @vercel/next@4.0.9
+  - @vercel/go@3.0.3
+  - @vercel/build-utils@7.2.2
+  - @vercel/node@3.0.7
+  - @vercel/redwood@2.0.4
+  - @vercel/remix-builder@2.0.9
+  - @vercel/static-build@2.0.8
+
+## 32.3.1
+
+### Patch Changes
+
+- Use "esbuild" to build CLI ([#10555](https://github.com/vercel/vercel/pull/10555))
+
+- Updated dependencies [[`9f63ca60a`](https://github.com/vercel/vercel/commit/9f63ca60ad914af0f7ba18c9bbe1656eeea68a0a), [`e3f9faf51`](https://github.com/vercel/vercel/commit/e3f9faf513bd97900d8966f2f1116fc3ca07221b)]:
+  - @vercel/next@4.0.8
+  - @vercel/remix-builder@2.0.8
+
+## 32.3.0
+
+### Minor Changes
+
+- [cli] Support northstar users ([#10535](https://github.com/vercel/vercel/pull/10535))
+
+### Patch Changes
+
+- Internal variants ([#10549](https://github.com/vercel/vercel/pull/10549))
+
+- [speed insights] Prepare for migration to new speed insights package ([#10500](https://github.com/vercel/vercel/pull/10500))
+
+- Updated dependencies [[`b0898a665`](https://github.com/vercel/vercel/commit/b0898a66591d5296dc38ffcf0e8345c9338b72f3), [`10d4e51ac`](https://github.com/vercel/vercel/commit/10d4e51ac57b76f05ddc0bf3adf220e2490244fc), [`decdf27fb`](https://github.com/vercel/vercel/commit/decdf27fb5ca914fe50a9320c4fd50ef79d2fbb3), [`f5ca497b7`](https://github.com/vercel/vercel/commit/f5ca497b7522a2dad637cef238da9716ac133057), [`ab329f0fe`](https://github.com/vercel/vercel/commit/ab329f0fe88e9cb72607d0cba41f5e168d77e077), [`d0d052011`](https://github.com/vercel/vercel/commit/d0d0520111264434d57d5920de0f622f6a2588dc), [`9bb3067de`](https://github.com/vercel/vercel/commit/9bb3067de28be77f3ce268a31a7aa6184836dfb1)]:
+  - @vercel/static-build@2.0.7
+  - @vercel/node@3.0.6
+  - @vercel/build-utils@7.2.1
+  - @vercel/next@4.0.7
+  - @vercel/python@4.0.2
+  - @vercel/redwood@2.0.3
+  - @vercel/remix-builder@2.0.7
+  - @vercel/go@3.0.2
+
+## 32.2.5
+
+### Patch Changes
+
+- Updated dependencies [[`849eedf0f`](https://github.com/vercel/vercel/commit/849eedf0f2841211e4175d374f1cf01330bf9611), [`f6f16b034`](https://github.com/vercel/vercel/commit/f6f16b0347bac9f5c33c79ccb1fb9fd9d254cae5), [`3035e18fb`](https://github.com/vercel/vercel/commit/3035e18fb67dfe7031e235a74136a41948f86d5a), [`cb784aeb9`](https://github.com/vercel/vercel/commit/cb784aeb9c9e4eddf1c65b61849a87edb1117af1)]:
+  - @vercel/next@4.0.6
+  - @vercel/remix-builder@2.0.6
+
+## 32.2.4
+
+### Patch Changes
+
+- Add support for bun detection in monorepo ([#10511](https://github.com/vercel/vercel/pull/10511))
+
+- Updated dependencies [[`1b6f3a0f6`](https://github.com/vercel/vercel/commit/1b6f3a0f6534f71c7486a4e33ac199f1da330626)]:
+  - @vercel/static-build@2.0.6
+
+## 32.2.3
+
+### Patch Changes
+
+- Updated dependencies [[`083aad448`](https://github.com/vercel/vercel/commit/083aad448e45edae296da3201eec9f890a01d22d)]:
+  - @vercel/next@4.0.5
+
+## 32.2.2
+
+### Patch Changes
+
+- Updated dependencies [[`7a0fed970`](https://github.com/vercel/vercel/commit/7a0fed970c39cb8f4df70544ded3284d3538b06a), [`2f461a8b0`](https://github.com/vercel/vercel/commit/2f461a8b0bcbdd05da0516395c2905c2d0242682), [`1bab21026`](https://github.com/vercel/vercel/commit/1bab21026ec0bb8a4a8fbeac3d6e4a197f1030fd)]:
+  - @vercel/next@4.0.4
+  - @vercel/remix-builder@2.0.5
+
+## 32.2.1
+
+### Patch Changes
+
+- Update @vercel/fun@1.1.0 ([#10477](https://github.com/vercel/vercel/pull/10477))
+
+- [node] upgrade edge-runtime ([#10451](https://github.com/vercel/vercel/pull/10451))
+
+- Updated dependencies [[`6784e7751`](https://github.com/vercel/vercel/commit/6784e77516ba180a691e3c48323b32bb4506d7b6), [`a8ad17626`](https://github.com/vercel/vercel/commit/a8ad176262ef822860ce338927e6f959961d2d32), [`0ee089a50`](https://github.com/vercel/vercel/commit/0ee089a501ebb78901c4afe1658e794917998f8f), [`f15cba614`](https://github.com/vercel/vercel/commit/f15cba6148a0cdb6975db7724775c35ab7d929b2), [`b265e13d4`](https://github.com/vercel/vercel/commit/b265e13d40d541b77148fa79ac60b4c4dd10974c), [`50e04dd85`](https://github.com/vercel/vercel/commit/50e04dd8584664c842a86c15d92d654f4ea8dcbb), [`45b73c7e8`](https://github.com/vercel/vercel/commit/45b73c7e86458564dc0bab007f6f6365c4c4ab5d), [`a732d30c8`](https://github.com/vercel/vercel/commit/a732d30c8409f96f59ea5406e974a6c4186cc130), [`9d64312aa`](https://github.com/vercel/vercel/commit/9d64312aaaa875a4e193b7602c50e5dc68979aad), [`6baefc825`](https://github.com/vercel/vercel/commit/6baefc825ad7cfc3a5edce31cb4244721452f753), [`989f0d813`](https://github.com/vercel/vercel/commit/989f0d813910d8d67ed355de93018f1dcd91b6ba), [`d8bc570f6`](https://github.com/vercel/vercel/commit/d8bc570f604950d97156d4f33c8accecf3b3b28f)]:
+  - @vercel/go@3.0.1
+  - @vercel/redwood@2.0.2
+  - @vercel/remix-builder@2.0.4
+  - @vercel/hydrogen@1.0.1
+  - @vercel/static-build@2.0.5
+  - @vercel/build-utils@7.2.0
+  - @vercel/next@4.0.3
+  - @vercel/node@3.0.5
+  - @vercel/python@4.0.1
+  - @vercel/ruby@2.0.2
+
+## 32.2.0
+
+### Minor Changes
+
+- show instant preview url on deploy ([#10458](https://github.com/vercel/vercel/pull/10458))
+
+### Patch Changes
+
+- N, not n. ([#10460](https://github.com/vercel/vercel/pull/10460))
+
+- Fix team URL on `vercel help switch` ([#10466](https://github.com/vercel/vercel/pull/10466))
+
+- Migrates the vc env command to the command data structure for use in the help output. ([#10429](https://github.com/vercel/vercel/pull/10429))
+
+- Update domains command to new structure ([#10427](https://github.com/vercel/vercel/pull/10427))
+
+- Updated semver dependency ([#10411](https://github.com/vercel/vercel/pull/10411))
+
+- migrate `rollback` command structure for help output ([#10426](https://github.com/vercel/vercel/pull/10426))
+
+- migrate `inti` command structure for help output ([#10428](https://github.com/vercel/vercel/pull/10428))
+
+- Remove mri workaround ([#10452](https://github.com/vercel/vercel/pull/10452))
+
+- migrate dev command structure for help output ([#10433](https://github.com/vercel/vercel/pull/10433))
+
+- Update secrets to more recent structure ([#10461](https://github.com/vercel/vercel/pull/10461))
+
+- Migrate `vc secrets` to new help command structure ([#10435](https://github.com/vercel/vercel/pull/10435))
+
+- migrate `promote` command structure for help output ([#10425](https://github.com/vercel/vercel/pull/10425))
+
+- migrate `git` command structure for help output ([#10431](https://github.com/vercel/vercel/pull/10431))
+
+- Update project command to new data structure ([#10432](https://github.com/vercel/vercel/pull/10432))
+
+- migrate teams command ([#10434](https://github.com/vercel/vercel/pull/10434))
+
+- Updated dependencies [[`5609a1187`](https://github.com/vercel/vercel/commit/5609a1187be9d6cf8d5f16825690c5ea72f17dc5), [`caaba0d68`](https://github.com/vercel/vercel/commit/caaba0d6855eff4350b6a04acc3ea502025bff8f), [`1b4de4a98`](https://github.com/vercel/vercel/commit/1b4de4a986f7a612aac834ebae3ec7bb9e9b8cf8), [`c3c54d6e6`](https://github.com/vercel/vercel/commit/c3c54d6e695ec078777c4b1f4f23acbeee3c3b09), [`6aa0aa4e6`](https://github.com/vercel/vercel/commit/6aa0aa4e65b81903f4fce677a198dcfaebee744b), [`e43191b18`](https://github.com/vercel/vercel/commit/e43191b1866da70a3dab3815a3f2176942240ef3), [`fc1e13c09`](https://github.com/vercel/vercel/commit/fc1e13c09928c654410b373fc1775c2b63c6ef4a)]:
+  - @vercel/build-utils@7.1.1
+  - @vercel/next@4.0.2
+  - @vercel/static-build@2.0.4
+  - @vercel/redwood@2.0.1
+  - @vercel/remix-builder@2.0.3
+  - @vercel/ruby@2.0.1
+  - @vercel/node@3.0.4
+
+## 32.1.0
+
+### Minor Changes
+
+- Improve error messages for JSON parse failures ([#10396](https://github.com/vercel/vercel/pull/10396))
+
+### Patch Changes
+
+- Updated dependencies [[`9e3827c78`](https://github.com/vercel/vercel/commit/9e3827c785e1bc45f2bed421132167381481770f)]:
+  - @vercel/build-utils@7.1.0
+  - @vercel/node@3.0.3
+  - @vercel/remix-builder@2.0.2
+  - @vercel/static-build@2.0.3
+
 ## 32.0.2
 
 ### Patch Changes

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vercel",
-  "version": "32.0.2",
+  "version": "32.4.0",
   "preferGlobal": true,
   "license": "Apache-2.0",
   "description": "The command-line interface for Vercel",
@@ -16,7 +16,7 @@
     "test-e2e": "rimraf test/fixtures/integration && pnpm test test/integration-1.test.ts test/integration-2.test.ts test/integration-3.test.ts",
     "test-dev": "pnpm test test/dev/",
     "coverage": "codecov",
-    "build": "ts-node ./scripts/build.ts",
+    "build": "node scripts/build.mjs",
     "dev": "ts-node ./src/index.ts"
   },
   "bin": {
@@ -24,27 +24,28 @@
     "vercel": "./dist/index.js"
   },
   "files": [
-    "dist",
-    "scripts/preinstall.js"
+    "dist"
   ],
   "engines": {
     "node": ">= 16"
   },
   "dependencies": {
-    "@vercel/build-utils": "7.0.0",
-    "@vercel/go": "3.0.0",
-    "@vercel/hydrogen": "1.0.0",
-    "@vercel/next": "4.0.1",
-    "@vercel/node": "3.0.2",
-    "@vercel/python": "4.0.0",
-    "@vercel/redwood": "2.0.0",
-    "@vercel/remix-builder": "2.0.1",
-    "@vercel/ruby": "2.0.0",
-    "@vercel/static-build": "2.0.2"
+    "@vercel/build-utils": "7.2.2",
+    "@vercel/fun": "1.1.0",
+    "@vercel/go": "3.0.3",
+    "@vercel/hydrogen": "1.0.1",
+    "@vercel/next": "4.0.9",
+    "@vercel/node": "3.0.7",
+    "@vercel/python": "4.0.2",
+    "@vercel/redwood": "2.0.4",
+    "@vercel/remix-builder": "2.0.9",
+    "@vercel/ruby": "2.0.2",
+    "@vercel/static-build": "2.0.8",
+    "chokidar": "3.3.1"
   },
   "devDependencies": {
     "@alex_neo/jest-expect-message": "1.0.5",
-    "@edge-runtime/node-utils": "2.2.0",
+    "@edge-runtime/node-utils": "2.2.1",
     "@next/env": "11.1.2",
     "@sentry/node": "5.5.0",
     "@sindresorhus/slugify": "0.11.0",
@@ -64,6 +65,7 @@
     "@types/inquirer": "7.3.1",
     "@types/jest": "27.4.1",
     "@types/jest-expect-message": "1.0.3",
+    "@types/json-parse-better-errors": "1.0.0",
     "@types/load-json-file": "2.0.7",
     "@types/mime-types": "2.1.0",
     "@types/minimatch": "3.0.3",
@@ -85,15 +87,12 @@
     "@types/yauzl-promise": "2.1.0",
     "@vercel-internals/constants": "1.0.4",
     "@vercel-internals/get-package-json": "1.0.0",
-    "@vercel-internals/types": "1.0.7",
-    "@vercel/client": "13.0.0",
+    "@vercel-internals/types": "1.0.12",
+    "@vercel/client": "13.0.5",
     "@vercel/error-utils": "2.0.1",
-    "@vercel/frameworks": "2.0.1",
-    "@vercel/fs-detectors": "5.0.1",
-    "@vercel/fun": "1.0.4",
-    "@vercel/ncc": "0.24.0",
+    "@vercel/frameworks": "2.0.2",
+    "@vercel/fs-detectors": "5.1.1",
     "@vercel/routing-utils": "3.0.0",
-    "@zeit/source-map-support": "0.6.2",
     "ajv": "6.12.2",
     "alpha-sort": "2.0.1",
     "ansi-escapes": "4.3.2",
@@ -105,10 +104,8 @@
     "bytes": "3.0.0",
     "chalk": "4.1.0",
     "chance": "1.1.7",
-    "chokidar": "3.3.1",
     "cli-table3": "0.6.3",
     "codecov": "3.8.2",
-    "cpy": "7.2.0",
     "date-fns": "1.29.0",
     "debug": "3.1.0",
     "dot": "1.1.3",
@@ -135,6 +132,7 @@
     "jaro-winkler": "0.2.8",
     "jest-junit": "16.0.0",
     "jest-matcher-utils": "29.3.1",
+    "json-parse-better-errors": "1.0.2",
     "jsonlines": "0.1.1",
     "line-async-iterator": "3.0.0",
     "load-json-file": "3.0.0",
@@ -154,7 +152,7 @@
     "qr-image": "3.2.0",
     "raw-body": "2.4.1",
     "rimraf": "3.0.2",
-    "semver": "5.5.0",
+    "semver": "5.7.2",
     "serve-handler": "6.1.1",
     "strip-ansi": "6.0.1",
     "supports-hyperlinks": "3.0.0",

packages/cli/scripts/build.mjs

@@ -0,0 +1,54 @@
+import { join } from 'node:path';
+import { copyFileSync, readFileSync, writeFileSync } from 'node:fs';
+import { esbuild } from '../../../utils/build.mjs';
+import { compileDevTemplates } from './compile-templates.mjs';
+
+const repoRoot = new URL('../', import.meta.url);
+
+function createConstants() {
+  const filename = new URL('src/util/constants.ts', repoRoot);
+  const contents = `// This file is auto-generated
+export const GA_TRACKING_ID: string | undefined = ${envToString(
+    'GA_TRACKING_ID'
+  )};
+export const SENTRY_DSN: string | undefined = ${envToString('SENTRY_DSN')};
+`;
+  writeFileSync(filename, contents, 'utf8');
+}
+
+function envToString(key) {
+  const value = process.env[key];
+  if (value) {
+    return JSON.stringify(value);
+  }
+}
+
+// Read the secrets from GitHub Actions and generate a file.
+// During local development, these secrets will be empty.
+createConstants();
+
+// Compile the `doT.js` template files for `vercel dev`
+await compileDevTemplates();
+
+const pkgPath = join(process.cwd(), 'package.json');
+const pkg = JSON.parse(readFileSync(pkgPath, 'utf8'));
+const externals = Object.keys(pkg.dependencies || {});
+await esbuild({
+  bundle: true,
+  external: externals,
+});
+
+// Copy a few static files into `dist`
+const distRoot = new URL('dist/', repoRoot);
+copyFileSync(
+  new URL('src/util/projects/VERCEL_DIR_README.txt', repoRoot),
+  new URL('VERCEL_DIR_README.txt', distRoot)
+);
+copyFileSync(
+  new URL('src/util/dev/builder-worker.js', repoRoot),
+  new URL('builder-worker.js', distRoot)
+);
+copyFileSync(
+  new URL('src/util/get-latest-version/get-latest-worker.js', repoRoot),
+  new URL('get-latest-worker.js', distRoot)
+);

packages/cli/scripts/build.ts

@@ -1,100 +0,0 @@
-import cpy from 'cpy';
-import execa from 'execa';
-import { join } from 'path';
-import { remove, readJSON, writeFile } from 'fs-extra';
-
-const dirRoot = join(__dirname, '..');
-const distRoot = join(dirRoot, 'dist');
-
-async function createConstants() {
-  console.log('Creating constants.ts');
-  const filename = join(dirRoot, 'src/util/constants.ts');
-  const contents = `// This file is auto-generated
-export const GA_TRACKING_ID: string | undefined = ${envToString(
-    'GA_TRACKING_ID'
-  )};
-export const SENTRY_DSN: string | undefined = ${envToString('SENTRY_DSN')};
-`;
-  await writeFile(filename, contents, 'utf8');
-}
-
-function envToString(key: string) {
-  const value = process.env[key];
-  if (!value) {
-    console.log(`- Constant ${key} is not assigned`);
-  }
-  return JSON.stringify(value);
-}
-
-async function main() {
-  // Read the secrets from GitHub Actions and generate a file.
-  // During local development, these secrets will be empty.
-  await createConstants();
-
-  // `vercel dev` uses chokidar to watch the filesystem, but opts-out of the
-  // `fsevents` feature using `useFsEvents: false`, so delete the module here so
-  // that it is not compiled by ncc, which makes the npm package size larger
-  // than necessary.
-  await remove(join(dirRoot, '../../node_modules/fsevents'));
-
-  // Compile the `doT.js` template files for `vercel dev`
-  console.log();
-  await execa(process.execPath, [join(__dirname, 'compile-templates.js')], {
-    stdio: 'inherit',
-  });
-
-  const pkg = await readJSON(join(dirRoot, 'package.json'));
-  const dependencies = Object.keys(pkg?.dependencies ?? {});
-  // Do the initial `ncc` build
-  console.log('Dependencies:', dependencies);
-  const externs: Array<string> = [];
-  for (const dep of dependencies) {
-    externs.push('--external', dep);
-  }
-  const args = ['ncc', 'build', 'src/index.ts', ...externs];
-  await execa('pnpm', args, { stdio: 'inherit', cwd: dirRoot });
-
-  // `ncc` has some issues with `@vercel/fun`'s runtime files:
-  //   - Executable bits on the `bootstrap` files appear to be lost:
-  //       https://github.com/vercel/ncc/pull/182
-  //   - The `bootstrap.js` asset does not get copied into the output dir:
-  //       https://github.com/vercel/ncc/issues/278
-  //
-  // Aside from those issues, all the same files from the `runtimes` directory
-  // should be copied into the output runtimes dir, specifically the `index.js`
-  // files (correctly) do not get copied into the output bundle because they
-  // get compiled into the final ncc bundle file, however, we want them to be
-  // present in the npm package because the contents of those files are involved
-  // with `fun`'s cache invalidation mechanism and they need to be shasum'd.
-  const runtimes = join(dirRoot, 'node_modules/@vercel/fun/dist/src/runtimes');
-  await cpy('**/*', join(distRoot, 'runtimes'), {
-    parents: true,
-    cwd: runtimes,
-  });
-
-  // Band-aid to bundle stuff that `ncc` neglects to bundle
-  await cpy(join(dirRoot, 'src/util/projects/VERCEL_DIR_README.txt'), distRoot);
-  await cpy(join(dirRoot, 'src/util/dev/builder-worker.js'), distRoot);
-  await cpy(
-    join(dirRoot, 'src/util/get-latest-version/get-latest-worker.js'),
-    distRoot
-  );
-
-  console.log('Finished building Vercel CLI');
-}
-
-process.on('unhandledRejection', (reason: any, promise: Promise<any>) => {
-  console.error('Unhandled Rejection at:', promise, 'reason:', reason);
-  process.exit(1);
-});
-
-process.on('uncaughtException', err => {
-  console.error('Uncaught Exception:');
-  console.error(err);
-  process.exit(1);
-});
-
-main().catch(err => {
-  console.error(err);
-  process.exit(1);
-});

packages/cli/scripts/compile-templates.js

@@ -1,88 +0,0 @@
-const execa = require('execa');
-const { join } = require('path');
-const { readFile, writeFile, readdir, remove } = require('fs-extra');
-
-async function main() {
-  const dirRoot = join(__dirname, '..');
-
-  // Compile the `doT.js` template files for `vercel dev`
-  const templatesDir = join(dirRoot, 'src/util/dev/templates');
-  const dotPacker = join(dirRoot, '../../node_modules/dot/bin/dot-packer');
-  await execa(process.execPath, [dotPacker], {
-    cwd: templatesDir,
-    stdio: 'inherit',
-  });
-
-  const files = await readdir(templatesDir);
-  const compiledFiles = files.filter(f => f.endsWith('.js'));
-
-  // Prettier
-  console.log('\nMaking the compiled template functions prettier...');
-  const prettier = join(dirRoot, '../../node_modules/prettier/bin-prettier.js');
-  await execa(
-    process.execPath,
-    [prettier, '--write', '--single-quote', ...compiledFiles],
-    {
-      cwd: templatesDir,
-      stdio: 'inherit',
-    }
-  );
-
-  console.log('\nConverting template functions to TypeScript');
-  for (const file of compiledFiles) {
-    const start = Date.now();
-    const fnPath = join(templatesDir, file);
-    const tsPath = fnPath.replace(/\.js$/, '.ts');
-    const def = await readFile(fnPath.replace(/\.js$/, '.tsdef'), 'utf8');
-    const interfaceName = def.match(/interface (\w+)/)[1];
-
-    const lines = require(fnPath).toString().split('\n');
-    let errorHtmlStart = -1;
-    let errorHtmlEnd = -1;
-    for (let i = 0; i < lines.length; i++) {
-      const line = lines[i];
-      if (errorHtmlStart === -1 && line.includes('encodeHTML')) {
-        errorHtmlStart = i;
-      } else if (errorHtmlEnd === -1 && line.includes(')();')) {
-        errorHtmlEnd = i;
-      }
-      if (/\bvar\b/.test(line)) {
-        lines[i] = line.replace(/\bvar\b/g, 'let');
-      }
-    }
-    lines.splice(errorHtmlStart, errorHtmlEnd);
-
-    lines[0] = `export default ${lines[0].replace(
-      '(it)',
-      `(it: ${interfaceName}): string`
-    )}`;
-
-    lines.unshift(
-      "import encodeHTML from 'escape-html';",
-      '',
-      ...def.split('\n')
-    );
-
-    await Promise.all([writeFile(tsPath, lines.join('\n')), remove(fnPath)]);
-    console.log(
-      `${file} -> ${file.replace(/\.js$/, '.ts')} (${Date.now() - start}ms)`
-    );
-  }
-}
-
-process.on('unhandledRejection', err => {
-  console.error('Unhandled Rejection:');
-  console.error(err);
-  process.exit(1);
-});
-
-process.on('uncaughtException', err => {
-  console.error('Uncaught Exception:');
-  console.error(err);
-  process.exit(1);
-});
-
-main().catch(err => {
-  console.error(err);
-  process.exit(1);
-});

packages/cli/scripts/compile-templates.mjs

@@ -0,0 +1,63 @@
+import execa from 'execa';
+import { fileURLToPath } from 'node:url';
+import { readFile, writeFile, readdir, unlink } from 'node:fs/promises';
+
+export async function compileDevTemplates() {
+  const dirRoot = new URL('../', import.meta.url);
+
+  // Compile the `doT.js` template files for `vercel dev`
+  const templatesDir = new URL('src/util/dev/templates/', dirRoot);
+  const dotPacker = fileURLToPath(
+    new URL('../../node_modules/dot/bin/dot-packer', dirRoot)
+  );
+  await execa(process.execPath, [dotPacker], {
+    cwd: templatesDir,
+    stdio: ['ignore', 'ignore', 'inherit'],
+  });
+
+  const files = await readdir(templatesDir);
+  const compiledFiles = files.filter(f => f.endsWith('.js'));
+
+  for (const file of compiledFiles) {
+    const fnPath = new URL(file, templatesDir);
+    const tsPath = fnPath.href.replace(/\.js$/, '.ts');
+    const def = await readFile(
+      new URL(fnPath.href.replace(/\.js$/, '.tsdef')),
+      'utf8'
+    );
+    const interfaceName = def.match(/interface (\w+)/)[1];
+
+    const { default: fn } = await import(fnPath);
+    const lines = fn.toString().split('\n');
+    let errorHtmlStart = -1;
+    let errorHtmlEnd = -1;
+    for (let i = 0; i < lines.length; i++) {
+      const line = lines[i];
+      if (errorHtmlStart === -1 && line.includes('encodeHTML')) {
+        errorHtmlStart = i;
+      } else if (errorHtmlEnd === -1 && line.includes(')();')) {
+        errorHtmlEnd = i;
+      }
+      if (/\bvar\b/.test(line)) {
+        lines[i] = line.replace(/\bvar\b/g, 'let');
+      }
+    }
+    lines.splice(errorHtmlStart, errorHtmlEnd);
+
+    lines[0] = `export default ${lines[0].replace(
+      '(it)',
+      `(it: ${interfaceName}): string`
+    )}`;
+
+    lines.unshift(
+      "import encodeHTML from 'escape-html';",
+      '',
+      ...def.split('\n')
+    );
+
+    await Promise.all([
+      writeFile(new URL(tsPath), lines.join('\n')),
+      unlink(fnPath),
+    ]);
+  }
+}

packages/cli/src/args.ts

@@ -27,7 +27,7 @@ export const help = () => `
       pull                 [path]      Pull your Project Settings from the cloud
       redeploy             [url|id]    Rebuild and deploy a previous deployment.
       rollback             [url|id]    Quickly revert back to a previous deployment
-      switch               [scope]     Switches between teams and your personal account
+      switch               [scope]     Switches between different scopes
 
     ${chalk.dim('Advanced')}
 

packages/cli/src/commands/build/index.ts

@@ -21,6 +21,7 @@ import {
   NowBuildError,
   Cron,
   validateNpmrc,
+  Flag,
 } from '@vercel/build-utils';
 import {
   detectBuilders,
@@ -93,6 +94,7 @@ interface BuildOutputConfig {
     version: string;
   };
   crons?: Cron[];
+  flags?: Flag[];
 }
 
 /**
@@ -426,6 +428,23 @@ async function doBuild(
 
   const ops: Promise<Error | void>[] = [];
 
+  const dependencies = [
+    ...Object.keys(pkg?.dependencies ?? {}),
+    ...Object.keys(pkg?.devDependencies ?? {}),
+  ];
+
+  const isUsingSpeedInsights = dependencies.some(
+    d => d === '@vercel/speed-insights'
+  );
+
+  if (isUsingSpeedInsights && process.env.VERCEL_ANALYTICS_ID) {
+    output.warn(
+      `The \`VERCEL_ANALYTICS_ID\` environment variable is deprecated and will be removed in a future release. Please remove it from your environment variables`
+    );
+
+    delete process.env.VERCEL_ANALYTICS_ID;
+  }
+
   // Write the `detectedBuilders` result to output dir
   const buildsJsonBuilds = new Map<Builder, SerializedBuilder>(
     builds.map(build => {
@@ -627,6 +646,7 @@ async function doBuild(
   const mergedWildcard = mergeWildcard(buildResults.values());
   const mergedOverrides: Record<string, PathOverride> =
     overrides.length > 0 ? Object.assign({}, ...overrides) : undefined;
+  const mergedFlags = mergeFlags(buildResults.values());
 
   const framework = await getFramework(cwd, buildResults);
 
@@ -640,6 +660,7 @@ async function doBuild(
     overrides: mergedOverrides,
     framework,
     crons: mergedCrons,
+    flags: mergedFlags,
   };
   await fs.writeJSON(join(outputDir, 'config.json'), config, { spaces: 2 });
 
@@ -774,3 +795,15 @@ function mergeWildcard(
   }
   return wildcard;
 }
+
+function mergeFlags(
+  buildResults: Iterable<BuildResult | BuildOutputConfig>
+): BuildResultV2Typical['flags'] {
+  return Array.from(buildResults).flatMap(result => {
+    if ('flags' in result) {
+      return result.flags ?? [];
+    }
+
+    return [];
+  });
+}

packages/cli/src/commands/certs/ls.ts

@@ -43,10 +43,7 @@ async function ls(
   }
 
   // Get the list of certificates
-  const { certs, pagination } = await getCerts(
-    client,
-    ...paginationOptions
-  ).catch(err => err);
+  const { certs, pagination } = await getCerts(client, ...paginationOptions);
 
   output.log(
     `${

packages/cli/src/commands/dev/command.ts

@@ -0,0 +1,34 @@
+import { Command } from '../help';
+import { packageName } from '../../util/pkg-name';
+
+export const devCommand: Command = {
+  name: 'dev',
+  description: `Starts the \`${packageName} dev\` server.`,
+  arguments: [
+    {
+      name: 'dir',
+      required: false,
+    },
+  ],
+  options: [
+    {
+      name: 'listen',
+      description: 'Specify a URI endpoint on which to listen [0.0.0.0:3000]',
+      argument: 'uri',
+      shorthand: null,
+      type: 'string',
+      deprecated: false,
+      multi: false,
+    },
+  ],
+  examples: [
+    {
+      name: `Start the \`${packageName} dev\` server on port 8080`,
+      value: `${packageName} dev --listen 8080`,
+    },
+    {
+      name: 'Make the `vercel dev` server bind to localhost on port 5000',
+      value: `${packageName} dev --listen 127.0.0.1:5000 `,
+    },
+  ],
+};

packages/cli/src/commands/dev/index.ts

@@ -12,43 +12,16 @@ import highlight from '../../util/output/highlight';
 import dev from './dev';
 import readConfig from '../../util/config/read-config';
 import readJSONFile from '../../util/read-json-file';
-import { packageName, getCommandName, logo } from '../../util/pkg-name';
+import { packageName, getCommandName } from '../../util/pkg-name';
 import { CantParseJSONFile } from '../../util/errors-ts';
 import { isErrnoException } from '@vercel/error-utils';
+import { help } from '../help';
+import { devCommand } from './command';
 
 const COMMAND_CONFIG = {
   dev: ['dev'],
 };
 
-const help = () => {
-  console.log(`
-  ${chalk.bold(`${logo} ${packageName} dev`)} [options] <dir>
-
-  Starts the \`${packageName} dev\` server.
-
-  ${chalk.dim('Options:')}
-
-    -h, --help             Output usage information
-    -d, --debug            Debug mode [off]
-    --no-color             No color mode [off]
-    -l, --listen  [uri]    Specify a URI endpoint on which to listen [0.0.0.0:3000]
-    -t, --token   [token]  Specify an Authorization Token
-    -y, --yes              Skip questions when setting up new project using default scope and settings
-
-  ${chalk.dim('Examples:')}
-
-  ${chalk.gray('–')} Start the \`${packageName} dev\` server on port 8080
-
-      ${chalk.cyan(`$ ${packageName} dev --listen 8080`)}
-
-  ${chalk.gray(
-    '–'
-  )} Make the \`vercel dev\` server bind to localhost on port 5000
-
-      ${chalk.cyan(`$ ${packageName} dev --listen 127.0.0.1:5000`)}
-  `);
-};
-
 export default async function main(client: Client) {
   if (process.env.__VERCEL_DEV_RUNNING) {
     client.output.error(
@@ -100,7 +73,7 @@ export default async function main(client: Client) {
   }
 
   if (argv['--help']) {
-    help();
+    client.output.print(help(devCommand, { columns: client.stderr.columns }));
     return 2;
   }
 
@@ -118,7 +91,7 @@ export default async function main(client: Client) {
     const pkg = await readJSONFile<PackageJson>(path.join(dir, 'package.json'));
 
     if (pkg instanceof CantParseJSONFile) {
-      client.output.error('Could not parse package.json');
+      client.output.error(pkg.message);
       return 1;
     }
 

packages/cli/src/commands/domains/command.ts

@@ -0,0 +1,153 @@
+import { Command } from '../help';
+import { packageName } from '../../util/pkg-name';
+
+export const domainsCommand: Command = {
+  name: 'domains',
+  description: 'Manage domains',
+  arguments: [
+    {
+      name: 'command',
+      required: true,
+    },
+  ],
+  subcommands: [
+    {
+      name: 'ls',
+      description: 'Show all domains in a list',
+      arguments: [],
+      options: [],
+      examples: [],
+    },
+    {
+      name: 'inspect',
+      description: 'Displays information related to a domain',
+      arguments: [
+        {
+          name: 'name',
+          required: true,
+        },
+      ],
+      options: [],
+      examples: [],
+    },
+    {
+      name: 'add',
+      description: 'Add a new domain that you already own',
+      arguments: [
+        {
+          name: 'name',
+          required: true,
+        },
+        {
+          name: 'project',
+          required: true,
+        },
+      ],
+      options: [],
+      examples: [],
+    },
+    {
+      name: 'rm',
+      description: 'Remove a domain',
+      arguments: [
+        {
+          name: 'name',
+          required: true,
+        },
+      ],
+      options: [],
+      examples: [],
+    },
+    {
+      name: 'buy',
+      description: "Buy a domain that you don't yet own",
+      arguments: [
+        {
+          name: 'name',
+          required: true,
+        },
+      ],
+      options: [],
+      examples: [],
+    },
+    {
+      name: 'move',
+      description: 'Move a domain to another scope',
+      arguments: [
+        {
+          name: 'name',
+          required: true,
+        },
+        {
+          name: 'destination',
+          required: true,
+        },
+      ],
+      options: [],
+      examples: [],
+    },
+    {
+      name: 'transfer-in',
+      description: 'Transfer in a domain to Vercel',
+      arguments: [
+        {
+          name: 'name',
+          required: true,
+        },
+      ],
+      options: [],
+      examples: [],
+    },
+  ],
+  options: [
+    {
+      name: 'next',
+      description: 'Show next page of results',
+      shorthand: 'N',
+      type: 'string',
+      deprecated: false,
+      multi: false,
+    },
+    {
+      name: 'yes',
+      description: 'Skip the confirmation prompt when removing a domain',
+      shorthand: 'y',
+      type: 'boolean',
+      deprecated: false,
+      multi: false,
+    },
+    {
+      name: 'limit',
+      shorthand: 'n',
+      description:
+        'Number of results to return per page (default: 20, max: 100)',
+      argument: 'NUMBER',
+      type: 'string',
+      deprecated: false,
+      multi: false,
+    },
+    {
+      name: 'force',
+      shorthand: 'f',
+      type: 'boolean',
+      deprecated: false,
+      description:
+        'Force a domain on a project and remove it from an existing one',
+      multi: false,
+    },
+  ],
+  examples: [
+    {
+      name: 'Add a domain that you already own',
+      value: [
+        `${packageName} domains add domain-name.com`,
+        "Make sure the domain's DNS nameservers are at least 2 of the ones listed on https://vercel.com/edge-network",
+        `NOTE: Running ${packageName} alias will automatically register your domain if it's configured with these nameservers (no need to 'domains add')`,
+      ],
+    },
+    {
+      name: 'Paginate results, where `1584722256178` is the time in milliseconds since the UNIX epoch',
+      value: `${packageName} domains ls--next 1584722256178`,
+    },
+  ],
+};

packages/cli/src/commands/domains/index.ts

@@ -1,5 +1,3 @@
-import chalk from 'chalk';
-
 import Client from '../../util/client';
 import getArgs from '../../util/get-args';
 import getSubcommand from '../../util/get-subcommand';
@@ -11,69 +9,8 @@ import inspect from './inspect';
 import ls from './ls';
 import rm from './rm';
 import move from './move';
-import { packageName, logo } from '../../util/pkg-name';
-
-const help = () => {
-  console.log(`
-  ${chalk.bold(`${logo} ${packageName} domains`)} [options] <command>
-
-  ${chalk.dim('Commands:')}
-
-    ls                                  Show all domains in a list
-    inspect      [name]                 Displays information related to a domain
-    add          [name] [project]       Add a new domain that you already own
-    rm           [name]                 Remove a domain
-    buy          [name]                 Buy a domain that you don't yet own
-    move         [name] [destination]   Move a domain to another user or team.
-    transfer-in  [name]                 Transfer in a domain to Vercel
-
-  ${chalk.dim('Options:')}
-
-    -h, --help                     Output usage information
-    -d, --debug                    Debug mode [off]
-    --no-color                     No color mode [off]
-    -f, --force                    Force a domain on a project and remove it from an existing one
-    -A ${chalk.bold.underline('FILE')}, --local-config=${chalk.bold.underline(
-    'FILE'
-  )}   Path to the local ${'`vercel.json`'} file
-    -Q ${chalk.bold.underline('DIR')}, --global-config=${chalk.bold.underline(
-    'DIR'
-  )}    Path to the global ${'`.vercel`'} directory
-    -t ${chalk.bold.underline('TOKEN')}, --token=${chalk.bold.underline(
-    'TOKEN'
-  )}        Login token
-    -S, --scope                    Set a custom scope
-    -N, --next                     Show next page of results
-    --limit=${chalk.bold.underline(
-      'VALUE'
-    )}                  Number of results to return per page (default: 20, max: 100)
-    -y, --yes                      Skip the confirmation prompt when removing a domain
-
-  ${chalk.dim('Examples:')}
-
-  ${chalk.gray('–')} Add a domain that you already own
-
-      ${chalk.cyan(
-        `$ ${packageName} domains add ${chalk.underline('domain-name.com')}`
-      )}
-
-      Make sure the domain's DNS nameservers are at least 2 of the
-      ones listed on ${chalk.underline('https://vercel.com/edge-network')}.
-
-      ${chalk.yellow('NOTE:')} Running ${chalk.dim(
-    `${packageName} alias`
-  )} will automatically register your domain
-      if it's configured with these nameservers (no need to ${chalk.dim(
-        '`domain add`'
-      )}).
-
-  ${chalk.gray('–')} Paginate results, where ${chalk.dim(
-    '`1584722256178`'
-  )} is the time in milliseconds since the UNIX epoch.
-
-      ${chalk.cyan(`$ ${packageName} domains ls --next 1584722256178`)}
-`);
-};
+import { domainsCommand } from './command';
+import { help } from '../help';
 
 const COMMAND_CONFIG = {
   add: ['add'],
@@ -104,7 +41,9 @@ export default async function main(client: Client) {
   }
 
   if (argv['--help']) {
-    help();
+    client.output.print(
+      help(domainsCommand, { columns: client.stderr.columns })
+    );
     return 2;
   }
 

packages/cli/src/commands/domains/move.ts

@@ -53,6 +53,12 @@ export default async function move(
 
   const teams = await getTeams(client);
   const matchId = await findDestinationMatch(destination, user, teams);
+
+  if (matchId && matchId === user.id && user.version === 'northstar') {
+    output.error(`You may not move your domain to your user account.`);
+    return 1;
+  }
+
   if (!matchId && !opts['--yes']) {
     output.warn(
       `You're not a member of ${param(destination)}. ` +

packages/cli/src/commands/env/command.ts

@@ -0,0 +1,157 @@
+import { Command } from '../help';
+import { packageName } from '../../util/pkg-name';
+import { getEnvTargetPlaceholder } from '../../util/env/env-target';
+
+const targetPlaceholder = getEnvTargetPlaceholder();
+
+export const envCommand: Command = {
+  name: 'env',
+  description: 'Interact with environment variables.',
+  arguments: [
+    {
+      name: 'command',
+      required: false,
+    },
+  ],
+  subcommands: [
+    {
+      name: 'ls',
+      description: 'List all variables for the specified Environment',
+      arguments: [],
+      options: [],
+      examples: [],
+    },
+    {
+      name: 'add',
+      description: 'Add an Environment Variable (see examples below)',
+      arguments: [
+        {
+          name: 'name',
+          required: true,
+        },
+        {
+          name: 'environment',
+          required: false,
+        },
+      ],
+      options: [],
+      examples: [],
+    },
+    {
+      name: 'rm',
+      description: 'Remove an Environment Variable (see examples below)',
+      arguments: [
+        {
+          name: 'name',
+          required: true,
+        },
+        {
+          name: 'environment',
+          required: false,
+        },
+      ],
+      options: [],
+      examples: [],
+    },
+    {
+      name: 'pull',
+      description:
+        'Pull all Development Environment Variables from the cloud and write to a file [.env.local]',
+      arguments: [
+        {
+          name: 'filename',
+          required: false,
+        },
+      ],
+      options: [],
+      examples: [],
+    },
+  ],
+  options: [
+    {
+      name: 'environment',
+      description:
+        'Set the Environment (development, preview, production) when pulling Environment Variables',
+      shorthand: null,
+      type: 'boolean',
+      deprecated: false,
+      multi: false,
+    },
+    {
+      name: 'git-branch',
+      description:
+        'Specify the Git branch to pull specific Environment Variables for',
+      shorthand: null,
+      type: 'string',
+      deprecated: false,
+      multi: false,
+    },
+    {
+      name: 'yes',
+      description: 'Skip the confirmation prompt when removing an alias',
+      shorthand: 'y',
+      type: 'boolean',
+      deprecated: false,
+      multi: false,
+    },
+  ],
+  examples: [
+    {
+      name: 'Pull all Development Environment Variables down from the cloud',
+      value: [
+        `${packageName} env pull <file>`,
+        `${packageName} env pull .env.development.local`,
+      ],
+    },
+    {
+      name: 'Add a new variable to multiple Environments',
+      value: [
+        `${packageName} env add <name>`,
+        `${packageName} env add API_TOKEN`,
+      ],
+    },
+    {
+      name: 'Add a new variable for a specific Environment',
+      value: [
+        `${packageName} env add <name> ${targetPlaceholder}`,
+        `${packageName} env add DB_PASS production`,
+      ],
+    },
+    {
+      name: 'Add a new variable for a specific Environment and Git Branch',
+      value: [
+        `${packageName} env add <name> ${targetPlaceholder} <gitbranch>`,
+        `${packageName} env add DB_PASS preview feat1`,
+      ],
+    },
+    {
+      name: 'Add a new Environment Variable from stdin',
+      value: [
+        `cat <file> | ${packageName} env add <name> ${targetPlaceholder}`,
+        `cat ~/.npmrc | ${packageName} env add NPM_RC preview`,
+        `${packageName} env add API_URL production < url.txt`,
+      ],
+    },
+    {
+      name: 'Remove a variable from multiple Environments',
+      value: [
+        `${packageName} env rm <name>`,
+        `${packageName} env rm API_TOKEN`,
+      ],
+    },
+    {
+      name: 'Remove a variable from a specific Environment',
+      value: [
+        `${packageName} env rm <name> ${targetPlaceholder}`,
+        `${packageName} env rm NPM_RC preview`,
+      ],
+    },
+    {
+      name: 'Remove a variable from a specific Environment and Git Branch',
+      value: [
+        `${packageName} env rm <name> ${targetPlaceholder} <gitbranch>`,
+        `${packageName} env rm NPM_RC preview feat1`,
+      ],
+    },
+  ],
+};

packages/cli/src/commands/env/index.ts

@@ -8,99 +8,15 @@ import getArgs from '../../util/get-args';
 import getInvalidSubcommand from '../../util/get-invalid-subcommand';
 import getSubcommand from '../../util/get-subcommand';
 import handleError from '../../util/handle-error';
-import { getCommandName, packageName, logo } from '../../util/pkg-name';
+import { help } from '../help';
+import { getCommandName } from '../../util/pkg-name';
 import { getLinkedProject } from '../../util/projects/link';
+
 import add from './add';
 import ls from './ls';
 import pull from './pull';
 import rm from './rm';
-
-const help = () => {
-  const targetPlaceholder = getEnvTargetPlaceholder();
-  console.log(`
-  ${chalk.bold(`${logo} ${packageName} env`)} [options] <command>
-
-  ${chalk.dim('Commands:')}
-
-    ls      [environment] [gitbranch]         List all variables for the specified Environment
-    add     [name] [environment] [gitbranch]  Add an Environment Variable (see examples below)
-    rm      [name] [environment] [gitbranch]  Remove an Environment Variable (see examples below)
-    pull    [filename]                        Pull all Development Environment Variables from the cloud and write to a file [.env.local]
-
-  ${chalk.dim('Options:')}
-
-    -h, --help                     Output usage information
-    --environment                  Set the Environment (development, preview, production) when pulling Environment Variables
-    --git-branch                   Specify the Git branch to pull specific Environment Variables for
-    -A ${chalk.bold.underline('FILE')}, --local-config=${chalk.bold.underline(
-    'FILE'
-  )}   Path to the local ${'`vercel.json`'} file
-    -Q ${chalk.bold.underline('DIR')}, --global-config=${chalk.bold.underline(
-    'DIR'
-  )}    Path to the global ${'`.vercel`'} directory
-    -d, --debug                    Debug mode [off]
-    --no-color                     No color mode [off]
-    -t ${chalk.bold.underline('TOKEN')}, --token=${chalk.bold.underline(
-    'TOKEN'
-  )}        Login token
-    -y, --yes                      Skip the confirmation prompt when overwriting env file on pull or removing an env variable
-
-  ${chalk.dim('Examples:')}
-
-  ${chalk.gray(
-    '–'
-  )} Pull all Development Environment Variables down from the cloud
-
-      ${chalk.cyan(`$ ${packageName} env pull <file>`)}
-      ${chalk.cyan(`$ ${packageName} env pull .env.development.local`)}
-
-  ${chalk.gray('–')} Add a new variable to multiple Environments
-
-      ${chalk.cyan(`$ ${packageName} env add <name>`)}
-      ${chalk.cyan(`$ ${packageName} env add API_TOKEN`)}
-
-  ${chalk.gray('–')} Add a new variable for a specific Environment
-
-      ${chalk.cyan(`$ ${packageName} env add <name> ${targetPlaceholder}`)}
-      ${chalk.cyan(`$ ${packageName} env add DB_PASS production`)}
-
-  ${chalk.gray(
-    '–'
-  )} Add a new variable for a specific Environment and Git Branch
-
-      ${chalk.cyan(
-        `$ ${packageName} env add <name> ${targetPlaceholder} <gitbranch>`
-      )}
-      ${chalk.cyan(`$ ${packageName} env add DB_PASS preview feat1`)}
-
-  ${chalk.gray('–')} Add a new Environment Variable from stdin
-
-      ${chalk.cyan(
-        `$ cat <file> | ${packageName} env add <name> ${targetPlaceholder}`
-      )}
-      ${chalk.cyan(`$ cat ~/.npmrc | ${packageName} env add NPM_RC preview`)}
-      ${chalk.cyan(`$ ${packageName} env add API_URL production < url.txt`)}
-
-  ${chalk.gray('–')} Remove a variable from multiple Environments
-
-      ${chalk.cyan(`$ ${packageName} env rm <name>`)}
-      ${chalk.cyan(`$ ${packageName} env rm API_TOKEN`)}
-
-  ${chalk.gray('–')} Remove a variable from a specific Environment
-
-      ${chalk.cyan(`$ ${packageName} env rm <name> ${targetPlaceholder}`)}
-      ${chalk.cyan(`$ ${packageName} env rm NPM_RC preview`)}
-
-  ${chalk.gray(
-    '–'
-  )} Remove a variable from a specific Environment and Git Branch
-
-      ${chalk.cyan(
-        `$ ${packageName} env rm <name> ${targetPlaceholder} <gitbranch>`
-      )}
-      ${chalk.cyan(`$ ${packageName} env rm NPM_RC preview feat1`)}
-`);
-};
+import { envCommand } from './command';
 
 const COMMAND_CONFIG = {
   ls: ['ls', 'list'],
@@ -125,7 +41,7 @@ export default async function main(client: Client) {
   }
 
   if (argv['--help']) {
-    help();
+    client.output.print(help(envCommand, { columns: client.stderr.columns }));
     return 2;
   }
 
@@ -177,7 +93,9 @@ export default async function main(client: Client) {
         );
       default:
         output.error(getInvalidSubcommand(COMMAND_CONFIG));
-        help();
+        client.output.print(
+          help(envCommand, { columns: client.stderr.columns })
+        );
         return 2;
     }
   }

packages/cli/src/commands/env/pull.ts

@@ -24,6 +24,7 @@ import {
 } from '../../util/env/diff-env-files';
 import { isErrnoException } from '@vercel/error-utils';
 import { addToGitIgnore } from '../../util/link/add-to-gitignore';
+import JSONparse from 'json-parse-better-errors';
 
 const CONTENTS_PREFIX = '# Created by Vercel CLI\n';
 
@@ -54,6 +55,12 @@ function tryReadHeadSync(path: string, length: number) {
   }
 }
 
+const VARIABLES_TO_IGNORE = [
+  'VERCEL_ANALYTICS_ID',
+  'VERCEL_SPEED_INSIGHTS_ID',
+  'VERCEL_WEB_ANALYTICS_ID',
+];
+
 export default async function pull(
   client: Client,
   link: ProjectLinked,
@@ -121,7 +128,7 @@ export default async function pull(
       // We need this because double quotes are stripped from the local .env file,
       // but `records` is already in the form of a JSON object that doesn't filter
       // double quotes.
-      const newEnv = JSON.parse(JSON.stringify(records).replace(/\\"/g, ''));
+      const newEnv = JSONparse(JSON.stringify(records).replace(/\\"/g, ''));
       deltaString = buildDeltaString(oldEnv, newEnv);
     }
   }
@@ -130,6 +137,7 @@ export default async function pull(
     CONTENTS_PREFIX +
     Object.keys(records)
       .sort()
+      .filter(key => !VARIABLES_TO_IGNORE.includes(key))
       .map(key => `${key}="${escapeValue(records[key])}"`)
       .join('\n') +
     '\n';

packages/cli/src/commands/git/command.ts

@@ -0,0 +1,50 @@
+import { Command } from '../help';
+import { packageName } from '../../util/pkg-name';
+
+export const gitCommand: Command = {
+  name: 'git',
+  description: 'Manage your Git provider connections.',
+  arguments: [
+    {
+      name: 'command',
+      required: true,
+    },
+  ],
+  subcommands: [
+    {
+      name: 'connect',
+      description:
+        'Connect your Vercel Project to your Git repository or provide the remote URL to your Git repository',
+      arguments: [
+        {
+          name: 'git url',
+          required: false,
+        },
+      ],
+      options: [],
+      examples: [],
+    },
+    {
+      name: 'disconnect',
+      description: 'Disconnect the Git provider repository from your project',
+      arguments: [],
+      options: [],
+      examples: [],
+    },
+  ],
+  options: [],
+  examples: [
+    {
+      name: 'Connect your Vercel Project to your Git repository defined in your local .git config',
+      value: `${packageName} git connect`,
+    },
+    {
+      name: 'Connect your Vercel Project to a Git repository using the remote URL',
+      value: `${packageName} git connect https://github.com/user/repo.git`,
+    },
+    {
+      name: 'Disconnect the Git provider repository',
+      value: `${packageName} git disconnect`,
+    },
+  ],
+};

packages/cli/src/commands/git/index.ts

@@ -1,51 +1,12 @@
-import chalk from 'chalk';
 import Client from '../../util/client';
 import { ensureLink } from '../../util/link/ensure-link';
 import getArgs from '../../util/get-args';
 import getInvalidSubcommand from '../../util/get-invalid-subcommand';
 import handleError from '../../util/handle-error';
-import { packageName, logo } from '../../util/pkg-name';
 import connect from './connect';
 import disconnect from './disconnect';
-
-const help = () => {
-  console.log(`
-  ${chalk.bold(`${logo} ${packageName} git`)} <command>
-
-  ${chalk.dim('Commands:')}
-
-    connect [url]             Connect your Vercel Project to your Git repository or provide the remote URL to your Git repository
-    disconnect                Disconnect the Git provider repository from your project
-
-  ${chalk.dim('Options:')}
-
-    -h, --help                Output usage information
-    -t ${chalk.bold.underline('TOKEN')}, --token=${chalk.bold.underline(
-    'TOKEN'
-  )}   Login token
-    -y, --yes                 Skip confirmation when connecting a Git provider
-
-  ${chalk.dim('Examples:')}
-
-  ${chalk.gray(
-    '–'
-  )} Connect your Vercel Project to your Git repository defined in your local .git config
-
-    ${chalk.cyan(`$ ${packageName} git connect`)}
-
-  ${chalk.gray(
-    '–'
-  )} Connect your Vercel Project to a Git repository using the remote URL
-
-    ${chalk.cyan(
-      `$ ${packageName} git connect https://github.com/user/repo.git`
-    )}
-
-  ${chalk.gray('–')} Disconnect the Git provider repository
-
-    ${chalk.cyan(`$ ${packageName} git disconnect`)}
-`);
-};
+import { help } from '../help';
+import { gitCommand } from './command';
 
 const COMMAND_CONFIG = {
   connect: ['connect'],
@@ -71,7 +32,7 @@ export default async function main(client: Client) {
   }
 
   if (argv['--help']) {
-    help();
+    client.output.print(help(gitCommand, { columns: client.stderr.columns }));
     return 2;
   }
 
@@ -96,7 +57,7 @@ export default async function main(client: Client) {
       return await disconnect(client, args, project, org);
     default:
       output.error(getInvalidSubcommand(COMMAND_CONFIG));
-      help();
+      client.output.print(help(gitCommand, { columns: client.stderr.columns }));
       return 2;
   }
 }

packages/cli/src/commands/help.ts

@@ -12,6 +12,7 @@ export interface CommandOption {
   argument?: string;
   deprecated: boolean;
   description?: string;
+  /** supports multiple entries */
   multi: boolean;
 }
 export interface CommandArgument {
@@ -322,7 +323,10 @@ export function buildSubcommandLines(
     ]);
   }
 
-  const finalColumnWidth = options.columns - maxWidthOfUnwrappedColumns;
+  // Really long descriptions go RIGHT up to the edge, which looks unpleasant.
+  const rightMargin = INDENT.repeat(4).length;
+  const finalColumnWidth =
+    options.columns - maxWidthOfUnwrappedColumns - rightMargin;
 
   const table = new Table(
     Object.assign({}, tableOptions, {

packages/cli/src/commands/init/command.ts

@@ -0,0 +1,47 @@
+import { Command } from '../help';
+import { packageName } from '../../util/pkg-name';
+
+export const initCommand: Command = {
+  name: 'init',
+  description: 'Initialize example Vercel Projects',
+  arguments: [
+    {
+      name: 'example',
+      required: false,
+    },
+    {
+      name: 'dir',
+      required: false,
+    },
+  ],
+  subcommands: undefined,
+  options: [
+    {
+      name: 'force',
+      description: 'Overwrite destination directory if exists [off]',
+      argument: undefined,
+      shorthand: 'f',
+      type: 'boolean',
+      deprecated: false,
+      multi: false,
+    },
+  ],
+  examples: [
+    {
+      name: 'Choose from all available examples',
+      value: `${packageName} init`,
+    },
+    {
+      name: 'Initialize example project into a new directory',
+      value: `${packageName} init <example>`,
+    },
+    {
+      name: 'Initialize example project into specified directory',
+      value: `${packageName} <example> <dir>`,
+    },
+    {
+      name: 'Initialize example project without checking',
+      value: `${packageName} init <example> --force`,
+    },
+  ],
+};

packages/cli/src/commands/init/index.ts

@@ -1,48 +1,16 @@
-import chalk from 'chalk';
-
 import getArgs from '../../util/get-args';
 import getSubcommand from '../../util/get-subcommand';
 import Client from '../../util/client';
 import handleError from '../../util/handle-error';
 import init from './init';
-import { packageName, logo } from '../../util/pkg-name';
 import { isError } from '@vercel/error-utils';
+import { help } from '../help';
+import { initCommand } from './command';
 
 const COMMAND_CONFIG = {
   init: ['init'],
 };
 
-const help = () => {
-  console.log(`
-  ${chalk.bold(`${logo} ${packageName} init`)} [example] [dir] [-f | --force]
-
-  ${chalk.dim('Options:')}
-
-    -h, --help        Output usage information
-    -d, --debug       Debug mode [off]
-    --no-color        No color mode [off]
-    -f, --force       Overwrite destination directory if exists [off]
-
-  ${chalk.dim('Examples:')}
-
-  ${chalk.gray('–')}  Choose from all available examples
-
-      ${chalk.cyan(`$ ${packageName} init`)}
-
-  ${chalk.gray('–')}  Initialize example project into a new directory
-
-      ${chalk.cyan(`$ ${packageName} init <example>`)}
-
-  ${chalk.gray('–')}  Initialize example project into specified directory
-
-      ${chalk.cyan(`$ ${packageName} init <example> <dir>`)}
-
-  ${chalk.gray('–')}  Initialize example project without checking
-
-      ${chalk.cyan(`$ ${packageName} init <example> --force`)}
-  `);
-};
-
 export default async function main(client: Client) {
   const { output } = client;
   let argv;
@@ -60,7 +28,7 @@ export default async function main(client: Client) {
   }
 
   if (argv['--help']) {
-    help();
+    client.output.print(help(initCommand, { columns: client.stderr.columns }));
     return 2;
   }
 

packages/cli/src/commands/login/index.ts

@@ -19,10 +19,14 @@ import Client from '../../util/client';
 import { LoginResult } from '../../util/login/types';
 import { help } from '../help';
 import { loginCommand } from './command';
+import { updateCurrentTeamAfterLogin } from '../../util/login/update-current-team-after-login';
 
 export default async function login(client: Client): Promise<number> {
   const { output } = client;
 
+  // user is not currently authenticated on this machine
+  const isInitialLogin = !client.authConfig.token;
+
   const argv = getArgs(client.argv.slice(2), {
     '--oob': Boolean,
     '--github': Boolean,
@@ -67,20 +71,24 @@ export default async function login(client: Client): Promise<number> {
     return result;
   }
 
-  // If the token was upgraded (not a new login), then don't modify
-  // the current scope.
-  if (!client.authConfig.token) {
-    if (result.teamId) {
-      // SSO login, so set the current scope to the appropriate Team
-      client.config.currentTeam = result.teamId;
-    } else {
-      delete client.config.currentTeam;
-    }
-  }
-
   // Save the user's authentication token to the configuration file.
   client.authConfig.token = result.token;
 
+  if (result.teamId) {
+    client.config.currentTeam = result.teamId;
+  } else {
+    delete client.config.currentTeam;
+  }
+
+  // If we have a brand new login, update `currentTeam`
+  if (isInitialLogin) {
+    await updateCurrentTeamAfterLogin(
+      client,
+      output,
+      client.config.currentTeam
+    );
+  }
+
   writeToAuthConfigFile(client.authConfig);
   writeToConfigFile(client.config);
 

packages/cli/src/commands/logout/command.ts

@@ -3,7 +3,7 @@ import { packageName } from '../../util/pkg-name';
 
 export const logoutCommand: Command = {
   name: 'logout',
-  description: 'Logout the current authenticated user or team.',
+  description: 'Logout the current authenticated user.',
   arguments: [],
   options: [],
   examples: [

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

@@ -0,0 +1,67 @@
+import { Command } from '../help';
+import { packageName } from '../../util/pkg-name';
+
+export const projectCommand: Command = {
+  name: 'project',
+  description: 'Manage your Vercel Projects.',
+  arguments: [
+    {
+      name: 'command',
+      required: true,
+    },
+  ],
+  subcommands: [
+    {
+      name: 'ls',
+      description: 'Show all projects in the selected scope',
+      arguments: [],
+      options: [],
+      examples: [],
+    },
+    {
+      name: 'add',
+      description: 'Add a new project',
+      arguments: [
+        {
+          name: 'name',
+          required: true,
+        },
+      ],
+      options: [],
+      examples: [],
+    },
+    {
+      name: 'rm',
+      description: 'Remove a project',
+      arguments: [
+        {
+          name: 'name',
+          required: true,
+        },
+      ],
+      options: [],
+      examples: [],
+    },
+  ],
+  options: [
+    {
+      name: 'next',
+      description: 'Show next page of results',
+      argument: 'MS',
+      shorthand: 'N',
+      type: 'string',
+      deprecated: false,
+      multi: false,
+    },
+  ],
+  examples: [
+    {
+      name: 'Add a new project',
+      value: `${packageName} project add my-project`,
+    },
+    {
+      name: 'Paginate projects, where `1584722256178` is the time in milliseconds since the UNIX epoch',
+      value: `${packageName} project ls --next 1584722256178`,
+    },
+  ],
+};

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

@@ -1,46 +1,13 @@
-import chalk from 'chalk';
 import Client from '../../util/client';
 import getArgs from '../../util/get-args';
 import getInvalidSubcommand from '../../util/get-invalid-subcommand';
 import getScope from '../../util/get-scope';
 import handleError from '../../util/handle-error';
-import { packageName, logo } from '../../util/pkg-name';
+import { help } from '../help';
 import add from './add';
 import list from './list';
 import rm from './rm';
-
-const help = () => {
-  console.log(`
-  ${chalk.bold(`${logo} ${packageName} project`)} [options] <command>
-
-  ${chalk.dim('Commands:')}
-
-    ls                               Show all projects in the selected team/user
-    add      [name]                  Add a new project
-    rm       [name]                  Remove a project
-
-  ${chalk.dim('Options:')}
-
-    -h, --help                     Output usage information
-    -t ${chalk.bold.underline('TOKEN')}, --token=${chalk.bold.underline(
-    'TOKEN'
-  )}        Login token
-    -S, --scope                    Set a custom scope
-    -N, --next                     Show next page of results
-
-  ${chalk.dim('Examples:')}
-
-  ${chalk.gray('–')} Add a new project
-
-    ${chalk.cyan(`$ ${packageName} project add my-project`)}
-
-  ${chalk.gray('–')} Paginate projects, where ${chalk.dim(
-    '`1584722256178`'
-  )} is the time in milliseconds since the UNIX epoch.
-
-    ${chalk.cyan(`$ ${packageName} project ls --next 1584722256178`)}
-`);
-};
+import { projectCommand } from './command';
 
 const COMMAND_CONFIG = {
   ls: ['ls', 'list'],
@@ -63,7 +30,9 @@ export default async function main(client: Client) {
   }
 
   if (argv['--help']) {
-    help();
+    client.output.print(
+      help(projectCommand, { columns: client.stderr.columns })
+    );
     return 2;
   }
 
@@ -84,7 +53,9 @@ export default async function main(client: Client) {
       return await rm(client, args);
     default:
       output.error(getInvalidSubcommand(COMMAND_CONFIG));
-      help();
+      client.output.print(
+        help(projectCommand, { columns: client.stderr.columns })
+      );
       return 2;
   }
 }

packages/cli/src/commands/promote/command.ts

@@ -0,0 +1,53 @@
+import { Command } from '../help';
+import { packageName } from '../../util/pkg-name';
+
+export const promoteCommand: Command = {
+  name: 'promote',
+  description: 'Promote an existing deployment to current.',
+  arguments: [
+    {
+      name: 'deployment id/url',
+      required: true,
+    },
+  ],
+  subcommands: [
+    {
+      name: 'status',
+      description: 'Show the status of any current pending promotions',
+      arguments: [
+        {
+          name: 'project',
+          required: false,
+        },
+      ],
+      options: [],
+      examples: [],
+    },
+  ],
+  options: [
+    {
+      name: 'timeout',
+      description: 'Time to wait for promotion completion [3m]',
+      argument: 'timeout',
+      shorthand: null,
+      type: 'string',
+      deprecated: false,
+      multi: false,
+    },
+  ],
+  examples: [
+    {
+      name: 'Show the status of any current pending promotions',
+      value: [
+        `${packageName} promote`,
+        `${packageName} promote status`,
+        `${packageName} promote status <project>`,
+        `${packageName} promote status --timeout 30s`,
+      ],
+    },
+    {
+      name: 'Promote a deployment using id or url',
+      value: `${packageName} promote <deployment id/url>`,
+    },
+  ],
+};

packages/cli/src/commands/promote/index.ts

@@ -1,53 +1,13 @@
-import chalk from 'chalk';
 import type Client from '../../util/client';
 import getArgs from '../../util/get-args';
 import getProjectByCwdOrLink from '../../util/projects/get-project-by-cwd-or-link';
-import { packageName, logo } from '../../util/pkg-name';
 import handleError from '../../util/handle-error';
 import { isErrnoException } from '@vercel/error-utils';
 import ms from 'ms';
 import requestPromote from './request-promote';
 import promoteStatus from './status';
-
-const help = () => {
-  console.log(`
-  ${chalk.bold(`${logo} ${packageName} promote`)} [deployment id/url]
-
-  Promote an existing deployment to current.
-
-  ${chalk.dim('Options:')}
-
-    -h, --help                     Output usage information
-    -A ${chalk.bold.underline('FILE')}, --local-config=${chalk.bold.underline(
-    'FILE'
-  )}   Path to the local ${'`vercel.json`'} file
-    -Q ${chalk.bold.underline('DIR')}, --global-config=${chalk.bold.underline(
-    'DIR'
-  )}    Path to the global ${'`.vercel`'} directory
-    -d, --debug                    Debug mode [off]
-    --no-color                     No color mode [off]
-    -t ${chalk.bold.underline('TOKEN')}, --token=${chalk.bold.underline(
-    'TOKEN'
-  )}        Login token
-    --timeout=${chalk.bold.underline(
-      'TIME'
-    )}                 Time to wait for promotion completion [3m]
-    -y, --yes                      Skip questions when setting up new project using default scope and settings
-
-  ${chalk.dim('Examples:')}
-
-  ${chalk.gray('–')} Show the status of any current pending promotions
-
-    ${chalk.cyan(`$ ${packageName} promote`)}
-    ${chalk.cyan(`$ ${packageName} promote status`)}
-    ${chalk.cyan(`$ ${packageName} promote status <project>`)}
-    ${chalk.cyan(`$ ${packageName} promote status --timeout 30s`)}
-
-  ${chalk.gray('–')} Promote a deployment using id or url
-
-    ${chalk.cyan(`$ ${packageName} promote <deployment id/url>`)}
-`);
-};
+import { promoteCommand } from './command';
+import { help } from '../help';
 
 /**
  * `vc promote` command
@@ -68,7 +28,9 @@ export default async (client: Client): Promise<number> => {
   }
 
   if (argv['--help'] || argv._[0] === 'help') {
-    help();
+    client.output.print(
+      help(promoteCommand, { columns: client.stderr.columns })
+    );
     return 2;
   }
 

packages/cli/src/commands/redeploy/index.ts

@@ -76,12 +76,23 @@ export default async function redeploy(client: Client): Promise<number> {
     });
 
     output.stopSpinner();
+
+    const isProdDeployment = deployment.target === 'production';
+    const previewUrl = `https://${deployment.url}`;
     output.print(
       `${prependEmoji(
         `Inspect: ${chalk.bold(deployment.inspectorUrl)} ${deployStamp()}`,
         emoji('inspect')
       )}\n`
     );
+    output.print(
+      prependEmoji(
+        `${isProdDeployment ? 'Production' : 'Preview'}: ${chalk.bold(
+          previewUrl
+        )} ${deployStamp()}`,
+        emoji('success')
+      ) + `\n`
+    );
 
     if (!client.stdout.isTTY) {
       client.stdout.write(`https://${deployment.url}`);

packages/cli/src/commands/rollback/command.ts

@@ -0,0 +1,53 @@
+import { Command } from '../help';
+import { packageName } from '../../util/pkg-name';
+
+export const rollbackCommand: Command = {
+  name: 'rollback',
+  description: 'Quickly revert back to a previous deployment.',
+  arguments: [
+    {
+      name: 'deployment id/url',
+      required: true,
+    },
+  ],
+  subcommands: [
+    {
+      name: 'status',
+      description: 'Show the status of any current pending rollbacks',
+      arguments: [
+        {
+          name: 'project',
+          required: false,
+        },
+      ],
+      options: [],
+      examples: [],
+    },
+  ],
+  options: [
+    {
+      name: 'timeout',
+      description: 'Time to wait for rollback completion [3m]',
+      argument: 'timeout',
+      shorthand: null,
+      type: 'string',
+      deprecated: false,
+      multi: false,
+    },
+  ],
+  examples: [
+    {
+      name: 'Show the status of any current pending rollbacks',
+      value: [
+        `${packageName} rollback`,
+        `${packageName} rollback status`,
+        `${packageName} rollback status <project>`,
+        `${packageName} rollback status --timeout 30s`,
+      ],
+    },
+    {
+      name: 'Rollback a deployment using id or url',
+      value: `${packageName} rollback <deployment id/url>`,
+    },
+  ],
+};

packages/cli/src/commands/rollback/index.ts

@@ -1,53 +1,13 @@
-import chalk from 'chalk';
 import type Client from '../../util/client';
 import getArgs from '../../util/get-args';
 import getProjectByCwdOrLink from '../../util/projects/get-project-by-cwd-or-link';
-import { packageName, logo } from '../../util/pkg-name';
 import handleError from '../../util/handle-error';
 import { isErrnoException } from '@vercel/error-utils';
 import ms from 'ms';
 import requestRollback from './request-rollback';
 import rollbackStatus from './status';
-
-const help = () => {
-  console.log(`
-  ${chalk.bold(`${logo} ${packageName} rollback`)} [deployment id/url]
-
-  Quickly revert back to a previous deployment.
-
-  ${chalk.dim('Options:')}
-
-    -h, --help                     Output usage information
-    -A ${chalk.bold.underline('FILE')}, --local-config=${chalk.bold.underline(
-    'FILE'
-  )}   Path to the local ${'`vercel.json`'} file
-    -Q ${chalk.bold.underline('DIR')}, --global-config=${chalk.bold.underline(
-    'DIR'
-  )}    Path to the global ${'`.vercel`'} directory
-    -d, --debug                    Debug mode [off]
-    --no-color                     No color mode [off]
-    -t ${chalk.bold.underline('TOKEN')}, --token=${chalk.bold.underline(
-    'TOKEN'
-  )}        Login token
-    --timeout=${chalk.bold.underline(
-      'TIME'
-    )}                 Time to wait for rollback completion [3m]
-    -y, --yes                      Skip questions when setting up new project using default scope and settings
-
-  ${chalk.dim('Examples:')}
-
-  ${chalk.gray('–')} Show the status of any current pending rollbacks
-
-    ${chalk.cyan(`$ ${packageName} rollback`)}
-    ${chalk.cyan(`$ ${packageName} rollback status`)}
-    ${chalk.cyan(`$ ${packageName} rollback status <project>`)}
-    ${chalk.cyan(`$ ${packageName} rollback status --timeout 30s`)}
-
-  ${chalk.gray('–')} Rollback a deployment using id or url
-
-    ${chalk.cyan(`$ ${packageName} rollback <deployment id/url>`)}
-`);
-};
+import { help } from '../help';
+import { rollbackCommand } from './command';
 
 /**
  * `vc rollback` command
@@ -68,7 +28,9 @@ export default async (client: Client): Promise<number> => {
   }
 
   if (argv['--help'] || argv._[0] === 'help') {
-    help();
+    client.output.print(
+      help(rollbackCommand, { columns: client.stderr.columns })
+    );
     return 2;
   }
 

packages/cli/src/commands/secrets/command.js

@@ -0,0 +1,96 @@
+import { packageName, getCommandName } from '../../util/pkg-name';
+
+export const secretsCommand = {
+  name: 'secrets',
+  description: `NOTE: The ${getCommandName(
+    'env'
+  )} command is recommended instead of ${getCommandName('secrets')}`,
+  arguments: [
+    {
+      name: 'command',
+      required: false,
+    },
+  ],
+  subcommands: [
+    {
+      name: 'ls',
+      description: 'Show all secrets in a list',
+      arguments: [],
+      options: [],
+      examples: [],
+    },
+    {
+      name: 'add',
+      description: 'Add a new secret',
+      arguments: [
+        {
+          name: 'name',
+          required: true,
+        },
+        {
+          name: 'value',
+          required: true,
+        },
+      ],
+      options: [],
+      examples: [],
+    },
+    {
+      name: 'rename',
+      description: 'Change the name of a secret',
+      arguments: [
+        {
+          name: 'old-name',
+          required: true,
+        },
+        {
+          name: 'new-name',
+          required: true,
+        },
+      ],
+      options: [],
+      examples: [],
+    },
+    {
+      name: 'rm',
+      description: 'Remove a secret',
+      arguments: [
+        {
+          name: 'name',
+          required: true,
+        },
+      ],
+      options: [],
+      examples: [],
+    },
+  ],
+  options: [
+    {
+      name: 'next',
+      description: 'Show next page of results',
+      argument: 'MS',
+      shorthand: 'n',
+      type: 'string',
+      deprecated: false,
+      multi: false,
+    },
+  ],
+  examples: [
+    {
+      name: 'Add a new secret',
+      value: `${packageName} secrets add my-secret "my value"
+
+      - Once added, a secret's value can't be retrieved in plain text anymore
+      - If the secret's value is more than one word, wrap it in quotes
+      - When in doubt, always wrap your value in quotes`,
+    },
+    {
+      name: 'Expose a secret as an environment variable (notice the `@` symbol)',
+      value: `${packageName} -e MY_SECRET=@my-secret`,
+    },
+    {
+      name: 'Paginate results, where 1584722256178 is the time in milliseconds since the UNIX epoch',
+      value: `$ ${packageName} secrets ls --next 1584722256178`,
+    },
+  ],
+};

packages/cli/src/commands/secrets/index.js

@@ -1,78 +1,17 @@
+import isErrnoException from '@vercel/error-utils';
 import chalk from 'chalk';
 import table from 'text-table';
 import ms from 'ms';
-import strlen from '../util/strlen.ts';
-import { handleError, error } from '../util/error';
-import NowSecrets from '../util/secrets';
-import exit from '../util/exit';
-import getScope from '../util/get-scope.ts';
-import confirm from '../util/input/confirm';
-import getCommandFlags from '../util/get-command-flags';
-import { packageName, getCommandName, logo } from '../util/pkg-name.ts';
-import getArgs from '../util/get-args';
-
-const help = () => {
-  console.log(`
-  ${chalk.yellow(
-    `${chalk.bold('NOTE:')} The ${getCommandName(
-      'env'
-    )} command is recommended instead of ${getCommandName('secrets')}`
-  )}
-
-  ${chalk.bold(`${logo} ${packageName} secrets`)} [options] <command>
-
-  ${chalk.dim('Commands:')}
-
-    ls                               Show all secrets in a list
-    add      [name] [value]          Add a new secret
-    rename   [old-name] [new-name]   Change the name of a secret
-    rm       [name]                  Remove a secret
-
-  ${chalk.dim('Options:')}
-
-    -h, --help                     Output usage information
-    -A ${chalk.bold.underline('FILE')}, --local-config=${chalk.bold.underline(
-    'FILE'
-  )}   Path to the local ${'`vercel.json`'} file
-    -Q ${chalk.bold.underline('DIR')}, --global-config=${chalk.bold.underline(
-    'DIR'
-  )}    Path to the global ${'`.vercel`'} directory
-    -d, --debug                    Debug mode [off]
-    -t ${chalk.bold.underline('TOKEN')}, --token=${chalk.bold.underline(
-    'TOKEN'
-  )}        Login token
-    -S, --scope                    Set a custom scope
-    -N, --next                     Show next page of results
-
-  ${chalk.dim('Examples:')}
-
-  ${chalk.gray('–')} Add a new secret
-
-    ${chalk.cyan(`$ ${packageName} secrets add my-secret "my value"`)}
-
-    ${chalk.gray(
-      '–'
-    )} Once added, a secret's value can't be retrieved in plain text anymore
-    ${chalk.gray(
-      '–'
-    )} If the secret's value is more than one word, wrap it in quotes
-    ${chalk.gray('–')} When in doubt, always wrap your value in quotes
-
-  ${chalk.gray(
-    '–'
-  )} Expose a secret as an environment variable (notice the ${chalk.cyan.bold(
-    '`@`'
-  )} symbol)
-
-    ${chalk.cyan(`$ ${packageName} -e MY_SECRET=${chalk.bold('@my-secret')}`)}
-
-  ${chalk.gray('–')} Paginate results, where ${chalk.dim(
-    '`1584722256178`'
-  )} is the time in milliseconds since the UNIX epoch
-
-    ${chalk.cyan(`$ ${packageName} secrets ls --next 1584722256178`)}
-`);
-};
+import strlen from '../../util/strlen';
+import { handleError, error } from '../../util/error';
+import NowSecrets from '../../util/secrets';
+import getScope from '../../util/get-scope';
+import confirm from '../../util/input/confirm';
+import getCommandFlags from '../../util/get-command-flags';
+import { getCommandName } from '../../util/pkg-name';
+import getArgs from '../../util/get-args';
+import { help } from '../help';
+import { secretsCommand } from './command';
 
 // Options
 let argv;
@@ -94,8 +33,10 @@ const main = async client => {
   nextTimestamp = argv.next;
 
   if (argv.help || !subcommand) {
-    help();
-    await exit(2);
+    client.output.print(
+      help(secretsCommand, { columns: client.stderr.columns })
+    );
+    return 2;
   }
 
   const {
@@ -107,9 +48,11 @@ const main = async client => {
   try {
     ({ contextName } = await getScope(client));
   } catch (err) {
-    if (err.code === 'NOT_AUTHORIZED' || err.code === 'TEAM_DELETED') {
-      output.error(err.message);
-      return 1;
+    if (isErrnoException(err)) {
+      if (err.code === 'NOT_AUTHORIZED' || err.code === 'TEAM_DELETED') {
+        output.error(err.message);
+        return 1;
+      }
     }
 
     throw err;
@@ -120,7 +63,7 @@ const main = async client => {
 
 export default async client => {
   try {
-    await main(client);
+    return await main(client);
   } catch (err) {
     handleError(err);
     process.exit(1);
@@ -183,7 +126,7 @@ async function run({ output, contextName, currentTeam, client }) {
       );
 
       if (out) {
-        console.log(`\n${out}\n`);
+        client.output.print(`\n${out}\n`);
       }
     }
 
@@ -298,19 +241,7 @@ async function run({ output, contextName, currentTeam, client }) {
       return 1;
     }
 
-    const [name, parsedValue] = args;
-    const [originalName, originalValue] = client.argv.slice(-2);
-
-    let value = parsedValue;
-    if (
-      name === originalName &&
-      typeof parsedValue === 'boolean' &&
-      parsedValue !== originalValue
-    ) {
-      // Corner case where `mri` transforms the secret value into a boolean because
-      // it starts with a `-` so it thinks its a flag, so we use the original value instead.
-      value = originalValue;
-    }
+    const [name, value] = args;
 
     if (typeof value === 'boolean') {
       const example = chalk.cyan(
@@ -340,7 +271,7 @@ async function run({ output, contextName, currentTeam, client }) {
   console.error(
     error('Please specify a valid subcommand: ls | add | rename | rm')
   );
-  help();
+  client.output.print(help(secretsCommand, { columns: client.stderr.columns }));
   return 2;
 }
 

packages/cli/src/commands/teams/command.ts

@@ -0,0 +1,77 @@
+import { Command } from '../help';
+import { packageName } from '../../util/pkg-name';
+
+export const teamsCommand: Command = {
+  name: 'teams',
+  description: 'Manage teams under your Vercel account',
+  arguments: [],
+  subcommands: [
+    {
+      name: 'add',
+      description: 'Create a new team',
+      arguments: [],
+      options: [],
+      examples: [],
+    },
+    {
+      name: 'ls',
+      description: "Show all teams you're a part of",
+      arguments: [],
+      options: [],
+      examples: [],
+    },
+    {
+      name: 'switch',
+      description: 'Switch to a different team',
+      arguments: [
+        {
+          name: 'name',
+          required: false,
+        },
+      ],
+      options: [],
+      examples: [],
+    },
+    {
+      name: 'invite',
+      description: 'Invite a new member to a team',
+      arguments: [
+        {
+          name: 'emails',
+          required: true,
+        },
+      ],
+      options: [],
+      examples: [],
+    },
+  ],
+  options: [
+    {
+      name: 'next',
+      shorthand: 'N',
+      type: 'string',
+      argument: 'MS',
+      deprecated: false,
+      multi: false,
+      description: 'Show next page of results',
+    },
+  ],
+  examples: [
+    {
+      name: "Switch to a team. If your team's url is 'vercel.com/name', then 'name' is the slug. If the slug is omitted, you can choose interactively.",
+      value: `${packageName} teams switch <slug>`,
+    },
+    {
+      name: 'Invite new members (interactively)',
+      value: `${packageName} teams invite`,
+    },
+    {
+      name: 'Invite multiple members simultaneously',
+      value: `${packageName} teams invite abc@vercel.com xyz@vercel.com`,
+    },
+    {
+      name: 'Paginate results, where `1584722256178` is the time in milliseconds since the UNIX epoch.',
+      value: `${packageName} teams ls --next 1584722256178`,
+    },
+  ],
+};

packages/cli/src/commands/teams/index.ts

@@ -1,63 +1,12 @@
-import chalk from 'chalk';
 import error from '../../util/output/error';
 import list from './list';
 import add from './add';
 import change from './switch';
 import invite from './invite';
-import { packageName, logo } from '../../util/pkg-name';
 import getArgs from '../../util/get-args';
 import Client from '../../util/client';
-
-const help = () => {
-  console.log(`
-  ${chalk.bold(`${logo} ${packageName} teams`)} [options] <command>
-
-  ${chalk.dim('Commands:')}
-
-    add                Create a new team
-    ls                 Show all teams you're a part of
-    switch   [name]    Switch to a different team
-    invite   [email]   Invite a new member to a team
-
-  ${chalk.dim('Options:')}
-
-    -h, --help                     Output usage information
-    -A ${chalk.bold.underline('FILE')}, --local-config=${chalk.bold.underline(
-    'FILE'
-  )}   Path to the local ${'`vercel.json`'} file
-    -Q ${chalk.bold.underline('DIR')}, --global-config=${chalk.bold.underline(
-    'DIR'
-  )}    Path to the global ${'`.vercel`'} directory
-    -d, --debug                    Debug mode [off]
-    --no-color                     No color mode [off]
-    -N, --next                     Show next page of results
-
-  ${chalk.dim('Examples:')}
-
-  ${chalk.gray('–')} Switch to a team
-
-      ${chalk.cyan(`$ ${packageName} switch <slug>`)}
-
-      ${chalk.gray(
-        '–'
-      )} If your team's url is 'vercel.com/teams/name', 'name' is the slug
-      ${chalk.gray('–')} If the slug is omitted, you can choose interactively
-
-      ${chalk.yellow(
-        'NOTE:'
-      )} When you switch, everything you add, list or remove will be scoped that team!
-
-  ${chalk.gray('–')} Invite new members (interactively)
-
-      ${chalk.cyan(`$ ${packageName} teams invite`)}
-
-  ${chalk.gray('–')} Paginate results, where ${chalk.dim(
-    '`1584722256178`'
-  )} is the time in milliseconds since the UNIX epoch.
-
-      ${chalk.cyan(`$ ${packageName} teams ls --next 1584722256178`)}
-  `);
-};
+import { teamsCommand } from './command';
+import { help } from '../help';
 
 export default async (client: Client) => {
   let subcommand;
@@ -74,7 +23,7 @@ export default async (client: Client) => {
   }
 
   if (argv['--help'] || !subcommand) {
-    help();
+    client.output.print(help(teamsCommand, { columns: client.stderr.columns }));
     return 2;
   }
 
@@ -107,7 +56,9 @@ export default async (client: Client) => {
         );
       }
       exitCode = 2;
-      help();
+      client.output.print(
+        help(teamsCommand, { columns: client.stderr.columns })
+      );
     }
   }
   return exitCode;

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

@@ -39,11 +39,12 @@ export default async function list(client: Client): Promise<number> {
     apiVersion: 2,
   });
   let { currentTeam } = config;
-  const accountIsCurrent = !currentTeam;
 
   output.spinner('Fetching user information');
   const user = await getUser(client);
 
+  const accountIsCurrent = !currentTeam && user.version !== 'northstar';
+
   if (accountIsCurrent) {
     currentTeam = user.id;
   }
@@ -55,12 +56,14 @@ export default async function list(client: Client): Promise<number> {
     current: id === currentTeam ? chars.tick : '',
   }));
 
-  teamList.unshift({
-    id: user.id,
-    name: user.email,
-    value: user.username || user.email,
-    current: accountIsCurrent ? chars.tick : '',
-  });
+  if (user.version !== 'northstar') {
+    teamList.unshift({
+      id: user.id,
+      name: user.email,
+      value: user.username || user.email,
+      current: accountIsCurrent ? chars.tick : '',
+    });
+  }
 
   // Bring the current Team to the beginning of the list
   if (!accountIsCurrent) {
@@ -71,18 +74,21 @@ export default async function list(client: Client): Promise<number> {
 
   // Printing
   output.stopSpinner();
-  console.log(); // empty line
+  client.stdout.write('\n'); // empty line
 
   table(
     ['', 'id', 'email / name'],
     teamList.map(team => [team.current, team.value, team.name]),
-    [1, 5]
+    [1, 5],
+    (str: string) => {
+      client.stdout.write(str);
+    }
   );
 
   if (pagination?.count === 20) {
     const flags = getCommandFlags(argv, ['_', '--next', '-N', '-d']);
     const nextCmd = `${packageName} teams ls${flags} --next ${pagination.next}`;
-    console.log(); // empty line
+    client.stdout.write('\n'); // empty line
     output.log(`To display the next page run ${cmd(nextCmd)}`);
   }
 

packages/cli/src/commands/teams/switch.ts

@@ -70,14 +70,21 @@ export default async function main(client: Client, desiredSlug?: string) {
       suffix += ` ${emoji('locked')}`;
     }
 
+    const personalAccountChoice =
+      user.version === 'northstar'
+        ? []
+        : [
+            { separator: 'Personal Account' },
+            {
+              name: `${user.name || user.email} (${user.username})${suffix}`,
+              value: user.username,
+              short: user.username,
+              selected: personalScopeSelected,
+            },
+          ];
+
     const choices = [
-      { separator: 'Personal Account' },
-      {
-        name: `${user.name || user.email} (${user.username})${suffix}`,
-        value: user.username,
-        short: user.username,
-        selected: personalScopeSelected,
-      },
+      ...personalAccountChoice,
       { separator: 'Teams' },
       ...teamChoices,
     ];
@@ -97,6 +104,11 @@ export default async function main(client: Client, desiredSlug?: string) {
   }
 
   if (desiredSlug === user.username || desiredSlug === user.email) {
+    if (user.version === 'northstar') {
+      output.error('You cannot set your Personal Account as the scope.');
+      return 1;
+    }
+
     // Switch to user's personal account
     if (personalScopeSelected) {
       output.log('No changes made');

packages/cli/src/index.ts

@@ -14,7 +14,6 @@ try {
 
 import { join } from 'path';
 import { existsSync } from 'fs';
-import sourceMap from '@zeit/source-map-support';
 import { mkdirp } from 'fs-extra';
 import chalk from 'chalk';
 import epipebomb from 'epipebomb';
@@ -56,6 +55,7 @@ import { ProxyAgent } from 'proxy-agent';
 import box from './util/output/box';
 import { execExtension } from './util/extension/exec';
 import { help } from './args';
+import { updateCurrentTeamAfterLogin } from './util/login/update-current-team-after-login';
 
 const VERCEL_DIR = getGlobalPathConfig();
 const VERCEL_CONFIG_PATH = configFiles.getConfigFilePath();
@@ -65,8 +65,6 @@ const GLOBAL_COMMANDS = new Set(['help']);
 
 epipebomb();
 
-sourceMap.install();
-
 // Configure the error reporting system
 Sentry.init({
   dsn: SENTRY_DSN,
@@ -337,17 +335,12 @@ const main = async () => {
         return result;
       }
 
-      if (result.teamId) {
-        // SSO login, so set the current scope to the appropriate Team
-        client.config.currentTeam = result.teamId;
-      } else {
-        delete client.config.currentTeam;
-      }
-
       // When `result` is a string it's the user's authentication token.
       // It needs to be saved to the configuration file.
       client.authConfig.token = result.token;
 
+      await updateCurrentTeamAfterLogin(client, output, result.teamId);
+
       configFiles.writeToAuthConfigFile(client.authConfig);
       configFiles.writeToConfigFile(client.config);
 
@@ -447,6 +440,11 @@ const main = async () => {
     }
 
     if (user.id === scope || user.email === scope || user.username === scope) {
+      if (user.version === 'northstar') {
+        output.error('You cannot set your Personal Account as the scope.');
+        return 1;
+      }
+
       delete client.config.currentTeam;
     } else {
       let teams = [];

packages/cli/src/util/build/corepack.ts

@@ -20,7 +20,8 @@ export async function initCorepack({
   );
   if (pkg instanceof CantParseJSONFile) {
     console.warn(
-      'Warning: Could not enable corepack because package.json is invalid JSON'
+      'Warning: Could not enable corepack because package.json is invalid JSON',
+      pkg.meta.parseErrorLocation
     );
   } else if (!pkg?.packageManager) {
     console.warn(
@@ -40,7 +41,7 @@ export async function initCorepack({
     const pkgManagerName = pkg.packageManager.split('@')[0];
     // We must explicitly call `corepack enable npm` since `corepack enable`
     // doesn't work with npm. See https://github.com/nodejs/corepack/pull/24
-    // Also, `corepack enable` is too broad and will change the verison of
+    // Also, `corepack enable` is too broad and will change the version of
     // yarn & pnpm even though those versions are not specified by the user.
     // See https://github.com/nodejs/corepack#known-good-releases
     // Finally, we use `--install-directory` so we can cache the result to

packages/cli/src/util/build/import-builders.ts

@@ -3,6 +3,7 @@ import plural from 'pluralize';
 import npa from 'npm-package-arg';
 import { satisfies } from 'semver';
 import { dirname, join } from 'path';
+import { createRequire } from 'module';
 import { mkdirp, outputJSON, readJSON, symlink } from 'fs-extra';
 import { isStaticRuntime } from '@vercel/fs-detectors';
 import { BuilderV2, BuilderV3, PackageJson } from '@vercel/build-utils';
@@ -28,6 +29,9 @@ type ResolveBuildersResult =
   | { buildersToAdd: Set<string> }
   | { builders: Map<string, BuilderWithPkg> };
 
+// Get a real `require()` reference that esbuild won't mutate
+const require_ = createRequire(__filename);
+
 /**
  * Imports the specified Vercel Builders, installing any missing ones
  * into `.vercel/builders` if necessary.
@@ -115,10 +119,9 @@ export async function resolveBuilders(
         // If `pkgPath` wasn't found in `.vercel/builders` then try as a CLI local
         // dependency. `require.resolve()` will throw if the Builder is not a CLI
         // dep, in which case we'll install it into `.vercel/builders`.
-        // NOTE: `eval('require')` is necessary to avoid bad transpilation to `__webpack_require__`
-        pkgPath = eval('require').resolve(`${name}/package.json`, {
+        pkgPath = require_.resolve(`${name}/package.json`, {
           paths: [__dirname],
-        }) as string;
+        });
         builderPkg = await readJSON(pkgPath);
       }
 
@@ -159,8 +162,7 @@ export async function resolveBuilders(
 
       const path = join(dirname(pkgPath), builderPkg.main || 'index.js');
 
-      // NOTE: `eval('require')` is necessary to avoid bad transpilation to `__webpack_require__`
-      const builder = eval('require')(path);
+      const builder = require_(path);
 
       builders.set(spec, {
         builder,

packages/cli/src/util/deploy/get-preferred-preview-url.ts

@@ -1,48 +0,0 @@
-import isWildcardAlias from '../alias/is-wildcard-alias';
-import { getCertsForCn } from '../certs/get-certs-for-cn';
-import Client from '../client';
-
-/**
- * Tries to find the "best" alias url.
- * @param aliasList
- */
-export async function getPreferredPreviewURL(
-  client: Client,
-  aliasList: string[]
-) {
-  if (aliasList.length === 0) {
-    return null;
-  }
-
-  /**
-   * First checks for non public aliases and non wildcard domains.
-   */
-  const preferredAliases = aliasList.filter(
-    alias =>
-      !alias.endsWith('.now.sh') &&
-      !alias.endsWith('.vercel.app') &&
-      !isWildcardAlias(alias)
-  );
-  for (const alias of preferredAliases) {
-    const certs = await getCertsForCn(client, alias, { limit: 1 }).catch(() => {
-      return null;
-    });
-    if (certs && certs.length > 0) {
-      return { previewUrl: `https://${alias}`, isWildcard: false };
-    }
-  }
-
-  /**
-   * Fallback to first alias
-   */
-  const [firstAlias] = aliasList;
-  if (isWildcardAlias(firstAlias)) {
-    return { previewUrl: firstAlias, isWildcard: true };
-  }
-
-  if (firstAlias.endsWith('.vercel.app') || firstAlias.endsWith('.now.sh')) {
-    return { previewUrl: `https://${firstAlias}`, isWildcard: false };
-  }
-
-  return { previewUrl: `http://${firstAlias}`, isWildcard: false };
-}

packages/cli/src/util/deploy/print-deployment-status.ts

@@ -1,20 +1,20 @@
 import chalk from 'chalk';
 import type Client from '../client';
 import type { Deployment } from '@vercel-internals/types';
-import { getPreferredPreviewURL } from '../../util/deploy/get-preferred-preview-url';
+
 import { isDeploying } from '../../util/deploy/is-deploying';
 import linkStyle from '../output/link';
 import { prependEmoji, emoji } from '../../util/emoji';
 
+/**
+ * Prints (to `client.output`) warnings and errors, if any.
+ */
 export async function printDeploymentStatus(
   client: Client,
   {
     readyState,
-    alias: aliasList,
     aliasError,
-    target,
     indications,
-    url: deploymentUrl,
     aliasWarning,
   }: {
     readyState: Deployment['readyState'];
@@ -36,7 +36,6 @@ export async function printDeploymentStatus(
   const { output } = client;
 
   indications = indications || [];
-  const isProdDeployment = target === 'production';
 
   let isStillBuilding = false;
   if (noWait) {
@@ -64,30 +63,6 @@ export async function printDeploymentStatus(
         aliasError.message ? `: ${aliasError.message}` : ''
       }`
     );
-  } else {
-    // print preview/production url
-    let previewUrl: string;
-    // if `noWait` is true, then use the deployment url, not an alias
-    if (!noWait && Array.isArray(aliasList) && aliasList.length > 0) {
-      const previewUrlInfo = await getPreferredPreviewURL(client, aliasList);
-      if (previewUrlInfo) {
-        previewUrl = previewUrlInfo.previewUrl;
-      } else {
-        previewUrl = `https://${deploymentUrl}`;
-      }
-    } else {
-      // fallback to deployment url
-      previewUrl = `https://${deploymentUrl}`;
-    }
-
-    output.print(
-      prependEmoji(
-        `${isProdDeployment ? 'Production' : 'Preview'}: ${chalk.bold(
-          previewUrl
-        )} ${deployStamp()}`,
-        emoji('success')
-      ) + `\n`
-    );
   }
 
   if (aliasWarning?.message) {

packages/cli/src/util/deploy/process-deployment.ts

@@ -9,7 +9,7 @@ import {
 import { Output } from '../output';
 import { progress } from '../output/progress';
 import Now from '../../util';
-import type { Org } from '@vercel-internals/types';
+import type { Deployment, Org } from '@vercel-internals/types';
 import ua from '../ua';
 import { linkFolderToProject } from '../projects/link';
 import { prependEmoji, emoji } from '../emoji';
@@ -17,9 +17,13 @@ import type { Agent } from 'http';
 
 function printInspectUrl(
   output: Output,
-  inspectorUrl: string,
+  inspectorUrl: string | null | undefined,
   deployStamp: () => string
 ) {
+  if (!inspectorUrl) {
+    return;
+  }
+
   output.print(
     prependEmoji(
       `Inspect: ${chalk.bold(inspectorUrl)} ${deployStamp()}`,
@@ -162,33 +166,47 @@ export default async function processDeployment({
       }
 
       if (event.type === 'created') {
+        const deployment: Deployment = event.payload;
+
         await linkFolderToProject(
           client,
           cwd,
           {
             orgId: org.id,
-            projectId: event.payload.projectId,
+            projectId: deployment.projectId!,
           },
           projectName,
           org.slug
         );
 
-        now.url = event.payload.url;
+        now.url = deployment.url;
 
         output.stopSpinner();
 
-        printInspectUrl(output, event.payload.inspectorUrl, deployStamp);
+        printInspectUrl(output, deployment.inspectorUrl, deployStamp);
+
+        const isProdDeployment = requestBody.target === 'production';
+        const previewUrl = `https://${deployment.url}`;
+
+        output.print(
+          prependEmoji(
+            `${isProdDeployment ? 'Production' : 'Preview'}: ${chalk.bold(
+              previewUrl
+            )} ${deployStamp()}`,
+            emoji('success')
+          ) + `\n`
+        );
 
         if (quiet) {
           process.stdout.write(`https://${event.payload.url}`);
         }
 
         if (noWait) {
-          return event.payload;
+          return deployment;
         }
 
         output.spinner(
-          event.payload.readyState === 'QUEUED' ? 'Queued' : 'Building',
+          deployment.readyState === 'QUEUED' ? 'Queued' : 'Building',
           0
         );
       }
@@ -243,6 +261,7 @@ export default async function processDeployment({
 
       // Handle alias-assigned event
       if (event.type === 'alias-assigned') {
+        output.stopSpinner();
         event.payload.indications = indications;
         return event.payload;
       }

packages/cli/src/util/dev/server.ts

@@ -20,6 +20,7 @@ import isPortReachable from 'is-port-reachable';
 import deepEqual from 'fast-deep-equal';
 import npa from 'npm-package-arg';
 import type { ChildProcess } from 'child_process';
+import JSONparse from 'json-parse-better-errors';
 
 import { getVercelIgnore, fileNameSymbol } from '@vercel/client';
 import {
@@ -726,7 +727,7 @@ export default class DevServer {
 
     try {
       const raw = await fs.readFile(abs, 'utf8');
-      const parsed: WithFileNameSymbol<T> = JSON.parse(raw);
+      const parsed: WithFileNameSymbol<T> = JSONparse(raw);
       parsed[fileNameSymbol] = rel;
       return parsed;
     } catch (err: unknown) {

packages/cli/src/util/errors-ts.ts

@@ -59,7 +59,7 @@ export class TeamDeleted extends NowError<'TEAM_DELETED', {}> {
   constructor() {
     super({
       code: 'TEAM_DELETED',
-      message: `Your team was deleted. You can switch to a different one using ${getCommandName(
+      message: `Your team was deleted or you were removed from the team. You can switch to a different one using ${getCommandName(
         `switch`
       )}.`,
       meta: {},
@@ -668,13 +668,14 @@ export class CertMissing extends NowError<'ALIAS_IN_USE', { domain: string }> {
 
 export class CantParseJSONFile extends NowError<
   'CANT_PARSE_JSON_FILE',
-  { file: string }
+  { file: string; parseErrorLocation: string }
 > {
-  constructor(file: string) {
+  constructor(file: string, parseErrorLocation: string) {
+    const message = `Can't parse json file ${file}: ${parseErrorLocation}`;
     super({
       code: 'CANT_PARSE_JSON_FILE',
-      meta: { file },
-      message: `Can't parse json file`,
+      meta: { file, parseErrorLocation },
+      message,
     });
   }
 }

packages/cli/src/util/exit.ts

@@ -1,8 +0,0 @@
-export default (code?: number) =>
-  new Promise(() => {
-    // We give stdout some time to flush out
-    // because there's a node bug where
-    // stdout writes are asynchronous
-    // https://github.com/nodejs/node/issues/6456
-    setTimeout(() => process.exit(code || 0), 100);
-  });