diff --git a/package.json b/package.json index e5201f422d56..1049d209d7be 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "@types/dedent": "0.7.0", "@types/jest": "^26.0.15", "@types/node": "~10.14.0", - "@types/which": "^1.3.2", + "@types/which": "^2.0.0", "@typescript-eslint/eslint-plugin": "^4.1.0", "@typescript-eslint/parser": "^4.1.0", "ansi-regex": "^5.0.0", diff --git a/packages/jest-core/package.json b/packages/jest-core/package.json index 87384a38e47e..1c5850fcd9d9 100644 --- a/packages/jest-core/package.json +++ b/packages/jest-core/package.json @@ -17,7 +17,7 @@ "@types/node": "*", "ansi-escapes": "^4.2.1", "chalk": "^4.0.0", - "emittery": "^0.7.2", + "emittery": "^0.8.0", "exit": "^0.1.2", "graceful-fs": "^4.2.4", "jest-changed-files": "^27.0.0-next.1", diff --git a/packages/jest-core/src/TestWatcher.ts b/packages/jest-core/src/TestWatcher.ts index 3dbacb3fb5e4..03f19b1f840b 100644 --- a/packages/jest-core/src/TestWatcher.ts +++ b/packages/jest-core/src/TestWatcher.ts @@ -11,7 +11,7 @@ type State = { interrupted: boolean; }; -export default class TestWatcher extends emittery.Typed<{change: State}> { +export default class TestWatcher extends emittery<{change: State}> { state: State; private _isWatchMode: boolean; diff --git a/packages/jest-runner/package.json b/packages/jest-runner/package.json index bfea0f83e512..a6a8563e820f 100644 --- a/packages/jest-runner/package.json +++ b/packages/jest-runner/package.json @@ -21,7 +21,7 @@ "@jest/types": "^27.0.0-next.1", "@types/node": "*", "chalk": "^4.0.0", - "emittery": "^0.7.1", + "emittery": "^0.8.0", "exit": "^0.1.2", "graceful-fs": "^4.2.4", "jest-config": "^27.0.0-next.2", diff --git a/packages/jest-runner/src/index.ts b/packages/jest-runner/src/index.ts index 2f4f1195310f..02e32d342b1f 100644 --- a/packages/jest-runner/src/index.ts +++ b/packages/jest-runner/src/index.ts @@ -47,7 +47,7 @@ export type { export default class TestRunner { private readonly _globalConfig: Config.GlobalConfig; private readonly _context: TestRunnerContext; - private readonly eventEmitter = new Emittery.Typed(); + private readonly eventEmitter = new Emittery(); readonly __PRIVATE_UNSTABLE_API_supportsEventEmitters__: boolean = true; readonly isSerial?: boolean; diff --git a/packages/jest-runner/src/types.ts b/packages/jest-runner/src/types.ts index e87d1b126816..4e1f7be2187b 100644 --- a/packages/jest-runner/src/types.ts +++ b/packages/jest-runner/src/types.ts @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -import type {Typed as EmitteryTyped} from 'emittery'; +import Emittery = require('emittery'); import type {JestEnvironment} from '@jest/environment'; import type { AssertionResult, @@ -80,7 +80,7 @@ export type TestRunnerSerializedContext = { // TODO: Should live in `@jest/core` or `jest-watcher` type WatcherState = {interrupted: boolean}; -export interface TestWatcher extends EmitteryTyped<{change: WatcherState}> { +export interface TestWatcher extends Emittery<{change: WatcherState}> { state: WatcherState; setState(state: WatcherState): void; isInterrupted(): boolean; diff --git a/yarn.lock b/yarn.lock index 7d6be98b256b..6adcdb3fdd2e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1798,7 +1798,7 @@ __metadata: "@types/rimraf": ^3.0.0 ansi-escapes: ^4.2.1 chalk: ^4.0.0 - emittery: ^0.7.2 + emittery: ^0.8.0 exit: ^0.1.2 graceful-fs: ^4.2.4 jest-changed-files: ^27.0.0-next.1 @@ -1906,7 +1906,7 @@ __metadata: "@types/dedent": 0.7.0 "@types/jest": ^26.0.15 "@types/node": ~10.14.0 - "@types/which": ^1.3.2 + "@types/which": ^2.0.0 "@typescript-eslint/eslint-plugin": ^4.1.0 "@typescript-eslint/parser": ^4.1.0 ansi-regex: ^5.0.0 @@ -3962,10 +3962,10 @@ __metadata: languageName: node linkType: hard -"@types/which@npm:^1.3.2": - version: 1.3.2 - resolution: "@types/which@npm:1.3.2" - checksum: ffb779f93f76c0f79c0c1d7f9f36f5c396a8b04b5214cd905a0c22a16555f41d689940aa642fb23fd040e648a5ae7e15e5dcc2fd7d6c44608f5c3dabec9e02e7 +"@types/which@npm:^2.0.0": + version: 2.0.0 + resolution: "@types/which@npm:2.0.0" + checksum: c479c56840abbf7e949b25c7587f2876825ce4f3f847e794b27a8f6b35ab433e0e226d493b1f2c3261f6d876b6965e3461795fb9d85bd0ffcaab3b4f17c92f79 languageName: node linkType: hard @@ -7671,10 +7671,10 @@ __metadata: languageName: node linkType: hard -"emittery@npm:^0.7.1, emittery@npm:^0.7.2": - version: 0.7.2 - resolution: "emittery@npm:0.7.2" - checksum: 34acfef51922a1b73d75cb658bf43ecb279633b263ffa831fb87697abbbd3aa4241ef15d204eeaa6a3c62656bd7563de7145c416a2bb18c4805e54ce6d7cdac6 +"emittery@npm:^0.8.0": + version: 0.8.0 + resolution: "emittery@npm:0.8.0" + checksum: 4429ab522bb043473e2e1465e878cef1f17a4f98f2e831172a1598d541ea8faa25bbfc4f76fe54898e3e0e20f6ee170e69180842326d01b86431ca2e0411383c languageName: node linkType: hard @@ -12053,7 +12053,7 @@ fsevents@^1.2.7: "@types/node": "*" "@types/source-map-support": ^0.5.0 chalk: ^4.0.0 - emittery: ^0.7.1 + emittery: ^0.8.0 exit: ^0.1.2 graceful-fs: ^4.2.4 jest-config: ^27.0.0-next.2