Replace the use of generated regular expressions with Path.isUnder

iclanton · iclanton · commit 2f8414891460 · 2019-09-30T21:25:27.000-07:00
diff --git a/apps/rush-lib/src/cli/actions/ChangeAction.ts b/apps/rush-lib/src/cli/actions/ChangeAction.ts
@@ -5,15 +5,17 @@ import * as os from 'os';
 import * as path from 'path';
 import * as child_process from 'child_process';
 import * as colors from 'colors';
-import * as lodash from 'lodash';
 
 import inquirer = require('inquirer');
 
 import {
   CommandLineFlagParameter,
   CommandLineStringParameter
 } from '@microsoft/ts-command-line';
-import { FileSystem } from '@microsoft/node-core-library';
+import {
+  FileSystem,
+  Path
+} from '@microsoft/node-core-library';
 
 import { RushConfigurationProject } from '../../api/RushConfigurationProject';
 import {
@@ -211,9 +213,8 @@ export class ChangeAction extends BaseRushAction {
       normalizedFolder = normalizedFolder + '/';
     }
 
-    const pathRegex: RegExp = new RegExp(`^${lodash.escapeRegExp(normalizedFolder)}`, 'i');
     for (const folder of changedFolders) {
-      if (folder && folder.match(pathRegex)) {
+      if (folder && Path.isUnderOrEqual(folder, normalizedFolder)) {
         return true;
       }
     }
diff --git a/apps/rush-lib/src/utilities/VersionControl.ts b/apps/rush-lib/src/utilities/VersionControl.ts
@@ -3,8 +3,10 @@
 
 import * as child_process from 'child_process';
 import * as colors from 'colors';
-import * as lodash from 'lodash';
-import { Executable } from '@microsoft/node-core-library';
+import {
+  Executable,
+  Path
+} from '@microsoft/node-core-library';
 
 const DEFAULT_BRANCH: string = 'master';
 const DEFAULT_REMOTE: string = 'origin';
@@ -60,16 +62,15 @@ export class VersionControl {
     const output: string = child_process.execSync(
       `git diff ${targetBranch}... --name-only --no-renames --diff-filter=A`
     ).toString();
-    const regex: RegExp | undefined = pathPrefix ? new RegExp(`^${lodash.escapeRegExp(pathPrefix)}`, 'i') : undefined;
     return output.split('\n').map((line) => {
       if (line) {
         const trimmedLine: string = line.trim();
-        if (regex && trimmedLine.match(regex)) {
+        if (!pathPrefix || Path.isUnderOrEqual(trimmedLine, pathPrefix)) {
           return trimmedLine;
         }
+      } else {
+        return undefined;
       }
-
-      return undefined;
     }).filter((line) => {
       return line && line.length > 0;
     }) as string[];
