4.4

jestjs · Oct 11, 2021 · 6e3798b · 6e3798b
1 parent 8e809c6
commit 6e3798b
Show file tree

Hide file tree

Showing 53 changed files with 82 additions and 80 deletions.
diff --git a/e2e/__tests__/detectOpenHandles.ts b/e2e/__tests__/detectOpenHandles.ts
@@ -11,7 +11,7 @@ import runJest, {runContinuous} from '../runJest';
 
 try {
   require('async_hooks');
-} catch (e) {
+} catch (e: any) {
   if (e.code === 'MODULE_NOT_FOUND') {
     // eslint-disable-next-line jest/no-focused-tests
     fit('skip test for unsupported nodes', () => {

diff --git a/e2e/__tests__/jsonReporter.test.ts b/e2e/__tests__/jsonReporter.test.ts
@@ -30,7 +30,7 @@ describe('JSON Reporter', () => {
 
     try {
       jsonResult = JSON.parse(testOutput);
-    } catch (err) {
+    } catch (err: any) {
       throw new Error(
         `Can't parse the JSON result from ${outputFileName}, ${err.toString()}`,
       );
@@ -71,7 +71,7 @@ describe('JSON Reporter', () => {
 
     try {
       jsonResult = JSON.parse(result.stdout);
-    } catch (err) {
+    } catch (err: any) {
       throw new Error(
         "Can't parse the JSON result from stdout" + err.toString(),
       );

diff --git a/e2e/__tests__/resolveConditions.test.ts b/e2e/__tests__/resolveConditions.test.ts
@@ -26,7 +26,7 @@ onNodeVersions('>=12.16.0', () => {
       });
       try {
         expect(exitCode).toBe(0);
-      } catch (error) {
+      } catch (error: any) {
         console.log(`Test failed on iteration ${i + 1}`);
         throw error;
       }

diff --git a/e2e/__tests__/testRetries.test.ts b/e2e/__tests__/testRetries.test.ts
@@ -50,7 +50,7 @@ describe('Test Retries', () => {
 
     try {
       jsonResult = JSON.parse(testOutput);
-    } catch (err) {
+    } catch (err: any) {
       throw new Error(
         `Can't parse the JSON result from ${outputFileName}, ${err.toString()}`,
       );
@@ -81,7 +81,7 @@ describe('Test Retries', () => {
 
     try {
       jsonResult = JSON.parse(testOutput);
-    } catch (err) {
+    } catch (err: any) {
       throw new Error(
         `Can't parse the JSON result from ${outputFileName}, ${err.toString()}`,
       );
@@ -112,7 +112,7 @@ describe('Test Retries', () => {
 
     try {
       jsonResult = JSON.parse(testOutput);
-    } catch (err) {
+    } catch (err: any) {
       throw new Error(
         `Can't parse the JSON result from ${outputFileName}, ${err.toString()}`,
       );

diff --git a/e2e/runJest.ts b/e2e/runJest.ts
@@ -144,7 +144,7 @@ export const json = function (
       ...result,
       json: JSON.parse(result.stdout || ''),
     };
-  } catch (e) {
+  } catch (e: any) {
     throw new Error(
       `
       Can't parse JSON.

diff --git a/packages/expect/src/__tests__/isError.test.ts b/packages/expect/src/__tests__/isError.test.ts
@@ -43,7 +43,7 @@ describe('isError', () => {
     testErrorFromDifferentContext((win: Window) => {
       try {
         win.document.querySelectorAll('');
-      } catch (e) {
+      } catch (e: any) {
         return e;
       }
       return null;

diff --git a/packages/expect/src/__tests__/stacktrace.test.ts b/packages/expect/src/__tests__/stacktrace.test.ts
@@ -33,7 +33,7 @@ jestExpect.extend({
 it('stack trace points to correct location when using matchers', () => {
   try {
     jestExpect(true).toBe(false);
-  } catch (error) {
+  } catch (error: any) {
     expect(error.stack).toContain('stacktrace.test.ts:35');
   }
 });
@@ -43,7 +43,7 @@ it('stack trace points to correct location when using nested matchers', () => {
     jestExpect(true).toMatchPredicate((value: unknown) => {
       jestExpect(value).toBe(false);
     });
-  } catch (error) {
+  } catch (error: any) {
     expect(error.stack).toContain('stacktrace.test.ts:44');
   }
 });
@@ -59,7 +59,7 @@ it('stack trace points to correct location when throwing from a custom matcher',
 
       foo();
     }).toCustomMatch('bar');
-  } catch (error) {
+  } catch (error: any) {
     expect(error.stack).toContain('stacktrace.test.ts:57');
   }
 });
diff --git a/packages/expect/src/index.ts b/packages/expect/src/index.ts
@@ -349,7 +349,7 @@ const makeThrowingMatcher = (
 
         return processResult(syncResult);
       }
-    } catch (error) {
+    } catch (error: any) {
       return handleError(error);
     }
   };

diff --git a/packages/expect/src/toThrowMatchers.ts b/packages/expect/src/toThrowMatchers.ts
@@ -107,7 +107,7 @@ export const createMatcher = (
       } else {
         try {
           received();
-        } catch (e) {
+        } catch (e: any) {
           thrown = getThrown(e);
         }
       }

diff --git a/packages/jest-changed-files/src/git.ts b/packages/jest-changed-files/src/git.ts
@@ -19,7 +19,7 @@ const findChangedFilesUsingCommand = async (
 
   try {
     result = await execa('git', args, {cwd});
-  } catch (e) {
+  } catch (e: any) {
     // TODO: Should we keep the original `message`?
     e.message = e.stderr;
 

diff --git a/packages/jest-changed-files/src/hg.ts b/packages/jest-changed-files/src/hg.ts
@@ -32,7 +32,7 @@ const adapter: SCMAdapter = {
 
     try {
       result = await execa('hg', args, {cwd, env});
-    } catch (e) {
+    } catch (e: any) {
       // TODO: Should we keep the original `message`?
       e.message = e.stderr;
 

diff --git a/packages/jest-circus/src/run.ts b/packages/jest-circus/src/run.ts
@@ -157,7 +157,7 @@ const _callCircusHook = async ({
       timeout,
     });
     await dispatch({describeBlock, hook, name: 'hook_success', test});
-  } catch (error) {
+  } catch (error: any) {
     await dispatch({describeBlock, error, hook, name: 'hook_failure', test});
   }
 };
@@ -180,7 +180,7 @@ const _callCircusTest = async (
       timeout,
     });
     await dispatch({name: 'test_fn_success', test});
-  } catch (error) {
+  } catch (error: any) {
     await dispatch({error, name: 'test_fn_failure', test});
   }
 };

diff --git a/packages/jest-circus/src/utils.ts b/packages/jest-circus/src/utils.ts
@@ -253,7 +253,7 @@ export const callAsyncCircusFn = (
     } else {
       try {
         returnedValue = fn.call(testContext);
-      } catch (error) {
+      } catch (error: any) {
         reject(error);
         return;
       }

diff --git a/packages/jest-cli/src/cli/index.ts b/packages/jest-cli/src/cli/index.ts
@@ -34,7 +34,7 @@ export async function run(
 
     const {results, globalConfig} = await runCLI(argv, projects);
     readResultsAndExit(results, globalConfig);
-  } catch (error) {
+  } catch (error: any) {
     clearLine(process.stderr);
     clearLine(process.stdout);
     if (error?.stack) {

diff --git a/packages/jest-config/src/__tests__/normalize.test.ts b/packages/jest-config/src/__tests__/normalize.test.ts
@@ -1816,7 +1816,7 @@ describe('extensionsToTreatAsEsm', () => {
 
     try {
       await callback();
-    } catch (error) {
+    } catch (error: any) {
       expect(wrap(stripAnsi(error.message).trim())).toMatchSnapshot();
     }
   }

diff --git a/packages/jest-config/src/normalize.ts b/packages/jest-config/src/normalize.ts
@@ -65,7 +65,7 @@ function verifyDirectoryExists(path: Config.Path, key: string) {
         )} option is not a directory.`,
       );
     }
-  } catch (err) {
+  } catch (err: any) {
     if (err instanceof ValidationError) {
       throw err;
     }
@@ -150,7 +150,7 @@ const setupPreset = async (
     } catch {}
 
     preset = await requireOrImportModule(presetModule);
-  } catch (error) {
+  } catch (error: any) {
     if (error instanceof SyntaxError || error instanceof TypeError) {
       throw createConfigError(
         `  Preset ${chalk.bold(presetPath)} is invalid:\n\n  ${

diff --git a/packages/jest-config/src/readConfigFileAndSetRootDir.ts b/packages/jest-config/src/readConfigFileAndSetRootDir.ts
@@ -36,7 +36,7 @@ export default async function readConfigFileAndSetRootDir(
     } else {
       configObject = await requireOrImportModule<any>(configPath);
     }
-  } catch (error) {
+  } catch (error: any) {
     if (isJSON) {
       throw new Error(
         `Jest: Failed to parse config file ${configPath}\n` +
@@ -92,7 +92,7 @@ const loadTSConfigFile = async (
         module: 'CommonJS',
       },
     });
-  } catch (e) {
+  } catch (e: any) {
     if (e.code === 'MODULE_NOT_FOUND') {
       throw new Error(
         `Jest: 'ts-node' is required for the TypeScript configuration files. Make sure it is installed\nError: ${e.message}`,

diff --git a/packages/jest-console/src/BufferedConsole.ts b/packages/jest-console/src/BufferedConsole.ts
@@ -74,7 +74,7 @@ export default class BufferedConsole extends Console {
   assert(value: unknown, message?: string | Error): void {
     try {
       assert(value, message);
-    } catch (error) {
+    } catch (error: any) {
       this._log('assert', error.toString());
     }
   }

diff --git a/packages/jest-console/src/CustomConsole.ts b/packages/jest-console/src/CustomConsole.ts
@@ -52,7 +52,7 @@ export default class CustomConsole extends Console {
   assert(value: unknown, message?: string | Error): asserts value {
     try {
       assert(value, message);
-    } catch (error) {
+    } catch (error: any) {
       this._logError('assert', error.toString());
     }
   }

diff --git a/packages/jest-core/src/TestScheduler.ts b/packages/jest-core/src/TestScheduler.ts
@@ -286,7 +286,7 @@ class TestScheduler {
             );
           }
         }
-      } catch (error) {
+      } catch (error: any) {
         if (!watcher.isInterrupted()) {
           throw error;
         }
@@ -410,7 +410,7 @@ class TestScheduler {
       try {
         const Reporter = await requireOrImportModule<any>(path, true);
         this.addReporter(new Reporter(this._globalConfig, options));
-      } catch (error) {
+      } catch (error: any) {
         error.message =
           'An error occurred while adding the reporter at path "' +
           chalk.bold(path) +

diff --git a/packages/jest-core/src/cli/index.ts b/packages/jest-core/src/cli/index.ts
@@ -175,7 +175,7 @@ const _run10000 = async (
       filterSetupPromise = (async () => {
         try {
           await rawFilter.setup();
-        } catch (err) {
+        } catch (err: any) {
           return err;
         }
         return undefined;

diff --git a/packages/jest-core/src/runGlobalHook.ts b/packages/jest-core/src/runGlobalHook.ts
@@ -58,7 +58,7 @@ export default async ({
             await globalModule(globalConfig);
           },
         );
-      } catch (error) {
+      } catch (error: any) {
         if (util.types.isNativeError(error)) {
           error.message = `Jest: Got error running ${moduleName} - ${modulePath}, reason: ${error.message}`;
 

diff --git a/packages/jest-core/src/watch.ts b/packages/jest-core/src/watch.ts
@@ -200,7 +200,7 @@ export default async function watch(
           stdin,
           stdout: outputStream,
         });
-      } catch (error) {
+      } catch (error: any) {
         const errorWithContext = new Error(
           `Failed to initialize watch plugin "${chalk.bold(
             slash(path.relative(process.cwd(), pluginWithConfig.path)),

diff --git a/packages/jest-each/src/bind.ts b/packages/jest-each/src/bind.ts
@@ -50,7 +50,7 @@ export default <EachCallback extends Global.TestCallback>(
             timeout,
           ),
         );
-      } catch (e) {
+      } catch (e: any) {
         const error = new ErrorWithStack(e.message, eachBind);
         return cb(title, () => {
           throw error;

diff --git a/packages/jest-fake-timers/src/legacyFakeTimers.ts b/packages/jest-fake-timers/src/legacyFakeTimers.ts
@@ -308,7 +308,7 @@ export default class FakeTimers<TimerRef> {
     let errThrown = false;
     try {
       cb();
-    } catch (e) {
+    } catch (e: any) {
       errThrown = true;
       cbErr = e;
     }

diff --git a/packages/jest-haste-map/src/index.ts b/packages/jest-haste-map/src/index.ts
@@ -793,7 +793,7 @@ export default class HasteMap extends EventEmitter {
 
     try {
       return crawl(crawlerOptions).catch(retry);
-    } catch (error) {
+    } catch (error: any) {
       return retry(error);
     }
   }

diff --git a/packages/jest-haste-map/src/worker.ts b/packages/jest-haste-map/src/worker.ts
@@ -60,7 +60,7 @@ export async function worker(data: WorkerMessage): Promise<WorkerMetadata> {
         id = fileData.name;
         module = [relativeFilePath, H.PACKAGE];
       }
-    } catch (err) {
+    } catch (err: any) {
       throw new Error(`Cannot parse ${filePath} as JSON: ${err.message}`);
     }
   } else if (!blacklist.has(filePath.substr(filePath.lastIndexOf('.')))) {

diff --git a/packages/jest-jasmine2/src/PCancelable.ts b/packages/jest-jasmine2/src/PCancelable.ts
@@ -75,7 +75,7 @@ export default class PCancelable<T> implements PromiseLike<T> {
     if (typeof this._cancel === 'function') {
       try {
         this._cancel();
-      } catch (err) {
+      } catch (err: any) {
         this._reject(err);
       }
     }

diff --git a/packages/jest-jasmine2/src/jasmine/Env.ts b/packages/jest-jasmine2/src/jasmine/Env.ts
@@ -438,7 +438,7 @@ export default function (j$: Jasmine) {
         let describeReturnValue: unknown | Error;
         try {
           describeReturnValue = specDefinitions.call(suite);
-        } catch (e) {
+        } catch (e: any) {
           declarationError = e;
         }
 

diff --git a/packages/jest-jasmine2/src/jasmineAsyncInstall.ts b/packages/jest-jasmine2/src/jasmineAsyncInstall.ts
@@ -212,7 +212,7 @@ function makeConcurrent(
           `Jest: concurrent test "${spec.getFullName()}" must return a Promise.`,
         );
       });
-    } catch (error) {
+    } catch (error: any) {
       promise = Promise.reject(error);
     }
 

diff --git a/packages/jest-jasmine2/src/queueRunner.ts b/packages/jest-jasmine2/src/queueRunner.ts
@@ -55,7 +55,7 @@ export default function queueRunner(options: Options): PromiseLike<void> & {
       };
       try {
         fn.call(options.userContext, next);
-      } catch (e) {
+      } catch (e: any) {
         options.onException(e);
         resolve();
       }

diff --git a/packages/jest-leak-detector/src/index.ts b/packages/jest-leak-detector/src/index.ts
@@ -33,7 +33,7 @@ export default class {
     try {
       // eslint-disable-next-line import/no-extraneous-dependencies
       weak = require('weak-napi');
-    } catch (err) {
+    } catch (err: any) {
       if (!err || err.code !== 'MODULE_NOT_FOUND') {
         throw err;
       }

diff --git a/packages/jest-mock/src/index.ts b/packages/jest-mock/src/index.ts
@@ -595,7 +595,7 @@ export class ModuleMocker {
 
             return undefined;
           })();
-        } catch (error) {
+        } catch (error: any) {
           // Store the thrown error so we can record it, then re-throw it.
           thrownError = error;
           callDidThrowError = true;

diff --git a/packages/jest-repl/src/cli/repl.ts b/packages/jest-repl/src/cli/repl.ts
@@ -49,7 +49,7 @@ const evalCommand: repl.REPLEval = (
           : transformResult.code;
     }
     result = runInThisContext(cmd);
-  } catch (e) {
+  } catch (e: any) {
     return callback(isRecoverableError(e) ? new repl.Recoverable(e) : e);
   }
   return callback(null, result);

diff --git a/packages/jest-repl/src/cli/runtime-cli.ts b/packages/jest-repl/src/cli/runtime-cli.ts
@@ -128,7 +128,7 @@ export async function run(
     } else {
       runtime.requireModule(filePath);
     }
-  } catch (e) {
+  } catch (e: any) {
     console.error(chalk.red(e.stack || e));
     process.on('exit', () => (process.exitCode = 1));
   }