don't keep separate argv config file

packages/jest-runtime/src/cli/index.ts

@@ -10,7 +10,7 @@ import path from 'path';
 import chalk from 'chalk';
 import {sync as realpath} from 'realpath-native';
 import yargs from 'yargs';
-import {Argv} from '@jest/types';
+import {Config} from '@jest/types';
 import {JestEnvironment} from '@jest/environment';
 import {Console, setGlobal} from 'jest-util';
 // @ts-ignore: Not migrated to TS
@@ -21,7 +21,7 @@ import {VERSION} from '../version';
 import {Context} from '../types';
 import * as args from './args';
 
-export function run(cliArgv?: Argv.Argv, cliInfo?: Array<string>) {
+export function run(cliArgv?: Config.Argv, cliInfo?: Array<string>) {
   const realFs = require('fs');
   const fs = require('graceful-fs');
   fs.gracefulify(realFs);

packages/jest-runtime/src/index.ts

@@ -6,7 +6,7 @@
  */
 
 import path from 'path';
-import {Argv, Config, SourceMaps} from '@jest/types';
+import {Config, SourceMaps} from '@jest/types';
 import {
   Jest,
   JestEnvironment,
@@ -264,7 +264,7 @@ class Runtime {
     });
   }
 
-  static runCLI(args?: Argv.Argv, info?: Array<string>) {
+  static runCLI(args?: Config.Argv, info?: Array<string>) {
     return cliRun(args, info);
   }
 

packages/jest-types/src/Config.ts

@@ -5,6 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import {Arguments} from 'yargs';
+
 export type Path = string;
 
 export type Glob = string;
@@ -355,3 +357,94 @@ export type ProjectConfig = {
   watchPathIgnorePatterns: Array<string>;
   unmockedModulePathPatterns: Array<string> | null | undefined;
 };
+
+export type Argv = Arguments<{
+  all: boolean;
+  automock: boolean;
+  bail: boolean | number;
+  browser: boolean;
+  cache: boolean;
+  cacheDirectory: string;
+  changedFilesWithAncestor: boolean;
+  changedSince: string;
+  ci: boolean;
+  clearCache: boolean;
+  clearMocks: boolean;
+  collectCoverage: boolean;
+  collectCoverageFrom: Array<string>;
+  collectCoverageOnlyFrom: Array<string>;
+  config: string;
+  coverage: boolean;
+  coverageDirectory: string;
+  coveragePathIgnorePatterns: Array<string>;
+  coverageReporters: Array<string>;
+  coverageThreshold: string;
+  debug: boolean;
+  env: string;
+  expand: boolean;
+  findRelatedTests: boolean;
+  forceExit: boolean;
+  globals: string;
+  globalSetup: string | null | undefined;
+  globalTeardown: string | null | undefined;
+  h: boolean;
+  haste: string;
+  help: boolean;
+  init: boolean;
+  json: boolean;
+  lastCommit: boolean;
+  logHeapUsage: boolean;
+  maxWorkers: number;
+  moduleDirectories: Array<string>;
+  moduleFileExtensions: Array<string>;
+  moduleLoader: string;
+  moduleNameMapper: string;
+  modulePathIgnorePatterns: Array<string>;
+  modulePaths: Array<string>;
+  name: string;
+  noSCM: boolean;
+  noStackTrace: boolean;
+  notify: boolean;
+  notifyMode: string;
+  onlyChanged: boolean;
+  outputFile: string;
+  preset: string | null | undefined;
+  projects: Array<string>;
+  prettierPath: string | null | undefined;
+  replname: string | null | undefined;
+  resetMocks: boolean;
+  resetModules: boolean;
+  resolver: string | null | undefined;
+  restoreMocks: boolean;
+  rootDir: string;
+  roots: Array<string>;
+  runInBand: boolean;
+  setupFiles: Array<string>;
+  setupFilesAfterEnv: Array<string>;
+  showConfig: boolean;
+  silent: boolean;
+  snapshotSerializers: Array<string>;
+  testEnvironment: string;
+  testFailureExitCode: string | null | undefined;
+  testMatch: Array<string>;
+  testNamePattern: string;
+  testPathIgnorePatterns: Array<string>;
+  testPathPattern: Array<string>;
+  testRegex: string | Array<string>;
+  testResultsProcessor: string | null | undefined;
+  testRunner: string;
+  testURL: string;
+  timers: 'real' | 'fake';
+  transform: string;
+  transformIgnorePatterns: Array<string>;
+  unmockedModulePathPatterns: Array<string> | null | undefined;
+  updateSnapshot: boolean;
+  useStderr: boolean;
+  verbose: boolean | null | undefined;
+  version: boolean;
+  watch: boolean;
+  watchAll: boolean;
+  watchman: boolean;
+  watchPathIgnorePatterns: Array<string>;
+}>;
+

packages/jest-types/src/index.ts

@@ -5,12 +5,11 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import * as Argv from './Argv';
 import * as Config from './Config';
 import * as Console from './Console';
 import * as Matchers from './Matchers';
 import * as SourceMaps from './SourceMaps';
 import * as TestResult from './TestResult';
 import * as Global from './Global';
 
-export {Argv, Config, Console, Matchers, SourceMaps, TestResult, Global};
+export {Config, Console, Matchers, SourceMaps, TestResult, Global};