Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export class CustomMarkdownEmitter extends MarkdownEmitter {
this._apiModel = apiModel;
}

public emit(
public override emit(
stringBuilder: StringBuilder,
docNode: DocNode,
options: ICustomMarkdownEmitterOptions
Expand Down
4 changes: 2 additions & 2 deletions apps/api-documenter/src/plugin/MarkdownDocumenterFeature.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ const uuidMarkdownDocumenterFeature: string = '34196154-9eb3-4de0-a8c8-7e9539dfe
*/
export class MarkdownDocumenterFeature extends PluginFeature {
/** {@inheritdoc PluginFeature.context} */
public context!: MarkdownDocumenterFeatureContext;
public override context!: MarkdownDocumenterFeatureContext;

/**
* This event occurs before each markdown file is written. It provides an opportunity to customize the
Expand All @@ -94,7 +94,7 @@ export class MarkdownDocumenterFeature extends PluginFeature {
// (implemented by child class)
}

public static [Symbol.hasInstance](instance: object): boolean {
public static override [Symbol.hasInstance](instance: object): boolean {
return TypeUuid.isInstanceOf(instance, uuidMarkdownDocumenterFeature);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,22 +41,22 @@ export class Class2<T> extends Namespace1.Class3 {

/** Some method. Overrides `Class3.someMethod`. */
// eslint-disable-next-line @typescript-eslint/explicit-member-accessibility
someMethod(x: boolean): void {}
override someMethod(x: boolean): void {}
}

/** @public */
export class Class1 extends Class2<number> {
/** A second prop. Overrides `Class2.secondProp`. */
// eslint-disable-next-line @typescript-eslint/explicit-member-accessibility
secondProp: boolean;
override secondProp: boolean;

/** A fourth prop */
// eslint-disable-next-line @typescript-eslint/explicit-member-accessibility
fourthProp: number;

/** Some overload. Overrides `Class3.someOverload`. */
// eslint-disable-next-line @typescript-eslint/explicit-member-accessibility
someOverload(x: boolean | string): void {}
override someOverload(x: boolean | string): void {}
}

/** @public */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"toolPackages": [
{
"packageName": "@microsoft/api-extractor",
"packageVersion": "7.58.10"
"packageVersion": "7.58.11"
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"comment": "",
"type": "none",
"packageName": "@microsoft/api-documenter"
}
],
"packageName": "@microsoft/api-documenter",
"email": "iclanton@users.noreply.github.com"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"comment": "",
"type": "none",
"packageName": "@microsoft/rush"
}
],
"packageName": "@microsoft/rush",
"email": "iclanton@users.noreply.github.com"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"comment": "",
"type": "none",
"packageName": "@rushstack/hashed-folder-copy-plugin"
}
],
"packageName": "@rushstack/hashed-folder-copy-plugin",
"email": "iclanton@users.noreply.github.com"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"comment": "",
"type": "none",
"packageName": "@rushstack/set-webpack-public-path-plugin"
}
],
"packageName": "@rushstack/set-webpack-public-path-plugin",
"email": "iclanton@users.noreply.github.com"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"comment": "",
"type": "none",
"packageName": "@rushstack/stream-collator"
}
],
"packageName": "@rushstack/stream-collator",
"email": "iclanton@users.noreply.github.com"
}
2 changes: 1 addition & 1 deletion libraries/rush-lib/src/api/LastInstallFlag.ts
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ export class LastInstallFlag extends FlagFile<Partial<ILastInstallFlagJson>> {
/**
* Returns true if the file exists and the contents match the current state.
*/
public async isValidAsync(): Promise<boolean> {
public override async isValidAsync(): Promise<boolean> {
return await this._isValidAsync(false, {});
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export class SaveCallbackPackageJsonEditor extends PackageJsonEditor {
return new SaveCallbackPackageJsonEditor(options);
}

public async saveIfModifiedAsync(): Promise<boolean> {
public override async saveIfModifiedAsync(): Promise<boolean> {
const modified: boolean = await super.saveIfModifiedAsync();
if (this._onSaved) {
this._onSaved(this.saveToObject());
Expand Down
2 changes: 1 addition & 1 deletion libraries/rush-lib/src/cli/RushCommandLineParser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ export class RushCommandLineParser extends CommandLineParser {
this.telemetry?.flush();
}

public async executeAsync(args?: string[]): Promise<boolean> {
public override async executeAsync(args?: string[]): Promise<boolean> {
// debugParameter will be correctly parsed during super.executeAsync(), so manually parse here.
this._terminalProvider.verboseEnabled = this._terminalProvider.debugEnabled =
process.argv.indexOf('--debug') >= 0;
Expand Down
2 changes: 1 addition & 1 deletion libraries/rush-lib/src/cli/actions/BaseRushAction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ export abstract class BaseRushAction extends BaseConfiglessRushAction {
return this._eventHooksManager;
}

protected readonly rushConfiguration!: RushConfiguration;
protected override readonly rushConfiguration!: RushConfiguration;

protected override async onExecuteAsync(): Promise<void> {
if (!this.rushConfiguration) {
Expand Down
2 changes: 1 addition & 1 deletion libraries/rush-lib/src/cli/actions/UpdateAction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export class UpdateAction extends BaseInstallAction {
});
}

protected async runAsync(): Promise<void> {
protected override async runAsync(): Promise<void> {
await this.parser.pluginManager.updateAsync();

if (this.parser.pluginManager.error) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ export class WorkspaceInstallManager extends BaseInstallManager {
return { shrinkwrapIsUpToDate, shrinkwrapWarnings };
}

protected async canSkipInstallAsync(
protected override async canSkipInstallAsync(
lastModifiedDate: Date,
subspace: Subspace,
variant: string | undefined
Expand Down Expand Up @@ -887,7 +887,11 @@ export class WorkspaceInstallManager extends BaseInstallManager {
* Used when invoking the NPM tool. Appends the common configuration options
* to the command-line.
*/
protected pushConfigurationArgs(args: string[], options: IInstallManagerOptions, subspace: Subspace): void {
protected override pushConfigurationArgs(
args: string[],
options: IInstallManagerOptions,
subspace: Subspace
): void {
super.pushConfigurationArgs(args, options, subspace);

// Add workspace-specific args
Expand Down
5 changes: 4 additions & 1 deletion libraries/rush-lib/src/logic/npm/NpmPackage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,10 @@ export class NpmPackage extends BasePackage {
* @param targetFolderName - Filename where it should have been installed
* Example: `C:\MyRepo\common\temp\node_modules\@rush-temp\project1`
*/
public static createVirtualTempPackage(packageJsonFilename: string, installFolderName: string): NpmPackage {
public static override createVirtualTempPackage(
packageJsonFilename: string,
installFolderName: string
): NpmPackage {
const packageJson: IPackageJson = JsonFile.load(packageJsonFilename);
const npmPackage: readPackageTree.Node = {
children: [],
Expand Down
4 changes: 2 additions & 2 deletions libraries/rush-lib/src/logic/operations/OperationError.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ export class OperationError extends Error {
this._type = type;
}

public get message(): string {
public override get message(): string {
return `[${this._type}] '${super.message}'`;
}

public toString(): string {
public override toString(): string {
return this.message;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ export class JsonLFileWritable extends TerminalWritable {
this._writer.write(JSON.stringify(chunk) + '\n');
}

protected onClose(): void {
protected override onClose(): void {
if (this._writer) {
try {
this._writer.close();
Expand Down Expand Up @@ -176,7 +176,7 @@ export class SplitLogFileWritable extends TerminalWritable {
}
}

protected onClose(): void {
protected override onClose(): void {
if (this._logWriter) {
try {
this._logWriter.close();
Expand Down
8 changes: 4 additions & 4 deletions libraries/rush-lib/src/logic/setup/TerminalInput.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class YesNoKeyboardLoop extends KeyboardLoop {
this.options = options;
}

protected onStart(): void {
protected override onStart(): void {
this.stderr.write(Colorize.green('==>') + ' ');
this.stderr.write(Colorize.bold(this.options.message));
let optionSuffix: string = '';
Expand All @@ -53,7 +53,7 @@ class YesNoKeyboardLoop extends KeyboardLoop {
this.stderr.write(' ' + Colorize.bold(optionSuffix) + ' ');
}

protected onKeypress(character: string, key: readline.Key): void {
protected override onKeypress(character: string, key: readline.Key): void {
if (this.result !== undefined) {
return;
}
Expand Down Expand Up @@ -102,7 +102,7 @@ class PasswordKeyboardLoop extends KeyboardLoop {
return this.stderr.columns ? this.stderr.columns : 80;
}

protected onStart(): void {
protected override onStart(): void {
this.result = '';

readline.cursorTo(this.stderr, 0);
Expand All @@ -118,7 +118,7 @@ class PasswordKeyboardLoop extends KeyboardLoop {
this._startX = AnsiEscape.removeCodes(line).length % this._getLineWrapWidth();
}

protected onKeypress(character: string, key: readline.Key): void {
protected override onKeypress(character: string, key: readline.Key): void {
switch (key.name) {
case 'enter':
case 'return':
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,12 @@ class FakeBaseInstallManager extends BaseInstallManager {
protected postInstallAsync(): Promise<void> {
return Promise.resolve();
}
public pushConfigurationArgs(args: string[], options: IInstallManagerOptions, subspace: Subspace): void {

public override pushConfigurationArgs(
args: string[],
options: IInstallManagerOptions,
subspace: Subspace
): void {
return super.pushConfigurationArgs(args, options, subspace);
}
}
Expand Down
12 changes: 6 additions & 6 deletions libraries/rushell/src/AstNode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ export abstract class AstBaseNode {
* Represents a complete script that can be executed.
*/
export class AstScript extends AstBaseNode {
public readonly kind: AstKind.Script = AstKind.Script;
public override readonly kind: AstKind.Script = AstKind.Script;

public body: AstNode | undefined;

Expand All @@ -93,7 +93,7 @@ export class AstScript extends AstBaseNode {
* Represents the "&&" operator, which is used to join two individual commands.
*/
export class AstAndIf extends AstBaseNode {
public readonly kind: AstKind.AndIf = AstKind.AndIf;
public override readonly kind: AstKind.AndIf = AstKind.AndIf;

/**
* The command that executes first, and always.
Expand All @@ -119,7 +119,7 @@ export class AstAndIf extends AstBaseNode {
* Represents a command. For example, the name of an executable to be started.
*/
export class AstCommand extends AstBaseNode {
public readonly kind: AstKind.Command = AstKind.Command;
public override readonly kind: AstKind.Command = AstKind.Command;

public commandPath: AstCompoundWord | undefined;
public arguments: AstCompoundWord[] = [];
Expand All @@ -136,7 +136,7 @@ export class AstCommand extends AstBaseNode {
* Represents a compound word, e.g. "--the-thing" or "./the/thing".
*/
export class AstCompoundWord extends AstBaseNode {
public readonly kind: AstKind.CompoundWord = AstKind.CompoundWord;
public override readonly kind: AstKind.CompoundWord = AstKind.CompoundWord;

public readonly parts: AstNode[] = [];

Expand All @@ -149,7 +149,7 @@ export class AstCompoundWord extends AstBaseNode {
* Represents an environment variable expansion expression, e.g. "${VARIABLE}"
*/
export class AstVariableExpansion extends AstBaseNode {
public readonly kind: AstKind.VariableExpansion = AstKind.VariableExpansion;
public override readonly kind: AstKind.VariableExpansion = AstKind.VariableExpansion;

protected override collectChildNodesInto(nodes: AstNode[]): void {
// no children
Expand All @@ -160,7 +160,7 @@ export class AstVariableExpansion extends AstBaseNode {
* Represents some plain text.
*/
export class AstText extends AstBaseNode {
public readonly kind: AstKind.Text = AstKind.Text;
public override readonly kind: AstKind.Text = AstKind.Text;

public token: Token | undefined;

Expand Down
2 changes: 1 addition & 1 deletion libraries/stream-collator/src/CollatedWriter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export class CollatedWriter extends TerminalWritable {
}

/** {@inheritDoc @rushstack/terminal#TerminalWritable.onClose} */
public onClose(): void {
public override onClose(): void {
this._collator._writerClose(this, this._bufferedChunks);
}

Expand Down
6 changes: 3 additions & 3 deletions repo-scripts/doc-plugin-rush-stack/src/RushStackFeature.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ interface INavigationFile {
export class RushStackFeature extends MarkdownDocumenterFeature {
private _apiItemsWithPages: Set<ApiItem> = new Set<ApiItem>();

public onInitialized(): void {
public override onInitialized(): void {
// eslint-disable-next-line no-console
console.log('RushStackFeature: onInitialized()');
}

public onBeforeWritePage(eventArgs: IMarkdownDocumenterFeatureOnBeforeWritePageArgs): void {
public override onBeforeWritePage(eventArgs: IMarkdownDocumenterFeatureOnBeforeWritePageArgs): void {
// Add the Jekyll header
const header: string = [
'---',
Expand All @@ -45,7 +45,7 @@ export class RushStackFeature extends MarkdownDocumenterFeature {
this._apiItemsWithPages.add(eventArgs.apiItem);
}

public onFinished(eventArgs: IMarkdownDocumenterFeatureOnFinishedArgs): void {
public override onFinished(eventArgs: IMarkdownDocumenterFeatureOnFinishedArgs): void {
const navigationFile: INavigationFile = {
api_nav: [
{
Expand Down
1 change: 1 addition & 0 deletions rigs/local-node-rig/profiles/default/tsconfig-base.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"compilerOptions": {
"resolveJsonModule": true,
"isolatedModules": true,
"noImplicitOverride": true,
"target": "es2018",

"outDir": "${configDir}/lib-commonjs",
Expand Down
1 change: 1 addition & 0 deletions rigs/local-web-rig/profiles/app/tsconfig-base.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"compilerOptions": {
"resolveJsonModule": true,
"isolatedModules": true,
"noImplicitOverride": true,

"target": "es2017",
"lib": [
Expand Down
1 change: 1 addition & 0 deletions rigs/local-web-rig/profiles/library/tsconfig-base.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"compilerOptions": {
"resolveJsonModule": true,
"isolatedModules": true,
"noImplicitOverride": true,

"outDir": "${configDir}/lib-esm",
"declarationDir": "${configDir}/lib-dts",
Expand Down
Loading