diff --git a/ng-dev/cli.ts b/ng-dev/cli.ts index 66a68e20e..4480bf71d 100644 --- a/ng-dev/cli.ts +++ b/ng-dev/cli.ts @@ -38,7 +38,7 @@ runParserWithCompletedFunctions((yargs: Argv) => { .command('format ', '', buildFormatParser) .command('pr ', '', buildPrParser) .command('pullapprove ', '', buildPullapproveParser) - .command('release ', '', buildReleaseParser) + .command('release', '', buildReleaseParser) .command('ts-circular-deps ', '', tsCircularDependenciesBuilder) .command('caretaker ', '', buildCaretakerParser) .command('misc ', '', buildMiscParser) diff --git a/ng-dev/release/BUILD.bazel b/ng-dev/release/BUILD.bazel index bfd4ad8f4..1ffc17298 100644 --- a/ng-dev/release/BUILD.bazel +++ b/ng-dev/release/BUILD.bazel @@ -16,7 +16,6 @@ ts_project( "//ng-dev/release/npm-dist-tag", "//ng-dev/release/precheck", "//ng-dev/release/publish", - "//ng-dev/release/set-dist-tag", "//ng-dev/release/stamping", "//ng-dev/utils", ], diff --git a/ng-dev/release/build/cli.ts b/ng-dev/release/build/cli.ts index 9deb6cc8d..e4fa892e3 100644 --- a/ng-dev/release/build/cli.ts +++ b/ng-dev/release/build/cli.ts @@ -88,5 +88,6 @@ export const ReleaseBuildCommandModule: CommandModule<{}, ReleaseBuildOptions> = builder, handler, command: 'build', - describe: 'Builds the release output for the current branch.', + // Hidden from help as this is for use by the release tooling itself. + describe: false, }; diff --git a/ng-dev/release/cli.ts b/ng-dev/release/cli.ts index 6dd6be66c..571239086 100644 --- a/ng-dev/release/cli.ts +++ b/ng-dev/release/cli.ts @@ -12,7 +12,6 @@ import {ReleaseInfoCommandModule} from './info/cli.js'; import {ReleaseNotesCommandModule} from './notes/cli.js'; import {ReleasePrecheckCommandModule} from './precheck/cli.js'; import {ReleasePublishCommandModule} from './publish/cli.js'; -import {ReleaseSetDistTagCommand} from './set-dist-tag/cli.js'; import {BuildEnvStampCommand} from './stamping/cli.js'; import {ReleaseNpmDistTagCommand} from './npm-dist-tag/cli.js'; @@ -27,7 +26,6 @@ export function buildReleaseParser(localYargs: Argv) { .command(ReleaseInfoCommandModule) .command(ReleaseNpmDistTagCommand) .command(ReleasePrecheckCommandModule) - .command(ReleaseSetDistTagCommand) .command(BuildEnvStampCommand) .command(ReleaseNotesCommandModule); } diff --git a/ng-dev/release/info/cli.ts b/ng-dev/release/info/cli.ts index 4dd270061..cf71de2ee 100644 --- a/ng-dev/release/info/cli.ts +++ b/ng-dev/release/info/cli.ts @@ -68,5 +68,6 @@ export const ReleaseInfoCommandModule: CommandModule<{}, ReleaseInfoOptions> = { builder, handler, command: 'info', - describe: 'Prints information for the current release state.', + // Hidden from help as this is for use by the release tooling itself. + describe: false, }; diff --git a/ng-dev/release/notes/cli.ts b/ng-dev/release/notes/cli.ts index eb9989256..3d865ca93 100644 --- a/ng-dev/release/notes/cli.ts +++ b/ng-dev/release/notes/cli.ts @@ -80,5 +80,6 @@ export const ReleaseNotesCommandModule: CommandModule<{}, Options> = { builder, handler, command: 'notes', - describe: 'Generate release notes', + // Hidden from help as this is for use by the release tooling itself. + describe: false, }; diff --git a/ng-dev/release/npm-dist-tag/cli.ts b/ng-dev/release/npm-dist-tag/cli.ts index f677d7c8a..4fa8e9955 100644 --- a/ng-dev/release/npm-dist-tag/cli.ts +++ b/ng-dev/release/npm-dist-tag/cli.ts @@ -20,8 +20,10 @@ function subCommandsBuilder(argv: Argv) { } export const ReleaseNpmDistTagCommand: CommandModule<{}, {}> = { - describe: 'Update the NPM dist tags for release packages.', + // Hidden from help menu as this is primarily for use by the release tooling itself. + describe: false, command: 'npm-dist-tag', + builder: subCommandsBuilder, handler: () => {}, }; diff --git a/ng-dev/release/precheck/cli.ts b/ng-dev/release/precheck/cli.ts index 826f6fa44..65b8001a5 100644 --- a/ng-dev/release/precheck/cli.ts +++ b/ng-dev/release/precheck/cli.ts @@ -71,5 +71,6 @@ async function handler() { export const ReleasePrecheckCommandModule: CommandModule<{}, {}> = { handler, command: 'precheck', + // Hidden from help as this is for use by the release tooling itself. describe: false, }; diff --git a/ng-dev/release/publish/cli.ts b/ng-dev/release/publish/cli.ts index 0d2e6b598..a00fbfd46 100644 --- a/ng-dev/release/publish/cli.ts +++ b/ng-dev/release/publish/cli.ts @@ -53,6 +53,6 @@ async function handler() { export const ReleasePublishCommandModule: CommandModule<{}, ReleasePublishOptions> = { builder, handler, - command: 'publish', + command: '$0', describe: 'Publish new releases and configure version branches.', }; diff --git a/ng-dev/release/set-dist-tag/BUILD.bazel b/ng-dev/release/set-dist-tag/BUILD.bazel deleted file mode 100644 index 0b743cc5c..000000000 --- a/ng-dev/release/set-dist-tag/BUILD.bazel +++ /dev/null @@ -1,10 +0,0 @@ -load("//tools:defaults.bzl", "ts_project") - -ts_project( - name = "set-dist-tag", - srcs = glob(["**/*.ts"]), - visibility = ["//ng-dev:__subpackages__"], - deps = [ - "//ng-dev/release/npm-dist-tag/set", - ], -) diff --git a/ng-dev/release/set-dist-tag/README.md b/ng-dev/release/set-dist-tag/README.md deleted file mode 100644 index b68fb47a6..000000000 --- a/ng-dev/release/set-dist-tag/README.md +++ /dev/null @@ -1,3 +0,0 @@ -This alias exists for backwards compatibility. Once the new `npm-dist-tag ` -commands are available in most versions, this can be deleted and the publish tool external -commands can be switched over. diff --git a/ng-dev/release/set-dist-tag/cli.ts b/ng-dev/release/set-dist-tag/cli.ts deleted file mode 100644 index 5e12565a9..000000000 --- a/ng-dev/release/set-dist-tag/cli.ts +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @license - * Copyright Google LLC - * - * Use of this source code is governed by an MIT-style license that can be - * found in the LICENSE file at https://angular.io/license - */ - -import {ReleaseNpmDistTagSetCommand} from '../npm-dist-tag/set/cli.js'; - -// ---- **IMPORTANT** ---- -// This command is part of our external commands invoked by the release publish -// command. Before making changes, keep in mind that more recent `ng-dev` versions -// can still invoke this command. -// ------------------------ - -// TODO(devversion): Remove this command in 2024 Jan. It only exists for backwards compat. -// If all active and LTS release trains support the new `release npm-dist-tag` -// command, this can be removed. - -/** CLI command module for setting an NPM dist tag. */ -export const ReleaseSetDistTagCommand: typeof ReleaseNpmDistTagSetCommand = { - ...ReleaseNpmDistTagSetCommand, - command: 'set-dist-tag ', -}; diff --git a/ng-dev/release/stamping/cli.ts b/ng-dev/release/stamping/cli.ts index 883ddba4f..6f24b7e0b 100644 --- a/ng-dev/release/stamping/cli.ts +++ b/ng-dev/release/stamping/cli.ts @@ -63,5 +63,6 @@ export const BuildEnvStampCommand: CommandModule<{}, Options> = { builder, handler, command: 'build-env-stamp', - describe: 'Build the environment stamping information', + // Hidden from help menu as this is primarily for use by the release tooling itself. + describe: false, };