From 15b1fd4d8590f50e9fca099b63d55743019e6382 Mon Sep 17 00:00:00 2001 From: Cory Hall <43035978+corymhall@users.noreply.github.com> Date: Thu, 12 May 2022 19:17:34 -0400 Subject: [PATCH 1/2] chore: pin @types/prettier to 2.6.0 (#20322) @types/prettier is a transitive dependency of `jest`. Version `2.6.1` introduced a breaking change by increasing the minimum supported version of typescript to `4.2`. See related issue for more information. re #20319 ---- ### All Submissions: * [ ] Have you followed the guidelines in our [Contributing guide?](https://github.com/aws/aws-cdk/blob/master/CONTRIBUTING.md) ### Adding new Unconventional Dependencies: * [ ] This PR adds new unconventional dependencies following the process described [here](https://github.com/aws/aws-cdk/blob/master/CONTRIBUTING.md/#adding-new-unconventional-dependencies) ### New Features * [ ] Have you added the new feature to an [integration test](https://github.com/aws/aws-cdk/blob/master/INTEGRATION_TESTS.md)? * [ ] Did you use `yarn integ` to deploy the infrastructure and generate the snapshot (i.e. `yarn integ` without `--dry-run`)? *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license* --- package.json | 1 + .../aws-cdk/lib/init-templates/v1/app/typescript/package.json | 1 + .../aws-cdk/lib/init-templates/v1/lib/typescript/package.json | 1 + .../lib/init-templates/v1/sample-app/typescript/package.json | 1 + .../aws-cdk/lib/init-templates/v2/app/typescript/package.json | 1 + .../aws-cdk/lib/init-templates/v2/lib/typescript/package.json | 1 + .../lib/init-templates/v2/sample-app/typescript/package.json | 1 + yarn.lock | 2 +- 8 files changed, 8 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 324e7789ff0e6..a1014eedad229 100644 --- a/package.json +++ b/package.json @@ -16,6 +16,7 @@ "postinstall": "patch-package --error-on-fail" }, "devDependencies": { + "@types/prettier": "2.6.0", "@yarnpkg/lockfile": "^1.1.0", "cdk-generate-synthetic-examples": "^0.1.10", "conventional-changelog-cli": "^2.2.2", diff --git a/packages/aws-cdk/lib/init-templates/v1/app/typescript/package.json b/packages/aws-cdk/lib/init-templates/v1/app/typescript/package.json index bdf726276b870..79e4771bf99e9 100644 --- a/packages/aws-cdk/lib/init-templates/v1/app/typescript/package.json +++ b/packages/aws-cdk/lib/init-templates/v1/app/typescript/package.json @@ -12,6 +12,7 @@ }, "devDependencies": { "@aws-cdk/assertions": "%cdk-version%", + "@types/prettier": "2.6.0", "@types/jest": "^27.5.0", "@types/node": "10.17.27", "jest": "^27.5.1", diff --git a/packages/aws-cdk/lib/init-templates/v1/lib/typescript/package.json b/packages/aws-cdk/lib/init-templates/v1/lib/typescript/package.json index e8741a189ad33..5ca10df588043 100644 --- a/packages/aws-cdk/lib/init-templates/v1/lib/typescript/package.json +++ b/packages/aws-cdk/lib/init-templates/v1/lib/typescript/package.json @@ -11,6 +11,7 @@ "devDependencies": { "@aws-cdk/assertions": "%cdk-version%", "@types/jest": "^27.5.0", + "@types/prettier": "2.6.0", "@types/node": "10.17.27", "jest": "^27.5.1", "ts-jest": "^27.1.4", diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/typescript/package.json b/packages/aws-cdk/lib/init-templates/v1/sample-app/typescript/package.json index 96014a68dffc7..56c0266b4c808 100644 --- a/packages/aws-cdk/lib/init-templates/v1/sample-app/typescript/package.json +++ b/packages/aws-cdk/lib/init-templates/v1/sample-app/typescript/package.json @@ -15,6 +15,7 @@ "@aws-cdk/assertions": "%cdk-version%", "@types/jest": "^27.5.0", "@types/node": "10.17.27", + "@types/prettier": "2.6.0", "jest": "^27.5.1", "ts-jest": "^27.1.4", "ts-node": "^10.7.0", diff --git a/packages/aws-cdk/lib/init-templates/v2/app/typescript/package.json b/packages/aws-cdk/lib/init-templates/v2/app/typescript/package.json index a38f83ac3c808..a8b6a793d7c25 100644 --- a/packages/aws-cdk/lib/init-templates/v2/app/typescript/package.json +++ b/packages/aws-cdk/lib/init-templates/v2/app/typescript/package.json @@ -13,6 +13,7 @@ "devDependencies": { "@types/jest": "^27.5.0", "@types/node": "10.17.27", + "@types/prettier": "2.6.0", "jest": "^27.5.1", "ts-jest": "^27.1.4", "aws-cdk": "%cdk-version%", diff --git a/packages/aws-cdk/lib/init-templates/v2/lib/typescript/package.json b/packages/aws-cdk/lib/init-templates/v2/lib/typescript/package.json index 01e44afa83501..d4b3a4a18fb18 100644 --- a/packages/aws-cdk/lib/init-templates/v2/lib/typescript/package.json +++ b/packages/aws-cdk/lib/init-templates/v2/lib/typescript/package.json @@ -11,6 +11,7 @@ "devDependencies": { "@types/jest": "^27.5.0", "@types/node": "10.17.27", + "@types/prettier": "2.6.0", "aws-cdk-lib": "%cdk-version%", "constructs": "%constructs-version%", "jest": "^27.5.1", diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/typescript/package.json b/packages/aws-cdk/lib/init-templates/v2/sample-app/typescript/package.json index 7ebca95c205f3..3e034334e1886 100644 --- a/packages/aws-cdk/lib/init-templates/v2/sample-app/typescript/package.json +++ b/packages/aws-cdk/lib/init-templates/v2/sample-app/typescript/package.json @@ -14,6 +14,7 @@ "aws-cdk": "%cdk-version%", "@types/jest": "^27.5.0", "@types/node": "10.17.27", + "@types/prettier": "2.6.0", "jest": "^27.5.1", "ts-jest": "^27.1.4", "ts-node": "^10.7.0", diff --git a/yarn.lock b/yarn.lock index e117078cc08af..3e4acfeb1d467 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1957,7 +1957,7 @@ resolved "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== -"@types/prettier@^2.1.5": +"@types/prettier@2.6.0", "@types/prettier@^2.1.5": version "2.6.0" resolved "https://registry.npmjs.org/@types/prettier/-/prettier-2.6.0.tgz#efcbd41937f9ae7434c714ab698604822d890759" integrity sha512-G/AdOadiZhnJp0jXCaBQU449W2h716OW/EoXeYkCytxKL06X1WCXB4DZpp8TpZ8eyIJVS1cw4lrlkkSYU21cDw== From 6a31fbb30d95328315e0aa8a7c9140edca99b5a5 Mon Sep 17 00:00:00 2001 From: corymhall <43035978+corymhall@users.noreply.github.com> Date: Thu, 12 May 2022 23:39:42 +0000 Subject: [PATCH 2/2] chore(release): 2.24.1 --- CHANGELOG.v2.alpha.md | 2 ++ CHANGELOG.v2.md | 2 ++ version.v2.json | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.v2.alpha.md b/CHANGELOG.v2.alpha.md index c2213ecaf0a9a..906bda813094d 100644 --- a/CHANGELOG.v2.alpha.md +++ b/CHANGELOG.v2.alpha.md @@ -2,6 +2,8 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +## [2.24.1-alpha.0](https://github.com/aws/aws-cdk/compare/v2.24.0-alpha.0...v2.24.1-alpha.0) (2022-05-12) + ## [2.24.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.23.0-alpha.0...v2.24.0-alpha.0) (2022-05-11) diff --git a/CHANGELOG.v2.md b/CHANGELOG.v2.md index dba476037abd5..e8e345e00c06e 100644 --- a/CHANGELOG.v2.md +++ b/CHANGELOG.v2.md @@ -2,6 +2,8 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +## [2.24.1](https://github.com/aws/aws-cdk/compare/v2.24.0...v2.24.1) (2022-05-12) + ## [2.24.0](https://github.com/aws/aws-cdk/compare/v2.23.0...v2.24.0) (2022-05-11) diff --git a/version.v2.json b/version.v2.json index bc6c11d2a3f2b..97d9c37cdba67 100644 --- a/version.v2.json +++ b/version.v2.json @@ -1,4 +1,4 @@ { - "version": "2.24.0", - "alphaVersion": "2.24.0-alpha.0" + "version": "2.24.1", + "alphaVersion": "2.24.1-alpha.0" } \ No newline at end of file