Version Packages (#10289)

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@31.2.2

### Patch Changes

- Migrate list command to new structure
([#10284](https://github.com/vercel/vercel/pull/10284))

- Migrate whoami command to new structure
([#10266](https://github.com/vercel/vercel/pull/10266))

- Migrate logs command to new structure
([#10281](https://github.com/vercel/vercel/pull/10281))

- Migrate login command to new structure
([#10283](https://github.com/vercel/vercel/pull/10283))

- Migrate pull command to new structure
([#10280](https://github.com/vercel/vercel/pull/10280))

- Migrate logout command to new structure
([#10282](https://github.com/vercel/vercel/pull/10282))

- Migrate build command to new structure
([#10286](https://github.com/vercel/vercel/pull/10286))

- Migrate inspect command to new structure
([#10277](https://github.com/vercel/vercel/pull/10277))

- Migrate redeploy command to new structure
([#10279](https://github.com/vercel/vercel/pull/10279))

- Migrate link command to new structure
([#10285](https://github.com/vercel/vercel/pull/10285))

- Update spacing of --help output for CLI
([#10287](https://github.com/vercel/vercel/pull/10287))

- Updated dependencies
\[[`4af242af8`](4af242af86),
[`0cbdae141`](0cbdae1411),
[`85dd66778`](85dd667781)]:
    -   @vercel/node@2.15.8
    -   @vercel/remix-builder@1.9.1
    -   @vercel/static-build@1.3.44

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

### Patch Changes

- Updated dependencies
\[[`4af242af8`](4af242af86),
[`85dd66778`](85dd667781)]:
    -   @vercel/node@2.15.8

## @vercel/node@2.15.8

### Patch Changes

- Move `@types/content-type` to dev dependency
([#10292](https://github.com/vercel/vercel/pull/10292))

- fix: compress condition
([#10288](https://github.com/vercel/vercel/pull/10288))

## @vercel/remix-builder@1.9.1

### Patch Changes

- Disable root workspace check in pnpm and yarn when adding deps
([#10291](https://github.com/vercel/vercel/pull/10291))

## @vercel/static-build@1.3.44

### Patch Changes

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

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

.github/CODEOWNERS

@@ -2,11 +2,11 @@
 # https://help.github.com/en/articles/about-code-owners
 
 # Restricted Paths
-*                                        @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood
-/.github/workflows                       @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood @ijjk
-/packages/fs-detectors                   @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood @agadzik @chloetedder
-/packages/next                           @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood @ijjk
-/packages/routing-utils                  @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood @ijjk
+*                                        @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/routing-utils                  @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood @trek @ijjk
 /packages/edge                           @vercel/compute
 /examples                                @leerob
 /examples/create-react-app               @Timer
@@ -14,7 +14,7 @@
 /examples/hugo                           @styfle
 /examples/jekyll                         @styfle
 /examples/zola                           @styfle
-/packages/node                           @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood @Kikobeats
+/packages/node                           @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood @trek @Kikobeats
 
 # Unrestricted Paths
 .changeset/

examples/hydrogen/package.json

@@ -44,6 +44,5 @@
     "react-use": "^17.4.0",
     "title": "^3.4.4",
     "typographic-base": "^1.0.4"
-  },
-  "author": "nrajlich"
+  }
 }

examples/nuxtjs/README.md

@@ -45,4 +45,4 @@ Locally preview production build:
 npm run preview
 ```
 
-Checkout the [deployment documentation](https://v3.nuxtjs.org/guide/deploy/presets) for more information.
+Checkout the [deployment documentation](https://nuxt.com/docs/getting-started/deployment#presets) for more information.

package.json

@@ -32,7 +32,7 @@
     "source-map-support": "0.5.12",
     "ts-eager": "2.0.2",
     "ts-jest": "29.1.0",
-    "turbo": "1.10.9",
+    "turbo": "1.10.12",
     "typescript": "4.9.5"
   },
   "scripts": {

packages/cli/CHANGELOG.md

@@ -1,5 +1,67 @@
 # vercel
 
+## 31.2.2
+
+### Patch Changes
+
+- Migrate list command to new structure ([#10284](https://github.com/vercel/vercel/pull/10284))
+
+- Migrate whoami command to new structure ([#10266](https://github.com/vercel/vercel/pull/10266))
+
+- Migrate logs command to new structure ([#10281](https://github.com/vercel/vercel/pull/10281))
+
+- Migrate login command to new structure ([#10283](https://github.com/vercel/vercel/pull/10283))
+
+- Migrate pull command to new structure ([#10280](https://github.com/vercel/vercel/pull/10280))
+
+- Migrate logout command to new structure ([#10282](https://github.com/vercel/vercel/pull/10282))
+
+- Migrate build command to new structure ([#10286](https://github.com/vercel/vercel/pull/10286))
+
+- Migrate inspect command to new structure ([#10277](https://github.com/vercel/vercel/pull/10277))
+
+- Migrate redeploy command to new structure ([#10279](https://github.com/vercel/vercel/pull/10279))
+
+- Migrate link command to new structure ([#10285](https://github.com/vercel/vercel/pull/10285))
+
+- Update spacing of --help output for CLI ([#10287](https://github.com/vercel/vercel/pull/10287))
+
+- Updated dependencies [[`4af242af8`](https://github.com/vercel/vercel/commit/4af242af8633e58b6a9bf920564416da3ef22ad4), [`0cbdae141`](https://github.com/vercel/vercel/commit/0cbdae1411aa7936ff7dfe551919ca5e56cd6e98), [`85dd66778`](https://github.com/vercel/vercel/commit/85dd667781693539d753d587566e53964bbe189d)]:
+  - @vercel/node@2.15.8
+  - @vercel/remix-builder@1.9.1
+  - @vercel/static-build@1.3.44
+
+## 31.2.1
+
+### Patch Changes
+
+- Migrate bisect command to new structure ([#10276](https://github.com/vercel/vercel/pull/10276))
+
+- Migrate remove command to new structure ([#10268](https://github.com/vercel/vercel/pull/10268))
+
+- Updated dependencies [[`fc413707d`](https://github.com/vercel/vercel/commit/fc413707d017e234d5013b761d885f65f9b981bc)]:
+  - @vercel/node@2.15.7
+  - @vercel/static-build@1.3.43
+
+## 31.2.0
+
+### Minor Changes
+
+- Add a "Global Options" section to help output ([#10250](https://github.com/vercel/vercel/pull/10250))
+
+### Patch Changes
+
+- Updated dependencies [[`d1b0dbe3a`](https://github.com/vercel/vercel/commit/d1b0dbe3a7d8754286aa2b7ba0c8b55d3adafdea), [`4a8622a10`](https://github.com/vercel/vercel/commit/4a8622a10d52260cb629a1c4a6f797ade05ea154), [`6469ef1b8`](https://github.com/vercel/vercel/commit/6469ef1b8ce37e93f50ab4a108aa0953d7631fe8)]:
+  - @vercel/remix-builder@1.9.0
+  - @vercel/next@3.9.3
+
+## 31.1.1
+
+### Patch Changes
+
+- Updated dependencies [[`7c30b13cc`](https://github.com/vercel/vercel/commit/7c30b13ccb79bdf0ac240282bba4c084f1d0d122)]:
+  - @vercel/next@3.9.2
+
 ## 31.1.0
 
 ### Minor Changes

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vercel",
-  "version": "31.1.0",
+  "version": "31.2.2",
   "preferGlobal": true,
   "license": "Apache-2.0",
   "description": "The command-line interface for Vercel",
@@ -34,13 +34,13 @@
     "@vercel/build-utils": "6.8.2",
     "@vercel/go": "2.5.1",
     "@vercel/hydrogen": "0.0.64",
-    "@vercel/next": "3.9.1",
-    "@vercel/node": "2.15.6",
+    "@vercel/next": "3.9.3",
+    "@vercel/node": "2.15.8",
     "@vercel/python": "3.1.60",
     "@vercel/redwood": "1.1.15",
-    "@vercel/remix-builder": "1.8.18",
+    "@vercel/remix-builder": "1.9.1",
     "@vercel/ruby": "1.3.76",
-    "@vercel/static-build": "1.3.42"
+    "@vercel/static-build": "1.3.44"
   },
   "devDependencies": {
     "@alex_neo/jest-expect-message": "1.0.5",

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

@@ -0,0 +1,69 @@
+import { Command } from '../help';
+import { getPkgName } from '../../util/pkg-name';
+
+export const bisectCommand: Command = {
+  name: 'bisect',
+  description: 'Bisect the current project interactively.',
+  arguments: [],
+  options: [
+    {
+      name: 'bad',
+      description: 'Known bad URL',
+      argument: 'URL',
+      shorthand: 'b',
+      type: 'string',
+      deprecated: false,
+      multi: false,
+    },
+    {
+      name: 'good',
+      description: 'Known good URL',
+      argument: 'URL',
+      shorthand: 'g',
+      type: 'string',
+      deprecated: false,
+      multi: false,
+    },
+    {
+      name: 'open',
+      description: 'Automatically open each URL in the browser',
+      argument: 'URL',
+      shorthand: 'o',
+      type: 'string',
+      deprecated: false,
+      multi: false,
+    },
+    {
+      name: 'path',
+      description: 'Subpath of the deployment URL to test',
+      argument: 'URL',
+      shorthand: 'p',
+      type: 'string',
+      deprecated: false,
+      multi: false,
+    },
+    {
+      name: 'run',
+      description: 'Test script to run for each deployment',
+      argument: 'URL',
+      shorthand: 'r',
+      type: 'string',
+      deprecated: false,
+      multi: false,
+    },
+  ],
+  examples: [
+    {
+      name: 'Bisect the current project interactively',
+      value: `${getPkgName()} bisect`,
+    },
+    {
+      name: 'Bisect with a known bad deployment',
+      value: `${getPkgName()} bisect --bad example-310pce9i0.vercel.app`,
+    },
+    {
+      name: 'Automated bisect with a run script',
+      value: `${getPkgName()} bisect --run ./test.sh`,
+    },
+  ],
+};

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

@@ -8,53 +8,19 @@ import { URLSearchParams, parse } from 'url';
 import box from '../../util/output/box';
 import formatDate from '../../util/format-date';
 import link from '../../util/output/link';
-import logo from '../../util/output/logo';
 import getArgs from '../../util/get-args';
 import Client from '../../util/client';
-import { getPkgName } from '../../util/pkg-name';
 import { Deployment } from '@vercel-internals/types';
 import { normalizeURL } from '../../util/bisect/normalize-url';
 import getScope from '../../util/get-scope';
 import getDeployment from '../../util/get-deployment';
+import { help } from '../help';
+import { bisectCommand } from './command';
 
 interface Deployments {
   deployments: Deployment[];
 }
-
-const pkgName = getPkgName();
-
-const help = () => {
-  console.log(`
-  ${chalk.bold(`${logo} ${pkgName} bisect`)} [options]
-
-  ${chalk.dim('Options:')}
-
-    -h, --help                 Output usage information
-    -d, --debug                Debug mode [off]
-    --no-color                 No color mode [off]
-    -b, --bad                  Known bad URL
-    -g, --good                 Known good URL
-    -o, --open                 Automatically open each URL in the browser
-    -p, --path                 Subpath of the deployment URL to test
-    -r, --run                  Test script to run for each deployment
-
-  ${chalk.dim('Examples:')}
-
-  ${chalk.gray('–')} Bisect the current project interactively
-
-      ${chalk.cyan(`$ ${pkgName} bisect`)}
-
-  ${chalk.gray('–')} Bisect with a known bad deployment
-
-      ${chalk.cyan(`$ ${pkgName} bisect --bad example-310pce9i0.vercel.app`)}
-
-  ${chalk.gray('–')} Automated bisect with a run script
-
-      ${chalk.cyan(`$ ${pkgName} bisect --run ./test.sh`)}
-  `);
-};
-
-export default async function main(client: Client): Promise<number> {
+export default async function bisect(client: Client): Promise<number> {
   const { output } = client;
   const scope = await getScope(client);
   const { contextName } = scope;
@@ -73,7 +39,7 @@ export default async function main(client: Client): Promise<number> {
   });
 
   if (argv['--help']) {
-    help();
+    output.print(help(bisectCommand, { columns: client.stderr.columns }));
     return 2;
   }
 

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

@@ -0,0 +1,46 @@
+import { Command } from '../help';
+import { getPkgName } from '../../util/pkg-name';
+
+export const buildCommand: Command = {
+  name: 'build',
+  description: 'Build the project.',
+  arguments: [],
+  options: [
+    {
+      name: 'prod',
+      description: 'Build a production deployment',
+      shorthand: null,
+      type: 'string',
+      deprecated: false,
+      multi: false,
+    },
+    {
+      name: 'output',
+      description: 'Directory where built assets should be written to',
+      shorthand: null,
+      argument: 'PATH',
+      type: 'string',
+      deprecated: false,
+      multi: false,
+    },
+    {
+      name: 'yes',
+      description:
+        'Skip the confirmation prompt about pulling environment variables and project settings when not found locally',
+      shorthand: 'y',
+      type: 'boolean',
+      deprecated: false,
+      multi: false,
+    },
+  ],
+  examples: [
+    {
+      name: 'Build the project',
+      value: `${getPkgName()} build`,
+    },
+    {
+      name: 'Build the project in a specific directory',
+      value: `${getPkgName()} build --cwd ./path-to-project`,
+    },
+  ],
+};

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

@@ -38,35 +38,37 @@ import {
 import { fileNameSymbol } from '@vercel/client';
 import type { VercelConfig } from '@vercel/client';
 
-import pull from './pull';
-import { staticFiles as getFiles } from '../util/get-files';
-import Client from '../util/client';
-import getArgs from '../util/get-args';
-import cmd from '../util/output/cmd';
-import * as cli from '../util/pkg-name';
-import cliPkg from '../util/pkg';
-import readJSONFile from '../util/read-json-file';
-import { CantParseJSONFile } from '../util/errors-ts';
+import pull from '../pull';
+import { staticFiles as getFiles } from '../../util/get-files';
+import Client from '../../util/client';
+import getArgs from '../../util/get-args';
+import cmd from '../../util/output/cmd';
+import * as cli from '../../util/pkg-name';
+import cliPkg from '../../util/pkg';
+import readJSONFile from '../../util/read-json-file';
+import { CantParseJSONFile } from '../../util/errors-ts';
 import {
   pickOverrides,
   ProjectLinkAndSettings,
   readProjectSettings,
-} from '../util/projects/project-settings';
-import { getProjectLink, VERCEL_DIR } from '../util/projects/link';
-import confirm from '../util/input/confirm';
-import { emoji, prependEmoji } from '../util/emoji';
-import stamp from '../util/output/stamp';
+} from '../../util/projects/project-settings';
+import { getProjectLink, VERCEL_DIR } from '../../util/projects/link';
+import confirm from '../../util/input/confirm';
+import { emoji, prependEmoji } from '../../util/emoji';
+import stamp from '../../util/output/stamp';
 import {
   OUTPUT_DIR,
   PathOverride,
   writeBuildResult,
-} from '../util/build/write-build-result';
-import { importBuilders } from '../util/build/import-builders';
-import { initCorepack, cleanupCorepack } from '../util/build/corepack';
-import { sortBuilders } from '../util/build/sort-builders';
-import { toEnumerableError } from '../util/error';
-import { validateConfig } from '../util/validate-config';
-import { setMonorepoDefaultSettings } from '../util/build/monorepo';
+} from '../../util/build/write-build-result';
+import { importBuilders } from '../../util/build/import-builders';
+import { initCorepack, cleanupCorepack } from '../../util/build/corepack';
+import { sortBuilders } from '../../util/build/sort-builders';
+import { toEnumerableError } from '../../util/error';
+import { validateConfig } from '../../util/validate-config';
+import { setMonorepoDefaultSettings } from '../../util/build/monorepo';
+import { help } from '../help';
+import { buildCommand } from './command';
 
 type BuildResult = BuildResultV2 | BuildResultV3;
 
@@ -103,35 +105,6 @@ export interface BuildsManifest {
   builds?: SerializedBuilder[];
 }
 
-const help = () => {
-  return console.log(`
-   ${chalk.bold(`${cli.logo} ${cli.name} build`)}
-
-   ${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
-      --cwd [path]                   The current working directory
-      --output [path]                Directory where built assets should be written to
-      --prod                         Build a production deployment
-      -d, --debug                    Debug mode [off]
-      --no-color                     No color mode [off]
-      -y, --yes                      Skip the confirmation prompt about pulling environment variables and project settings when not found locally
-
-    ${chalk.dim('Examples:')}
-
-    ${chalk.gray('-')} Build the project
-
-      ${chalk.cyan(`$ ${cli.name} build`)}
-      ${chalk.cyan(`$ ${cli.name} build --cwd ./path-to-project`)}
-`);
-};
-
 export default async function main(client: Client): Promise<number> {
   let { cwd } = client;
   const { output } = client;
@@ -162,7 +135,7 @@ export default async function main(client: Client): Promise<number> {
   });
 
   if (argv['--help']) {
-    help();
+    output.print(help(buildCommand, { columns: client.stderr.columns }));
     return 2;
   }
 

packages/cli/src/commands/help.ts

@@ -30,6 +30,86 @@ export interface Command {
   examples: CommandExample[];
 }
 
+const globalCommandOptions: CommandOption[] = [
+  {
+    name: 'help',
+    shorthand: 'h',
+    type: 'string',
+    description: 'Output usage information',
+    deprecated: false,
+    multi: false,
+  },
+  {
+    name: 'version',
+    shorthand: 'v',
+    type: 'string',
+    description: 'Output the version number',
+    deprecated: false,
+    multi: false,
+  },
+  {
+    name: 'cwd',
+    shorthand: null,
+    type: 'string',
+    argument: 'DIR',
+    description:
+      'Sets the current working directory for a single run of a command',
+    deprecated: false,
+    multi: false,
+  },
+  {
+    name: 'local-config',
+    shorthand: 'A',
+    type: 'string',
+    argument: 'FILE',
+    description: 'Path to the local `vercel.json` file',
+    deprecated: false,
+    multi: false,
+  },
+  {
+    name: 'global-config',
+    shorthand: 'Q',
+    type: 'string',
+    argument: 'DIR',
+    description: 'Path to the global `.vercel` directory',
+    deprecated: false,
+    multi: false,
+  },
+  {
+    name: 'debug',
+    shorthand: 'd',
+    type: 'string',
+    description: 'Debug mode (default off)',
+    deprecated: false,
+    multi: false,
+  },
+  {
+    name: 'no-color',
+    shorthand: null,
+    type: 'string',
+    description: 'No color mode (default off)',
+    deprecated: false,
+    multi: false,
+  },
+  {
+    name: 'scope',
+    shorthand: 'S',
+    type: 'string',
+    description: 'Set a custom scope',
+    deprecated: false,
+    multi: false,
+  },
+  {
+    name: 'token',
+    shorthand: 't',
+    type: 'string',
+    argument: 'TOKEN',
+    description: 'Login token',
+    deprecated: false,
+    multi: false,
+  },
+];
+
 export function calcLineLength(line: string[]) {
   return stripAnsi(lineToString(line)).length;
 }
@@ -52,8 +132,8 @@ export function lineToString(line: string[]) {
   return string;
 }
 
-export function outputArrayToString(outputArray: string[]) {
-  return outputArray.join(NEWLINE);
+export function outputArrayToString(outputArray: (string | null)[]) {
+  return outputArray.filter(line => line !== null).join(NEWLINE);
 }
 
 /**
@@ -62,7 +142,12 @@ export function outputArrayToString(outputArray: string[]) {
  * @returns
  */
 export function buildCommandSynopsisLine(command: Command) {
-  const line: string[] = [LOGO, chalk.bold(NAME), chalk.bold(command.name)];
+  const line: string[] = [
+    INDENT,
+    LOGO,
+    chalk.bold(NAME),
+    chalk.bold(command.name),
+  ];
   if (command.arguments.length > 0) {
     for (const argument of command.arguments) {
       line.push(argument.required ? argument.name : `[${argument.name}]`);
@@ -71,32 +156,39 @@ export function buildCommandSynopsisLine(command: Command) {
   if (command.options.length > 0) {
     line.push('[options]');
   }
+
+  line.push(NEWLINE);
   return lineToString(line);
 }
 
 export function buildCommandOptionLines(
-  command: Command,
-  options: BuildHelpOutputOptions
+  commandOptions: CommandOption[],
+  options: BuildHelpOutputOptions,
+  sectionTitle: String
 ) {
   // Filter out deprecated and intentionally undocumented options
-  command.options = command.options.filter(
+  commandOptions = commandOptions.filter(
     option => !option.deprecated && option.description !== undefined
   );
 
+  if (commandOptions.length === 0) {
+    return null;
+  }
+
   // Initialize output array with header and empty line
-  const outputArray: string[] = [chalk.dim(`Options:`), ''];
+  const outputArray: string[] = [`${INDENT}${chalk.dim(sectionTitle)}:`, ''];
 
   // Start building option lines
   const optionLines: string[][] = [];
   // Sort command options alphabetically
-  command.options.sort((a, b) =>
+  commandOptions.sort((a, b) =>
     a.name < b.name ? -1 : a.name > b.name ? 1 : 0
   );
   // Keep track of longest "start" of an option line to determine description spacing
   let maxLineStartLength = 0;
   // Iterate over options and create the "start" of each option (e.g. `  -b, --build-env <key=value>`)
-  for (const option of command.options) {
-    const startLine: string[] = [INDENT];
+  for (const option of commandOptions) {
+    const startLine: string[] = [INDENT, INDENT, INDENT];
     if (option.shorthand) {
       startLine.push(`-${option.shorthand},`);
     }
@@ -135,7 +227,7 @@ export function buildCommandOptionLines(
    */
   for (let i = 0; i < optionLines.length; i++) {
     const optionLine = optionLines[i];
-    const option = command.options[i];
+    const option = commandOptions[i];
     // Add only 2 spaces to the longest line, and then make all shorter lines the same length.
     optionLine.push(
       ' '.repeat(2 + (maxLineStartLength - calcLineLength(optionLine)))
@@ -162,16 +254,13 @@ export function buildCommandOptionLines(
     for (const line of lines) {
       outputArray.push(lineToString(line));
     }
-    // add an empty line in between in each option block for readability (skip the last block)
-    if (i !== optionLines.length - 1) outputArray.push('');
   }
 
-  // return the entire list of options as a single string after delete the last '\n' added to the option list
-  return outputArrayToString(outputArray);
+  return `${outputArrayToString(outputArray)}${NEWLINE}`;
 }
 
 export function buildCommandExampleLines(command: Command) {
-  const outputArray: string[] = [chalk.dim(`Examples:`), ''];
+  const outputArray: string[] = [`${INDENT}${chalk.dim('Examples:')}`, ''];
   for (const example of command.examples) {
     const nameLine: string[] = [INDENT];
     nameLine.push(chalk.gray('-'));
@@ -190,12 +279,15 @@ export function buildCommandExampleLines(command: Command) {
     }
     outputArray.push('');
   }
-  // delete the last newline added after examples iteration
-  outputArray.splice(-1);
 
   return outputArrayToString(outputArray);
 }
 
+function buildDescriptionLine(command: Command) {
+  const line: string[] = [INDENT, command.description, NEWLINE];
+  return lineToString(line);
+}
+
 interface BuildHelpOutputOptions {
   columns: number;
 }
@@ -204,13 +296,12 @@ export function buildHelpOutput(
   command: Command,
   options: BuildHelpOutputOptions
 ) {
-  const outputArray: string[] = [
+  const outputArray: (string | null)[] = [
+    '',
     buildCommandSynopsisLine(command),
-    '',
-    command.description,
-    '',
-    buildCommandOptionLines(command, options),
-    '',
+    buildDescriptionLine(command),
+    buildCommandOptionLines(command.options, options, 'Options'),
+    buildCommandOptionLines(globalCommandOptions, options, 'Global Options'),
     buildCommandExampleLines(command),
     '',
   ];

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

@@ -0,0 +1,50 @@
+import { Command } from '../help';
+import { getPkgName } from '../../util/pkg-name';
+
+export const inspectCommand: Command = {
+  name: 'inspect',
+  description: 'Show information about a deployment.',
+  arguments: [
+    {
+      name: 'url',
+      required: true,
+    },
+  ],
+  options: [
+    {
+      name: 'timeout',
+      description: 'Time to wait for deployment completion [3m]',
+      argument: 'TIME',
+      shorthand: null,
+      type: 'string',
+      deprecated: false,
+      multi: false,
+    },
+    {
+      name: 'wait',
+      description: 'Blocks until deployment completes',
+      shorthand: null,
+      type: 'string',
+      deprecated: false,
+      multi: false,
+    },
+  ],
+  examples: [
+    {
+      name: 'Get information about a deployment by its unique URL',
+      value: `${getPkgName()} inspect my-deployment-ji2fjij2.vercel.app`,
+    },
+    {
+      name: 'Get information about the deployment an alias points to',
+      value: `${getPkgName()} inspect my-deployment.vercel.app`,
+    },
+    {
+      name: 'Get information about a deployment by piping in the URL',
+      value: `echo my-deployment.vercel.app | ${getPkgName()} inspect`,
+    },
+    {
+      name: 'Wait up to 90 seconds for deployment to complete',
+      value: `${getPkgName()} inspect my-deployment.vercel.app --wait --timeout 90s`,
+    },
+  ],
+};

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

@@ -1,71 +1,27 @@
 import chalk from 'chalk';
-import getArgs from '../util/get-args';
-import buildsList from '../util/output/builds';
-import routesList from '../util/output/routes';
-import indent from '../util/output/indent';
-import logo from '../util/output/logo';
-import elapsed from '../util/output/elapsed';
-import { handleError } from '../util/error';
-import getScope from '../util/get-scope';
-import { getPkgName, getCommandName } from '../util/pkg-name';
-import Client from '../util/client';
-import getDeployment from '../util/get-deployment';
+import getArgs from '../../util/get-args';
+import buildsList from '../../util/output/builds';
+import routesList from '../../util/output/routes';
+import indent from '../../util/output/indent';
+import elapsed from '../../util/output/elapsed';
+import { handleError } from '../../util/error';
+import getScope from '../../util/get-scope';
+import { getCommandName } from '../../util/pkg-name';
+import Client from '../../util/client';
+import getDeployment from '../../util/get-deployment';
 import type { Build, Deployment } from '@vercel-internals/types';
 import title from 'title';
 import { isErrnoException } from '@vercel/error-utils';
 import { URL } from 'url';
-import readStandardInput from '../util/input/read-standard-input';
-import sleep from '../util/sleep';
+import readStandardInput from '../../util/input/read-standard-input';
+import sleep from '../../util/sleep';
 import ms from 'ms';
-import { isDeploying } from '../util/deploy/is-deploying';
+import { isDeploying } from '../../util/deploy/is-deploying';
+import { help } from '../help';
+import { inspectCommand } from './command';
 
-const help = () => {
-  console.log(`
-  ${chalk.bold(`${logo} ${getPkgName()} inspect`)} <url>
-
-  ${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
-    -t ${chalk.bold.underline('TOKEN')}, --token=${chalk.bold.underline(
-    'TOKEN'
-  )}        Login token
-    -d, --debug                    Debug mode [off]
-    --no-color                     No color mode [off]
-    -S, --scope                    Set a custom scope
-    --timeout=${chalk.bold.underline(
-      'TIME'
-    )}                 Time to wait for deployment completion [3m]
-    --wait                         Blocks until deployment completes
-
-  ${chalk.dim('Examples:')}
-
-  ${chalk.gray('–')} Get information about a deployment by its unique URL
-
-    ${chalk.cyan(`$ ${getPkgName()} inspect my-deployment-ji2fjij2.vercel.app`)}
-
-  ${chalk.gray('-')} Get information about the deployment an alias points to
-
-    ${chalk.cyan(`$ ${getPkgName()} inspect my-deployment.vercel.app`)}
-
-  ${chalk.gray('-')} Get information about a deployment by piping in the URL
-
-    ${chalk.cyan(`$ echo my-deployment.vercel.app | ${getPkgName()} inspect`)}
-
-  ${chalk.gray('-')} Wait up to 90 seconds for deployment to complete
-
-    ${chalk.cyan(
-      `$ ${getPkgName()} inspect my-deployment.vercel.app --wait --timeout 90s`
-    )}
-  `);
-};
-
-export default async function main(client: Client) {
+export default async function inspect(client: Client) {
+  const { output } = client;
   let argv;
 
   try {
@@ -79,7 +35,7 @@ export default async function main(client: Client) {
   }
 
   if (argv['--help']) {
-    help();
+    output.print(help(inspectCommand, { columns: client.stderr.columns }));
     return 2;
   }
 
@@ -99,7 +55,7 @@ export default async function main(client: Client) {
 
   if (!deploymentIdOrHost) {
     error(`${getCommandName('inspect <url>')} expects exactly one argument`);
-    help();
+    output.print(help(inspectCommand, { columns: client.stderr.columns }));
     return 1;
   }
 

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

@@ -0,0 +1,54 @@
+import { Command } from '../help';
+import { getPkgName } from '../../util/pkg-name';
+
+export const linkCommand: Command = {
+  name: 'link',
+  description: 'Link a local directory to a Vercel Project.',
+  arguments: [],
+  options: [
+    {
+      name: 'repo',
+      description: 'Link multiple projects based on Git repository (alpha)',
+      shorthand: 'r',
+      type: 'string',
+      deprecated: false,
+      multi: false,
+    },
+    {
+      name: 'project',
+      description: 'Specify a project name',
+      shorthand: 'p',
+      argument: 'NAME',
+      type: 'string',
+      deprecated: false,
+      multi: false,
+    },
+    {
+      name: 'yes',
+      description:
+        'Skip questions when setting up new project using default scope and settings',
+      shorthand: 'y',
+      type: 'boolean',
+      deprecated: false,
+      multi: false,
+    },
+  ],
+  examples: [
+    {
+      name: 'Link current directory to a Vercel Project',
+      value: `${getPkgName()} link`,
+    },
+    {
+      name: 'Link current directory with default options and skip questions',
+      value: `${getPkgName()} link --yes`,
+    },
+    {
+      name: 'Link a specific directory to a Vercel Project',
+      value: `${getPkgName()} link --cwd /path/to/project`,
+    },
+    {
+      name: 'Link to the current Git repository, allowing for multiple Vercel Projects to be linked simultaneously (useful for monorepos)',
+      value: `${getPkgName()} link --repo`,
+    },
+  ],
+};

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

@@ -1,62 +1,12 @@
-import chalk from 'chalk';
 import Client from '../../util/client';
 import getArgs from '../../util/get-args';
-import logo from '../../util/output/logo';
 import cmd from '../../util/output/cmd';
-import { getPkgName } from '../../util/pkg-name';
 import { ensureLink } from '../../util/link/ensure-link';
 import { ensureRepoLink } from '../../util/link/repo';
+import { help } from '../help';
+import { linkCommand } from './command';
 
-const help = () => {
-  console.log(`
-  ${chalk.bold(`${logo} ${getPkgName()} link`)} [options]
-
-  ${chalk.dim('Options:')}
-
-    -h, --help                     Output usage information
-    -r, --repo                     Link multiple projects based on Git repository (alpha)
-    -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
-    -p ${chalk.bold.underline('NAME')}, --project=${chalk.bold.underline(
-    'NAME'
-  )}        Project name
-    -y, --yes                      Skip questions when setting up new project using default scope and settings
-
-  ${chalk.dim('Examples:')}
-
-  ${chalk.gray('–')} Link current directory to a Vercel Project
-
-      ${chalk.cyan(`$ ${getPkgName()} link`)}
-
-  ${chalk.gray(
-    '–'
-  )} Link current directory with default options and skip questions
-
-      ${chalk.cyan(`$ ${getPkgName()} link --yes`)}
-
-  ${chalk.gray('–')} Link a specific directory to a Vercel Project
-
-      ${chalk.cyan(`$ ${getPkgName()} link --cwd /path/to/project`)}
-
-  ${chalk.gray('–')} ${chalk.yellow(
-    '(alpha)'
-  )} Link to the current Git repository, allowing for multiple
-    Vercel Projects to be linked simultaneously (useful for monorepos)
-
-      ${chalk.cyan(`$ ${getPkgName()} link --repo`)}
-`);
-};
-
-export default async function main(client: Client) {
+export default async function link(client: Client) {
   const argv = getArgs(client.argv.slice(2), {
     '--yes': Boolean,
     '-y': '--yes',
@@ -71,7 +21,7 @@ export default async function main(client: Client) {
   });
 
   if (argv['--help']) {
-    help();
+    client.output.print(help(linkCommand, { columns: client.stderr.columns }));
     return 2;
   }
 

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

@@ -0,0 +1,61 @@
+import { Command } from '../help';
+import { getPkgName } from '../../util/pkg-name';
+
+export const listCommand: Command = {
+  name: 'list',
+  description: 'List app deployments for an app.',
+  arguments: [
+    {
+      name: 'app',
+      required: false,
+    },
+  ],
+  options: [
+    {
+      name: 'meta',
+      description:
+        'Filter deployments by metadata (e.g.: `-m KEY=value`). Can appear many times.',
+      argument: 'KEY=value',
+      shorthand: null,
+      type: 'string',
+      deprecated: false,
+      multi: true,
+    },
+    {
+      name: 'environment',
+      description: '',
+      argument: 'production|preview',
+      shorthand: null,
+      type: 'string',
+      deprecated: false,
+      multi: false,
+    },
+    {
+      name: 'next',
+      description: 'Show next page of results',
+      argument: 'MS',
+      shorthand: 'n',
+      type: 'string',
+      deprecated: false,
+      multi: false,
+    },
+  ],
+  examples: [
+    {
+      name: 'List all deployments for the currently linked project',
+      value: `${getPkgName()} list`,
+    },
+    {
+      name: 'List all deployments for the project `my-app` in the team of the currently linked project',
+      value: `${getPkgName()} list my-app`,
+    },
+    {
+      name: 'Filter deployments by metadata',
+      value: `${getPkgName()} list -m key1=value1 -m key2=value2`,
+    },
+    {
+      name: 'Paginate deployments for a project, where `1584722256178` is the time in milliseconds since the UNIX epoch',
+      value: `${getPkgName()} list my-app --next 1584722256178`,
+    },
+  ],
+};

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

@@ -2,78 +2,27 @@ import chalk from 'chalk';
 import ms from 'ms';
 import table from 'text-table';
 import title from 'title';
-import Now from '../util';
-import getArgs from '../util/get-args';
-import { handleError } from '../util/error';
-import logo from '../util/output/logo';
-import elapsed from '../util/output/elapsed';
-import strlen from '../util/strlen';
-import toHost from '../util/to-host';
-import parseMeta from '../util/parse-meta';
-import { isValidName } from '../util/is-valid-name';
-import getCommandFlags from '../util/get-command-flags';
-import { getPkgName, getCommandName } from '../util/pkg-name';
-import Client from '../util/client';
+import Now from '../../util';
+import getArgs from '../../util/get-args';
+import { handleError } from '../../util/error';
+import elapsed from '../../util/output/elapsed';
+import strlen from '../../util/strlen';
+import toHost from '../../util/to-host';
+import parseMeta from '../../util/parse-meta';
+import { isValidName } from '../../util/is-valid-name';
+import getCommandFlags from '../../util/get-command-flags';
+import { getCommandName } from '../../util/pkg-name';
+import Client from '../../util/client';
 import { Deployment } from '@vercel/client';
-import { getLinkedProject } from '../util/projects/link';
-import { ensureLink } from '../util/link/ensure-link';
-import getScope from '../util/get-scope';
-import { isAPIError } from '../util/errors-ts';
+import { getLinkedProject } from '../../util/projects/link';
+import { ensureLink } from '../../util/link/ensure-link';
+import getScope from '../../util/get-scope';
+import { isAPIError } from '../../util/errors-ts';
 import { isErrnoException } from '@vercel/error-utils';
+import { help } from '../help';
+import { listCommand } from './command';
 
-const help = () => {
-  console.log(`
-  ${chalk.bold(`${logo} ${getPkgName()} list`)} [app]
-
-  ${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]
-    -y, --yes                      Skip questions when setting up new project using default scope and settings
-    -t ${chalk.bold.underline('TOKEN')}, --token=${chalk.bold.underline(
-    'TOKEN'
-  )}        Login token
-    -S, --scope                    Set a custom scope
-    -m, --meta                     Filter deployments by metadata (e.g.: ${chalk.dim(
-      '`-m KEY=value`'
-    )}). Can appear many times.
-    --environment=${chalk.bold.underline(
-      'ENVIRONMENT'
-    )}      Filter by environment (production|preview)
-    -N, --next                     Show next page of results
-
-  ${chalk.dim('Examples:')}
-
-  ${chalk.gray('–')} List all deployments for the currently linked project
-
-    ${chalk.cyan(`$ ${getPkgName()} ls`)}
-
-  ${chalk.gray('–')} List all deployments for the project ${chalk.dim(
-    '`my-app`'
-  )} in the team of the currently linked project
-
-    ${chalk.cyan(`$ ${getPkgName()} ls my-app`)}
-
-  ${chalk.gray('–')} Filter deployments by metadata
-
-    ${chalk.cyan(`$ ${getPkgName()} ls -m key1=value1 -m key2=value2`)}
-
-  ${chalk.gray('–')} Paginate deployments for a project, where ${chalk.dim(
-    '`1584722256178`'
-  )} is the time in milliseconds since the UNIX epoch.
-
-    ${chalk.cyan(`$ ${getPkgName()} ls my-app --next 1584722256178`)}
-`);
-};
-
-export default async function main(client: Client) {
+export default async function list(client: Client) {
   let argv;
 
   try {
@@ -111,7 +60,7 @@ export default async function main(client: Client) {
   }
 
   if (argv['--help']) {
-    help();
+    output.print(help(listCommand, { columns: client.stderr.columns }));
     return 2;
   }
 

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

@@ -0,0 +1,49 @@
+import { Command } from '../help';
+import { getPkgName } from '../../util/pkg-name';
+
+export const loginCommand: Command = {
+  name: 'login',
+  description: 'Authenticate using your email or team id.',
+  arguments: [
+    {
+      name: 'email or team id',
+      required: false,
+    },
+  ],
+  options: [
+    {
+      name: 'github',
+      description: 'Log in with GitHub',
+      shorthand: null,
+      type: 'string',
+      deprecated: false,
+      multi: false,
+    },
+    {
+      name: 'oob',
+      description: 'Log in with "out of band" authentication',
+      shorthand: null,
+      type: 'string',
+      deprecated: false,
+      multi: false,
+    },
+  ],
+  examples: [
+    {
+      name: 'Log into the Vercel platform',
+      value: `${getPkgName()} login`,
+    },
+    {
+      name: 'Log in using a specific email address',
+      value: `${getPkgName()} login username@example.com`,
+    },
+    {
+      name: 'Log in using a specific team "slug" for SAML Single Sign-On',
+      value: `${getPkgName()} login acme`,
+    },
+    {
+      name: 'Log in using GitHub in "out-of-band" mode',
+      value: `${getPkgName()} login --github --oob`,
+    },
+  ],
+};

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

@@ -1,55 +1,24 @@
 import { validate as validateEmail } from 'email-validator';
 import chalk from 'chalk';
-import hp from '../util/humanize-path';
-import getArgs from '../util/get-args';
-import logo from '../util/output/logo';
-import prompt from '../util/login/prompt';
-import doSamlLogin from '../util/login/saml';
-import doEmailLogin from '../util/login/email';
-import doGithubLogin from '../util/login/github';
-import doGitlabLogin from '../util/login/gitlab';
-import doBitbucketLogin from '../util/login/bitbucket';
-import { prependEmoji, emoji } from '../util/emoji';
-import { getCommandName, getPkgName } from '../util/pkg-name';
-import getGlobalPathConfig from '../util/config/global-path';
-import { writeToAuthConfigFile, writeToConfigFile } from '../util/config/files';
-import Client from '../util/client';
-import { LoginResult } from '../util/login/types';
-
-const help = () => {
-  console.log(`
-  ${chalk.bold(`${logo} ${getPkgName()} login`)} <email or team>
-
-  ${chalk.dim('Options:')}
-
-    -h, --help                     Output usage information
-    --no-color                     No color mode [off]
-    -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
-
-  ${chalk.dim('Examples:')}
-
-  ${chalk.gray('–')} Log into the Vercel platform
-
-    ${chalk.cyan(`$ ${getPkgName()} login`)}
-
-  ${chalk.gray('–')} Log in using a specific email address
-
-    ${chalk.cyan(`$ ${getPkgName()} login john@doe.com`)}
-
-  ${chalk.gray('–')} Log in using a specific team "slug" for SAML Single Sign-On
-
-    ${chalk.cyan(`$ ${getPkgName()} login acme`)}
-
-  ${chalk.gray('–')} Log in using GitHub in "out-of-band" mode
-
-    ${chalk.cyan(`$ ${getPkgName()} login --github --oob`)}
-`);
-};
+import hp from '../../util/humanize-path';
+import getArgs from '../../util/get-args';
+import prompt from '../../util/login/prompt';
+import doSamlLogin from '../../util/login/saml';
+import doEmailLogin from '../../util/login/email';
+import doGithubLogin from '../../util/login/github';
+import doGitlabLogin from '../../util/login/gitlab';
+import doBitbucketLogin from '../../util/login/bitbucket';
+import { prependEmoji, emoji } from '../../util/emoji';
+import { getCommandName } from '../../util/pkg-name';
+import getGlobalPathConfig from '../../util/config/global-path';
+import {
+  writeToAuthConfigFile,
+  writeToConfigFile,
+} from '../../util/config/files';
+import Client from '../../util/client';
+import { LoginResult } from '../../util/login/types';
+import { help } from '../help';
+import { loginCommand } from './command';
 
 export default async function login(client: Client): Promise<number> {
   const { output } = client;
@@ -62,7 +31,7 @@ export default async function login(client: Client): Promise<number> {
   });
 
   if (argv['--help']) {
-    help();
+    output.print(help(loginCommand, { columns: client.stderr.columns }));
     return 2;
   }
 

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

@@ -0,0 +1,15 @@
+import { Command } from '../help';
+import { getPkgName } from '../../util/pkg-name';
+
+export const logoutCommand: Command = {
+  name: 'logout',
+  description: 'Logout the current authenticated user or team.',
+  arguments: [],
+  options: [],
+  examples: [
+    {
+      name: 'Logout from the CLI',
+      value: `${getPkgName()} logout`,
+    },
+  ],
+};

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

@@ -1,37 +1,19 @@
-import chalk from 'chalk';
-import logo from '../util/output/logo';
-import { handleError } from '../util/error';
-import { writeToConfigFile, writeToAuthConfigFile } from '../util/config/files';
-import getArgs from '../util/get-args';
-import Client from '../util/client';
-import { getCommandName, getPkgName } from '../util/pkg-name';
-import { isAPIError } from '../util/errors-ts';
+import { handleError } from '../../util/error';
+import {
+  writeToConfigFile,
+  writeToAuthConfigFile,
+} from '../../util/config/files';
+import getArgs from '../../util/get-args';
+import Client from '../../util/client';
+import { getCommandName } from '../../util/pkg-name';
+import { isAPIError } from '../../util/errors-ts';
 import { errorToString } from '@vercel/error-utils';
-
-const help = () => {
-  console.log(`
-  ${chalk.bold(`${logo} ${getPkgName()} logout`)}
-
-  ${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
-
-  ${chalk.dim('Examples:')}
-
-  ${chalk.gray('–')} Logout from the CLI:
-
-    ${chalk.cyan(`$ ${getPkgName()} logout`)}
-`);
-};
+import { help } from '../help';
+import { logoutCommand } from './command';
 
 export default async function main(client: Client): Promise<number> {
   let argv;
+  const { authConfig, config, output } = client;
 
   try {
     argv = getArgs(client.argv.slice(2), {
@@ -44,12 +26,10 @@ export default async function main(client: Client): Promise<number> {
   }
 
   if (argv['--help']) {
-    help();
+    output.print(help(logoutCommand, { columns: client.stderr.columns }));
     return 2;
   }
 
-  const { authConfig, config, output } = client;
-
   if (!authConfig.token) {
     output.note(
       `Not currently logged in, so ${getCommandName('logout')} did nothing`

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

@@ -0,0 +1,66 @@
+import { Command } from '../help';
+import { getPkgName } from '../../util/pkg-name';
+
+export const logsCommand: Command = {
+  name: 'logs',
+  description: 'Display logs for a specific deployment.',
+  arguments: [
+    {
+      name: 'url|deploymentId',
+      required: true,
+    },
+  ],
+  options: [
+    {
+      name: 'follow',
+      shorthand: 'f',
+      description: 'Wait for additional data [off]',
+      type: 'string',
+      deprecated: false,
+      multi: false,
+    },
+    {
+      name: 'limit',
+      shorthand: 'n',
+      description: 'Number of log entries [100]',
+      argument: 'NUMBER',
+      type: 'string',
+      deprecated: false,
+      multi: false,
+    },
+    {
+      name: 'since',
+      shorthand: null,
+      description: 'Only return logs after date (ISO 8601)',
+      argument: 'SINCE',
+      type: 'string',
+      deprecated: false,
+      multi: false,
+    },
+    {
+      name: 'until',
+      shorthand: null,
+      description:
+        'Only return logs before date (ISO 8601), ignored when used with --follow',
+      argument: 'UNTIL',
+      type: 'string',
+      deprecated: false,
+      multi: false,
+    },
+    {
+      name: 'output',
+      shorthand: 'o',
+      description: `Specify the output format (short|raw) [short]`,
+      argument: 'MODE',
+      type: 'string',
+      deprecated: false,
+      multi: false,
+    },
+  ],
+  examples: [
+    {
+      name: 'Print the logs for the deployment DEPLOYMENT_ID',
+      value: `${getPkgName()} logs DEPLOYMENT_ID`,
+    },
+  ],
+};

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

@@ -1,60 +1,15 @@
 import chalk from 'chalk';
-import logo from '../util/output/logo';
-import elapsed from '../util/output/elapsed';
-import { maybeURL, normalizeURL } from '../util/url';
-import printEvents, { DeploymentEvent } from '../util/events';
-import getScope from '../util/get-scope';
-import { getPkgName } from '../util/pkg-name';
-import getArgs from '../util/get-args';
-import Client from '../util/client';
-import getDeployment from '../util/get-deployment';
+import elapsed from '../../util/output/elapsed';
+import { maybeURL, normalizeURL } from '../../util/url';
+import printEvents, { DeploymentEvent } from '../../util/events';
+import getScope from '../../util/get-scope';
+import getArgs from '../../util/get-args';
+import Client from '../../util/client';
+import getDeployment from '../../util/get-deployment';
+import { help } from '../help';
+import { logsCommand } from './command';
 
-const help = () => {
-  console.log(`
-  ${chalk.bold(`${logo} ${getPkgName()} logs`)} <url|deploymentId>
-
-  ${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]
-    -f, --follow                   Wait for additional data [off]
-    -n ${chalk.bold.underline(
-      'NUMBER'
-    )}                      Number of logs [100]
-    -t ${chalk.bold.underline('TOKEN')}, --token=${chalk.bold.underline(
-    'TOKEN'
-  )}        Login token
-    --since=${chalk.bold.underline(
-      'SINCE'
-    )}                  Only return logs after date (ISO 8601)
-    --until=${chalk.bold.underline(
-      'UNTIL'
-    )}                  Only return logs before date (ISO 8601), ignored for ${'`-f`'}
-    -S, --scope                    Set a custom scope
-    -o ${chalk.bold.underline('MODE')}, --output=${chalk.bold.underline(
-    'MODE'
-  )}         Specify the output format (${Object.keys(logPrinters).join(
-    '|'
-  )}) [short]
-
-  ${chalk.dim('Examples:')}
-
-  ${chalk.gray('–')} Print the logs for the deployment ${chalk.dim(
-    '`deploymentId`'
-  )}
-
-    ${chalk.cyan(`$ ${getPkgName()} logs deploymentId`)}
-`);
-};
-
-export default async function main(client: Client) {
+export default async function logs(client: Client) {
   let head;
   let limit;
   let follow;
@@ -76,14 +31,13 @@ export default async function main(client: Client) {
 
   argv._ = argv._.slice(1);
   deploymentIdOrURL = argv._[0];
+  const { output } = client;
 
   if (argv['--help'] || !deploymentIdOrURL || deploymentIdOrURL === 'help') {
-    help();
+    output.print(help(logsCommand, { columns: client.stderr.columns }));
     return 2;
   }
 
-  const { output } = client;
-
   try {
     since = argv['--since'] ? toTimestamp(argv['--since']) : 0;
   } catch (err) {

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

@@ -0,0 +1,53 @@
+import { Command } from '../help';
+import { getPkgName } from '../../util/pkg-name';
+import { getEnvTargetPlaceholder } from '../../util/env/env-target';
+
+export const pullCommand: Command = {
+  name: 'pull',
+  description:
+    'Pull latest environment variables and project settings from Vercel. ',
+  arguments: [
+    {
+      name: 'project-path',
+      required: false,
+    },
+  ],
+  options: [
+    {
+      name: 'environment',
+      description: 'Deployment environment [development]',
+      argument: 'environment',
+      shorthand: null,
+      type: 'string',
+      deprecated: false,
+      multi: false,
+    },
+    {
+      name: 'yes',
+      description:
+        'Skip questions when setting up new project using default scope and settings',
+      shorthand: 'y',
+      type: 'string',
+      deprecated: false,
+      multi: false,
+    },
+  ],
+  examples: [
+    {
+      name: 'Pull the latest Environment Variables and Project Settings from the cloud',
+      value: `${getPkgName()} pull`,
+    },
+    {
+      name: 'Pull the latest Environment Variables and Project Settings from the cloud targeting a directory',
+      value: `${getPkgName()} pull ./path-to-project`,
+    },
+    {
+      name: 'Pull for a specific environment',
+      value: `${getPkgName()} pull --environment=${getEnvTargetPlaceholder()}`,
+    },
+    {
+      name: 'If you want to download environment variables to a specific file, use `vercel env pull` instead',
+      value: `${getPkgName()} env pull`,
+    },
+  ],
+};

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

@@ -1,66 +1,26 @@
 import chalk from 'chalk';
 import { join } from 'path';
-import Client from '../util/client';
+import Client from '../../util/client';
 import type {
   Project,
   ProjectEnvTarget,
   ProjectLinked,
 } from '@vercel-internals/types';
-import { emoji, prependEmoji } from '../util/emoji';
-import getArgs from '../util/get-args';
-import logo from '../util/output/logo';
-import stamp from '../util/output/stamp';
-import { getPkgName } from '../util/pkg-name';
-import { VERCEL_DIR, VERCEL_DIR_PROJECT } from '../util/projects/link';
-import { writeProjectSettings } from '../util/projects/project-settings';
-import envPull from './env/pull';
+import { emoji, prependEmoji } from '../../util/emoji';
+import getArgs from '../../util/get-args';
+import stamp from '../../util/output/stamp';
+import { VERCEL_DIR, VERCEL_DIR_PROJECT } from '../../util/projects/link';
+import { writeProjectSettings } from '../../util/projects/project-settings';
+import envPull from '../env/pull';
 import {
   isValidEnvTarget,
   getEnvTargetPlaceholder,
-} from '../util/env/env-target';
-import { ensureLink } from '../util/link/ensure-link';
-import humanizePath from '../util/humanize-path';
+} from '../../util/env/env-target';
+import { ensureLink } from '../../util/link/ensure-link';
+import humanizePath from '../../util/humanize-path';
 
-const help = () => {
-  return console.log(`
-  ${chalk.bold(`${logo} ${getPkgName()} pull`)} [project-path]
-
- ${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]
-    --git-branch                   Specify the Git branch to pull specific Environment Variables for
-    --no-color                     No color mode [off]
-    --environment [environment]    Deployment environment [development]
-    -y, --yes                      Skip questions when setting up new project using default scope and settings
-
-  ${chalk.dim('Examples:')}
-
-  ${chalk.gray(
-    '–'
-  )} Pull the latest Environment Variables and Project Settings from the cloud
-    and stores them in \`.vercel/.env.\${target}.local\` and \`.vercel/project.json\` respectively.
-
-    ${chalk.cyan(`$ ${getPkgName()} pull`)}
-    ${chalk.cyan(`$ ${getPkgName()} pull ./path-to-project`)}
-
-  ${chalk.gray('–')} Pull for a specific environment
-
-    ${chalk.cyan(
-      `$ ${getPkgName()} pull --environment=${getEnvTargetPlaceholder()}`
-    )}
-
-  ${chalk.gray(
-    'If you want to download environment variables to a specific file, use `vercel env pull` instead.'
-  )}
-`);
-};
+import { help } from '../help';
+import { pullCommand } from './command';
 
 function processArgs(client: Client) {
   return getArgs(client.argv.slice(2), {
@@ -77,7 +37,7 @@ function parseArgs(client: Client) {
   const argv = processArgs(client);
 
   if (argv['--help']) {
-    help();
+    client.output.print(help(pullCommand, { columns: client.stderr.columns }));
     return 2;
   }
 

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

@@ -0,0 +1,33 @@
+import { Command } from '../help';
+import { getPkgName } from '../../util/pkg-name';
+
+export const redeployCommand: Command = {
+  name: 'redeploy',
+  description: 'Rebuild and deploy a previous deployment.',
+  arguments: [
+    {
+      name: 'deploymentId|deploymentName',
+      required: false,
+    },
+  ],
+  options: [
+    {
+      name: 'no-wait',
+      shorthand: null,
+      description: "Don't wait for the redeploy to finish",
+      type: 'boolean',
+      deprecated: false,
+      multi: false,
+    },
+  ],
+  examples: [
+    {
+      name: 'Rebuild and deploy an existing deployment using id or url',
+      value: `${getPkgName()} redeploy my-deployment.vercel.app`,
+    },
+    {
+      name: 'Write Deployment URL to a file',
+      value: `${getPkgName()} redeploy my-deployment.vercel.app > deployment-url.txt`,
+    },
+  ],
+};

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

@@ -1,66 +1,29 @@
 import chalk from 'chalk';
 import { checkDeploymentStatus } from '@vercel/client';
-import type Client from '../util/client';
-import { emoji, prependEmoji } from '../util/emoji';
-import getArgs from '../util/get-args';
-import { getCommandName, getPkgName } from '../util/pkg-name';
-import { getDeploymentByIdOrURL } from '../util/deploy/get-deployment-by-id-or-url';
-import getScope from '../util/get-scope';
-import handleError from '../util/handle-error';
+import type Client from '../../util/client';
+import { emoji, prependEmoji } from '../../util/emoji';
+import getArgs from '../../util/get-args';
+import { getCommandName } from '../../util/pkg-name';
+import { getDeploymentByIdOrURL } from '../../util/deploy/get-deployment-by-id-or-url';
+import getScope from '../../util/get-scope';
+import handleError from '../../util/handle-error';
 import { isErrnoException } from '@vercel/error-utils';
-import logo from '../util/output/logo';
-import Now from '../util';
-import { printDeploymentStatus } from '../util/deploy/print-deployment-status';
-import stamp from '../util/output/stamp';
-import ua from '../util/ua';
+import Now from '../../util';
+import { printDeploymentStatus } from '../../util/deploy/print-deployment-status';
+import stamp from '../../util/output/stamp';
+import ua from '../../util/ua';
 import type { VercelClientOptions } from '@vercel/client';
-
-const help = () => {
-  console.log(`
-  ${chalk.bold(
-    `${logo} ${getPkgName()} redeploy`
-  )} [deploymentId|deploymentName]
-
-  Rebuild and deploy 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]
-    --no-wait                      Don't wait for the redeploy to finish
-    -t ${chalk.bold.underline('TOKEN')}, --token=${chalk.bold.underline(
-    'TOKEN'
-  )}        Login token
-    -y, --yes                      Skip questions when setting up new project using default scope and settings
-
-  ${chalk.dim('Examples:')}
-
-  ${chalk.gray('–')} Rebuild and deploy an existing deployment using id or url
-
-    ${chalk.cyan(`$ ${getPkgName()} redeploy my-deployment.vercel.app`)}
-
-  ${chalk.gray('–')} Write Deployment URL to a file
-
-    ${chalk.cyan(
-      `$ ${getPkgName()} redeploy my-deployment.vercel.app > deployment-url.txt`
-    )}
-`);
-};
+import { help } from '../help';
+import { redeployCommand } from './command';
 
 /**
  * `vc redeploy` command
  * @param {Client} client
  * @returns {Promise<number>} Resolves an exit code; 0 on success
  */
-export default async (client: Client): Promise<number> => {
+export default async function redeploy(client: Client): Promise<number> {
   let argv;
+  const { output } = client;
   try {
     argv = getArgs(client.argv.slice(2), {
       '--no-wait': Boolean,
@@ -73,11 +36,10 @@ export default async (client: Client): Promise<number> => {
   }
 
   if (argv['--help'] || argv._[0] === 'help') {
-    help();
+    output.print(help(redeployCommand, { columns: client.stderr.columns }));
     return 2;
   }
 
-  const { output } = client;
   const deployIdOrUrl = argv._[1];
   if (!deployIdOrUrl) {
     output.error(
@@ -201,4 +163,4 @@ export default async (client: Client): Promise<number> => {
     }
     return 1;
   }
-};
+}

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

@@ -0,0 +1,45 @@
+import { Command } from '../help';
+import { getPkgName } from '../../util/pkg-name';
+
+export const removeCommand: Command = {
+  name: 'remove',
+  description: 'Remove a deployment by name or id.',
+  arguments: [
+    {
+      name: '...deploymentId|deploymentName',
+      required: true,
+    },
+  ],
+  options: [
+    {
+      name: 'yes',
+      shorthand: 'y',
+      type: 'boolean',
+      deprecated: false,
+      description: 'Skip confirmation',
+      multi: false,
+    },
+    {
+      name: 'safe',
+      shorthand: 's',
+      type: 'boolean',
+      deprecated: false,
+      description: 'Skip deployments with an active alias',
+      multi: false,
+    },
+  ],
+  examples: [
+    {
+      name: 'Remove a deployment identified by `deploymentId`',
+      value: `${getPkgName()} remove my-app`,
+    },
+    {
+      name: 'Remove all deployments with name `my-app`',
+      value: `${getPkgName()} remove deploymentId`,
+    },
+    {
+      name: 'Remove two deployments with IDs `eyWt6zuSdeus` and `uWHoA9RQ1d1o`',
+      value: `${getPkgName()} remove eyWt6zuSdeus uWHoA9RQ1d1o`,
+    },
+  ],
+};

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

@@ -2,74 +2,31 @@ import chalk from 'chalk';
 import ms from 'ms';
 import plural from 'pluralize';
 import table from 'text-table';
-import Now from '../util';
-import getAliases from '../util/alias/get-aliases';
-import logo from '../util/output/logo';
-import elapsed from '../util/output/elapsed';
-import { normalizeURL } from '../util/url';
-import getScope from '../util/get-scope';
-import { isValidName } from '../util/is-valid-name';
-import removeProject from '../util/projects/remove-project';
-import getProjectByIdOrName from '../util/projects/get-project-by-id-or-name';
-import getDeployment from '../util/get-deployment';
-import getDeploymentsByProjectId from '../util/deploy/get-deployments-by-project-id';
-import { getPkgName, getCommandName } from '../util/pkg-name';
-import getArgs from '../util/get-args';
-import handleError from '../util/handle-error';
-import type Client from '../util/client';
-import { Output } from '../util/output';
+import Now from '../../util';
+import getAliases from '../../util/alias/get-aliases';
+import elapsed from '../../util/output/elapsed';
+import { normalizeURL } from '../../util/url';
+import getScope from '../../util/get-scope';
+import { isValidName } from '../../util/is-valid-name';
+import removeProject from '../../util/projects/remove-project';
+import getProjectByIdOrName from '../../util/projects/get-project-by-id-or-name';
+import getDeployment from '../../util/get-deployment';
+import getDeploymentsByProjectId from '../../util/deploy/get-deployments-by-project-id';
+import { getCommandName } from '../../util/pkg-name';
+import getArgs from '../../util/get-args';
+import handleError from '../../util/handle-error';
+import type Client from '../../util/client';
+import { Output } from '../../util/output';
 import { Alias, Deployment, Project } from '@vercel-internals/types';
-import { NowError } from '../util/now-error';
+import { NowError } from '../../util/now-error';
+import { help } from '../help';
+import { removeCommand } from './command';
 
 type DeploymentWithAliases = Deployment & {
   aliases: Alias[];
 };
 
-const help = () => {
-  console.log(`
-  ${chalk.bold(
-    `${logo} ${getPkgName()} remove`
-  )} [...deploymentId|deploymentName]
-
-  ${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
-    -y, --yes                      Skip confirmation
-    -s, --safe                     Skip deployments with an active alias
-    -S, --scope                    Set a custom scope
-
-  ${chalk.dim('Examples:')}
-
-  ${chalk.gray('–')} Remove a deployment identified by ${chalk.dim(
-    '`deploymentId`'
-  )}
-
-    ${chalk.cyan(`$ ${getPkgName()} rm deploymentId`)}
-
-  ${chalk.gray('–')} Remove all deployments with name ${chalk.dim('`my-app`')}
-
-    ${chalk.cyan(`$ ${getPkgName()} rm my-app`)}
-
-  ${chalk.gray('–')} Remove two deployments with IDs ${chalk.dim(
-    '`eyWt6zuSdeus`'
-  )} and ${chalk.dim('`uWHoA9RQ1d1o`')}
-
-    ${chalk.cyan(`$ ${getPkgName()} rm eyWt6zuSdeus uWHoA9RQ1d1o`)}
-`);
-};
-
-export default async function main(client: Client) {
+export default async function remove(client: Client) {
   let argv;
 
   try {
@@ -98,13 +55,13 @@ export default async function main(client: Client) {
   const { success, error, log } = output;
 
   if (argv['--help'] || ids[0] === 'help') {
-    help();
+    output.print(help(removeCommand, { columns: client.stderr.columns }));
     return 2;
   }
 
   if (ids.length < 1) {
     error(`${getCommandName('rm')} expects at least one argument`);
-    help();
+    output.print(help(removeCommand, { columns: client.stderr.columns }));
     return 1;
   }
 

packages/cli/src/commands/whoami.ts

@@ -1,56 +0,0 @@
-import chalk from 'chalk';
-import logo from '../util/output/logo';
-import getScope from '../util/get-scope';
-import { getPkgName } from '../util/pkg-name';
-import getArgs from '../util/get-args';
-import Client from '../util/client';
-
-const help = () => {
-  console.log(`
-  ${chalk.bold(`${logo} ${getPkgName()} whoami`)}
-
-  ${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
-
-  ${chalk.dim('Examples:')}
-
-  ${chalk.gray('–')} Shows the username of the currently logged in user
-
-    ${chalk.cyan(`$ ${getPkgName()} whoami`)}
-`);
-};
-
-export default async (client: Client): Promise<number> => {
-  const { output } = client;
-  const argv = getArgs(client.argv.slice(2), {});
-  argv._ = argv._.slice(1);
-
-  if (argv['--help'] || argv._[0] === 'help') {
-    help();
-    return 2;
-  }
-
-  const { contextName } = await getScope(client, { getTeam: false });
-
-  if (client.stdout.isTTY) {
-    output.log(contextName);
-  } else {
-    // If stdout is not a TTY, then only print the username
-    // to support piping the output to another file / exe
-    client.stdout.write(`${contextName}\n`);
-  }
-
-  return 0;
-};

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

@@ -0,0 +1,15 @@
+import { Command } from '../help';
+import { getPkgName } from '../../util/pkg-name';
+
+export const whoamiCommand: Command = {
+  name: 'whoami',
+  description: 'Shows the username of the currently logged in user.',
+  arguments: [],
+  options: [],
+  examples: [
+    {
+      name: 'Shows the username of the currently logged in user',
+      value: `${getPkgName()} whoami`,
+    },
+  ],
+};

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

@@ -0,0 +1,29 @@
+import { help } from '../help';
+import { whoamiCommand } from './command';
+
+import getScope from '../../util/get-scope';
+import getArgs from '../../util/get-args';
+import Client from '../../util/client';
+
+export default async function whoami(client: Client): Promise<number> {
+  const { output } = client;
+  const argv = getArgs(client.argv.slice(2), {});
+  argv._ = argv._.slice(1);
+
+  if (argv['--help'] || argv._[0] === 'help') {
+    output.print(help(whoamiCommand, { columns: client.stderr.columns }));
+    return 2;
+  }
+
+  const { contextName } = await getScope(client, { getTeam: false });
+
+  if (client.stdout.isTTY) {
+    output.log(contextName);
+  } else {
+    // If stdout is not a TTY, then only print the username
+    // to support piping the output to another file / exe
+    client.stdout.write(`${contextName}\n`);
+  }
+
+  return 0;
+}

packages/cli/test/dev/fixtures/43-compress-encoding/api/index.js

@@ -0,0 +1,9 @@
+const { createGzip } = require('zlib');
+
+module.exports = (_req, resp) => {
+  resp.setHeader('content-encoding', 'gzip');
+
+  const gzip = createGzip();
+  gzip.pipe(resp);
+  gzip.end('Hello World!');
+};

packages/cli/test/dev/integration-4.test.ts

@@ -143,6 +143,13 @@ test(
   })
 );
 
+test(
+  '[vercel dev] 43-compress-encoding',
+  testFixtureStdio('43-compress-encoding', async (testPath: any) => {
+    await testPath(200, '/api', 'Hello World!');
+  })
+);
+
 test(
   '[vercel dev] Middleware that returns a 200 response',
   testFixtureStdio('middleware-response', async (testPath: any) => {

packages/cli/test/unit/commands/__snapshots__/help.test.ts.snap

@@ -1,106 +1,164 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`help command help output snapshots column width 40 1`] = `
-"▲ vercel deploy [project-path] [options]
+"
+  ▲ vercel deploy [project-path] [options]
 
-Deploy your project to Vercel. The \`deploy\` command is the default command for the Vercel CLI, and can be omitted (\`vc deploy my-app\` equals \`vc my-app\`).
+  Deploy your project to Vercel. The \`deploy\` command is the default command for the Vercel CLI, and can be omitted (\`vc deploy my-app\` equals \`vc my-app\`).
 
-Options:
+  Options:
 
-  --archive                    Compress
-                               the
-                               deployment
-                               code into
-                               a file
-                               before
-                               uploading
-                               it
+      --archive                    
+                                   Compress
+                                   the
+                                   deployment
+                                   code
+                                   into
+                                   a
+                                   file
+                                   before
+                                   uploading
+                                   it
+      -b, --build-env <key=value>  
+                                   Specify
+                                   environment
+                                   variables
+                                   during
+                                   build-time
+                                   (e.g.
+                                   \`-b
+                                   KEY1=value1
+                                   -b
+                                   KEY2=value2\`)
+      -e, --env <key=value>        
+                                   Specify
+                                   environment
+                                   variables
+                                   during
+                                   run-time
+                                   (e.g.
+                                   \`-e
+                                   KEY1=value1
+                                   -e
+                                   KEY2=value2\`)
+      -f, --force                  
+                                   Force
+                                   a new
+                                   deployment
+                                   even
+                                   if
+                                   nothing
+                                   has
+                                   changed
+      -m, --meta <key=value>       
+                                   Specify
+                                   metadata
+                                   for
+                                   the
+                                   deployment
+                                   (e.g.
+                                   \`-m
+                                   KEY1=value1
+                                   -m
+                                   KEY2=value2\`)
+      --no-wait                    
+                                   Don't
+                                   wait
+                                   for
+                                   the
+                                   deployment
+                                   to
+                                   finish
+      --prebuilt                   Use
+                                   in
+                                   combination
+                                   with
+                                   \`vc
+                                   build\`.
+                                   Deploy
+                                   an
+                                   existing
+                                   build
+      --prod                       
+                                   Create
+                                   a
+                                   production
+                                   deployment
+      -p, --public                 
+                                   Deployment
+                                   is
+                                   public
+                                   (\`/_src\`)
+                                   is
+                                   exposed)
+      --regions                    Set
+                                   default
+                                   regions
+                                   to
+                                   enable
+                                   the
+                                   deployment
+                                   on
+      --with-cache                 
+                                   Retain
+                                   build
+                                   cache
+                                   when
+                                   using
+                                   "--force"
+      -y, --yes                    Use
+                                   default
+                                   options
+                                   to
+                                   skip
+                                   all
+                                   prompts
 
-  -b, --build-env <key=value>  Specify
-                               environment
-                               variables
-                               during
-                               build-time
-                               (e.g. \`-b
-                               KEY1=value1
-                               -b
-                               KEY2=value2\`)
+  Global Options:
 
-  -e, --env <key=value>        Specify
-                               environment
-                               variables
-                               during
-                               run-time
-                               (e.g. \`-e
-                               KEY1=value1
-                               -e
-                               KEY2=value2\`)
+      --cwd <DIR>                Sets
+                                 the
+                                 current
+                                 working
+                                 directory
+                                 for a
+                                 single
+                                 run of
+                                 a
+                                 command
+      -d, --debug                Debug
+                                 mode
+                                 (default
+                                 off)
+      -Q, --global-config <DIR>  Path to
+                                 the
+                                 global
+                                 \`.vercel\`
+                                 directory
+      -h, --help                 Output
+                                 usage
+                                 information
+      -A, --local-config <FILE>  Path to
+                                 the
+                                 local
+                                 \`vercel.json\`
+                                 file
+      --no-color                 No
+                                 color
+                                 mode
+                                 (default
+                                 off)
+      -S, --scope                Set a
+                                 custom
+                                 scope
+      -t, --token <TOKEN>        Login
+                                 token
+      -v, --version              Output
+                                 the
+                                 version
+                                 number
 
-  -f, --force                  Force a
-                               new
-                               deployment
-                               even if
-                               nothing
-                               has
-                               changed
-
-  -m, --meta <key=value>       Specify
-                               metadata
-                               for the
-                               deployment
-                               (e.g. \`-m
-                               KEY1=value1
-                               -m
-                               KEY2=value2\`)
-
-  --no-wait                    Don't
-                               wait for
-                               the
-                               deployment
-                               to finish
-
-  --prebuilt                   Use in
-                               combination
-                               with \`vc
-                               build\`.
-                               Deploy an
-                               existing
-                               build
-
-  --prod                       Create a
-                               production
-                               deployment
-
-  -p, --public                 
-                               Deployment
-                               is public
-                               (\`/_src\`)
-                               is
-                               exposed)
-
-  --regions                    Set
-                               default
-                               regions
-                               to enable
-                               the
-                               deployment
-                               on
-
-  --with-cache                 Retain
-                               build
-                               cache
-                               when
-                               using
-                               "--force"
-
-  -y, --yes                    Use
-                               default
-                               options
-                               to skip
-                               all
-                               prompts
-
-Examples:
+  Examples:
 
   - Deploy the current directory
 
@@ -122,47 +180,53 @@ Deploy your project to Vercel. The \`deploy\` command is the default command for
   - Write Deployment URL to a file
 
     $ vercel > deployment-url.txt
+
 "
 `;
 
 exports[`help command help output snapshots column width 80 1`] = `
-"▲ vercel deploy [project-path] [options]
+"
+  ▲ vercel deploy [project-path] [options]
 
-Deploy your project to Vercel. The \`deploy\` command is the default command for the Vercel CLI, and can be omitted (\`vc deploy my-app\` equals \`vc my-app\`).
+  Deploy your project to Vercel. The \`deploy\` command is the default command for the Vercel CLI, and can be omitted (\`vc deploy my-app\` equals \`vc my-app\`).
 
-Options:
+  Options:
 
-  --archive                    Compress the deployment code into a file before
-                               uploading it
+      --archive                    Compress the deployment code into a file
+                                   before uploading it
+      -b, --build-env <key=value>  Specify environment variables during
+                                   build-time (e.g. \`-b KEY1=value1 -b
+                                   KEY2=value2\`)
+      -e, --env <key=value>        Specify environment variables during run-time
+                                   (e.g. \`-e KEY1=value1 -e KEY2=value2\`)
+      -f, --force                  Force a new deployment even if nothing has
+                                   changed
+      -m, --meta <key=value>       Specify metadata for the deployment (e.g. \`-m
+                                   KEY1=value1 -m KEY2=value2\`)
+      --no-wait                    Don't wait for the deployment to finish
+      --prebuilt                   Use in combination with \`vc build\`. Deploy an
+                                   existing build
+      --prod                       Create a production deployment
+      -p, --public                 Deployment is public (\`/_src\`) is exposed)
+      --regions                    Set default regions to enable the deployment
+                                   on
+      --with-cache                 Retain build cache when using "--force"
+      -y, --yes                    Use default options to skip all prompts
 
-  -b, --build-env <key=value>  Specify environment variables during build-time
-                               (e.g. \`-b KEY1=value1 -b KEY2=value2\`)
+  Global Options:
 
-  -e, --env <key=value>        Specify environment variables during run-time
-                               (e.g. \`-e KEY1=value1 -e KEY2=value2\`)
+      --cwd <DIR>                Sets the current working directory for a single
+                                 run of a command
+      -d, --debug                Debug mode (default off)
+      -Q, --global-config <DIR>  Path to the global \`.vercel\` directory
+      -h, --help                 Output usage information
+      -A, --local-config <FILE>  Path to the local \`vercel.json\` file
+      --no-color                 No color mode (default off)
+      -S, --scope                Set a custom scope
+      -t, --token <TOKEN>        Login token
+      -v, --version              Output the version number
 
-  -f, --force                  Force a new deployment even if nothing has
-                               changed
-
-  -m, --meta <key=value>       Specify metadata for the deployment (e.g. \`-m
-                               KEY1=value1 -m KEY2=value2\`)
-
-  --no-wait                    Don't wait for the deployment to finish
-
-  --prebuilt                   Use in combination with \`vc build\`. Deploy an
-                               existing build
-
-  --prod                       Create a production deployment
-
-  -p, --public                 Deployment is public (\`/_src\`) is exposed)
-
-  --regions                    Set default regions to enable the deployment on
-
-  --with-cache                 Retain build cache when using "--force"
-
-  -y, --yes                    Use default options to skip all prompts
-
-Examples:
+  Examples:
 
   - Deploy the current directory
 
@@ -184,41 +248,45 @@ Deploy your project to Vercel. The \`deploy\` command is the default command for
   - Write Deployment URL to a file
 
     $ vercel > deployment-url.txt
+
 "
 `;
 
 exports[`help command help output snapshots column width 120 1`] = `
-"▲ vercel deploy [project-path] [options]
+"
+  ▲ vercel deploy [project-path] [options]
 
-Deploy your project to Vercel. The \`deploy\` command is the default command for the Vercel CLI, and can be omitted (\`vc deploy my-app\` equals \`vc my-app\`).
+  Deploy your project to Vercel. The \`deploy\` command is the default command for the Vercel CLI, and can be omitted (\`vc deploy my-app\` equals \`vc my-app\`).
 
-Options:
+  Options:
 
-  --archive                    Compress the deployment code into a file before uploading it
+      --archive                    Compress the deployment code into a file before uploading it
+      -b, --build-env <key=value>  Specify environment variables during build-time (e.g. \`-b KEY1=value1 -b
+                                   KEY2=value2\`)
+      -e, --env <key=value>        Specify environment variables during run-time (e.g. \`-e KEY1=value1 -e KEY2=value2\`)
+      -f, --force                  Force a new deployment even if nothing has changed
+      -m, --meta <key=value>       Specify metadata for the deployment (e.g. \`-m KEY1=value1 -m KEY2=value2\`)
+      --no-wait                    Don't wait for the deployment to finish
+      --prebuilt                   Use in combination with \`vc build\`. Deploy an existing build
+      --prod                       Create a production deployment
+      -p, --public                 Deployment is public (\`/_src\`) is exposed)
+      --regions                    Set default regions to enable the deployment on
+      --with-cache                 Retain build cache when using "--force"
+      -y, --yes                    Use default options to skip all prompts
 
-  -b, --build-env <key=value>  Specify environment variables during build-time (e.g. \`-b KEY1=value1 -b KEY2=value2\`)
+  Global Options:
 
-  -e, --env <key=value>        Specify environment variables during run-time (e.g. \`-e KEY1=value1 -e KEY2=value2\`)
+      --cwd <DIR>                Sets the current working directory for a single run of a command
+      -d, --debug                Debug mode (default off)
+      -Q, --global-config <DIR>  Path to the global \`.vercel\` directory
+      -h, --help                 Output usage information
+      -A, --local-config <FILE>  Path to the local \`vercel.json\` file
+      --no-color                 No color mode (default off)
+      -S, --scope                Set a custom scope
+      -t, --token <TOKEN>        Login token
+      -v, --version              Output the version number
 
-  -f, --force                  Force a new deployment even if nothing has changed
-
-  -m, --meta <key=value>       Specify metadata for the deployment (e.g. \`-m KEY1=value1 -m KEY2=value2\`)
-
-  --no-wait                    Don't wait for the deployment to finish
-
-  --prebuilt                   Use in combination with \`vc build\`. Deploy an existing build
-
-  --prod                       Create a production deployment
-
-  -p, --public                 Deployment is public (\`/_src\`) is exposed)
-
-  --regions                    Set default regions to enable the deployment on
-
-  --with-cache                 Retain build cache when using "--force"
-
-  -y, --yes                    Use default options to skip all prompts
-
-Examples:
+  Examples:
 
   - Deploy the current directory
 
@@ -240,5 +308,6 @@ Deploy your project to Vercel. The \`deploy\` command is the default command for
   - Write Deployment URL to a file
 
     $ vercel > deployment-url.txt
+
 "
 `;

packages/gatsby-plugin-vercel-builder/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @vercel/gatsby-plugin-vercel-builder
 
+## 1.3.16
+
+### Patch Changes
+
+- Updated dependencies [[`4af242af8`](https://github.com/vercel/vercel/commit/4af242af8633e58b6a9bf920564416da3ef22ad4), [`85dd66778`](https://github.com/vercel/vercel/commit/85dd667781693539d753d587566e53964bbe189d)]:
+  - @vercel/node@2.15.8
+
+## 1.3.15
+
+### Patch Changes
+
+- Updated dependencies [[`fc413707d`](https://github.com/vercel/vercel/commit/fc413707d017e234d5013b761d885f65f9b981bc)]:
+  - @vercel/node@2.15.7
+
 ## 1.3.14
 
 ### Patch Changes

packages/gatsby-plugin-vercel-builder/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/gatsby-plugin-vercel-builder",
-  "version": "1.3.14",
+  "version": "1.3.16",
   "main": "dist/index.js",
   "files": [
     "dist",
@@ -21,7 +21,7 @@
   "dependencies": {
     "@sinclair/typebox": "0.25.24",
     "@vercel/build-utils": "6.8.2",
-    "@vercel/node": "2.15.6",
+    "@vercel/node": "2.15.8",
     "@vercel/routing-utils": "2.2.1",
     "esbuild": "0.14.47",
     "etag": "1.8.1",

packages/next/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @vercel/next
 
+## 3.9.3
+
+### Patch Changes
+
+- fix dynamic not found pages ([#10262](https://github.com/vercel/vercel/pull/10262))
+
+## 3.9.2
+
+### Patch Changes
+
+- Fix pages/404 gsp + i18n case ([#10258](https://github.com/vercel/vercel/pull/10258))
+
 ## 3.9.1
 
 ### Patch Changes

packages/next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "3.9.1",
+  "version": "3.9.3",
   "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",

packages/next/src/index.ts

@@ -1139,8 +1139,9 @@ export const build: BuildV2 = async ({
     const canUsePreviewMode = Object.keys(pages).some(page =>
       isApiPage(pages[page].fsPath)
     );
-    staticPages = await filterStaticPages(
-      await glob('**/*.html', pagesDir),
+    const originalStaticPages = await glob('**/*.html', pagesDir);
+    staticPages = filterStaticPages(
+      originalStaticPages,
       dynamicPages,
       entryDirectory,
       htmlContentType,
@@ -1316,6 +1317,17 @@ export const build: BuildV2 = async ({
         );
       }
 
+      const localePrefixed404 = !!(
+        routesManifest.i18n &&
+        originalStaticPages[
+          path.posix.join(
+            entryDirectory,
+            routesManifest.i18n.defaultLocale,
+            '404.html'
+          )
+        ]
+      );
+
       return serverBuild({
         config,
         functionsConfigManifest,
@@ -1325,6 +1337,7 @@ export const build: BuildV2 = async ({
         dynamicPages,
         canUsePreviewMode,
         staticPages,
+        localePrefixed404,
         lambdaPages: pages,
         lambdaAppPaths,
         omittedPrerenderRoutes,
@@ -2679,6 +2692,7 @@ async function getServerlessPages(params: {
       ? Promise.all([
           glob('**/page.js', path.join(params.pagesDir, '../app')),
           glob('**/route.js', path.join(params.pagesDir, '../app')),
+          glob('**/_not-found.js', path.join(params.pagesDir, '../app')),
         ]).then(items => Object.assign(...items))
       : Promise.resolve({}),
     getMiddlewareManifest(params.entryPath, params.outputDirectory),

packages/next/src/server-build.ts

@@ -91,6 +91,7 @@ export async function serverBuild({
   routesManifest,
   staticPages,
   lambdaPages,
+  localePrefixed404,
   nextVersion,
   lambdaAppPaths,
   canUsePreviewMode,
@@ -112,6 +113,7 @@ export async function serverBuild({
   baseDir: string;
   canUsePreviewMode: boolean;
   omittedPrerenderRoutes: Set<string>;
+  localePrefixed404: boolean;
   staticPages: { [key: string]: FileFsRef };
   lambdaAppPaths: { [key: string]: FileFsRef };
   lambdaPages: { [key: string]: FileFsRef };
@@ -207,7 +209,6 @@ export async function serverBuild({
 
   const { i18n } = routesManifest;
   const hasPages404 = routesManifest.pages404;
-  let localePrefixed404 = false;
 
   let static404Page =
     staticPages[path.posix.join(entryDirectory, '404')] && hasPages404
@@ -216,17 +217,12 @@ export async function serverBuild({
       ? path.posix.join(entryDirectory, '_errors/404')
       : undefined;
 
-  if (!static404Page && i18n) {
-    if (
-      staticPages[path.posix.join(entryDirectory, i18n.defaultLocale, '404')]
-    ) {
-      localePrefixed404 = true;
-      static404Page = path.posix.join(
-        entryDirectory,
-        i18n.defaultLocale,
-        '404'
-      );
-    }
+  if (
+    !static404Page &&
+    i18n &&
+    staticPages[path.posix.join(entryDirectory, i18n.defaultLocale, '404')]
+  ) {
+    static404Page = path.posix.join(entryDirectory, i18n.defaultLocale, '404');
   }
 
   if (!hasStatic500 && i18n) {

packages/next/test/fixtures/00-app-dir-base-path/vercel.json

@@ -42,14 +42,14 @@
       "status": 200,
       "mustContain": "hello from /ssg",
       "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
       }
     },
     {
       "path": "/hello/world/ssg",
       "status": 200,
       "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
       },
       "headers": {
         "RSC": "1"
@@ -82,14 +82,14 @@
       "status": 200,
       "mustContain": "hello from app/dashboard/deployments/[id]/settings",
       "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
       }
     },
     {
       "path": "/hello/world/dashboard/deployments/123/settings",
       "status": 200,
       "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
       },
       "headers": {
         "RSC": "1"
@@ -102,14 +102,14 @@
       "status": 200,
       "mustContain": "catchall",
       "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
       }
     },
     {
       "path": "/hello/world/dashboard/deployments/catchall/something",
       "status": 200,
       "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
       },
       "headers": {
         "RSC": "1"
@@ -122,7 +122,7 @@
       "status": 200,
       "mustContain": "hello from app/dashboard",
       "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
       }
     },
     {
@@ -142,7 +142,7 @@
       },
       "responseHeaders": {
         "content-type": "text/x-component",
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
       }
     },
     {

packages/next/test/fixtures/00-app-dir-dynamic-404/app/layout.js

@@ -0,0 +1,10 @@
+export default function Layout({ children }) {
+  return (
+    <html>
+      <head>
+        <title>Hello World</title>
+      </head>
+      <body>{children}</body>
+    </html>
+  )
+}

packages/next/test/fixtures/00-app-dir-dynamic-404/app/not-found.js

@@ -0,0 +1,13 @@
+import { cookies } from 'next/headers';
+
+export default function Page() {
+  cookies(); // dynamic
+
+  return (
+    <>
+      <h1>This Is The Not Found Page</h1>
+
+      <div id="timestamp">{Date.now()}</div>
+    </>
+  )
+}

packages/next/test/fixtures/00-app-dir-dynamic-404/app/page.js

@@ -0,0 +1,3 @@
+export default function Page() {
+  return <h1>My page TEST</h1>
+}

packages/next/test/fixtures/00-app-dir-dynamic-404/index.test.js

@@ -0,0 +1,12 @@
+/* eslint-env jest */
+const path = require('path');
+const { deployAndTest } = require('../../utils');
+
+const ctx = {};
+
+describe(`${__dirname.split(path.sep).pop()}`, () => {
+  it('should deploy and pass probe checks', async () => {
+    const info = await deployAndTest(__dirname);
+    Object.assign(ctx, info);
+  });
+});

packages/next/test/fixtures/00-app-dir-dynamic-404/next.config.js

@@ -0,0 +1 @@
+module.exports = {};

packages/next/test/fixtures/00-app-dir-dynamic-404/package.json

@@ -0,0 +1,11 @@
+{
+  "dependencies": {
+    "next": "canary",
+    "react": "experimental",
+    "react-dom": "experimental"
+  },
+  "ignoreNextjsUpdates": true,
+  "scripts": {
+    "vercel-build": "next build"
+  }
+}

packages/next/test/fixtures/00-app-dir-dynamic-404/probes.json

@@ -0,0 +1,12 @@
+{ "probes": [
+  {
+    "path": "/",
+    "status": 200,
+    "mustContain": "My page"
+  },
+  {
+    "path": "/not-found-page",
+    "status": 404,
+    "mustContain": "This Is The Not Found Page"
+  }
+]}

packages/next/test/fixtures/00-app-dir-dynamic-404/vercel.json

@@ -0,0 +1,8 @@
+{
+  "builds": [
+    {
+      "src": "package.json",
+      "use": "@vercel/next"
+    }
+  ]
+}

packages/next/test/fixtures/00-app-dir-middleware/vercel.json

@@ -22,7 +22,7 @@
         "redirect": "manual"
       },
       "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
       },
       "headers": {
         "RSC": "1"
@@ -46,7 +46,7 @@
         "redirect": "manual"
       },
       "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
       },
       "headers": {
         "RSC": "1"
@@ -70,7 +70,7 @@
         "redirect": "manual"
       },
       "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
       },
       "headers": {
         "RSC": "1"

packages/next/test/fixtures/00-app-dir-static/vercel.json

@@ -11,7 +11,7 @@
       "status": 200,
       "mustContain": "hello from app/dashboard",
       "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
       }
     },
     {
@@ -31,7 +31,7 @@
       },
       "responseHeaders": {
         "content-type": "text/x-component",
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
       }
     },
     {

packages/next/test/fixtures/00-app-dir-trailing-slash/vercel.json

@@ -23,14 +23,14 @@
       "status": 200,
       "mustContain": "hello from /ssg",
       "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
       }
     },
     {
       "path": "/ssg/",
       "status": 200,
       "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
       },
       "headers": {
         "RSC": "1"
@@ -63,14 +63,14 @@
       "status": 200,
       "mustContain": "hello from app/dashboard/deployments/[id]/settings",
       "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
       }
     },
     {
       "path": "/dashboard/deployments/123/settings/",
       "status": 200,
       "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
       },
       "headers": {
         "RSC": "1"
@@ -83,14 +83,14 @@
       "status": 200,
       "mustContain": "catchall",
       "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
       }
     },
     {
       "path": "/dashboard/deployments/catchall/something/",
       "status": 200,
       "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
       },
       "headers": {
         "RSC": "1"
@@ -103,7 +103,7 @@
       "status": 200,
       "mustContain": "hello from app/dashboard",
       "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
       }
     },
     {
@@ -123,7 +123,7 @@
       },
       "responseHeaders": {
         "content-type": "text/x-component",
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
       }
     },
     {

packages/next/test/fixtures/00-app-dir/vercel.json

@@ -42,14 +42,14 @@
       "status": 200,
       "mustContain": "hello from /ssg",
       "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
       }
     },
     {
       "path": "/ssg",
       "status": 200,
       "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
       },
       "headers": {
         "RSC": "1"
@@ -82,14 +82,14 @@
       "status": 200,
       "mustContain": "hello from app/dashboard/deployments/[id]/settings",
       "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
       }
     },
     {
       "path": "/dashboard/deployments/123/settings",
       "status": 200,
       "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
       },
       "headers": {
         "RSC": "1"
@@ -102,14 +102,14 @@
       "status": 200,
       "mustContain": "catchall",
       "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
       }
     },
     {
       "path": "/dashboard/deployments/catchall/something",
       "status": 200,
       "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
       },
       "headers": {
         "RSC": "1"
@@ -122,7 +122,7 @@
       "status": 200,
       "mustContain": "hello from app/dashboard",
       "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
       }
     },
     {
@@ -142,7 +142,7 @@
       },
       "responseHeaders": {
         "content-type": "text/x-component",
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
       }
     },
     {

packages/next/test/fixtures/00-i18n-404-revalidate/pages/blog/[slug].js

@@ -0,0 +1,38 @@
+import { useRouter } from "next/router"
+
+export default function Page(props) {
+  const router = useRouter()
+  
+  return (
+    <>
+      <p>/blog/[slug]</p>
+      <p>{JSON.stringify(router.query)}</p>
+      <p>{JSON.stringify(props)}</p>
+    </>
+  )
+}
+
+export function getStaticProps({ params }) {
+  if (params.slug === 'second') {
+    return {
+      notFound: true
+    }
+  }
+  
+  return {
+    props: {
+      now: Date.now(),
+      params
+    }
+  }
+}
+
+export function getStaticPaths() {
+  return {
+    paths: [
+      { params: { slug: 'first' } },
+      { params: { slug: 'second' } },
+    ],
+    fallback: 'blocking'
+  }
+}

packages/next/test/fixtures/01-app-dir-static/vercel.json

@@ -11,7 +11,7 @@
       "status": 200,
       "mustContain": "about",
       "responseHeaders": {
-        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch"
+        "vary": "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Url"
       }
     },
     {

packages/node/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @vercel/node
 
+## 2.15.8
+
+### Patch Changes
+
+- Move `@types/content-type` to dev dependency ([#10292](https://github.com/vercel/vercel/pull/10292))
+
+- fix: compress condition ([#10288](https://github.com/vercel/vercel/pull/10288))
+
+## 2.15.7
+
+### Patch Changes
+
+- fix: move content-type as dependency ([#10274](https://github.com/vercel/vercel/pull/10274))
+
 ## 2.15.6
 
 ### Patch Changes

packages/node/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/node",
-  "version": "2.15.6",
+  "version": "2.15.8",
   "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/node-js",
@@ -28,6 +28,7 @@
     "@vercel/error-utils": "1.0.10",
     "@vercel/static-config": "2.0.17",
     "async-listen": "3.0.0",
+    "content-type": "1.0.5",
     "edge-runtime": "2.4.3",
     "esbuild": "0.14.47",
     "exit-hook": "2.2.1",
@@ -42,14 +43,13 @@
     "@babel/plugin-transform-modules-commonjs": "7.5.0",
     "@tootallnate/once": "1.1.2",
     "@types/aws-lambda": "8.10.19",
-    "@types/content-type": "1.1.3",
+    "@types/content-type": "1.1.5",
     "@types/cookie": "0.3.3",
     "@types/etag": "1.8.0",
     "@types/jest": "29.5.0",
     "@types/test-listen": "1.1.0",
     "@vercel/ncc": "0.24.0",
     "@vercel/nft": "0.22.5",
-    "content-type": "1.0.4",
     "cookie": "0.4.0",
     "cross-env": "7.0.3",
     "etag": "1.8.1",

packages/node/src/serverless-functions/serverless-handler.mts

@@ -107,7 +107,7 @@ export async function createServerlessEventHandler(
     // @ts-expect-error
     const response = await fetch(url, {
       body: await serializeBody(request),
-      compress: isStreaming,
+      compress: !isStreaming,
       headers: {
         ...request.headers,
         host: request.headers['x-forwarded-host'],

packages/remix/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @vercel/remix-builder
 
+## 1.9.1
+
+### Patch Changes
+
+- Disable root workspace check in pnpm and yarn when adding deps ([#10291](https://github.com/vercel/vercel/pull/10291))
+
+## 1.9.0
+
+### Minor Changes
+
+- Install `@vercel/remix-run-dev` at build-time instead of using symlink ([#9784](https://github.com/vercel/vercel/pull/9784))
+
+### Patch Changes
+
+- Update `@remix-run/dev` fork to v1.19.1 ([#10246](https://github.com/vercel/vercel/pull/10246))
+
 ## 1.8.18
 
 ### Patch Changes

packages/remix/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/remix-builder",
-  "version": "1.8.18",
+  "version": "1.9.1",
   "license": "Apache-2.0",
   "main": "./dist/index.js",
   "homepage": "https://vercel.com/docs",
@@ -20,7 +20,6 @@
     "defaults"
   ],
   "dependencies": {
-    "@remix-run/dev": "npm:@vercel/remix-run-dev@1.18.1",
     "@vercel/build-utils": "6.8.2",
     "@vercel/nft": "0.22.5",
     "@vercel/static-config": "2.0.17",
@@ -29,6 +28,7 @@
     "ts-morph": "12.0.0"
   },
   "devDependencies": {
+    "@remix-run/dev": "npm:@vercel/remix-run-dev@1.19.1",
     "@types/jest": "27.5.1",
     "@types/node": "14.18.33",
     "@types/semver": "7.3.13"

packages/remix/src/build.ts

@@ -1,5 +1,5 @@
 import { Project } from 'ts-morph';
-import { promises as fs } from 'fs';
+import { readFileSync, promises as fs } from 'fs';
 import { basename, dirname, extname, join, relative, sep } from 'path';
 import {
   debug,
@@ -26,7 +26,6 @@ import type {
   PackageJson,
   BuildResultV2Typical,
 } from '@vercel/build-utils';
-import type { AppConfig } from '@remix-run/dev/dist/config';
 import type { ConfigRoute } from '@remix-run/dev/dist/config/routes';
 import type { BaseFunctionConfig } from '@vercel/static-config';
 import {
@@ -41,16 +40,22 @@ import {
   ResolvedEdgeRouteConfig,
   findEntry,
   chdirAndReadConfig,
-  addDependency,
+  addDependencies,
+  resolveSemverMinMax,
   ensureResolvable,
+  isESM,
 } from './utils';
-import semver from 'semver';
 
-const _require: typeof require = eval('require');
+interface ServerBundle {
+  serverBuildPath: string;
+  routes: string[];
+}
 
-const REMIX_RUN_DEV_PATH = dirname(
-  _require.resolve('@remix-run/dev/package.json')
+const remixBuilderPkg = JSON.parse(
+  readFileSync(join(__dirname, '../package.json'), 'utf8')
 );
+const remixRunDevForkVersion =
+  remixBuilderPkg.devDependencies['@remix-run/dev'];
 
 const DEFAULTS_PATH = join(__dirname, '../defaults');
 
@@ -63,8 +68,17 @@ const nodeServerSrcPromise = fs.readFile(
   'utf-8'
 );
 
-// This value is the minimum supported version for our fork of Remix
-const minimumSupportRemixVersion = '1.10.0';
+// Minimum supported version of the `@vercel/remix` package
+const VERCEL_REMIX_MIN_VERSION = '1.10.0';
+
+// Minimum supported version of the `@vercel/remix-run-dev` forked compiler
+const REMIX_RUN_DEV_MIN_VERSION = '1.15.0';
+
+// Maximum version of `@vercel/remix-run-dev` fork
+// (and also `@vercel/remix` since they get published at the same time)
+const REMIX_RUN_DEV_MAX_VERSION = remixRunDevForkVersion.slice(
+  remixRunDevForkVersion.lastIndexOf('@') + 1
+);
 
 export const build: BuildV2 = async ({
   entrypoint,
@@ -133,18 +147,32 @@ export const build: BuildV2 = async ({
     repoRootPath,
     '@remix-run/dev'
   );
-
-  const remixVersion = JSON.parse(
-    await fs.readFile(join(remixRunDevPath, 'package.json'), 'utf8')
-  ).version;
+  const remixRunDevPkg = JSON.parse(
+    readFileSync(join(remixRunDevPath, 'package.json'), 'utf8')
+  );
+  const remixVersion = remixRunDevPkg.version;
 
   const remixConfig = await chdirAndReadConfig(
+    remixRunDevPath,
     entrypointFsDirname,
     packageJsonPath
   );
   const { serverEntryPoint, appDirectory } = remixConfig;
   const remixRoutes = Object.values(remixConfig.routes);
 
+  const depsToAdd: string[] = [];
+
+  if (remixRunDevPkg.name !== '@vercel/remix-run-dev') {
+    const remixDevForkVersion = resolveSemverMinMax(
+      REMIX_RUN_DEV_MIN_VERSION,
+      REMIX_RUN_DEV_MAX_VERSION,
+      remixVersion
+    );
+    depsToAdd.push(
+      `@remix-run/dev@npm:@vercel/remix-run-dev@${remixDevForkVersion}`
+    );
+  }
+
   // `app/entry.server.tsx` and `app/entry.client.tsx` are optional in Remix,
   // so if either of those files are missing then add our own versions.
   const userEntryServerFile = findEntry(appDirectory, 'entry.server');
@@ -155,44 +183,27 @@ export const build: BuildV2 = async ({
     );
     if (!pkg.dependencies['@vercel/remix']) {
       // Dependency version resolution logic
-      // 1. Users app is on 1.9.0 -> we install the 1.10.0 (minimum) version of our fork (`@vercel/remix`)
-      // 2. Users app is on 1.11.0 (a version greater than 1.10.0 and less than the latest version of the fork) -> we install the (matching) 1.11.0 version of `@vercel/remix`
-      // 3. Users app is on something greater than our latest version of the fork -> we install the latest version of our fork
-
-      // remixVersion is the version of the `@remix-run/dev` package in the *users' app*
-      const usersRemixVersion = semver.gt(
-        remixVersion,
-        minimumSupportRemixVersion
-      )
-        ? remixVersion
-        : minimumSupportRemixVersion;
-
-      // Prevent frozen lockfile rejections
-      const envForAddDep = { ...spawnOpts.env };
-      delete envForAddDep.CI;
-      delete envForAddDep.VERCEL;
-      delete envForAddDep.NOW_BUILDER;
-      await addDependency(
-        cliType,
-        [
-          `@vercel/remix@${
-            semver.gt(
-              usersRemixVersion,
-              require('@remix-run/dev/package.json').version
-            )
-              ? 'latest'
-              : usersRemixVersion
-          }`,
-        ],
-        {
-          ...spawnOpts,
-          env: envForAddDep,
-          cwd: entrypointFsDirname,
-        }
+      // 1. Users app is on 1.9.0 -> we install the 1.10.0 (minimum) version of `@vercel/remix`.
+      // 2. Users app is on 1.11.0 (a version greater than 1.10.0 and less than the known max
+      //    published version) -> we install the (matching) 1.11.0 version of `@vercel/remix`.
+      // 3. Users app is on something greater than our latest version of the fork -> we install
+      //    the latest known published version of `@vercel/remix`.
+      const vercelRemixVersion = resolveSemverMinMax(
+        VERCEL_REMIX_MIN_VERSION,
+        REMIX_RUN_DEV_MAX_VERSION,
+        remixVersion
       );
+      depsToAdd.push(`@vercel/remix@${vercelRemixVersion}`);
     }
   }
 
+  if (depsToAdd.length) {
+    await addDependencies(cliType, depsToAdd, {
+      ...spawnOpts,
+      cwd: entrypointFsDirname,
+    });
+  }
+
   const userEntryClientFile = findEntry(
     remixConfig.appDirectory,
     'entry.client'
@@ -210,12 +221,8 @@ export const build: BuildV2 = async ({
     ? `${remixConfigPath}.original${extname(remixConfigPath)}`
     : undefined;
 
-  const backupRemixRunDevPath = `${remixRunDevPath}.__vercel_backup`;
-  await fs.rename(remixRunDevPath, backupRemixRunDevPath);
-  await fs.symlink(REMIX_RUN_DEV_PATH, remixRunDevPath);
-
   // These get populated inside the try/catch below
-  let serverBundles: AppConfig['serverBundles'];
+  let serverBundles: ServerBundle[];
   const serverBundlesMap = new Map<string, ConfigRoute[]>();
   const resolvedConfigsMap = new Map<ConfigRoute, ResolvedRouteConfig>();
 
@@ -273,16 +280,9 @@ export const build: BuildV2 = async ({
     if (remixConfigPath && renamedRemixConfigPath) {
       await fs.rename(remixConfigPath, renamedRemixConfigPath);
 
-      // Figure out if the `remix.config` file is using ESM syntax
-      let isESM = false;
-      try {
-        _require(renamedRemixConfigPath);
-      } catch (err: any) {
-        isESM = err.code === 'ERR_REQUIRE_ESM';
-      }
-
       let patchedConfig: string;
-      if (isESM) {
+      // Figure out if the `remix.config` file is using ESM syntax
+      if (isESM(renamedRemixConfigPath)) {
         patchedConfig = `import config from './${basename(
           renamedRemixConfigPath
         )}';
@@ -340,10 +340,6 @@ module.exports = config;`;
     if (remixConfigWrapped && remixConfigPath && renamedRemixConfigPath) {
       await fs.rename(renamedRemixConfigPath, remixConfigPath);
     }
-
-    // Remove `@remix-run/dev` symlink
-    await fs.unlink(remixRunDevPath);
-    await fs.rename(backupRemixRunDevPath, remixRunDevPath);
   }
 
   // This needs to happen before we run NFT to create the Node/Edge functions

packages/remix/src/prepare-cache.ts

@@ -1,6 +1,6 @@
 import { glob } from '@vercel/build-utils';
 import { dirname, join, relative } from 'path';
-import { chdirAndReadConfig } from './utils';
+import { _require, chdirAndReadConfig } from './utils';
 import type { PrepareCache } from '@vercel/build-utils';
 
 export const prepareCache: PrepareCache = async ({
@@ -12,7 +12,13 @@ export const prepareCache: PrepareCache = async ({
   const mountpoint = dirname(entrypoint);
   const entrypointFsDirname = join(workPath, mountpoint);
   const packageJsonPath = join(entrypointFsDirname, 'package.json');
+  const remixRunDevPath = dirname(
+    _require.resolve('@remix-run/dev/package.json', {
+      paths: [entrypointFsDirname],
+    })
+  );
   const remixConfig = await chdirAndReadConfig(
+    remixRunDevPath,
     entrypointFsDirname,
     packageJsonPath
   );

packages/remix/src/utils.ts

@@ -1,8 +1,8 @@
+import semver from 'semver';
 import { existsSync, promises as fs } from 'fs';
 import { basename, dirname, join, relative, resolve, sep } from 'path';
 import { pathToRegexp, Key } from 'path-to-regexp';
 import { debug, spawnAsync } from '@vercel/build-utils';
-import { readConfig } from '@remix-run/dev/dist/config';
 import { walkParentDirs } from '@vercel/build-utils';
 import type {
   ConfigRoute,
@@ -15,12 +15,15 @@ import type {
   SpawnOptionsExtended,
 } from '@vercel/build-utils/dist/fs/run-user-scripts';
 
+export const _require: typeof require = eval('require');
+
 export interface ResolvedNodeRouteConfig {
   runtime: 'nodejs';
   regions?: string[];
   maxDuration?: number;
   memory?: number;
 }
+
 export interface ResolvedEdgeRouteConfig {
   runtime: 'edge';
   regions?: BaseFunctionConfig['regions'];
@@ -43,8 +46,6 @@ export interface ResolvedRoutePaths {
   rePath: string;
 }
 
-const _require: typeof require = eval('require');
-
 const SPLAT_PATH = '/:params*';
 
 const entryExts = ['.js', '.jsx', '.ts', '.tsx'];
@@ -212,7 +213,14 @@ export function syncEnv(source: NodeJS.ProcessEnv, dest: NodeJS.ProcessEnv) {
   return () => syncEnv(originalDest, dest);
 }
 
-export async function chdirAndReadConfig(dir: string, packageJsonPath: string) {
+export async function chdirAndReadConfig(
+  remixRunDevPath: string,
+  dir: string,
+  packageJsonPath: string
+) {
+  const { readConfig }: typeof import('@remix-run/dev/dist/config') =
+    await import(join(remixRunDevPath, 'dist/config.js'));
+
   const originalCwd = process.cwd();
 
   // As of Remix v1.14.0, reading the config may trigger adding
@@ -249,19 +257,24 @@ export async function chdirAndReadConfig(dir: string, packageJsonPath: string) {
   return remixConfig;
 }
 
-export interface AddDependencyOptions extends SpawnOptionsExtended {
+export interface AddDependenciesOptions extends SpawnOptionsExtended {
   saveDev?: boolean;
 }
 
 /**
  * Runs `npm i ${name}` / `pnpm i ${name}` / `yarn add ${name}`.
  */
-export function addDependency(
+export function addDependencies(
   cliType: CliType,
   names: string[],
-  opts: AddDependencyOptions = {}
+  opts: AddDependenciesOptions = {}
 ) {
+  debug('Installing additional dependencies:');
+  for (const name of names) {
+    debug(` - ${name}`);
+  }
   const args: string[] = [];
+
   if (cliType === 'npm' || cliType === 'pnpm') {
     args.push('install');
     if (opts.saveDev) {
@@ -269,14 +282,31 @@ export function addDependency(
     }
   } else {
     // 'yarn'
-    args.push('add');
+    args.push('add', '--ignore-workspace-root-check');
     if (opts.saveDev) {
       args.push('--dev');
     }
   }
+
+  // Don't fail if pnpm is being run at the workspace root
+  if (cliType === 'pnpm' && opts.cwd) {
+    if (existsSync(join(opts.cwd, 'pnpm-workspace.yaml'))) {
+      args.push('--workspace-root');
+    }
+  }
+
   return spawnAsync(cliType, args.concat(names), opts);
 }
 
+export function resolveSemverMinMax(
+  min: string,
+  max: string,
+  version: string
+): string {
+  const floored = semver.intersects(version, `>= ${min}`) ? version : min;
+  return semver.intersects(floored, `<= ${max}`) ? floored : max;
+}
+
 export async function ensureResolvable(
   start: string,
   base: string,
@@ -369,3 +399,14 @@ async function ensureSymlink(
   await fs.symlink(relativeTarget, symlinkPath);
   debug(`Created symlink for "${pkgName}"`);
 }
+
+export function isESM(path: string): boolean {
+  // Figure out if the `remix.config` file is using ESM syntax
+  let isESM = false;
+  try {
+    _require(path);
+  } catch (err: any) {
+    isESM = err.code === 'ERR_REQUIRE_ESM';
+  }
+  return isESM;
+}

packages/remix/test/fixtures/01-remix-basics/package.json

@@ -10,14 +10,14 @@
     "start": "remix-serve build"
   },
   "dependencies": {
-    "@remix-run/node": "^1.7.4",
-    "@remix-run/react": "^1.7.4",
-    "@remix-run/serve": "^1.7.4",
+    "@remix-run/node": "1.15.0",
+    "@remix-run/react": "1.15.0",
+    "@remix-run/serve": "1.15.0",
     "react": "18.2.0",
     "react-dom": "18.2.0"
   },
   "devDependencies": {
-    "@remix-run/dev": "^1.7.4",
+    "@remix-run/dev": "1.15.0",
     "@types/react": "^17.0.45",
     "@types/react-dom": "^17.0.17",
     "typescript": "^4.6.4"

packages/remix/test/fixtures/03-with-pnpm/package.json

@@ -10,13 +10,13 @@
     "start": "remix-serve build"
   },
   "dependencies": {
-    "@remix-run/react": "1.5.0",
-    "@remix-run/serve": "1.5.0",
+    "@remix-run/react": "1.10.0",
+    "@remix-run/serve": "1.10.0",
     "react": "18.2.0",
     "react-dom": "18.2.0"
   },
   "devDependencies": {
-    "@remix-run/dev": "1.5.0",
+    "@remix-run/dev": "1.10.0",
     "@types/react": "^17.0.45",
     "@types/react-dom": "^17.0.17",
     "typescript": "^4.6.4"

packages/remix/test/unit.resolve-semver-min-max.test.ts

@@ -0,0 +1,20 @@
+import { resolveSemverMinMax } from '../src/utils';
+
+describe('resolveSemverMinMax()', () => {
+  it.each([
+    { min: '1.0.0', max: '1.15.0', version: '0.9.0', expected: '1.0.0' },
+    { min: '1.0.0', max: '1.15.0', version: '1.0.0', expected: '1.0.0' },
+    { min: '1.0.0', max: '1.15.0', version: '1.1.0', expected: '1.1.0' },
+    { min: '1.0.0', max: '1.15.0', version: '1.10.0', expected: '1.10.0' },
+    { min: '1.0.0', max: '1.15.0', version: '1.15.0', expected: '1.15.0' },
+    { min: '1.0.0', max: '1.15.0', version: '1.16.0', expected: '1.15.0' },
+    { min: '1.0.0', max: '1.15.0', version: '^1.12.0', expected: '^1.12.0' },
+    { min: '1.0.0', max: '1.15.0', version: '0.x.x', expected: '1.0.0' },
+  ])(
+    'Should return "$expected" for version "$version" (min=$min, max=$max)',
+    ({ min, max, version, expected }) => {
+      const actual = resolveSemverMinMax(min, max, version);
+      expect(actual).toEqual(expected);
+    }
+  );
+});

packages/remix/tsconfig.json

@@ -12,6 +12,7 @@
     "noUnusedParameters": true,
     "outDir": "./dist",
     "types": ["node", "jest"],
+    "skipLibCheck": true,
     "strict": true,
     "target": "ES2020",
     "sourceMap": true

packages/static-build/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @vercel/static-build
 
+## 1.3.44
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @vercel/gatsby-plugin-vercel-builder@1.3.16
+
+## 1.3.43
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @vercel/gatsby-plugin-vercel-builder@1.3.15
+
 ## 1.3.42
 
 ### Patch Changes

packages/static-build/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/static-build",
-  "version": "1.3.42",
+  "version": "1.3.44",
   "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/build-step",
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@vercel/gatsby-plugin-vercel-analytics": "1.0.10",
-    "@vercel/gatsby-plugin-vercel-builder": "1.3.14"
+    "@vercel/gatsby-plugin-vercel-builder": "1.3.16"
   },
   "devDependencies": {
     "@types/aws-lambda": "8.10.64",

utils/update-remix-run-dev.js

@@ -11,14 +11,13 @@ module.exports = async ({ github, context }, newVersion) => {
   const packagePath = path.join(repoRootPath, 'packages', 'remix');
   const oldVersion = JSON.parse(
     fs.readFileSync(path.join(packagePath, 'package.json'), 'utf-8')
-  ).dependencies['@remix-run/dev'];
+  ).devDependencies['@remix-run/dev'];
   if (newVersion === '') {
     newVersion = execSync('npm view @vercel/remix-run-dev dist-tags.latest', {
       encoding: 'utf-8',
     });
   }
   newVersion = newVersion.trim();
-  const branch = `vercel-remix-run-dev-${newVersion.replaceAll('.', '-')}`;
 
   if (oldVersion === newVersion) {
     // eslint-disable-next-line no-console
@@ -28,6 +27,7 @@ module.exports = async ({ github, context }, newVersion) => {
     return;
   }
 
+  const branch = `vercel-remix-run-dev-${newVersion.replaceAll('.', '-')}`;
   if (
     execSync(`git ls-remote --heads origin ${branch}`, { encoding: 'utf-8' })
       .toString()
@@ -39,7 +39,7 @@ module.exports = async ({ github, context }, newVersion) => {
   }
 
   execSync(
-    `pnpm install @remix-run/dev@npm:@vercel/remix-run-dev@${newVersion} --save-exact --lockfile-only`,
+    `pnpm install @remix-run/dev@npm:@vercel/remix-run-dev@${newVersion} --save-exact --save-dev --lockfile-only`,
     { cwd: packagePath }
   );