From c394dcc1d414e1b0e24a8548a29365ee82188aec Mon Sep 17 00:00:00 2001 From: Ahn Date: Sun, 4 Mar 2018 11:53:50 +0100 Subject: [PATCH 1/2] Update types for FullJestConfig to be in sync with types in Jest --- src/jest-types.ts | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/jest-types.ts b/src/jest-types.ts index 3925fc7a46..3374b20743 100644 --- a/src/jest-types.ts +++ b/src/jest-types.ts @@ -39,6 +39,10 @@ export interface FullJestConfig { cacheDirectory: Path; clearMocks: boolean; coveragePathIgnorePatterns: string[]; + cwd: Path; + detectLeaks: boolean; + displayName: string; + forceCoverageMatch: Glob[]; globals: ConfigGlobals; haste: HasteConfig; moduleDirectories: string[]; @@ -51,12 +55,17 @@ export interface FullJestConfig { resetMocks: boolean; resetModules: boolean; resolver: Path | null; + restoreMocks: boolean; rootDir: Path; roots: Path[]; + runner: string; setupFiles: Path[]; setupTestFrameworkScriptFile: Path; + skipNodeResolution: boolean; snapshotSerializers: Path[]; testEnvironment: string; + testEnvironmentOptions: object; + testLocationInResults: boolean; testMatch: Glob[]; testPathIgnorePatterns: string[]; testRegex: string; @@ -65,6 +74,7 @@ export interface FullJestConfig { timers: 'real' | 'fake'; transform: Array<[string, Path]>; transformIgnorePatterns: Glob[]; + watchPathIgnorePatterns: string[]; unmockedModulePathPatterns: string[] | null; } From 8fc82151e31d8c518e928620ef9c9c89e94cb59a Mon Sep 17 00:00:00 2001 From: Ahn Date: Sun, 4 Mar 2018 12:26:10 +0100 Subject: [PATCH 2/2] Small adjustments for optional type --- src/jest-types.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/jest-types.ts b/src/jest-types.ts index 3374b20743..893e917d14 100644 --- a/src/jest-types.ts +++ b/src/jest-types.ts @@ -41,7 +41,7 @@ export interface FullJestConfig { coveragePathIgnorePatterns: string[]; cwd: Path; detectLeaks: boolean; - displayName: string; + displayName: string | null; forceCoverageMatch: Glob[]; globals: ConfigGlobals; haste: HasteConfig; @@ -60,7 +60,7 @@ export interface FullJestConfig { roots: Path[]; runner: string; setupFiles: Path[]; - setupTestFrameworkScriptFile: Path; + setupTestFrameworkScriptFile: Path | null; skipNodeResolution: boolean; snapshotSerializers: Path[]; testEnvironment: string;