Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/release/7' into feat/jest24
Browse files Browse the repository at this point in the history
* origin/release/7:
  v7.0.0-alpha.2
  feat: adjust semver range of jest-zone-patch (#209)
  Adjust CHANGELOG (#208)
  Transform templateUrl, styleUrls and styles everywhere (#211)
  v7.0.0-alpha.1
  v7.0.0-alpha.0
  • Loading branch information
thymikee committed Jan 26, 2019
2 parents e4966f7 + 61cfeb3 commit bcc00df
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
{
"name": "jest-preset-angular",
"version": "6.0.1",
"version": "7.0.0-alpha.2",
"description": "Jest preset configuration for Angular projects",
"main": "index.js",
"repository": "git@github.com:thymikee/jest-preset-angular.git",
"author": "Michał Pierzchała <thymikee@gmail.com>",
"license": "MIT",
"dependencies": {
"@types/jest": "^23.3.10",
"ts-jest": "~23.10.5"
"jest-zone-patch": ">=0.0.9 <1.0.0",
"ts-jest": "~23.10.0"
},
"devDependencies": {
"@types/node": "^10.12.12",
Expand Down
7 changes: 6 additions & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1891,6 +1891,11 @@ jest-worker@^24.0.0:
merge-stream "^1.0.1"
supports-color "^6.1.0"

"jest-zone-patch@>=0.0.9 <1.0.0":
version "0.0.9"
resolved "https://registry.yarnpkg.com/jest-zone-patch/-/jest-zone-patch-0.0.9.tgz#ee6823317798a3ae967e82be963f0b1f80b03d3f"
integrity sha512-QmlUxg2NIvLHSqexS3nqQ+Kid6o+5cxYnlcTi204XwsRcBm+mVYodpe+9ddcooKR9ATBIUl4zY247Uky/PgXhw==

jest@^24.0.0:
version "24.0.0"
resolved "https://registry.yarnpkg.com/jest/-/jest-24.0.0.tgz#b8e2c8e6274e1092c7f56e57762a1fdc7800201e"
Expand Down Expand Up @@ -3358,7 +3363,7 @@ trim-right@^1.0.1:
resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=

ts-jest@~23.10.5:
ts-jest@~23.10.0:
version "23.10.5"
resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-23.10.5.tgz#cdb550df4466a30489bf70ba867615799f388dd5"
integrity sha512-MRCs9qnGoyKgFc8adDEntAOP64fWK1vZKnOYU1o2HxaqjdJvGqmkLCPCnVq1/If4zkUmEjKPnCiUisTrlX2p2A==
Expand Down

0 comments on commit bcc00df

Please sign in to comment.