Avoid duplicating types for pretty format

jestjs · Jul 12, 2021 · cd76e67 · cd76e67
1 parent 8d5ea2e
commit cd76e67
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/packages/jest-config/src/normalize.ts b/packages/jest-config/src/normalize.ts
@@ -27,7 +27,6 @@ import {
   tryRealpath,
 } from 'jest-util';
 import {ValidationError, validate} from 'jest-validate';
-import {DEFAULT_OPTIONS as PRETTY_FORMAT_DEFAULTS} from 'pretty-format';
 import DEFAULT_CONFIG from './Defaults';
 import DEPRECATED_CONFIG from './Deprecated';
 import {validateReporters} from './ReporterValidationErrors';

diff --git a/packages/jest-jasmine2/src/setup_jest_globals.ts b/packages/jest-jasmine2/src/setup_jest_globals.ts
@@ -106,12 +106,14 @@ export default async ({
 
   patchJasmine();
   const {expand, updateSnapshot} = globalConfig;
-  const {prettierPath} = config;
+  const {prettierPath, inlineSnapshotFormat, snapshotFormat} = config;
   const snapshotResolver = await buildSnapshotResolver(config, localRequire);
   const snapshotPath = snapshotResolver.resolveSnapshotPath(testPath);
   const snapshotState = new SnapshotState(snapshotPath, {
     expand,
+    inlineSnapshotFormat,
     prettierPath,
+    snapshotFormat,
     updateSnapshot,
   });
   // @ts-expect-error: snapshotState is a jest extension of `expect`

diff --git a/packages/jest-types/src/Config.ts b/packages/jest-types/src/Config.ts
@@ -8,7 +8,6 @@
 import type {ForegroundColor} from 'chalk';
 import type {ReportOptions} from 'istanbul-reports';
 import type {Arguments} from 'yargs';
-import type {OptionsReceived as PrettyFormatOptions} from 'pretty-format';
 
 type CoverageProvider = 'babel' | 'v8';
 
@@ -61,6 +60,9 @@ export interface ConfigGlobals {
   [K: string]: unknown;
 }
 
+// This interface gets filled out when pretty-format is included
+interface PrettyFormatOptions {}
+
 export type DefaultOptions = {
   automock: boolean;
   bail: number;

diff --git a/packages/jest-types/src/index.ts b/packages/jest-types/src/index.ts
@@ -1,3 +1,4 @@
+
 /**
  * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
  *

diff --git a/packages/pretty-format/src/types.ts b/packages/pretty-format/src/types.ts
@@ -46,7 +46,7 @@ export type Options = {
   theme: Theme;
 };
 
-export type OptionsReceived = {
+export interface PrettyFormatOptions {
   callToJSON?: boolean;
   escapeRegex?: boolean;
   escapeString?: boolean;
@@ -58,7 +58,9 @@ export type OptionsReceived = {
   printBasicPrototype?: boolean;
   printFunctionName?: boolean;
   theme?: ThemeReceived;
-};
+}
+
+export type OptionsReceived = PrettyFormatOptions;
 
 export type Config = {
   callToJSON: boolean;