chore: upgrade dependencies, correct typings (#1524)

Author: ahnpnl

package-lock.json

@@ -85,7 +85,7 @@
   },
   "devDependencies": {
     "@commitlint/cli": "8.x",
-    "@commitlint/config-conventional": "7.x",
+    "@commitlint/config-conventional": "8.x",
     "@jest/transform": "25.x",
     "@jest/types": "25.x",
     "@types/babel__core": "7.x",

package.json

@@ -73,7 +73,7 @@ export function makeCompiler({
   jestConfig = {
     ...jestConfig,
     testMatch: ['^.+\\.tsx?$'],
-    testRegex: jestConfig?.testRegex ? testRegex.concat(jestConfig.testRegex) : testRegex,
+    testRegex: jestConfig?.testRegex ? [...testRegex, ...jestConfig.testRegex] : testRegex,
   }
   const cs = new ConfigSet(getJestConfig(jestConfig, tsJestConfig), parentConfig)
 

src/__helpers__/fakers.ts

@@ -1,6 +1,6 @@
 import { Config } from '@jest/types'
 import { createLogger } from 'bs-logger'
-import * as stringifyJson from 'fast-json-stable-stringify'
+import stableStringify = require('fast-json-stable-stringify')
 import { existsSync } from 'fs'
 import { stringify as stringifyJson5 } from 'json5'
 import { basename, resolve } from 'path'
@@ -119,16 +119,16 @@ Visit https://kulshekhar.github.io/ts-jest/user/config/#jest-preset for more inf
   if (
     preset &&
     migratedConfig.transform &&
-    stringifyJson(migratedConfig.transform) === stringifyJson(preset.value.transform)
+    stableStringify(migratedConfig.transform) === stableStringify(preset.value.transform)
   ) {
     delete migratedConfig.transform
   }
 
   // cleanup
   cleanupConfig(actualConfig)
   cleanupConfig(migratedConfig)
-  const before = stringifyJson(actualConfig)
-  const after = stringifyJson(migratedConfig)
+  const before = stableStringify(actualConfig)
+  const after = stableStringify(migratedConfig)
   if (after === before) {
     process.stderr.write(`
 No migration needed for given Jest configuration

src/cli/config/migrate.ts

@@ -53,7 +53,7 @@ export function cacheResolvedModules(
   }
 }
 
-export function isTestFile(testMatchPatterns: [string, RegExp], fileName: string) {
+export function isTestFile(testMatchPatterns: (string | RegExp)[], fileName: string) {
   return testMatchPatterns.some(pattern =>
     typeof pattern === 'string' ? micromatch.isMatch(fileName, pattern) : pattern.test(fileName),
   )

src/compiler/compiler-utils.ts

@@ -1,4 +1,4 @@
-import { Transformer } from '@jest/transform/build/types'
+import { Transformer } from '@jest/transform'
 import { Config } from '@jest/types'
 import { testing } from 'bs-logger'
 import { readFileSync } from 'fs'

src/config/config-set.spec.ts

@@ -196,8 +196,8 @@ export class ConfigSet {
    * @internal
    */
   @Memoize()
-  get testMatchPatterns(): [string, RegExp] {
-    return this.jest.testMatch.concat(this.jest.testRegex) as [string, RegExp]
+  get testMatchPatterns(): (string | RegExp)[] {
+    return [...this.jest.testMatch, ...this.jest.testRegex]
   }
 
   /**

src/config/config-set.ts

@@ -1,4 +1,4 @@
-import { CacheKeyOptions, TransformOptions, TransformedSource, Transformer } from '@jest/transform/build/types'
+import { CacheKeyOptions, TransformOptions, TransformedSource, Transformer } from '@jest/transform'
 import { Config } from '@jest/types'
 import { Logger } from 'bs-logger'
 import { inspect } from 'util'

src/shims.d.ts

@@ -1,7 +1,5 @@
-import { TransformedSource, Transformer } from '@jest/transform/build/types'
+import { TransformedSource, Transformer } from '@jest/transform'
 import * as _babel from 'babel__core'
-import { CompilerOptions, SourceFile, TransformerFactory } from 'typescript'
-// tslint:disable-next-line:no-duplicate-imports
 import * as _ts from 'typescript'
 
 import { ConfigSet } from './config/config-set'
@@ -37,7 +35,7 @@ export interface TsJestGlobalOptions {
    *     - `path/to/tsconfig.json`: path to a specific tsconfig file (<rootDir> can be used)
    *     - `{...}`: an object with inline compiler options
    */
-  tsConfig?: boolean | string | CompilerOptions
+  tsConfig?: boolean | string | _ts.CompilerOptions
 
   /**
    * packageJson. It can be:
@@ -122,7 +120,7 @@ interface TsJestConfig$tsConfig$file {
 }
 interface TsJestConfig$tsConfig$inline {
   kind: 'inline'
-  value: CompilerOptions
+  value: _ts.CompilerOptions
 }
 type TsJestConfig$tsConfig = TsJestConfig$tsConfig$file | TsJestConfig$tsConfig$inline | undefined
 interface TsJestConfig$diagnostics {
@@ -227,5 +225,5 @@ export interface CompilerInstance {
 export interface AstTransformerDesc {
   name: string
   version: number
-  factory(cs: ConfigSet): TransformerFactory<SourceFile>
+  factory(cs: ConfigSet): _ts.TransformerFactory<_ts.SourceFile>
 }