Remove a bunch of path API calls.

Author: iclanton

apps/rush-lib/src/api/test/ChangeFile.test.ts

@@ -1,15 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
 // See LICENSE in the project root for license information.
 
-import * as path from 'path';
-
 import { ChangeFile } from '../ChangeFile';
 import { RushConfiguration } from '../RushConfiguration';
 import { ChangeType } from '../ChangeManagement';
 
 describe(ChangeFile.name, () => {
   it('can add a change', () => {
-    const rushFilename: string = path.resolve(__dirname, 'repo', 'rush-npm.json');
+    const rushFilename: string = `${__dirname}/repo/rush-npm.json`;
     const rushConfiguration: RushConfiguration = RushConfiguration.loadFromConfigurationFile(rushFilename);
 
     const changeFile: ChangeFile = new ChangeFile(

apps/rush-lib/src/api/test/CommonVersionsConfiguration.test.ts

@@ -1,13 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
 // See LICENSE in the project root for license information.
 
-import * as path from 'path';
-
 import { CommonVersionsConfiguration } from '../CommonVersionsConfiguration';
 
 describe(CommonVersionsConfiguration.name, () => {
   it('can load the file', () => {
-    const filename: string = path.resolve(__dirname, 'jsonFiles', 'common-versions.json');
+    const filename: string = `${__dirname}/jsonFiles/common-versions.json`;
     const configuration: CommonVersionsConfiguration = CommonVersionsConfiguration.loadFromFile(filename);
 
     expect(configuration.preferredVersions.get('@scope/library-1')).toEqual('~3.2.1');

apps/rush-lib/src/api/test/EnvironmentConfiguration.test.ts

@@ -99,7 +99,7 @@ describe(EnvironmentConfiguration.name, () => {
     });
 
     it('returns expected path from environment variable with normalization', () => {
-      const expectedValue: string = path.resolve(path.join(process.cwd(), 'temp'));
+      const expectedValue: string = path.resolve(process.cwd(), 'temp');
       const envVar: string = './temp';
       process.env[ENV_VAR] = envVar;
 

apps/rush-lib/src/api/test/EventHooks.test.ts

@@ -1,13 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
 // See LICENSE in the project root for license information.
 
-import * as path from 'path';
 import { RushConfiguration } from '../RushConfiguration';
 import { Event, EventHooks } from '../EventHooks';
 
 describe(EventHooks.name, () => {
   it('loads a post build hook from rush.json', () => {
-    const rushFilename: string = path.resolve(__dirname, 'repo', 'rush-npm.json');
+    const rushFilename: string = `${__dirname}/repo/rush-npm.json`;
     const rushConfiguration: RushConfiguration = RushConfiguration.loadFromConfigurationFile(rushFilename);
     expect(rushConfiguration.eventHooks.get(Event.postRushBuild)).toEqual(['do something']);
   });

apps/rush-lib/src/api/test/LastInstallFlag.test.ts

@@ -1,25 +1,24 @@
 // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
 // See LICENSE in the project root for license information.
 
-import * as path from 'path';
 import { FileSystem } from '@rushstack/node-core-library';
 
 import { LastInstallFlag } from '../LastInstallFlag';
 
-const TEMP_DIR: string = path.join(__dirname, 'temp');
+const TEMP_DIR_PATH: string = `${__dirname}/temp`;
 
 describe(LastInstallFlag.name, () => {
   beforeEach(() => {
-    FileSystem.ensureEmptyFolder(TEMP_DIR);
+    FileSystem.ensureEmptyFolder(TEMP_DIR_PATH);
   });
 
   afterEach(() => {
-    FileSystem.ensureEmptyFolder(TEMP_DIR);
+    FileSystem.ensureEmptyFolder(TEMP_DIR_PATH);
   });
 
   it('can create and remove a flag in an empty directory', () => {
     // preparation
-    const flag: LastInstallFlag = new LastInstallFlag(TEMP_DIR);
+    const flag: LastInstallFlag = new LastInstallFlag(TEMP_DIR_PATH);
     FileSystem.deleteFile(flag.path);
 
     // test state, should be invalid since the file doesn't exist
@@ -38,8 +37,8 @@ describe(LastInstallFlag.name, () => {
 
   it('can detect if the last flag was in a different state', () => {
     // preparation
-    const flag1: LastInstallFlag = new LastInstallFlag(TEMP_DIR, { node: '5.0.0' });
-    const flag2: LastInstallFlag = new LastInstallFlag(TEMP_DIR, { node: '8.9.4' });
+    const flag1: LastInstallFlag = new LastInstallFlag(TEMP_DIR_PATH, { node: '5.0.0' });
+    const flag2: LastInstallFlag = new LastInstallFlag(TEMP_DIR_PATH, { node: '8.9.4' });
     FileSystem.deleteFile(flag1.path);
 
     // test state, should be invalid since the file doesn't exist
@@ -63,7 +62,7 @@ describe(LastInstallFlag.name, () => {
 
   it('can detect if the last flag was in a corrupted state', () => {
     // preparation, write non-json into flag file
-    const flag: LastInstallFlag = new LastInstallFlag(TEMP_DIR);
+    const flag: LastInstallFlag = new LastInstallFlag(TEMP_DIR_PATH);
     FileSystem.writeFile(flag.path, 'sdfjkaklfjksldajgfkld');
 
     // test state, should be invalid since the file is not JSON
@@ -72,13 +71,13 @@ describe(LastInstallFlag.name, () => {
   });
 
   it("throws an error if new storePath doesn't match the old one", () => {
-    const flag1: LastInstallFlag = new LastInstallFlag(TEMP_DIR, {
+    const flag1: LastInstallFlag = new LastInstallFlag(TEMP_DIR_PATH, {
       packageManager: 'pnpm',
-      storePath: path.join(TEMP_DIR, 'pnpm-store')
+      storePath: `${TEMP_DIR_PATH}/pnpm-store`
     });
-    const flag2: LastInstallFlag = new LastInstallFlag(TEMP_DIR, {
+    const flag2: LastInstallFlag = new LastInstallFlag(TEMP_DIR_PATH, {
       packageManager: 'pnpm',
-      storePath: path.join(TEMP_DIR, 'temp-store')
+      storePath: `${TEMP_DIR_PATH}/temp-store`
     });
 
     flag1.create();
@@ -88,11 +87,11 @@ describe(LastInstallFlag.name, () => {
   });
 
   it("doesn't throw an error if conditions for error aren't met", () => {
-    const flag1: LastInstallFlag = new LastInstallFlag(TEMP_DIR, {
+    const flag1: LastInstallFlag = new LastInstallFlag(TEMP_DIR_PATH, {
       packageManager: 'pnpm',
-      storePath: path.join(TEMP_DIR, 'pnpm-store')
+      storePath: `${TEMP_DIR_PATH}/pnpm-store`
     });
-    const flag2: LastInstallFlag = new LastInstallFlag(TEMP_DIR, {
+    const flag2: LastInstallFlag = new LastInstallFlag(TEMP_DIR_PATH, {
       packageManager: 'npm'
     });
 

apps/rush-lib/src/api/test/VersionMismatchFinder.test.ts

@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
 // See LICENSE in the project root for license information.
 
-import * as path from 'path';
-
 import { RushConfigurationProject } from '../RushConfigurationProject';
 import { VersionMismatchFinder } from '../../logic/versionMismatch/VersionMismatchFinder';
 import { PackageJsonEditor } from '../PackageJsonEditor';
@@ -432,7 +430,7 @@ describe(VersionMismatchFinder.name, () => {
       cyclicDependencyProjects: new Set<string>()
     } as any as RushConfigurationProject);
     const projectB: VersionMismatchFinderEntity = new VersionMismatchFinderCommonVersions(
-      CommonVersionsConfiguration.loadFromFile(path.resolve(__dirname, 'jsonFiles', 'common-versions.json'))
+      CommonVersionsConfiguration.loadFromFile(`${__dirname}/jsonFiles/common-versions.json`)
     );
 
     const mismatchFinder: VersionMismatchFinder = new VersionMismatchFinder([projectA, projectB]);

apps/rush-lib/src/api/test/VersionPolicy.test.ts

@@ -1,15 +1,14 @@
 // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
 // See LICENSE in the project root for license information.
 
-import * as path from 'path';
 import { IPackageJson } from '@rushstack/node-core-library';
 
 import { VersionPolicyConfiguration } from '../VersionPolicyConfiguration';
 import { VersionPolicy, LockStepVersionPolicy, IndividualVersionPolicy, BumpType } from '../VersionPolicy';
 
 describe(VersionPolicy.name, () => {
   describe(LockStepVersionPolicy.name, () => {
-    const filename: string = path.resolve(__dirname, 'jsonFiles', 'rushWithLockVersion.json');
+    const filename: string = `${__dirname}/jsonFiles/rushWithLockVersion.json`;
     const versionPolicyConfig: VersionPolicyConfiguration = new VersionPolicyConfiguration(filename);
     let versionPolicy1: VersionPolicy;
     let versionPolicy2: VersionPolicy;
@@ -117,7 +116,7 @@ describe(VersionPolicy.name, () => {
   });
 
   describe(IndividualVersionPolicy.name, () => {
-    const fileName: string = path.resolve(__dirname, 'jsonFiles', 'rushWithIndividualVersion.json');
+    const fileName: string = `${__dirname}/jsonFiles/rushWithIndividualVersion.json`;
     const versionPolicyConfig: VersionPolicyConfiguration = new VersionPolicyConfiguration(fileName);
     const versionPolicy: VersionPolicy = versionPolicyConfig.getVersionPolicy('testPolicy2');
 

apps/rush-lib/src/cli/actions/test/AddAction.test.ts

@@ -3,8 +3,6 @@
 
 import '../../test/mockRushCommandLineParser';
 
-import * as path from 'path';
-
 import { PackageJsonUpdater } from '../../../logic/PackageJsonUpdater';
 import { RushCommandLineParser } from '../../RushCommandLineParser';
 import { AddAction } from '../AddAction';
@@ -32,8 +30,8 @@ describe(AddAction.name, () => {
 
     describe(`'add' action`, () => {
       it(`adds a dependency to just one repo in the workspace`, async () => {
-        const startPath: string = path.resolve(__dirname, 'addRepo');
-        const aPath: string = path.resolve(__dirname, 'addRepo', 'a');
+        const startPath: string = `${__dirname}/addRepo`;
+        const aPath: string = `${__dirname}/addRepo/a`;
 
         // Create a Rush CLI instance. This instance is heavy-weight and relies on setting process.exit
         // to exit and clear the Rush file lock. So running multiple `it` or `describe` test blocks over the same test
@@ -57,8 +55,8 @@ describe(AddAction.name, () => {
 
     describe(`'add' action with --all`, () => {
       it(`adds a dependency to all repos in the workspace`, async () => {
-        const startPath: string = path.resolve(__dirname, 'addRepo');
-        const aPath: string = path.resolve(__dirname, 'addRepo', 'a');
+        const startPath: string = `${__dirname}/addRepo`;
+        const aPath: string = `${__dirname}/addRepo/a`;
 
         // Create a Rush CLI instance. This instance is heavy-weight and relies on setting process.exit
         // to exit and clear the Rush file lock. So running multiple `it` or `describe` test blocks over the same test

apps/rush-lib/src/cli/test/Cli.test.ts

@@ -8,7 +8,7 @@ import { Utilities } from '../../utilities/Utilities';
 describe('CLI', () => {
   it('should not fail when there is no rush.json', () => {
     const workingDir: string = '/';
-    const startPath: string = path.resolve(path.join(__dirname, '../../../lib/start.js'));
+    const startPath: string = path.resolve(__dirname, '../../../lib/start.js');
 
     expect(() => {
       Utilities.executeCommand({
@@ -22,13 +22,13 @@ describe('CLI', () => {
 
   it('rushx should pass args to scripts', () => {
     // Invoke "rushx"
-    const startPath: string = path.resolve(path.join(__dirname, '../../../lib/startx.js'));
+    const startPath: string = path.resolve(__dirname, '../../../lib/startx.js');
 
     // Run "rushx show-args 1 2 -x" in the "repo/rushx-project" folder
     const output: string = Utilities.executeCommandAndCaptureOutput(
       'node',
       [startPath, 'show-args', '1', '2', '-x'],
-      path.join(__dirname, 'repo', 'rushx-project')
+      `${__dirname}/repo/rushx-project`
     );
     const lastLine: string =
       output
@@ -40,12 +40,12 @@ describe('CLI', () => {
 
   it('rushx should fail in un-rush project', () => {
     // Invoke "rushx"
-    const startPath: string = path.resolve(path.join(__dirname, '../../../lib/startx.js'));
+    const startPath: string = path.resolve(__dirname, '../../../lib/startx.js');
 
     const output = Utilities.executeCommandAndCaptureOutput(
       'node',
       [startPath, 'show-args', '1', '2', '-x'],
-      path.join(__dirname, 'repo', 'rushx-not-in-rush-project')
+      `${__dirname}/repo/rushx-not-in-rush-project`
     );
 
     console.log(output);

apps/rush-lib/src/cli/test/CommandLineHelp.test.ts

@@ -3,7 +3,6 @@
 
 import { AnsiEscape } from '@rushstack/node-core-library';
 import * as colorsPackage from 'colors';
-import * as path from 'path';
 
 import { RushCommandLineParser } from '../RushCommandLineParser';
 
@@ -20,7 +19,7 @@ describe('CommandLineHelp', () => {
     });
 
     oldCwd = process.cwd();
-    const localCwd: string = path.join(__dirname, 'repo');
+    const localCwd: string = `${__dirname}/repo`;
 
     process.chdir(localCwd);