Skip to content

Commit

Permalink
fix: jest-util should not depend on jest-mock (#4992)
Browse files Browse the repository at this point in the history
* fix: jest-util should not depend on jest-mock

* docs: update changelog
  • Loading branch information
SimenB authored and cpojer committed Nov 30, 2017
1 parent 6414f28 commit 4e2f41f
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion packages/jest-util/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
2 changes: 1 addition & 1 deletion packages/jest-util/src/fake_timers.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down

0 comments on commit 4e2f41f

Please sign in to comment.