From cf841e3d5b48ce6f41db3f2fb98919fd845eb955 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Thu, 30 Nov 2017 20:26:44 +0100 Subject: [PATCH 1/2] fix: jest-util should not depend on jest-mock --- packages/jest-util/package.json | 4 +++- packages/jest-util/src/fake_timers.js | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/jest-util/package.json b/packages/jest-util/package.json index 476c0208dbff..204112225adf 100644 --- a/packages/jest-util/package.json +++ b/packages/jest-util/package.json @@ -12,8 +12,10 @@ "chalk": "^2.0.1", "graceful-fs": "^4.1.11", "jest-message-util": "^21.2.1", - "jest-mock": "^21.2.0", "jest-validate": "^21.2.1", "mkdirp": "^0.5.1" + }, + "devDependencies": { + "jest-mock": "^21.2.0" } } diff --git a/packages/jest-util/src/fake_timers.js b/packages/jest-util/src/fake_timers.js index 4cc562339695..0633a3fa0640 100644 --- a/packages/jest-util/src/fake_timers.js +++ b/packages/jest-util/src/fake_timers.js @@ -9,7 +9,7 @@ import type {ProjectConfig} from 'types/Config'; import type {Global} from 'types/Global'; -import type {ModuleMocker} from 'jest-mock'; +import type {ModuleMocker} from 'types/Mock'; import {formatStackTrace} from 'jest-message-util'; import setGlobal from './set_global'; From 22d9da0cd4a0c3f5f8248e3baa9df40cac0a7f44 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Thu, 30 Nov 2017 20:28:27 +0100 Subject: [PATCH 2/2] docs: update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 325099eedc0c..149b2b2bb10e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -116,6 +116,8 @@ ### Chore & Maintenance +* `[jest-util]` `jest-util` should not depend on `jest-mock` + ([#4992](https://github.com/facebook/jest/pull/4992)) * `[*]` [**BREAKING**] Drop support for Node.js version 4 ([#4769](https://github.com/facebook/jest/pull/4769)) * `[docs]` Wrap code comments at 80 characters