Version Packages (#10278)

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

packages/cli/CHANGELOG.md

@@ -1,5 +1,17 @@
 # vercel
 
+## 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

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vercel",
-  "version": "31.2.0",
+  "version": "31.2.1",
   "preferGlobal": true,
   "license": "Apache-2.0",
   "description": "The command-line interface for Vercel",
@@ -35,12 +35,12 @@
     "@vercel/go": "2.5.1",
     "@vercel/hydrogen": "0.0.64",
     "@vercel/next": "3.9.3",
-    "@vercel/node": "2.15.6",
+    "@vercel/node": "2.15.7",
     "@vercel/python": "3.1.60",
     "@vercel/redwood": "1.1.15",
     "@vercel/remix-builder": "1.9.0",
     "@vercel/ruby": "1.3.76",
-    "@vercel/static-build": "1.3.42"
+    "@vercel/static-build": "1.3.43"
   },
   "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/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/gatsby-plugin-vercel-builder/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @vercel/gatsby-plugin-vercel-builder
 
+## 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.15",
   "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.7",
     "@vercel/routing-utils": "2.2.1",
     "esbuild": "0.14.47",
     "etag": "1.8.1",

packages/node/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @vercel/node
 
+## 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.7",
   "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/node-js",
@@ -25,6 +25,7 @@
     "@types/node": "14.18.33",
     "@types/node-fetch": "2.6.3",
     "@vercel/build-utils": "6.8.2",
+    "content-type": "1.0.4",
     "@vercel/error-utils": "1.0.10",
     "@vercel/static-config": "2.0.17",
     "async-listen": "3.0.0",
@@ -33,6 +34,7 @@
     "exit-hook": "2.2.1",
     "node-fetch": "2.6.9",
     "path-to-regexp": "6.2.1",
+    "@types/content-type": "1.1.3",
     "ts-morph": "12.0.0",
     "ts-node": "10.9.1",
     "typescript": "4.9.5"
@@ -42,14 +44,12 @@
     "@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/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/static-build/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @vercel/static-build
 
+## 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.43",
   "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.15"
   },
   "devDependencies": {
     "@types/aws-lambda": "8.10.64",

pnpm-lock.yaml

@@ -319,7 +319,7 @@ importers:
         specifier: 3.9.3
         version: link:../next
       '@vercel/node':
-        specifier: 2.15.6
+        specifier: 2.15.7
         version: link:../node
       '@vercel/python':
         specifier: 3.1.60
@@ -334,7 +334,7 @@ importers:
         specifier: 1.3.76
         version: link:../ruby
       '@vercel/static-build':
-        specifier: 1.3.42
+        specifier: 1.3.43
         version: link:../static-build
     devDependencies:
       '@alex_neo/jest-expect-message':
@@ -948,7 +948,7 @@ importers:
         specifier: 6.8.2
         version: link:../build-utils
       '@vercel/node':
-        specifier: 2.15.6
+        specifier: 2.15.7
         version: link:../node
       '@vercel/routing-utils':
         specifier: 2.2.1
@@ -1191,6 +1191,9 @@ importers:
       '@edge-runtime/vm':
         specifier: 3.0.1
         version: 3.0.1
+      '@types/content-type':
+        specifier: 1.1.3
+        version: 1.1.3
       '@types/node':
         specifier: 14.18.33
         version: 14.18.33
@@ -1209,6 +1212,9 @@ importers:
       async-listen:
         specifier: 3.0.0
         version: 3.0.0
+      content-type:
+        specifier: 1.0.4
+        version: 1.0.4
       edge-runtime:
         specifier: 2.4.3
         version: 2.4.3
@@ -1246,9 +1252,6 @@ importers:
       '@types/aws-lambda':
         specifier: 8.10.19
         version: 8.10.19
-      '@types/content-type':
-        specifier: 1.1.3
-        version: 1.1.3
       '@types/cookie':
         specifier: 0.3.3
         version: 0.3.3
@@ -1267,9 +1270,6 @@ importers:
       '@vercel/nft':
         specifier: 0.22.5
         version: 0.22.5
-      content-type:
-        specifier: 1.0.4
-        version: 1.0.4
       cookie:
         specifier: 0.4.0
         version: 0.4.0
@@ -1428,7 +1428,7 @@ importers:
         specifier: 1.0.10
         version: link:../gatsby-plugin-vercel-analytics
       '@vercel/gatsby-plugin-vercel-builder':
-        specifier: 1.3.14
+        specifier: 1.3.15
         version: link:../gatsby-plugin-vercel-builder
     devDependencies:
       '@types/aws-lambda':
@@ -4804,7 +4804,7 @@ packages:
 
   /@types/content-type@1.1.3:
     resolution: {integrity: sha512-pv8VcFrZ3fN93L4rTNIbbUzdkzjEyVMp5mPVjsFfOYTDOZMZiZ8P1dhu+kEv3faYyKzZgLlSvnyQNFg+p/v5ug==}
-    dev: true
+    dev: false
 
   /@types/convert-source-map@1.5.2:
     resolution: {integrity: sha512-tHs++ZeXer40kCF2JpE51Hg7t4HPa18B1b1Dzy96S0eCw8QKECNMYMfwa1edK/x8yCN0r4e6ewvLcc5CsVGkdg==}
@@ -7555,7 +7555,6 @@ packages:
   /content-type@1.0.4:
     resolution: {integrity: sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==}
     engines: {node: '>= 0.6'}
-    dev: true
 
   /convert-hrtime@3.0.0:
     resolution: {integrity: sha512-7V+KqSvMiHp8yWDuwfww06XleMWVVB9b9tURBx+G7UTADuo5hYPuowKloz4OzOqbPezxgo+fdQ1522WzPG4OeA==}