Skip to content

Commit b0af8de

Browse files
committed
Clean up a few function signatures and function calls.
1 parent e0c6c54 commit b0af8de

File tree

7 files changed

+12
-28
lines changed

7 files changed

+12
-28
lines changed

libraries/rush-lib/src/api/LastLinkFlag.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,6 @@ export class LastLinkFlagFactory {
5858
* @internal
5959
*/
6060
public static getCommonTempFlag(subspace: Subspace): LastLinkFlag {
61-
return new LastLinkFlag(subspace.getSubspaceTempFolder(), {});
61+
return new LastLinkFlag(subspace.getSubspaceTempFolder());
6262
}
6363
}

libraries/rush-lib/src/cli/actions/BaseInstallAction.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ export abstract class BaseInstallAction extends BaseRushAction {
185185
});
186186
}
187187
} else {
188-
VersionMismatchFinder.ensureConsistentVersions(this.rushConfiguration, this._terminal, {});
188+
VersionMismatchFinder.ensureConsistentVersions(this.rushConfiguration, this._terminal);
189189
}
190190

191191
const stopwatch: Stopwatch = Stopwatch.start();

libraries/rush-lib/src/logic/PackageJsonUpdater.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -215,8 +215,7 @@ export class PackageJsonUpdater {
215215

216216
if (updateOtherPackages) {
217217
const mismatchFinder: VersionMismatchFinder = VersionMismatchFinder.getMismatches(
218-
this._rushConfiguration,
219-
{}
218+
this._rushConfiguration
220219
);
221220
for (const update of this._getUpdates(mismatchFinder, allDependenciesToUpdate)) {
222221
this.updateProject(update);
@@ -390,8 +389,7 @@ export class PackageJsonUpdater {
390389
// we need to do a mismatch check
391390
if (updateOtherPackages) {
392391
const mismatchFinder: VersionMismatchFinder = VersionMismatchFinder.getMismatches(
393-
this._rushConfiguration,
394-
{}
392+
this._rushConfiguration
395393
);
396394
otherPackageUpdates = this._getUpdates(mismatchFinder, Object.entries(dependenciesToAddOrUpdate));
397395
}

libraries/rush-lib/src/logic/base/BaseInstallManager.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -425,8 +425,7 @@ export abstract class BaseInstallManager {
425425
await PnpmfileConfiguration.writeCommonTempPnpmfileShimAsync(
426426
this.rushConfiguration,
427427
subspace.getSubspaceTempFolder(),
428-
subspace,
429-
this.options
428+
subspace
430429
);
431430

432431
if (this.rushConfiguration.subspacesFeatureEnabled) {

libraries/rush-lib/src/logic/pnpm/PnpmShrinkwrapFile.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -719,8 +719,7 @@ export class PnpmShrinkwrapFile extends BaseShrinkwrapFile {
719719
if (!this._pnpmfileConfiguration) {
720720
this._pnpmfileConfiguration = await PnpmfileConfiguration.initializeAsync(
721721
project.rushConfiguration,
722-
subspace,
723-
{}
722+
subspace
724723
);
725724
}
726725

libraries/rush-lib/src/logic/pnpm/PnpmfileConfiguration.ts

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,6 @@ import { pnpmfileShimFilename, scriptsFolderPath } from '../../utilities/PathCon
1414
import type { IPnpmfileContext, IPnpmfileShimSettings } from './IPnpmfile';
1515
import type { Subspace } from '../../api/Subspace';
1616

17-
/**
18-
* Options used when generating the pnpmfile shim settings file.
19-
*/
20-
export interface IPnpmfileShimOptions {}
21-
2217
/**
2318
* Loads PNPM's pnpmfile.js configuration, and invokes it to preprocess package.json files,
2419
* optionally utilizing a pnpmfile shim to inject preferred versions.
@@ -32,8 +27,7 @@ export class PnpmfileConfiguration {
3227

3328
public static async initializeAsync(
3429
rushConfiguration: RushConfiguration,
35-
subspace: Subspace,
36-
pnpmfileShimOptions?: IPnpmfileShimOptions
30+
subspace: Subspace
3731
): Promise<PnpmfileConfiguration> {
3832
if (rushConfiguration.packageManager !== 'pnpm') {
3933
throw new Error(
@@ -46,8 +40,7 @@ export class PnpmfileConfiguration {
4640
log: (message: string) => {},
4741
pnpmfileShimSettings: await PnpmfileConfiguration._getPnpmfileShimSettingsAsync(
4842
rushConfiguration,
49-
subspace,
50-
pnpmfileShimOptions
43+
subspace
5144
)
5245
};
5346

@@ -57,8 +50,7 @@ export class PnpmfileConfiguration {
5750
public static async writeCommonTempPnpmfileShimAsync(
5851
rushConfiguration: RushConfiguration,
5952
targetDir: string,
60-
subspace: Subspace,
61-
options?: IPnpmfileShimOptions
53+
subspace: Subspace
6254
): Promise<void> {
6355
if (rushConfiguration.packageManager !== 'pnpm') {
6456
throw new Error(
@@ -78,7 +70,7 @@ export class PnpmfileConfiguration {
7870
});
7971

8072
const pnpmfileShimSettings: IPnpmfileShimSettings =
81-
await PnpmfileConfiguration._getPnpmfileShimSettingsAsync(rushConfiguration, subspace, options);
73+
await PnpmfileConfiguration._getPnpmfileShimSettingsAsync(rushConfiguration, subspace);
8274

8375
// Write the settings file used by the shim
8476
await JsonFile.saveAsync(pnpmfileShimSettings, path.join(targetDir, 'pnpmfileSettings.json'), {
@@ -88,8 +80,7 @@ export class PnpmfileConfiguration {
8880

8981
private static async _getPnpmfileShimSettingsAsync(
9082
rushConfiguration: RushConfiguration,
91-
subspace: Subspace,
92-
options?: IPnpmfileShimOptions
83+
subspace: Subspace
9384
): Promise<IPnpmfileShimSettings> {
9485
let allPreferredVersions: { [dependencyName: string]: string } = {};
9586
let allowedAlternativeVersions: { [dependencyName: string]: readonly string[] } = {};

libraries/rush-lib/src/logic/versionMismatch/VersionMismatchFinder.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,10 +134,7 @@ export class VersionMismatchFinder {
134134
}
135135
): void {
136136
if (rushConfiguration.ensureConsistentVersions || options.isRushCheckCommand) {
137-
const mismatchFinder: VersionMismatchFinder = VersionMismatchFinder.getMismatches(
138-
rushConfiguration,
139-
{}
140-
);
137+
const mismatchFinder: VersionMismatchFinder = VersionMismatchFinder.getMismatches(rushConfiguration);
141138

142139
if (options.printAsJson) {
143140
mismatchFinder.printAsJson();

0 commit comments

Comments
 (0)