Support '1' in addition to 'true' in env var boolean values.

microsoft · Mar 20, 2024 · adff2fa · adff2fa
1 parent b7ab99e
commit adff2fa
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/eslint/eslint-patch/src/eslint-bulk-suppressions/bulk-suppressions-patch.ts b/eslint/eslint-patch/src/eslint-bulk-suppressions/bulk-suppressions-patch.ts
@@ -258,7 +258,7 @@ export function shouldBulkSuppress(params: {
     };
   }
 
-  return process.env[ESLINT_BULK_PRUNE_ENV_VAR_NAME] !== 'true' && currentNodeIsSuppressed;
+  return process.env[ESLINT_BULK_PRUNE_ENV_VAR_NAME] !== '1' && currentNodeIsSuppressed;
 }
 
 export function prune(): void {

diff --git a/eslint/eslint-patch/src/eslint-bulk-suppressions/cli/prune.ts b/eslint/eslint-patch/src/eslint-bulk-suppressions/cli/prune.ts
@@ -17,7 +17,7 @@ export async function pruneAsync(): Promise<void> {
     throw new Error(`@rushstack/eslint-bulk: Unknown arguments: ${args.join(' ')}`);
   }
 
-  process.env[ESLINT_BULK_PRUNE_ENV_VAR_NAME] = 'true';
+  process.env[ESLINT_BULK_PRUNE_ENV_VAR_NAME] = '1';
 
   await runEslintAsync(['.'], 'prune');
 }
diff --git a/eslint/eslint-patch/src/eslint-bulk-suppressions/generate-patched-file.ts b/eslint/eslint-patch/src/eslint-bulk-suppressions/generate-patched-file.ts
@@ -16,10 +16,9 @@ export function generatePatchedLinterJsFileIfDoesNotExist(
   inputFilePath: string,
   outputFilePath: string
 ): void {
-  if (
-    process.env[ESLINT_BULK_FORCE_REGENERATE_PATCH_ENV_VAR_NAME] !== 'true' &&
-    fs.existsSync(outputFilePath)
-  ) {
+  const generateEnvVarValue: string | undefined =
+    process.env[ESLINT_BULK_FORCE_REGENERATE_PATCH_ENV_VAR_NAME];
+  if (generateEnvVarValue !== 'true' && generateEnvVarValue !== '1' && fs.existsSync(outputFilePath)) {
     return;
   }
 

diff --git a/eslint/eslint-patch/src/eslint-bulk-suppressions/index.ts b/eslint/eslint-patch/src/eslint-bulk-suppressions/index.ts
@@ -15,7 +15,8 @@ if (!eslintFolder) {
   process.exit(1);
 }
 
-if (process.env[ESLINT_BULK_DETECT_ENV_VAR_NAME] === 'true') {
+const eslintBulkDetectEnvVarValue: string | undefined = process.env[ESLINT_BULK_DETECT_ENV_VAR_NAME];
+if (eslintBulkDetectEnvVarValue === 'true' || eslintBulkDetectEnvVarValue === '1') {
   findAndConsoleLogPatchPathCli();
   process.exit(0);
 }

diff --git a/eslint/eslint-patch/src/eslint-bulk-suppressions/path-utils.ts b/eslint/eslint-patch/src/eslint-bulk-suppressions/path-utils.ts
@@ -15,7 +15,8 @@ interface IConfiguration {
 const CURRENT_PACKAGE_VERSION: string = currentPackageJson.version;
 
 export function findAndConsoleLogPatchPathCli(): void {
-  if (process.env[ESLINT_BULK_DETECT_ENV_VAR_NAME] !== 'true') {
+  const eslintBulkDetectEnvVarValue: string | undefined = process.env[ESLINT_BULK_DETECT_ENV_VAR_NAME];
+  if (eslintBulkDetectEnvVarValue !== 'true' && eslintBulkDetectEnvVarValue !== '1') {
     return;
   }
-Original file line number
+Diff line change
@@ Expand Up / @@ -258,7 +258,7 @@ export function shouldBulkSuppress(params: { @@
         };
       }
-      return process.env[ESLINT_BULK_PRUNE_ENV_VAR_NAME] !== 'true' && currentNodeIsSuppressed;
+      return process.env[ESLINT_BULK_PRUNE_ENV_VAR_NAME] !== '1' && currentNodeIsSuppressed;
     }
     export function prune(): void {
@@ Expand Down @@