Add @types/jest, upgrade example app dependencies, README and CHANGELOG #116
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
thymikee
requested changes
Jan 27, 2018
CHANGELOG.md
Outdated
| @@ -4,6 +4,9 @@ | |||
| * Breaking: Upgrade Jest to 22 ([#109](https://github.com/thymikee/jest-preset-angular/pull/109)) | |||
| * Breaking: Upgrade `ts-jest` to 22 ([#109](https://github.com/thymikee/jest-preset-angular/pull/109)) | |||
| * Chore: Get rid of explicit `jsdom` dependency and custom test environment | |||
| * Fix: Upgrade example app to Angular 5.2.x using Angular CLI 1.6.6 | |||
| * Fix: Add @types/jest as a package dependency | |||
| * Fix: Adjust README for easy installation guide and add configuration section with vendor libaries like jQuery etc.. | |||
There was a problem hiding this comment.
Can you move these to master change log and link to PT?
There was a problem hiding this comment.
do you mean I should commit these changes to CHANGELOG.md on master branch and mention these changes with PR behind ?
There was a problem hiding this comment.
No, by master I mean master changelog. The first line of this file states:
## Changelog (master)
Since these "fixes" are not part of v5.0.0 release, let's just move them up:
## Changelog (master)
* Feature: Simplify installation by adding @types/jest as a package dependency ([#116](...))
* Chore: Upgrade example app to Angular 5.2 using Angular CLI 1.6 ([#116](...))
### v5.0.0
**v5.0.0 stuff, do not touch**
And later with a followup PR:
* Docs: Add a configuration section with vendor libraries like jQuery ([#117](...))
README.md
Outdated
| @@ -222,3 +224,22 @@ import 'rxjs/add/operator/catch'; | |||
|
|
|||
| import './jestGlobalMocks'; | |||
| ``` | |||
|
|
|||
| ### Allow vendor libraries like jQuery, etc... | |||
There was a problem hiding this comment.
Can we separate this into its own PR? I'd like not to mix unrelated changes in one shot
There was a problem hiding this comment.
ok I think that's better
thymikee
approved these changes
Jan 27, 2018
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.