From bf0842cbb817b475eaa33dd7ec878bf69c915336 Mon Sep 17 00:00:00 2001 From: qun Date: Thu, 4 Jul 2024 13:17:52 +0000 Subject: [PATCH 01/21] feat: support install-autoinstaller --- common/reviews/api/rush-lib.api.md | 26 ++++++++++- .../rush-lib/src/api/RushGlobalFolder.ts | 2 +- .../rush-lib/src/cli/RushCommandLineParser.ts | 2 + .../cli/actions/InstallAutoinstallerAction.ts | 43 +++++++++++++++++++ libraries/rush-lib/src/index.ts | 4 ++ libraries/rush-lib/src/logic/Autoinstaller.ts | 3 ++ 6 files changed, 77 insertions(+), 3 deletions(-) create mode 100644 libraries/rush-lib/src/cli/actions/InstallAutoinstallerAction.ts diff --git a/common/reviews/api/rush-lib.api.md b/common/reviews/api/rush-lib.api.md index 95f430832c7..710f236e95e 100644 --- a/common/reviews/api/rush-lib.api.md +++ b/common/reviews/api/rush-lib.api.md @@ -61,6 +61,26 @@ export class ApprovedPackagesPolicy { readonly reviewCategories: ReadonlySet; } +// @public (undocumented) +export class Autoinstaller { + // Warning: (ae-forgotten-export) The symbol "IAutoinstallerOptions" needs to be exported by the entry point index.d.ts + constructor(options: IAutoinstallerOptions); + // (undocumented) + get folderFullPath(): string; + // (undocumented) + readonly name: string; + // (undocumented) + get packageJsonPath(): string; + // (undocumented) + prepareAsync(): Promise; + // (undocumented) + get shrinkwrapFilePath(): string; + // (undocumented) + updateAsync(): Promise; + // (undocumented) + static validateName(autoinstallerName: string): void; +} + // @beta export class BuildCacheConfiguration { readonly buildCacheEnabled: boolean; @@ -1365,12 +1385,14 @@ export class RushConstants { static readonly yarnShrinkwrapFilename: 'yarn.lock'; } -// @internal -export class _RushGlobalFolder { +// @public +class RushGlobalFolder { constructor(); readonly nodeSpecificPath: string; readonly path: string; } +export { RushGlobalFolder } +export { RushGlobalFolder as _RushGlobalFolder } // @internal export class _RushInternals { diff --git a/libraries/rush-lib/src/api/RushGlobalFolder.ts b/libraries/rush-lib/src/api/RushGlobalFolder.ts index 1d0541d05bd..8de63681496 100644 --- a/libraries/rush-lib/src/api/RushGlobalFolder.ts +++ b/libraries/rush-lib/src/api/RushGlobalFolder.ts @@ -8,7 +8,7 @@ import { EnvironmentConfiguration } from './EnvironmentConfiguration'; /** * This class provides global folders that are used for rush's internal install locations. * - * @internal + * @public */ export class RushGlobalFolder { /** diff --git a/libraries/rush-lib/src/cli/RushCommandLineParser.ts b/libraries/rush-lib/src/cli/RushCommandLineParser.ts index 26bf565a927..9c5b37e5d83 100644 --- a/libraries/rush-lib/src/cli/RushCommandLineParser.ts +++ b/libraries/rush-lib/src/cli/RushCommandLineParser.ts @@ -61,6 +61,7 @@ import { PhasedScriptAction } from './scriptActions/PhasedScriptAction'; import type { IBuiltInPluginConfiguration } from '../pluginFramework/PluginLoader/BuiltInPluginLoader'; import { InitSubspaceAction } from './actions/InitSubspaceAction'; import { RushAlerts } from '../utilities/RushAlerts'; +import { InstallAutoinstallerAction } from './actions/InstallAutoinstallerAction'; /** * Options for `RushCommandLineParser`. @@ -313,6 +314,7 @@ export class RushCommandLineParser extends CommandLineParser { this.addAction(new SetupAction(this)); this.addAction(new UnlinkAction(this)); this.addAction(new UpdateAction(this)); + this.addAction(new InstallAutoinstallerAction(this)); this.addAction(new UpdateAutoinstallerAction(this)); this.addAction(new UpdateCloudCredentialsAction(this)); this.addAction(new UpgradeInteractiveAction(this)); diff --git a/libraries/rush-lib/src/cli/actions/InstallAutoinstallerAction.ts b/libraries/rush-lib/src/cli/actions/InstallAutoinstallerAction.ts new file mode 100644 index 00000000000..d29a3c7d4ff --- /dev/null +++ b/libraries/rush-lib/src/cli/actions/InstallAutoinstallerAction.ts @@ -0,0 +1,43 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. +// See LICENSE in the project root for license information. + +import type { IRequiredCommandLineStringParameter } from '@rushstack/ts-command-line'; + +import { BaseRushAction } from './BaseRushAction'; +import type { RushCommandLineParser } from '../RushCommandLineParser'; +import { Autoinstaller } from '../../logic/Autoinstaller'; + +export class InstallAutoinstallerAction extends BaseRushAction { + private readonly _name: IRequiredCommandLineStringParameter; + + public constructor(parser: RushCommandLineParser) { + super({ + actionName: 'install-autoinstaller', + summary: 'Install autoinstaller package dependencies', + documentation: 'Use this command to install dependencies for an autoinstaller folder.', + parser + }); + + this._name = this.defineStringParameter({ + parameterLongName: '--name', + argumentName: 'AUTOINSTALLER_NAME', + required: true, + description: + 'Specifies the name of the autoinstaller, which must be one of the folders under common/autoinstallers.' + }); + } + + protected async runAsync(): Promise { + const autoinstallerName: string = this._name.value; + const autoinstaller: Autoinstaller = new Autoinstaller({ + autoinstallerName, + rushConfiguration: this.rushConfiguration, + rushGlobalFolder: this.rushGlobalFolder + }); + + await autoinstaller.prepareAsync(); + + // eslint-disable-next-line no-console + console.log('\nSuccess.'); + } +} diff --git a/libraries/rush-lib/src/index.ts b/libraries/rush-lib/src/index.ts index 63e7e812116..aa1981b92fd 100644 --- a/libraries/rush-lib/src/index.ts +++ b/libraries/rush-lib/src/index.ts @@ -193,3 +193,7 @@ export { type IRushCommandLineParameter, type IRushCommandLineAction } from './api/RushCommandLine'; + +export { RushGlobalFolder } from './api/RushGlobalFolder'; + +export { Autoinstaller } from './logic/Autoinstaller'; diff --git a/libraries/rush-lib/src/logic/Autoinstaller.ts b/libraries/rush-lib/src/logic/Autoinstaller.ts index 91d7218f33c..99b516eaede 100644 --- a/libraries/rush-lib/src/logic/Autoinstaller.ts +++ b/libraries/rush-lib/src/logic/Autoinstaller.ts @@ -31,6 +31,9 @@ interface IAutoinstallerOptions { restrictConsoleOutput?: boolean; } +/** + * @public + */ export class Autoinstaller { public readonly name: string; From 04718732b1a2ba9ee0c03a2b12d7924322b3f5d3 Mon Sep 17 00:00:00 2001 From: qun Date: Thu, 4 Jul 2024 13:25:43 +0000 Subject: [PATCH 02/21] rush change --- .../feat-install-autoinstaller_2024-07-04-13-25.json | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 common/changes/@microsoft/rush/feat-install-autoinstaller_2024-07-04-13-25.json diff --git a/common/changes/@microsoft/rush/feat-install-autoinstaller_2024-07-04-13-25.json b/common/changes/@microsoft/rush/feat-install-autoinstaller_2024-07-04-13-25.json new file mode 100644 index 00000000000..a6c9beead20 --- /dev/null +++ b/common/changes/@microsoft/rush/feat-install-autoinstaller_2024-07-04-13-25.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@microsoft/rush", + "comment": "Support rush install-autoinstaller command", + "type": "none" + } + ], + "packageName": "@microsoft/rush" +} \ No newline at end of file From 07854bad72af42fcef54a0ef70cea5b44767dd87 Mon Sep 17 00:00:00 2001 From: qun Date: Thu, 4 Jul 2024 16:08:01 +0000 Subject: [PATCH 03/21] fix: ci --- .../__snapshots__/RushCommandLine.test.ts.snap | 13 +++++++++++++ .../__snapshots__/CommandLineHelp.test.ts.snap | 15 +++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/libraries/rush-lib/src/api/test/__snapshots__/RushCommandLine.test.ts.snap b/libraries/rush-lib/src/api/test/__snapshots__/RushCommandLine.test.ts.snap index 1176f03cc55..5ba3b450add 100644 --- a/libraries/rush-lib/src/api/test/__snapshots__/RushCommandLine.test.ts.snap +++ b/libraries/rush-lib/src/api/test/__snapshots__/RushCommandLine.test.ts.snap @@ -907,6 +907,19 @@ Object { }, ], }, + Object { + "actionName": "install-autoinstaller", + "parameters": Array [ + Object { + "description": "Specifies the name of the autoinstaller, which must be one of the folders under common/autoinstallers.", + "environmentVariable": undefined, + "kind": "String", + "longName": "--name", + "required": true, + "shortName": undefined, + }, + ], + }, Object { "actionName": "update-autoinstaller", "parameters": Array [ diff --git a/libraries/rush-lib/src/cli/test/__snapshots__/CommandLineHelp.test.ts.snap b/libraries/rush-lib/src/cli/test/__snapshots__/CommandLineHelp.test.ts.snap index 6d7ef926f75..341d58d5519 100644 --- a/libraries/rush-lib/src/cli/test/__snapshots__/CommandLineHelp.test.ts.snap +++ b/libraries/rush-lib/src/cli/test/__snapshots__/CommandLineHelp.test.ts.snap @@ -51,6 +51,8 @@ Positional arguments: update Install package dependencies for all projects in the repo, and create or update the shrinkwrap file as needed + install-autoinstaller + Install autoinstaller package dependencies update-autoinstaller Updates autoinstaller package dependencies update-cloud-credentials @@ -758,6 +760,19 @@ Optional arguments: " `; +exports[`CommandLineHelp prints the help for each action: install-autoinstaller 1`] = ` +"usage: rush install-autoinstaller [-h] --name AUTOINSTALLER_NAME + +Use this command to install dependencies for an autoinstaller folder. + +Optional arguments: + -h, --help Show this help message and exit. + --name AUTOINSTALLER_NAME + Specifies the name of the autoinstaller, which must + be one of the folders under common/autoinstallers. +" +`; + exports[`CommandLineHelp prints the help for each action: link 1`] = ` "usage: rush link [-h] [-f] From fe24372d60a6263ab3c7d8a2c67ae7903a928884 Mon Sep 17 00:00:00 2001 From: qun Date: Fri, 5 Jul 2024 03:26:17 +0000 Subject: [PATCH 04/21] chore: export type --- libraries/rush-lib/src/index.ts | 2 +- libraries/rush-lib/src/logic/Autoinstaller.ts | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libraries/rush-lib/src/index.ts b/libraries/rush-lib/src/index.ts index aa1981b92fd..f572911eb78 100644 --- a/libraries/rush-lib/src/index.ts +++ b/libraries/rush-lib/src/index.ts @@ -196,4 +196,4 @@ export { export { RushGlobalFolder } from './api/RushGlobalFolder'; -export { Autoinstaller } from './logic/Autoinstaller'; +export { Autoinstaller, type IAutoinstallerOptions } from './logic/Autoinstaller'; diff --git a/libraries/rush-lib/src/logic/Autoinstaller.ts b/libraries/rush-lib/src/logic/Autoinstaller.ts index 99b516eaede..3890f4a44c8 100644 --- a/libraries/rush-lib/src/logic/Autoinstaller.ts +++ b/libraries/rush-lib/src/logic/Autoinstaller.ts @@ -24,7 +24,10 @@ import { LastInstallFlag } from '../api/LastInstallFlag'; import { RushCommandLineParser } from '../cli/RushCommandLineParser'; import type { PnpmPackageManager } from '../api/packageManager/PnpmPackageManager'; -interface IAutoinstallerOptions { +/** + * @public + */ +export interface IAutoinstallerOptions { autoinstallerName: string; rushConfiguration: RushConfiguration; rushGlobalFolder: RushGlobalFolder; From f3e6ac30fd10dfd94019ea591ed5c2b5daea7138 Mon Sep 17 00:00:00 2001 From: qun Date: Fri, 5 Jul 2024 03:28:37 +0000 Subject: [PATCH 05/21] chore: update md --- common/reviews/api/rush-lib.api.md | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/common/reviews/api/rush-lib.api.md b/common/reviews/api/rush-lib.api.md index 710f236e95e..d3038ad6c15 100644 --- a/common/reviews/api/rush-lib.api.md +++ b/common/reviews/api/rush-lib.api.md @@ -63,7 +63,6 @@ export class ApprovedPackagesPolicy { // @public (undocumented) export class Autoinstaller { - // Warning: (ae-forgotten-export) The symbol "IAutoinstallerOptions" needs to be exported by the entry point index.d.ts constructor(options: IAutoinstallerOptions); // (undocumented) get folderFullPath(): string; @@ -346,6 +345,18 @@ export class _FlagFile { // @beta export type GetCacheEntryIdFunction = (options: IGenerateCacheEntryIdOptions) => string; +// @public (undocumented) +export interface IAutoinstallerOptions { + // (undocumented) + autoinstallerName: string; + // (undocumented) + restrictConsoleOutput?: boolean; + // (undocumented) + rushConfiguration: RushConfiguration; + // (undocumented) + rushGlobalFolder: RushGlobalFolder; +} + // @internal (undocumented) export interface _IBuiltInPluginConfiguration extends _IRushPluginConfigurationBase { // (undocumented) From 120c0b86cf7ff610d0145777e9e2b97974e11ec0 Mon Sep 17 00:00:00 2001 From: Lincoln <778157949@qq.com> Date: Thu, 11 Jul 2024 08:54:42 +0800 Subject: [PATCH 06/21] Update libraries/rush-lib/src/cli/actions/InstallAutoinstallerAction.ts Co-authored-by: Ian Clanton-Thuon --- .../rush-lib/src/cli/actions/InstallAutoinstallerAction.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/rush-lib/src/cli/actions/InstallAutoinstallerAction.ts b/libraries/rush-lib/src/cli/actions/InstallAutoinstallerAction.ts index d29a3c7d4ff..dc9a195d425 100644 --- a/libraries/rush-lib/src/cli/actions/InstallAutoinstallerAction.ts +++ b/libraries/rush-lib/src/cli/actions/InstallAutoinstallerAction.ts @@ -23,7 +23,7 @@ export class InstallAutoinstallerAction extends BaseRushAction { argumentName: 'AUTOINSTALLER_NAME', required: true, description: - 'Specifies the name of the autoinstaller, which must be one of the folders under common/autoinstallers.' + 'The name of the autoinstaller, which must be one of the folders under common/autoinstallers.' }); } From 52bebb9dd2e6f6e740e89bc9703299a7fad1f26b Mon Sep 17 00:00:00 2001 From: Lincoln <778157949@qq.com> Date: Thu, 11 Jul 2024 08:55:30 +0800 Subject: [PATCH 07/21] Update common/changes/@microsoft/rush/feat-install-autoinstaller_2024-07-04-13-25.json Co-authored-by: Ian Clanton-Thuon --- .../rush/feat-install-autoinstaller_2024-07-04-13-25.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/changes/@microsoft/rush/feat-install-autoinstaller_2024-07-04-13-25.json b/common/changes/@microsoft/rush/feat-install-autoinstaller_2024-07-04-13-25.json index a6c9beead20..fa463bed98d 100644 --- a/common/changes/@microsoft/rush/feat-install-autoinstaller_2024-07-04-13-25.json +++ b/common/changes/@microsoft/rush/feat-install-autoinstaller_2024-07-04-13-25.json @@ -2,7 +2,7 @@ "changes": [ { "packageName": "@microsoft/rush", - "comment": "Support rush install-autoinstaller command", + "comment": "Add a new `rush install-autoinstaller` command that ensures that the specified autoinstaller is installed.", "type": "none" } ], From 375b69222bfe7f30e98e9a3767d849c6fcfc70fd Mon Sep 17 00:00:00 2001 From: qun Date: Thu, 11 Jul 2024 01:11:06 +0000 Subject: [PATCH 08/21] chore: use terminal instead of console --- .../rush-lib/src/cli/actions/InstallAutoinstallerAction.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libraries/rush-lib/src/cli/actions/InstallAutoinstallerAction.ts b/libraries/rush-lib/src/cli/actions/InstallAutoinstallerAction.ts index dc9a195d425..8f899a2c1c4 100644 --- a/libraries/rush-lib/src/cli/actions/InstallAutoinstallerAction.ts +++ b/libraries/rush-lib/src/cli/actions/InstallAutoinstallerAction.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import type { IRequiredCommandLineStringParameter } from '@rushstack/ts-command-line'; +import type { ITerminal } from '@rushstack/terminal'; import { BaseRushAction } from './BaseRushAction'; import type { RushCommandLineParser } from '../RushCommandLineParser'; @@ -9,6 +10,7 @@ import { Autoinstaller } from '../../logic/Autoinstaller'; export class InstallAutoinstallerAction extends BaseRushAction { private readonly _name: IRequiredCommandLineStringParameter; + private readonly _terminal: ITerminal; public constructor(parser: RushCommandLineParser) { super({ @@ -25,6 +27,8 @@ export class InstallAutoinstallerAction extends BaseRushAction { description: 'The name of the autoinstaller, which must be one of the folders under common/autoinstallers.' }); + + this._terminal = parser.terminal; } protected async runAsync(): Promise { @@ -37,7 +41,6 @@ export class InstallAutoinstallerAction extends BaseRushAction { await autoinstaller.prepareAsync(); - // eslint-disable-next-line no-console - console.log('\nSuccess.'); + this._terminal.writeLine('\nSuccess.'); } } From 4e4833591a5529ebee2fcf5924796e39ffca5297 Mon Sep 17 00:00:00 2001 From: qun Date: Thu, 11 Jul 2024 01:25:44 +0000 Subject: [PATCH 09/21] update snapshot --- .../src/api/test/__snapshots__/RushCommandLine.test.ts.snap | 2 +- .../src/cli/test/__snapshots__/CommandLineHelp.test.ts.snap | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/rush-lib/src/api/test/__snapshots__/RushCommandLine.test.ts.snap b/libraries/rush-lib/src/api/test/__snapshots__/RushCommandLine.test.ts.snap index 5ba3b450add..95eeecdc06e 100644 --- a/libraries/rush-lib/src/api/test/__snapshots__/RushCommandLine.test.ts.snap +++ b/libraries/rush-lib/src/api/test/__snapshots__/RushCommandLine.test.ts.snap @@ -911,7 +911,7 @@ Object { "actionName": "install-autoinstaller", "parameters": Array [ Object { - "description": "Specifies the name of the autoinstaller, which must be one of the folders under common/autoinstallers.", + "description": "The name of the autoinstaller, which must be one of the folders under common/autoinstallers.", "environmentVariable": undefined, "kind": "String", "longName": "--name", diff --git a/libraries/rush-lib/src/cli/test/__snapshots__/CommandLineHelp.test.ts.snap b/libraries/rush-lib/src/cli/test/__snapshots__/CommandLineHelp.test.ts.snap index 341d58d5519..3ff352ee11d 100644 --- a/libraries/rush-lib/src/cli/test/__snapshots__/CommandLineHelp.test.ts.snap +++ b/libraries/rush-lib/src/cli/test/__snapshots__/CommandLineHelp.test.ts.snap @@ -768,8 +768,8 @@ Use this command to install dependencies for an autoinstaller folder. Optional arguments: -h, --help Show this help message and exit. --name AUTOINSTALLER_NAME - Specifies the name of the autoinstaller, which must - be one of the folders under common/autoinstallers. + The name of the autoinstaller, which must be one of + the folders under common/autoinstallers. " `; From d7b70ad9172d1bf58979662dd1a719257ad22eee Mon Sep 17 00:00:00 2001 From: qun Date: Thu, 11 Jul 2024 04:37:45 +0000 Subject: [PATCH 10/21] chore: a --- .../rush-lib/src/cli/actions/UpdateAutoinstallerAction.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libraries/rush-lib/src/cli/actions/UpdateAutoinstallerAction.ts b/libraries/rush-lib/src/cli/actions/UpdateAutoinstallerAction.ts index 29dbb898e26..754b733a322 100644 --- a/libraries/rush-lib/src/cli/actions/UpdateAutoinstallerAction.ts +++ b/libraries/rush-lib/src/cli/actions/UpdateAutoinstallerAction.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import type { IRequiredCommandLineStringParameter } from '@rushstack/ts-command-line'; +import type { ITerminal } from '@rushstack/terminal'; import { BaseRushAction } from './BaseRushAction'; import type { RushCommandLineParser } from '../RushCommandLineParser'; @@ -9,6 +10,7 @@ import { Autoinstaller } from '../../logic/Autoinstaller'; export class UpdateAutoinstallerAction extends BaseRushAction { private readonly _name: IRequiredCommandLineStringParameter; + private readonly _terminal: ITerminal; public constructor(parser: RushCommandLineParser) { super({ @@ -25,6 +27,8 @@ export class UpdateAutoinstallerAction extends BaseRushAction { description: 'Specifies the name of the autoinstaller, which must be one of the folders under common/autoinstallers.' }); + + this._terminal = parser.terminal; } protected async runAsync(): Promise { @@ -41,7 +45,6 @@ export class UpdateAutoinstallerAction extends BaseRushAction { await autoinstaller.updateAsync(); - // eslint-disable-next-line no-console - console.log('\nSuccess.'); + this._terminal.writeLine('\nSuccess.'); } } From d4cff21d5746a1fb0bf9a3c4b846279ddf75bf96 Mon Sep 17 00:00:00 2001 From: qun Date: Thu, 11 Jul 2024 04:44:42 +0000 Subject: [PATCH 11/21] feat: abstract the BaseAutoinstallerAction class --- .../cli/actions/BaseAutoinstallerAction.ts | 29 +++++++++++++++++++ .../cli/actions/InstallAutoinstallerAction.ts | 22 ++------------ .../cli/actions/UpdateAutoinstallerAction.ts | 22 ++------------ 3 files changed, 35 insertions(+), 38 deletions(-) create mode 100644 libraries/rush-lib/src/cli/actions/BaseAutoinstallerAction.ts diff --git a/libraries/rush-lib/src/cli/actions/BaseAutoinstallerAction.ts b/libraries/rush-lib/src/cli/actions/BaseAutoinstallerAction.ts new file mode 100644 index 00000000000..b2c9accf521 --- /dev/null +++ b/libraries/rush-lib/src/cli/actions/BaseAutoinstallerAction.ts @@ -0,0 +1,29 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. +// See LICENSE in the project root for license information. + +import type { IRequiredCommandLineStringParameter } from '@rushstack/ts-command-line'; +import type { ITerminal } from '@rushstack/terminal'; + +import { BaseRushAction, type IBaseRushActionOptions } from './BaseRushAction'; +import type { RushCommandLineParser } from '../RushCommandLineParser'; + +export abstract class BaseAutoinstallerAction extends BaseRushAction { + protected readonly _name: IRequiredCommandLineStringParameter; + protected readonly _terminal: ITerminal; + + public constructor(parser: RushCommandLineParser, options: IBaseRushActionOptions) { + super(options); + + this._name = this.defineStringParameter({ + parameterLongName: '--name', + argumentName: 'AUTOINSTALLER_NAME', + required: true, + description: + 'Specifies the name of the autoinstaller, which must be one of the folders under common/autoinstallers.' + }); + + this._terminal = parser.terminal; + } + + protected abstract runAsync(): Promise; +} diff --git a/libraries/rush-lib/src/cli/actions/InstallAutoinstallerAction.ts b/libraries/rush-lib/src/cli/actions/InstallAutoinstallerAction.ts index 8f899a2c1c4..4ce584d84a9 100644 --- a/libraries/rush-lib/src/cli/actions/InstallAutoinstallerAction.ts +++ b/libraries/rush-lib/src/cli/actions/InstallAutoinstallerAction.ts @@ -1,34 +1,18 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import type { IRequiredCommandLineStringParameter } from '@rushstack/ts-command-line'; -import type { ITerminal } from '@rushstack/terminal'; - -import { BaseRushAction } from './BaseRushAction'; import type { RushCommandLineParser } from '../RushCommandLineParser'; import { Autoinstaller } from '../../logic/Autoinstaller'; +import { BaseAutoinstallerAction } from './BaseAutoinstallerAction'; -export class InstallAutoinstallerAction extends BaseRushAction { - private readonly _name: IRequiredCommandLineStringParameter; - private readonly _terminal: ITerminal; - +export class InstallAutoinstallerAction extends BaseAutoinstallerAction { public constructor(parser: RushCommandLineParser) { - super({ + super(parser, { actionName: 'install-autoinstaller', summary: 'Install autoinstaller package dependencies', documentation: 'Use this command to install dependencies for an autoinstaller folder.', parser }); - - this._name = this.defineStringParameter({ - parameterLongName: '--name', - argumentName: 'AUTOINSTALLER_NAME', - required: true, - description: - 'The name of the autoinstaller, which must be one of the folders under common/autoinstallers.' - }); - - this._terminal = parser.terminal; } protected async runAsync(): Promise { diff --git a/libraries/rush-lib/src/cli/actions/UpdateAutoinstallerAction.ts b/libraries/rush-lib/src/cli/actions/UpdateAutoinstallerAction.ts index 754b733a322..3fdb87a59ce 100644 --- a/libraries/rush-lib/src/cli/actions/UpdateAutoinstallerAction.ts +++ b/libraries/rush-lib/src/cli/actions/UpdateAutoinstallerAction.ts @@ -1,34 +1,18 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import type { IRequiredCommandLineStringParameter } from '@rushstack/ts-command-line'; -import type { ITerminal } from '@rushstack/terminal'; - -import { BaseRushAction } from './BaseRushAction'; import type { RushCommandLineParser } from '../RushCommandLineParser'; import { Autoinstaller } from '../../logic/Autoinstaller'; +import { BaseAutoinstallerAction } from './BaseAutoinstallerAction'; -export class UpdateAutoinstallerAction extends BaseRushAction { - private readonly _name: IRequiredCommandLineStringParameter; - private readonly _terminal: ITerminal; - +export class UpdateAutoinstallerAction extends BaseAutoinstallerAction { public constructor(parser: RushCommandLineParser) { - super({ + super(parser, { actionName: 'update-autoinstaller', summary: 'Updates autoinstaller package dependencies', documentation: 'Use this command to regenerate the shrinkwrap file for an autoinstaller folder.', parser }); - - this._name = this.defineStringParameter({ - parameterLongName: '--name', - argumentName: 'AUTOINSTALLER_NAME', - required: true, - description: - 'Specifies the name of the autoinstaller, which must be one of the folders under common/autoinstallers.' - }); - - this._terminal = parser.terminal; } protected async runAsync(): Promise { From 07e75db1bbd592ff89f3287bda9c9962e8cdb804 Mon Sep 17 00:00:00 2001 From: qun Date: Thu, 11 Jul 2024 04:50:12 +0000 Subject: [PATCH 12/21] chore: modify the desc --- libraries/rush-lib/src/cli/actions/BaseAutoinstallerAction.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/rush-lib/src/cli/actions/BaseAutoinstallerAction.ts b/libraries/rush-lib/src/cli/actions/BaseAutoinstallerAction.ts index b2c9accf521..d0d7ef16409 100644 --- a/libraries/rush-lib/src/cli/actions/BaseAutoinstallerAction.ts +++ b/libraries/rush-lib/src/cli/actions/BaseAutoinstallerAction.ts @@ -19,7 +19,7 @@ export abstract class BaseAutoinstallerAction extends BaseRushAction { argumentName: 'AUTOINSTALLER_NAME', required: true, description: - 'Specifies the name of the autoinstaller, which must be one of the folders under common/autoinstallers.' + 'The name of the autoinstaller, which must be one of the folders under common/autoinstallers.' }); this._terminal = parser.terminal; From d8287fc718152383c23f277b723419d4b5a5ea20 Mon Sep 17 00:00:00 2001 From: qun Date: Thu, 11 Jul 2024 04:53:58 +0000 Subject: [PATCH 13/21] chore: remove useless params --- .../rush-lib/src/cli/actions/BaseAutoinstallerAction.ts | 5 ++--- .../rush-lib/src/cli/actions/InstallAutoinstallerAction.ts | 2 +- .../rush-lib/src/cli/actions/UpdateAutoinstallerAction.ts | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/libraries/rush-lib/src/cli/actions/BaseAutoinstallerAction.ts b/libraries/rush-lib/src/cli/actions/BaseAutoinstallerAction.ts index d0d7ef16409..e3bbcfc78df 100644 --- a/libraries/rush-lib/src/cli/actions/BaseAutoinstallerAction.ts +++ b/libraries/rush-lib/src/cli/actions/BaseAutoinstallerAction.ts @@ -5,13 +5,12 @@ import type { IRequiredCommandLineStringParameter } from '@rushstack/ts-command- import type { ITerminal } from '@rushstack/terminal'; import { BaseRushAction, type IBaseRushActionOptions } from './BaseRushAction'; -import type { RushCommandLineParser } from '../RushCommandLineParser'; export abstract class BaseAutoinstallerAction extends BaseRushAction { protected readonly _name: IRequiredCommandLineStringParameter; protected readonly _terminal: ITerminal; - public constructor(parser: RushCommandLineParser, options: IBaseRushActionOptions) { + public constructor(options: IBaseRushActionOptions) { super(options); this._name = this.defineStringParameter({ @@ -22,7 +21,7 @@ export abstract class BaseAutoinstallerAction extends BaseRushAction { 'The name of the autoinstaller, which must be one of the folders under common/autoinstallers.' }); - this._terminal = parser.terminal; + this._terminal = this.parser.terminal; } protected abstract runAsync(): Promise; diff --git a/libraries/rush-lib/src/cli/actions/InstallAutoinstallerAction.ts b/libraries/rush-lib/src/cli/actions/InstallAutoinstallerAction.ts index 4ce584d84a9..0b23572a634 100644 --- a/libraries/rush-lib/src/cli/actions/InstallAutoinstallerAction.ts +++ b/libraries/rush-lib/src/cli/actions/InstallAutoinstallerAction.ts @@ -7,7 +7,7 @@ import { BaseAutoinstallerAction } from './BaseAutoinstallerAction'; export class InstallAutoinstallerAction extends BaseAutoinstallerAction { public constructor(parser: RushCommandLineParser) { - super(parser, { + super({ actionName: 'install-autoinstaller', summary: 'Install autoinstaller package dependencies', documentation: 'Use this command to install dependencies for an autoinstaller folder.', diff --git a/libraries/rush-lib/src/cli/actions/UpdateAutoinstallerAction.ts b/libraries/rush-lib/src/cli/actions/UpdateAutoinstallerAction.ts index 3fdb87a59ce..ecabc83fe45 100644 --- a/libraries/rush-lib/src/cli/actions/UpdateAutoinstallerAction.ts +++ b/libraries/rush-lib/src/cli/actions/UpdateAutoinstallerAction.ts @@ -7,7 +7,7 @@ import { BaseAutoinstallerAction } from './BaseAutoinstallerAction'; export class UpdateAutoinstallerAction extends BaseAutoinstallerAction { public constructor(parser: RushCommandLineParser) { - super(parser, { + super({ actionName: 'update-autoinstaller', summary: 'Updates autoinstaller package dependencies', documentation: 'Use this command to regenerate the shrinkwrap file for an autoinstaller folder.', From db3105bf23f8d00ff2f8ada56c4af37cd3259244 Mon Sep 17 00:00:00 2001 From: qun Date: Thu, 11 Jul 2024 05:00:21 +0000 Subject: [PATCH 14/21] chore: update snapshot --- .../src/api/test/__snapshots__/RushCommandLine.test.ts.snap | 2 +- .../src/cli/test/__snapshots__/CommandLineHelp.test.ts.snap | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/rush-lib/src/api/test/__snapshots__/RushCommandLine.test.ts.snap b/libraries/rush-lib/src/api/test/__snapshots__/RushCommandLine.test.ts.snap index 95eeecdc06e..fde44db0060 100644 --- a/libraries/rush-lib/src/api/test/__snapshots__/RushCommandLine.test.ts.snap +++ b/libraries/rush-lib/src/api/test/__snapshots__/RushCommandLine.test.ts.snap @@ -924,7 +924,7 @@ Object { "actionName": "update-autoinstaller", "parameters": Array [ Object { - "description": "Specifies the name of the autoinstaller, which must be one of the folders under common/autoinstallers.", + "description": "The name of the autoinstaller, which must be one of the folders under common/autoinstallers.", "environmentVariable": undefined, "kind": "String", "longName": "--name", diff --git a/libraries/rush-lib/src/cli/test/__snapshots__/CommandLineHelp.test.ts.snap b/libraries/rush-lib/src/cli/test/__snapshots__/CommandLineHelp.test.ts.snap index 3ff352ee11d..c85c1b11bf2 100644 --- a/libraries/rush-lib/src/cli/test/__snapshots__/CommandLineHelp.test.ts.snap +++ b/libraries/rush-lib/src/cli/test/__snapshots__/CommandLineHelp.test.ts.snap @@ -1294,8 +1294,8 @@ folder. Optional arguments: -h, --help Show this help message and exit. --name AUTOINSTALLER_NAME - Specifies the name of the autoinstaller, which must - be one of the folders under common/autoinstallers. + The name of the autoinstaller, which must be one of + the folders under common/autoinstallers. " `; From 1644e74827e0ee8e24cb80d6d2fd110d2149def3 Mon Sep 17 00:00:00 2001 From: qun Date: Tue, 16 Jul 2024 10:20:49 +0000 Subject: [PATCH 15/21] chore: resolve comments --- .../src/cli/actions/BaseAutoinstallerAction.ts | 16 +++++++++++++++- .../cli/actions/InstallAutoinstallerAction.ts | 13 ++----------- .../src/cli/actions/UpdateAutoinstallerAction.ts | 12 +----------- libraries/rush-lib/src/logic/Autoinstaller.ts | 4 ++-- 4 files changed, 20 insertions(+), 25 deletions(-) diff --git a/libraries/rush-lib/src/cli/actions/BaseAutoinstallerAction.ts b/libraries/rush-lib/src/cli/actions/BaseAutoinstallerAction.ts index e3bbcfc78df..6651aa714e1 100644 --- a/libraries/rush-lib/src/cli/actions/BaseAutoinstallerAction.ts +++ b/libraries/rush-lib/src/cli/actions/BaseAutoinstallerAction.ts @@ -5,6 +5,7 @@ import type { IRequiredCommandLineStringParameter } from '@rushstack/ts-command- import type { ITerminal } from '@rushstack/terminal'; import { BaseRushAction, type IBaseRushActionOptions } from './BaseRushAction'; +import { Autoinstaller } from '../../logic/Autoinstaller'; export abstract class BaseAutoinstallerAction extends BaseRushAction { protected readonly _name: IRequiredCommandLineStringParameter; @@ -24,5 +25,18 @@ export abstract class BaseAutoinstallerAction extends BaseRushAction { this._terminal = this.parser.terminal; } - protected abstract runAsync(): Promise; + protected abstract prepareAsync(autoinstaller: Autoinstaller): Promise; + + protected async runAsync(): Promise { + const autoinstallerName: string = this._name.value; + const autoinstaller: Autoinstaller = new Autoinstaller({ + autoinstallerName, + rushConfiguration: this.rushConfiguration, + rushGlobalFolder: this.rushGlobalFolder + }); + + await this.prepareAsync(autoinstaller); + + this._terminal.writeLine('\nSuccess.'); + } } diff --git a/libraries/rush-lib/src/cli/actions/InstallAutoinstallerAction.ts b/libraries/rush-lib/src/cli/actions/InstallAutoinstallerAction.ts index 0b23572a634..bb48dc0fe5c 100644 --- a/libraries/rush-lib/src/cli/actions/InstallAutoinstallerAction.ts +++ b/libraries/rush-lib/src/cli/actions/InstallAutoinstallerAction.ts @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import type { RushCommandLineParser } from '../RushCommandLineParser'; import { Autoinstaller } from '../../logic/Autoinstaller'; +import type { RushCommandLineParser } from '../RushCommandLineParser'; import { BaseAutoinstallerAction } from './BaseAutoinstallerAction'; export class InstallAutoinstallerAction extends BaseAutoinstallerAction { @@ -15,16 +15,7 @@ export class InstallAutoinstallerAction extends BaseAutoinstallerAction { }); } - protected async runAsync(): Promise { - const autoinstallerName: string = this._name.value; - const autoinstaller: Autoinstaller = new Autoinstaller({ - autoinstallerName, - rushConfiguration: this.rushConfiguration, - rushGlobalFolder: this.rushGlobalFolder - }); - + protected async prepareAsync(autoinstaller: Autoinstaller): Promise { await autoinstaller.prepareAsync(); - - this._terminal.writeLine('\nSuccess.'); } } diff --git a/libraries/rush-lib/src/cli/actions/UpdateAutoinstallerAction.ts b/libraries/rush-lib/src/cli/actions/UpdateAutoinstallerAction.ts index ecabc83fe45..c36d3838bd9 100644 --- a/libraries/rush-lib/src/cli/actions/UpdateAutoinstallerAction.ts +++ b/libraries/rush-lib/src/cli/actions/UpdateAutoinstallerAction.ts @@ -15,20 +15,10 @@ export class UpdateAutoinstallerAction extends BaseAutoinstallerAction { }); } - protected async runAsync(): Promise { - const autoinstallerName: string = this._name.value; - const autoinstaller: Autoinstaller = new Autoinstaller({ - autoinstallerName, - rushConfiguration: this.rushConfiguration, - rushGlobalFolder: this.rushGlobalFolder - }); - + protected async prepareAsync(autoinstaller: Autoinstaller): Promise { // Do not run `autoinstaller.prepareAsync` here. It tries to install the autoinstaller with // --frozen-lockfile or equivalent, which will fail if the autoinstaller's dependencies // have been changed. - await autoinstaller.updateAsync(); - - this._terminal.writeLine('\nSuccess.'); } } diff --git a/libraries/rush-lib/src/logic/Autoinstaller.ts b/libraries/rush-lib/src/logic/Autoinstaller.ts index 3890f4a44c8..84772271267 100644 --- a/libraries/rush-lib/src/logic/Autoinstaller.ts +++ b/libraries/rush-lib/src/logic/Autoinstaller.ts @@ -25,7 +25,7 @@ import { RushCommandLineParser } from '../cli/RushCommandLineParser'; import type { PnpmPackageManager } from '../api/packageManager/PnpmPackageManager'; /** - * @public + * @beta */ export interface IAutoinstallerOptions { autoinstallerName: string; @@ -35,7 +35,7 @@ export interface IAutoinstallerOptions { } /** - * @public + * @beta */ export class Autoinstaller { public readonly name: string; From c7828c6e5517396af83e88cc91a75d60fcd72c46 Mon Sep 17 00:00:00 2001 From: qun Date: Tue, 16 Jul 2024 10:30:45 +0000 Subject: [PATCH 16/21] fix: lint --- common/reviews/api/rush-lib.api.md | 4 ++-- .../rush-lib/src/cli/actions/InstallAutoinstallerAction.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/reviews/api/rush-lib.api.md b/common/reviews/api/rush-lib.api.md index d3038ad6c15..4c4173d04de 100644 --- a/common/reviews/api/rush-lib.api.md +++ b/common/reviews/api/rush-lib.api.md @@ -61,7 +61,7 @@ export class ApprovedPackagesPolicy { readonly reviewCategories: ReadonlySet; } -// @public (undocumented) +// @beta (undocumented) export class Autoinstaller { constructor(options: IAutoinstallerOptions); // (undocumented) @@ -345,7 +345,7 @@ export class _FlagFile { // @beta export type GetCacheEntryIdFunction = (options: IGenerateCacheEntryIdOptions) => string; -// @public (undocumented) +// @beta (undocumented) export interface IAutoinstallerOptions { // (undocumented) autoinstallerName: string; diff --git a/libraries/rush-lib/src/cli/actions/InstallAutoinstallerAction.ts b/libraries/rush-lib/src/cli/actions/InstallAutoinstallerAction.ts index bb48dc0fe5c..b8445383d75 100644 --- a/libraries/rush-lib/src/cli/actions/InstallAutoinstallerAction.ts +++ b/libraries/rush-lib/src/cli/actions/InstallAutoinstallerAction.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import { Autoinstaller } from '../../logic/Autoinstaller'; +import type { Autoinstaller } from '../../logic/Autoinstaller'; import type { RushCommandLineParser } from '../RushCommandLineParser'; import { BaseAutoinstallerAction } from './BaseAutoinstallerAction'; From 4eb62e3661fb3f994abf992da1b481747690437a Mon Sep 17 00:00:00 2001 From: qun Date: Tue, 16 Jul 2024 11:29:20 +0000 Subject: [PATCH 17/21] fix: ci --- libraries/rush-lib/src/cli/actions/UpdateAutoinstallerAction.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/rush-lib/src/cli/actions/UpdateAutoinstallerAction.ts b/libraries/rush-lib/src/cli/actions/UpdateAutoinstallerAction.ts index c36d3838bd9..e8e2f7085b2 100644 --- a/libraries/rush-lib/src/cli/actions/UpdateAutoinstallerAction.ts +++ b/libraries/rush-lib/src/cli/actions/UpdateAutoinstallerAction.ts @@ -2,7 +2,7 @@ // See LICENSE in the project root for license information. import type { RushCommandLineParser } from '../RushCommandLineParser'; -import { Autoinstaller } from '../../logic/Autoinstaller'; +import type { Autoinstaller } from '../../logic/Autoinstaller'; import { BaseAutoinstallerAction } from './BaseAutoinstallerAction'; export class UpdateAutoinstallerAction extends BaseAutoinstallerAction { From a41f2658d23b8cad20a1c3e1c465c2f8438e8e34 Mon Sep 17 00:00:00 2001 From: Lincoln <778157949@qq.com> Date: Wed, 21 Aug 2024 15:13:26 +0800 Subject: [PATCH 18/21] Update libraries/rush-lib/src/cli/actions/BaseAutoinstallerAction.ts Co-authored-by: Ian Clanton-Thuon --- libraries/rush-lib/src/cli/actions/BaseAutoinstallerAction.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libraries/rush-lib/src/cli/actions/BaseAutoinstallerAction.ts b/libraries/rush-lib/src/cli/actions/BaseAutoinstallerAction.ts index 6651aa714e1..5a1c6770e38 100644 --- a/libraries/rush-lib/src/cli/actions/BaseAutoinstallerAction.ts +++ b/libraries/rush-lib/src/cli/actions/BaseAutoinstallerAction.ts @@ -37,6 +37,7 @@ export abstract class BaseAutoinstallerAction extends BaseRushAction { await this.prepareAsync(autoinstaller); - this._terminal.writeLine('\nSuccess.'); + this._terminal.writeLine(); + this._terminal.writeLine('Success.'); } } From 7eedfa6d3ecc3723c31a5f59613d0cff170d1fd3 Mon Sep 17 00:00:00 2001 From: qun Date: Wed, 21 Aug 2024 07:38:10 +0000 Subject: [PATCH 19/21] chore: remove useless exports --- common/reviews/api/rush-lib.api.md | 37 +------------------ .../rush-lib/src/api/RushGlobalFolder.ts | 2 +- libraries/rush-lib/src/index.ts | 4 -- 3 files changed, 3 insertions(+), 40 deletions(-) diff --git a/common/reviews/api/rush-lib.api.md b/common/reviews/api/rush-lib.api.md index 4c4173d04de..95f430832c7 100644 --- a/common/reviews/api/rush-lib.api.md +++ b/common/reviews/api/rush-lib.api.md @@ -61,25 +61,6 @@ export class ApprovedPackagesPolicy { readonly reviewCategories: ReadonlySet; } -// @beta (undocumented) -export class Autoinstaller { - constructor(options: IAutoinstallerOptions); - // (undocumented) - get folderFullPath(): string; - // (undocumented) - readonly name: string; - // (undocumented) - get packageJsonPath(): string; - // (undocumented) - prepareAsync(): Promise; - // (undocumented) - get shrinkwrapFilePath(): string; - // (undocumented) - updateAsync(): Promise; - // (undocumented) - static validateName(autoinstallerName: string): void; -} - // @beta export class BuildCacheConfiguration { readonly buildCacheEnabled: boolean; @@ -345,18 +326,6 @@ export class _FlagFile { // @beta export type GetCacheEntryIdFunction = (options: IGenerateCacheEntryIdOptions) => string; -// @beta (undocumented) -export interface IAutoinstallerOptions { - // (undocumented) - autoinstallerName: string; - // (undocumented) - restrictConsoleOutput?: boolean; - // (undocumented) - rushConfiguration: RushConfiguration; - // (undocumented) - rushGlobalFolder: RushGlobalFolder; -} - // @internal (undocumented) export interface _IBuiltInPluginConfiguration extends _IRushPluginConfigurationBase { // (undocumented) @@ -1396,14 +1365,12 @@ export class RushConstants { static readonly yarnShrinkwrapFilename: 'yarn.lock'; } -// @public -class RushGlobalFolder { +// @internal +export class _RushGlobalFolder { constructor(); readonly nodeSpecificPath: string; readonly path: string; } -export { RushGlobalFolder } -export { RushGlobalFolder as _RushGlobalFolder } // @internal export class _RushInternals { diff --git a/libraries/rush-lib/src/api/RushGlobalFolder.ts b/libraries/rush-lib/src/api/RushGlobalFolder.ts index 8de63681496..1d0541d05bd 100644 --- a/libraries/rush-lib/src/api/RushGlobalFolder.ts +++ b/libraries/rush-lib/src/api/RushGlobalFolder.ts @@ -8,7 +8,7 @@ import { EnvironmentConfiguration } from './EnvironmentConfiguration'; /** * This class provides global folders that are used for rush's internal install locations. * - * @public + * @internal */ export class RushGlobalFolder { /** diff --git a/libraries/rush-lib/src/index.ts b/libraries/rush-lib/src/index.ts index f572911eb78..63e7e812116 100644 --- a/libraries/rush-lib/src/index.ts +++ b/libraries/rush-lib/src/index.ts @@ -193,7 +193,3 @@ export { type IRushCommandLineParameter, type IRushCommandLineAction } from './api/RushCommandLine'; - -export { RushGlobalFolder } from './api/RushGlobalFolder'; - -export { Autoinstaller, type IAutoinstallerOptions } from './logic/Autoinstaller'; From 01a34d5ce8d4dc291002248873cfc2254e049f9b Mon Sep 17 00:00:00 2001 From: Ian Clanton-Thuon Date: Wed, 21 Aug 2024 08:30:52 -0700 Subject: [PATCH 20/21] Update libraries/rush-lib/src/logic/Autoinstaller.ts --- libraries/rush-lib/src/logic/Autoinstaller.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/libraries/rush-lib/src/logic/Autoinstaller.ts b/libraries/rush-lib/src/logic/Autoinstaller.ts index 84772271267..47f325b65fe 100644 --- a/libraries/rush-lib/src/logic/Autoinstaller.ts +++ b/libraries/rush-lib/src/logic/Autoinstaller.ts @@ -24,9 +24,6 @@ import { LastInstallFlag } from '../api/LastInstallFlag'; import { RushCommandLineParser } from '../cli/RushCommandLineParser'; import type { PnpmPackageManager } from '../api/packageManager/PnpmPackageManager'; -/** - * @beta - */ export interface IAutoinstallerOptions { autoinstallerName: string; rushConfiguration: RushConfiguration; From 0a6b8bec5107d1cd43eb1f411994080db9b9c866 Mon Sep 17 00:00:00 2001 From: Ian Clanton-Thuon Date: Wed, 21 Aug 2024 08:30:59 -0700 Subject: [PATCH 21/21] Update libraries/rush-lib/src/logic/Autoinstaller.ts --- libraries/rush-lib/src/logic/Autoinstaller.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/libraries/rush-lib/src/logic/Autoinstaller.ts b/libraries/rush-lib/src/logic/Autoinstaller.ts index 47f325b65fe..b136a554d3f 100644 --- a/libraries/rush-lib/src/logic/Autoinstaller.ts +++ b/libraries/rush-lib/src/logic/Autoinstaller.ts @@ -31,9 +31,6 @@ export interface IAutoinstallerOptions { restrictConsoleOutput?: boolean; } -/** - * @beta - */ export class Autoinstaller { public readonly name: string;