From cbb88bba34dbb852d8f4013be6e020769feb306d Mon Sep 17 00:00:00 2001
From: Chang Cao <chang.cao@compass.com>
Date: Sat, 17 Sep 2022 23:16:47 +0800
Subject: [PATCH] fix: mark `ts-jest` as optional in `ConfigGlobals` (#3816)

Fixes #3815
---
 e2e/config-typing/jest.config.ts |  3 +++
 src/types.ts                     | 11 ++++-------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/e2e/config-typing/jest.config.ts b/e2e/config-typing/jest.config.ts
index 832d5ffe4e..c58409f7ee 100644
--- a/e2e/config-typing/jest.config.ts
+++ b/e2e/config-typing/jest.config.ts
@@ -9,6 +9,9 @@ const jestCfg: JestConfigWithTsJest = {
       },
     ],
   },
+  globals: {
+    aaa: true,
+  },
 }
 
 export default jestCfg
diff --git a/src/types.ts b/src/types.ts
index 14ae3948b9..b99d434f6f 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -17,7 +17,7 @@ declare module '@jest/types' {
        */
       // eslint-disable-next-line
       // @ts-ignore
-      'ts-jest': TsJestGlobalOptions
+      'ts-jest'?: TsJestGlobalOptions
     }
   }
 }
@@ -184,7 +184,7 @@ export interface TransformOptionsTsJest extends TransformOptions {
  * @deprecated use `JestConfigWithTsJest` instead
  */
 export interface GlobalConfigTsJest extends Config.ConfigGlobals {
-  'ts-jest': TsJestGlobalOptions
+  'ts-jest'?: TsJestGlobalOptions
 }
 /**
  * @deprecated use `JestConfigWithTsJest` instead
@@ -193,16 +193,13 @@ export interface InitialOptionsTsJest extends Config.InitialOptions {
   globals?: GlobalConfigTsJest
 }
 type TsJestTransformerOptions = TsJestGlobalOptions
-export interface JestConfigWithTsJest extends Partial<Omit<Config.ProjectConfig, 'transform'>> {
-  transform: {
+export interface JestConfigWithTsJest extends Omit<Config.InitialOptions, 'transform'> {
+  transform?: {
     [regex: string]: 'ts-jest' | ['ts-jest', TsJestTransformerOptions] | string | [string, Record<string, unknown>]
   }
 }
 
 export type StringMap = Map<string, string>
-/**
- * @internal
- */
 export interface DepGraphInfo {
   fileContent: string
   resolvedModuleNames: string[]