Skip to content

Commit 7a91944

Browse files
authored
Merge pull request microsoft#1815 from iclanton/ianc/fix-spelling
[rush] Fix some spelling mistakes in rush-lib.
2 parents 55aa60b + dd2b3ad commit 7a91944

15 files changed

+35
-24
lines changed

apps/rush-lib/src/api/ChangeManager.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { ChangeFile } from './ChangeFile';
44
import { IChangeFile } from './ChangeManagement';
55

66
/**
7-
* A class that helps with programatically interacting with Rush's change files.
7+
* A class that helps with programmatically interacting with Rush's change files.
88
* @public
99
*/
1010
export class ChangeManager {

apps/rush-lib/src/api/Changelog.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// See LICENSE in the project root for license information.
33

44
/**
5-
* Interface respresenting a changelog json object for a package used to represent the parsed
5+
* Interface representing a changelog json object for a package used to represent the parsed
66
* content of CHANGELOG.json
77
*/
88
export interface IChangelog {
@@ -37,7 +37,7 @@ export interface IChangeLogEntry {
3737
date: string | undefined;
3838

3939
/**
40-
* Comments for the entry, where key respresents the ChangeType string (Example: major)
40+
* Comments for the entry, where key represents the ChangeType string (Example: major)
4141
*/
4242
comments: {
4343
/** Describes changes which cause a patch-level SemVer bump */

apps/rush-lib/src/api/RushConfiguration.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ export type PnpmStoreOptions = 'local' | 'global';
111111
*/
112112
export interface IPackageManagerOptionsJsonBase {
113113
/**
114-
* Enviroment variables for the package manager
114+
* Environment variables for the package manager
115115
*/
116116
environmentVariables?: IConfigurationEnvironment
117117
}
@@ -249,7 +249,7 @@ export interface ICurrentVariantJson {
249249
*/
250250
export abstract class PackageManagerOptionsConfigurationBase implements IPackageManagerOptionsJsonBase {
251251
/**
252-
* Enviroment variables for the package manager
252+
* Environment variables for the package manager
253253
*/
254254
public readonly environmentVariables?: IConfigurationEnvironment
255255

apps/rush-lib/src/cli/RushCommandLineParser.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ export class RushCommandLineParser extends CommandLineParser {
188188
commandLineConfiguration = CommandLineConfiguration.loadFromFileOrDefault(commandLineConfigFile);
189189
}
190190

191-
// Build actions from the command line configuration supercede default build actions.
191+
// Build actions from the command line configuration supersede default build actions.
192192
this._addCommandLineConfigActions(commandLineConfiguration);
193193
this._addDefaultBuildActions(commandLineConfiguration);
194194
this._validateCommandLineConfigParameterAssociations(commandLineConfiguration);

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ export abstract class BaseInstallAction extends BaseRushAction {
104104
}
105105
}
106106

107-
// Because the 'defautltValue' option on the _maxInstallAttempts parameter is set,
107+
// Because the 'defaultValue' option on the _maxInstallAttempts parameter is set,
108108
// it is safe to assume that the value is not null
109109
if (this._maxInstallAttempts.value! < 1) {
110110
throw new Error(`The value of "${this._maxInstallAttempts.longName}" must be positive and nonzero.`);

apps/rush-lib/src/cli/actions/InstallAction.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export class InstallAction extends BaseInstallAction {
3535
networkConcurrency: this._networkConcurrencyParameter.value,
3636
collectLogFile: this._debugPackageManagerParameter.value!,
3737
variant: this._variant.value,
38-
// Because the 'defautltValue' option on the _maxInstallAttempts parameter is set,
38+
// Because the 'defaultValue' option on the _maxInstallAttempts parameter is set,
3939
// it is safe to assume that the value is not null
4040
maxInstallAttempts: this._maxInstallAttempts.value!
4141
};

apps/rush-lib/src/cli/actions/ScanAction.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -40,19 +40,19 @@ export class ScanAction extends BaseConfiglessRushAction {
4040
}
4141

4242
const requireRegExps: RegExp[] = [
43-
// Example: require('someting')
43+
// Example: require('something')
4444
/\brequire\s*\(\s*[']([^']+\s*)[']\)/,
4545
/\brequire\s*\(\s*["]([^"]+)["]\s*\)/,
4646

47-
// Example: require.ensure('someting')
47+
// Example: require.ensure('something')
4848
/\brequire.ensure\s*\(\s*[']([^']+\s*)[']\)/,
4949
/\brequire.ensure\s*\(\s*["]([^"]+)["]\s*\)/,
5050

51-
// Example: require.resolve('someting')
51+
// Example: require.resolve('something')
5252
/\brequire.resolve\s*\(\s*[']([^']+\s*)[']\)/,
5353
/\brequire.resolve\s*\(\s*["]([^"]+)["]\s*\)/,
5454

55-
// Example: System.import('someting')
55+
// Example: System.import('something')
5656
/\bSystem.import\s*\(\s*[']([^']+\s*)[']\)/,
5757
/\bSystem.import\s*\(\s*["]([^"]+)["]\s*\)/,
5858

apps/rush-lib/src/cli/actions/UpdateAction.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ export class UpdateAction extends BaseInstallAction {
6363
networkConcurrency: this._networkConcurrencyParameter.value,
6464
collectLogFile: this._debugPackageManagerParameter.value!,
6565
variant: this._variant.value,
66-
// Because the 'defautltValue' option on the _maxInstallAttempts parameter is set,
66+
// Because the 'defaultValue' option on the _maxInstallAttempts parameter is set,
6767
// it is safe to assume that the value is not null
6868
maxInstallAttempts: this._maxInstallAttempts.value!
6969
};

apps/rush-lib/src/logic/InstallManager.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1372,12 +1372,12 @@ export class InstallManager {
13721372
const pathToDeleteWithoutStar: string = path.join(this._rushConfiguration.commonTempFolder,
13731373
'node_modules', RushConstants.rushTempNpmScope);
13741374
// Glob can't handle Windows paths
1375-
const normalizedpathToDeleteWithoutStar: string = Text.replaceAll(pathToDeleteWithoutStar, '\\', '/');
1375+
const normalizedPathToDeleteWithoutStar: string = Text.replaceAll(pathToDeleteWithoutStar, '\\', '/');
13761376

13771377
let anyChanges: boolean = false;
13781378

13791379
// Example: "C:/MyRepo/common/temp/node_modules/@rush-temp/*/package.json"
1380-
for (const packageJsonPath of glob.sync(globEscape(normalizedpathToDeleteWithoutStar) + '/*/package.json')) {
1380+
for (const packageJsonPath of glob.sync(globEscape(normalizedPathToDeleteWithoutStar) + '/*/package.json')) {
13811381
// Example: "C:/MyRepo/common/temp/node_modules/@rush-temp/example/package.json"
13821382
const packageJsonObject: IRushTempPackageJson = JsonFile.load(packageJsonPath);
13831383

apps/rush-lib/src/logic/PublishUtilities.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -407,12 +407,12 @@ export class PublishUtilities {
407407
prereleaseToken.isPartialPrerelease &&
408408
depChange.changeType! < ChangeType.hotfix
409409
) {
410-
// FOr partial prereleases, do not version bump dependecies with the `prereleaseToken`
411-
// value unless an actual change (hotfix, patch, minor, major) has occured
410+
// For partial prereleases, do not version bump dependencies with the `prereleaseToken`
411+
// value unless an actual change (hotfix, patch, minor, major) has occurred
412412
return;
413413
} else if (depChange && prereleaseToken && prereleaseToken.hasValue) {
414414
// TODO: treat prerelease version the same as non-prerelease version.
415-
// For prelease, the newVersion needs to be appended with prerelease name.
415+
// For prerelease, the newVersion needs to be appended with prerelease name.
416416
// And dependency should specify the specific prerelease version.
417417
dependencies[depName] = PublishUtilities._getChangeInfoNewVersion(depChange, prereleaseToken);
418418
} else if (depChange && depChange.changeType! >= ChangeType.hotfix) {

apps/rush-lib/src/logic/pnpm/PnpmLinkManager.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ export class PnpmLinkManager extends BaseLinkManager {
150150
// creates for the installed version of each .TGZ package, all we need to do
151151
// is re-use that symlink in order to get linked to whatever PNPM thought was
152152
// appropriate. This folder is usually something like:
153-
// C:\{uri-encoed-path-to-tgz}\node_modules\{package-name}
153+
// C:\{uri-encoded-path-to-tgz}\node_modules\{package-name}
154154

155155
// e.g.:
156156
// file:projects/bentleyjs-core.tgz

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ export class PnpmShrinkwrapFile extends BaseShrinkwrapFile {
311311
let value: string | undefined = BaseShrinkwrapFile.tryGetValue(this._shrinkwrapJson.dependencies, dependencyName);
312312
if (value) {
313313

314-
// Getting the top level depenedency version from a PNPM lockfile version 5.1
314+
// Getting the top level dependency version from a PNPM lockfile version 5.1
315315
// --------------------------------------------------------------------------
316316
//
317317
// 1) Top-level tarball dependency entries in pnpm-lock.yaml look like:

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -175,11 +175,11 @@ export class VersionMismatchFinder {
175175
};
176176
mismatchDependencyVersionArray.push(mismatchDependencyVersion);
177177
});
178-
const mismatchDepency: IMismatchDependency = {
178+
const mismatchDependency: IMismatchDependency = {
179179
dependencyName: dependency,
180180
versions: mismatchDependencyVersionArray
181181
};
182-
mismatchDependencies.push(mismatchDepency);
182+
mismatchDependencies.push(mismatchDependency);
183183
});
184184

185185
const output: IMismatchDependencies = {

apps/rush-lib/src/schemas/rush.schema.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
"definitions": {
88
"environmentVariables": {
9-
"description": "Enviroment variables for the package manager",
9+
"description": "Environment variables for the package manager",
1010
"type": "object",
1111
"additionalProperties": {
1212
"type": "object",
@@ -73,7 +73,7 @@
7373
"type": "boolean"
7474
},
7575
"npmOptions": {
76-
"description": "Options that are only used when the NPM pacakge manager is selected.",
76+
"description": "Options that are only used when the NPM package manager is selected.",
7777
"type": "object",
7878
"properties": {
7979
"environmentVariables": {
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"changes": [
3+
{
4+
"packageName": "@microsoft/rush",
5+
"comment": "",
6+
"type": "none"
7+
}
8+
],
9+
"packageName": "@microsoft/rush",
10+
"email": "[email protected]"
11+
}

0 commit comments

Comments
 (0)