Skip to content

Commit

Permalink
chore: remove some usage of import = require (#10323)
Browse files Browse the repository at this point in the history
  • Loading branch information
SimenB committed Jul 28, 2020
1 parent d392028 commit 76f356e
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 19 deletions.
4 changes: 2 additions & 2 deletions packages/jest-reporters/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import type {
TestResult,
} from '@jest/test-result';
import type {FS as HasteFS, ModuleMap} from 'jest-haste-map';
import HasteResolver = require('jest-resolve');
import type {ResolverType} from 'jest-resolve';
import type {worker} from './coverage_worker';

export type ReporterOnStartOptions = {
Expand All @@ -24,7 +24,7 @@ export type Context = {
config: Config.ProjectConfig;
hasteFS: HasteFS;
moduleMap: ModuleMap;
resolver: HasteResolver;
resolver: ResolverType;
};

export type Test = {
Expand Down
12 changes: 6 additions & 6 deletions packages/jest-resolve-dependencies/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import type {Config} from '@jest/types';
import type {FS as HasteFS} from 'jest-haste-map';
import Resolver = require('jest-resolve');
import type {ResolveModuleConfig, ResolverType} from 'jest-resolve';
import {SnapshotResolver, isSnapshotPath} from 'jest-snapshot';

namespace DependencyResolver {
Expand All @@ -24,11 +24,11 @@ namespace DependencyResolver {
/* eslint-disable-next-line no-redeclare */
class DependencyResolver {
private _hasteFS: HasteFS;
private _resolver: Resolver;
private _resolver: ResolverType;
private _snapshotResolver: SnapshotResolver;

constructor(
resolver: Resolver,
resolver: ResolverType,
hasteFS: HasteFS,
snapshotResolver: SnapshotResolver,
) {
Expand All @@ -39,7 +39,7 @@ class DependencyResolver {

resolve(
file: Config.Path,
options?: Resolver.ResolveModuleConfig,
options?: ResolveModuleConfig,
): Array<Config.Path> {
const dependencies = this._hasteFS.getDependencies(file);
if (!dependencies) {
Expand Down Expand Up @@ -76,7 +76,7 @@ class DependencyResolver {
resolveInverseModuleMap(
paths: Set<Config.Path>,
filter: (file: Config.Path) => boolean,
options?: Resolver.ResolveModuleConfig,
options?: ResolveModuleConfig,
): Array<DependencyResolver.ResolvedModule> {
if (!paths.size) {
return [];
Expand Down Expand Up @@ -141,7 +141,7 @@ class DependencyResolver {
resolveInverse(
paths: Set<Config.Path>,
filter: (file: Config.Path) => boolean,
options?: Resolver.ResolveModuleConfig,
options?: ResolveModuleConfig,
): Array<Config.Path> {
return this.resolveInverseModuleMap(paths, filter, options).map(
module => module.file,
Expand Down
1 change: 1 addition & 0 deletions packages/jest-resolve/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ namespace Resolver {
skipNodeResolution?: boolean;
paths?: Array<Config.Path>;
};
export type ResolverType = Resolver;
}

const NATIVE_PLATFORM = 'native';
Expand Down
6 changes: 3 additions & 3 deletions packages/jest-runner/src/runTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import RuntimeClass = require('jest-runtime');
import * as fs from 'graceful-fs';
import {ErrorWithStack, interopRequireDefault, setGlobal} from 'jest-util';
import LeakDetector from 'jest-leak-detector';
import Resolver = require('jest-resolve');
import type {ResolverType} from 'jest-resolve';
import {getTestEnvironment} from 'jest-config';
import * as docblock from 'jest-docblock';
import {formatExecError} from 'jest-message-util';
Expand Down Expand Up @@ -79,7 +79,7 @@ async function runTestInternal(
path: Config.Path,
globalConfig: Config.GlobalConfig,
config: Config.ProjectConfig,
resolver: Resolver,
resolver: ResolverType,
context?: TestRunnerContext,
): Promise<RunTestInternalResult> {
const testSource = fs.readFileSync(path, 'utf8');
Expand Down Expand Up @@ -311,7 +311,7 @@ export default async function runTest(
path: Config.Path,
globalConfig: Config.GlobalConfig,
config: Config.ProjectConfig,
resolver: Resolver,
resolver: ResolverType,
context?: TestRunnerContext,
): Promise<TestResult> {
const {leakDetector, result} = await runTestInternal(
Expand Down
4 changes: 2 additions & 2 deletions packages/jest-runner/src/testWorker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import HasteMap = require('jest-haste-map');
import exit = require('exit');
import {separateMessageFromStack} from 'jest-message-util';
import Runtime = require('jest-runtime');
import Resolver = require('jest-resolve');
import type {ResolverType} from 'jest-resolve';
import type {ErrorWithCode, TestRunnerSerializedContext} from './types';
import runTest from './runTest';

Expand Down Expand Up @@ -52,7 +52,7 @@ const formatError = (error: string | ErrorWithCode): SerializableError => {
};
};

const resolvers = new Map<string, Resolver>();
const resolvers = new Map<string, ResolverType>();
const getResolver = (config: Config.ProjectConfig) => {
const resolver = resolvers.get(config.name);
if (!resolver) {
Expand Down
8 changes: 4 additions & 4 deletions packages/jest-runner/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import type {Config} from '@jest/types';
import type {SerializableError, TestResult} from '@jest/test-result';
import type {JestEnvironment} from '@jest/environment';
import type {FS as HasteFS, ModuleMap} from 'jest-haste-map';
import HasteResolver = require('jest-resolve');
import Runtime = require('jest-runtime');
import type {ResolverType} from 'jest-resolve';
import type {RuntimeType} from 'jest-runtime';

export type ErrorWithCode = Error & {code?: string};
export type Test = {
Expand All @@ -24,7 +24,7 @@ export type Context = {
config: Config.ProjectConfig;
hasteFS: HasteFS;
moduleMap: ModuleMap;
resolver: HasteResolver;
resolver: ResolverType;
};

export type OnTestStart = (test: Test) => Promise<void>;
Expand All @@ -41,7 +41,7 @@ export type TestFramework = (
globalConfig: Config.GlobalConfig,
config: Config.ProjectConfig,
environment: JestEnvironment,
runtime: Runtime,
runtime: RuntimeType,
testPath: string,
) => Promise<TestResult>;

Expand Down
4 changes: 2 additions & 2 deletions packages/jest-runtime/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
*/

import type {Config} from '@jest/types';
import HasteResolver = require('jest-resolve');
import type {ResolverType} from 'jest-resolve';
import type {FS as HasteFS, ModuleMap} from 'jest-haste-map';

export type Context = {
config: Config.ProjectConfig;
hasteFS: HasteFS;
moduleMap: ModuleMap;
resolver: HasteResolver;
resolver: ResolverType;
};

0 comments on commit 76f356e

Please sign in to comment.