Skip to content

fix: jest-util should not depend on jest-mock #4992

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cpojer merged 2 commits into from
Nov 30, 2017
Merged

fix: jest-util should not depend on jest-mock #4992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf841e3
fix: jest-util should not depend on jest-mock
SimenB Nov 30, 2017
22d9da0
docs: update changelog
SimenB Nov 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
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
View file
Open in desktop
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"
Copy link
Member Author

@SimenB SimenB Nov 30, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's imported directly in the tests

}
}
2 changes: 1 addition & 1 deletion packages/jest-util/src/fake_timers.js
View file
Open in desktop
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