From 4db01907684bf5ed0e60e4e30cc0d77dada50fe1 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 6 Nov 2019 15:50:46 +0000 Subject: [PATCH 1/2] chore(deps-dev): bump @types/jest from 24.0.19 to 24.0.22 Bumps [@types/jest](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jest) from 24.0.19 to 24.0.22. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jest) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- packages/@aws-cdk/assert/package.json | 2 +- packages/@aws-cdk/cx-api/package.json | 2 +- packages/cdk-dasm/package.json | 2 +- packages/decdk/package.json | 2 +- tools/cdk-build-tools/package.json | 2 +- yarn.lock | 8 ++++---- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 836ea9f5a3c72..f9d8dc970b053 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "build-all": "tsc -b" }, "devDependencies": { - "@types/jest": "^24.0.19", + "@types/jest": "^24.0.22", "@types/node": "^8.10.58", "@types/nodeunit": "^0.0.30", "conventional-changelog-cli": "^2.0.25", diff --git a/packages/@aws-cdk/assert/package.json b/packages/@aws-cdk/assert/package.json index 3c20d432060a5..5ce7977c64403 100644 --- a/packages/@aws-cdk/assert/package.json +++ b/packages/@aws-cdk/assert/package.json @@ -26,7 +26,7 @@ }, "license": "Apache-2.0", "devDependencies": { - "@types/jest": "^24.0.19", + "@types/jest": "^24.0.22", "cdk-build-tools": "^1.15.0", "pkglint": "^1.15.0" }, diff --git a/packages/@aws-cdk/cx-api/package.json b/packages/@aws-cdk/cx-api/package.json index a01c23b3737fc..8819c3e6bfea2 100644 --- a/packages/@aws-cdk/cx-api/package.json +++ b/packages/@aws-cdk/cx-api/package.json @@ -61,7 +61,7 @@ }, "license": "Apache-2.0", "devDependencies": { - "@types/jest": "^24.0.19", + "@types/jest": "^24.0.22", "@types/semver": "^6.2.0", "cdk-build-tools": "^1.15.0", "jest": "^24.9.0", diff --git a/packages/cdk-dasm/package.json b/packages/cdk-dasm/package.json index b5653df51e393..85f51d71aa678 100644 --- a/packages/cdk-dasm/package.json +++ b/packages/cdk-dasm/package.json @@ -30,7 +30,7 @@ "yaml": "1.7.2" }, "devDependencies": { - "@types/jest": "^24.0.19", + "@types/jest": "^24.0.22", "@types/yaml": "1.2.0", "jest": "^24.9.0" }, diff --git a/packages/decdk/package.json b/packages/decdk/package.json index 8ebe7809ee30e..6c1ae9fded0f0 100644 --- a/packages/decdk/package.json +++ b/packages/decdk/package.json @@ -159,7 +159,7 @@ }, "devDependencies": { "@types/fs-extra": "^8.0.1", - "@types/jest": "^24.0.19", + "@types/jest": "^24.0.22", "@types/yaml": "1.2.0", "@types/yargs": "^13.0.3", "jest": "^24.9.0", diff --git a/tools/cdk-build-tools/package.json b/tools/cdk-build-tools/package.json index d3b7873d16107..4e58a6b41b0c5 100644 --- a/tools/cdk-build-tools/package.json +++ b/tools/cdk-build-tools/package.json @@ -31,7 +31,7 @@ "license": "Apache-2.0", "devDependencies": { "@types/fs-extra": "^8.0.1", - "@types/jest": "^24.0.19", + "@types/jest": "^24.0.22", "@types/yargs": "^13.0.3", "pkglint": "^1.15.0" }, diff --git a/yarn.lock b/yarn.lock index bdc9062f9bfb9..92231e6145a8b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1230,10 +1230,10 @@ resolved "https://registry.yarnpkg.com/@types/jest-diff/-/jest-diff-20.0.1.tgz#35cc15b9c4f30a18ef21852e255fdb02f6d59b89" integrity sha512-yALhelO3i0hqZwhjtcr6dYyaLoCHbAMshwtj6cGxTvHZAKXHsYGdff6E8EPw3xLKY0ELUTQ69Q1rQiJENnccMA== -"@types/jest@^24.0.19": - version "24.0.19" - resolved "https://registry.yarnpkg.com/@types/jest/-/jest-24.0.19.tgz#f7036058d2a5844fe922609187c0ad8be430aff5" - integrity sha512-YYiqfSjocv7lk5H/T+v5MjATYjaTMsUkbDnjGqSMoO88jWdtJXJV4ST/7DKZcoMHMBvB2SeSfyOzZfkxXHR5xg== +"@types/jest@^24.0.22": + version "24.0.22" + resolved "https://registry.yarnpkg.com/@types/jest/-/jest-24.0.22.tgz#08a50be08e78aba850a1185626e71d31e2336145" + integrity sha512-t2OvhNZnrNjlzi2i0/cxbLVM59WN15I2r1Qtb7wDv28PnV9IzrPtagFRey/S9ezdLD0zyh1XGMQIEQND2YEfrw== dependencies: "@types/jest-diff" "*" From 6acb2c0378b3e9dd79019484d3bdfc018f114bbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=91=A8=F0=9F=8F=BC=E2=80=8D=F0=9F=92=BB=20Romain=20M?= =?UTF-8?q?arcadier-Muller?= Date: Fri, 8 Nov 2019 14:25:56 +0100 Subject: [PATCH 2/2] fixup Matches extension --- packages/@aws-cdk/assert/jest.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/@aws-cdk/assert/jest.ts b/packages/@aws-cdk/assert/jest.ts index 36afbc6841659..76c72a889c012 100644 --- a/packages/@aws-cdk/assert/jest.ts +++ b/packages/@aws-cdk/assert/jest.ts @@ -6,7 +6,7 @@ import { expect as ourExpect } from './lib/expect'; declare global { namespace jest { - interface Matchers { + interface Matchers { toMatchTemplate(template: any, matchStyle?: MatchStyle): R; @@ -77,4 +77,4 @@ function assertHaveResource(assertion: HaveResourceAssertion, actual: cxapi.Clou message: () => assertion.generateErrorMessage(), }; } -} \ No newline at end of file +}