fix: concat the useFilesToBeExempted() and autoCheckOpts.filesFilter

salesforce · Nov 21, 2023 · f49a730 · f49a730
1 parent dc709d8
commit f49a730
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/packages/common/src/helpers.ts b/packages/common/src/helpers.ts
@@ -1,5 +1,3 @@
-// eslint-disable-next-line eslint-comments/disable-enable-pair
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /*
  * Copyright (c) 2021, salesforce.com, inc.
  * All rights reserved.
@@ -21,8 +19,9 @@ export function log(...args: unknown[]): void {
 export function useFilesToBeExempted(): string[] {
     const packageName: string = process.env.SA11Y_AUTO_FILTER_LIST_PACKAGE_NAME || '';
     let getFilesToBeExempted: () => string[];
-    if (packageName != '') {
+    if (packageName !== '') {
         try {
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
             getFilesToBeExempted = require(packageName);
             const filesToBeExempted = getFilesToBeExempted();
             return filesToBeExempted;

diff --git a/packages/jest/src/setup.ts b/packages/jest/src/setup.ts
@@ -100,7 +100,10 @@ export function setup(opts: Sa11yOpts = defaultSa11yOpts): void {
     autoCheckOpts.cleanupAfterEach ||= !!process.env.SA11Y_CLEANUP;
     if (process.env.SA11Y_AUTO_FILTER?.trim().length)
         autoCheckOpts.filesFilter ||= process.env.SA11Y_AUTO_FILTER.split(',');
-    if (useFilesToBeExempted().length != 0) autoCheckOpts.filesFilter ||= useFilesToBeExempted();
+    if (useFilesToBeExempted().length !== 0) {
+        autoCheckOpts.filesFilter = autoCheckOpts.filesFilter || [];
+        autoCheckOpts.filesFilter = autoCheckOpts.filesFilter.concat(useFilesToBeExempted());
+    }
     registerSa11yAutomaticChecks(autoCheckOpts);
 }