From 7c061640bc829157ecdcf3fc8c470c5d5aebc3a4 Mon Sep 17 00:00:00 2001 From: Tatsuya Yamamoto Date: Thu, 16 Jun 2022 06:10:24 +0900 Subject: [PATCH 1/4] fix(init-templates): unable to initialize typescript templates (#20752) fix #20751 ---- ### All Submissions: * [x] Have you followed the guidelines in our [Contributing guide?](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) ### Adding new Unconventional Dependencies: * [ ] This PR adds new unconventional dependencies following the process described [here](https://github.com/aws/aws-cdk/blob/main/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/main/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* --- .../aws-cdk/lib/init-templates/v1/app/typescript/package.json | 2 +- .../aws-cdk/lib/init-templates/v1/lib/typescript/package.json | 2 +- .../lib/init-templates/v1/sample-app/typescript/package.json | 2 +- .../aws-cdk/lib/init-templates/v2/app/typescript/package.json | 2 +- .../aws-cdk/lib/init-templates/v2/lib/typescript/package.json | 2 +- .../lib/init-templates/v2/sample-app/typescript/package.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) 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 95b40136c359a..19862aa845b6e 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 @@ -13,7 +13,7 @@ "devDependencies": { "@aws-cdk/assertions": "%cdk-version%", "@types/prettier": "2.6.0", - "@types/jest": "^28.1.1", + "@types/jest": "^27.5.2", "@types/node": "10.17.27", "jest": "^27.5.1", "ts-jest": "^27.1.4", 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 7c91edc6b4ee1..77bcfe180e8d0 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 @@ -10,7 +10,7 @@ }, "devDependencies": { "@aws-cdk/assertions": "%cdk-version%", - "@types/jest": "^28.1.1", + "@types/jest": "^27.5.2", "@types/prettier": "2.6.0", "@types/node": "10.17.27", "jest": "^27.5.1", 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 33fccc280d4a9..4b59361dd3346 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 @@ -13,7 +13,7 @@ "devDependencies": { "aws-cdk": "%cdk-version%", "@aws-cdk/assertions": "%cdk-version%", - "@types/jest": "^28.1.1", + "@types/jest": "^27.5.2", "@types/node": "10.17.27", "@types/prettier": "2.6.0", "jest": "^27.5.1", 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 e7e2690c60598..9994de63ea890 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 @@ -11,7 +11,7 @@ "cdk": "cdk" }, "devDependencies": { - "@types/jest": "^28.1.1", + "@types/jest": "^27.5.2", "@types/node": "10.17.27", "@types/prettier": "2.6.0", "jest": "^27.5.1", 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 2f0b6bb9a8ef5..ff17adb798745 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 @@ -9,7 +9,7 @@ "test": "jest" }, "devDependencies": { - "@types/jest": "^28.1.1", + "@types/jest": "^27.5.2", "@types/node": "10.17.27", "@types/prettier": "2.6.0", "aws-cdk-lib": "%cdk-version%", 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 5ba3737920efd..aff8b059810d2 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 @@ -12,7 +12,7 @@ }, "devDependencies": { "aws-cdk": "%cdk-version%", - "@types/jest": "^28.1.1", + "@types/jest": "^27.5.2", "@types/node": "10.17.27", "@types/prettier": "2.6.0", "jest": "^27.5.1", From 5190ac401a06b72b217a1d2c99fabfa515726dc6 Mon Sep 17 00:00:00 2001 From: epolon Date: Thu, 16 Jun 2022 00:22:24 +0300 Subject: [PATCH 2/4] chore(release): 2.28.1 --- CHANGELOG.v2.alpha.md | 2 ++ CHANGELOG.v2.md | 7 +++++++ version.v2.json | 4 ++-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.v2.alpha.md b/CHANGELOG.v2.alpha.md index bb37f84a92536..ee0749e0a9e65 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.28.1-alpha.0](https://github.com/aws/aws-cdk/compare/v2.28.0-alpha.0...v2.28.1-alpha.0) (2022-06-15) + ## [2.28.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.27.0-alpha.0...v2.28.0-alpha.0) (2022-06-14) diff --git a/CHANGELOG.v2.md b/CHANGELOG.v2.md index be086e4c6d3ee..8a46589f591f5 100644 --- a/CHANGELOG.v2.md +++ b/CHANGELOG.v2.md @@ -2,6 +2,13 @@ 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.28.1](https://github.com/aws/aws-cdk/compare/v2.28.0...v2.28.1) (2022-06-15) + + +### Bug Fixes + +* **init-templates:** unable to initialize typescript templates ([#20752](https://github.com/aws/aws-cdk/issues/20752)) ([7c06164](https://github.com/aws/aws-cdk/commit/7c061640bc829157ecdcf3fc8c470c5d5aebc3a4)), closes [#20751](https://github.com/aws/aws-cdk/issues/20751) + ## [2.28.0](https://github.com/aws/aws-cdk/compare/v2.27.0...v2.28.0) (2022-06-14) diff --git a/version.v2.json b/version.v2.json index 284d78f235798..0284249725e41 100644 --- a/version.v2.json +++ b/version.v2.json @@ -1,4 +1,4 @@ { - "version": "2.28.0", - "alphaVersion": "2.28.0-alpha.0" + "version": "2.28.1", + "alphaVersion": "2.28.1-alpha.0" } \ No newline at end of file From f6cd304ace24012b8353781ad69bdc38c4e471fa Mon Sep 17 00:00:00 2001 From: epolon Date: Thu, 16 Jun 2022 00:55:10 +0300 Subject: [PATCH 3/4] fix header --- CHANGELOG.v2.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.v2.md b/CHANGELOG.v2.md index 8a46589f591f5..d81d38c532d38 100644 --- a/CHANGELOG.v2.md +++ b/CHANGELOG.v2.md @@ -2,7 +2,7 @@ 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.28.1](https://github.com/aws/aws-cdk/compare/v2.28.0...v2.28.1) (2022-06-15) +## [2.28.1](https://github.com/aws/aws-cdk/compare/v2.28.0...v2.28.1) (2022-06-15) ### Bug Fixes @@ -1966,7 +1966,7 @@ section is changed from `HttpMethod` to `CorsHttpMethod`. ### ⚠ BREAKING CHANGES TO EXPERIMENTAL FEATURES -* **ecs-patterns:** ** the desiredCount property stored on the above constructs will be optional, allowing them to be undefined. This is enabled through the `@aws-cdk/aws-ecs-patterns:removeDefaultDesiredCount` feature flag. We would recommend all aws-cdk users to set the `REMOVE_DEFAULT_DESIRED_COUNT` flag to true for all of their existing applications. +* **ecs-patterns:** ** the desiredCount property stored on the above constructs will be optional, allowing them to be undefined. This is enabled through the `@aws-cdk/aws-ecs-patterns:removeDefaultDesiredCount` feature flag. We would recommend all aws-cdk users to set the `REMOVE_DEFAULT_DESIRED_COUNT` flag to true for all of their existing applications. Fixes: https://github.com/aws/aws-cdk/issues/12990 * **aws-appsync:** RdsDataSource now takes a ServerlessCluster instead of a DatabaseCluster From d80d044996bd484fa78085a6fed142405982e854 Mon Sep 17 00:00:00 2001 From: epolon Date: Thu, 16 Jun 2022 00:55:42 +0300 Subject: [PATCH 4/4] one more header --- CHANGELOG.v2.alpha.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.v2.alpha.md b/CHANGELOG.v2.alpha.md index ee0749e0a9e65..c03683ddd7240 100644 --- a/CHANGELOG.v2.alpha.md +++ b/CHANGELOG.v2.alpha.md @@ -2,7 +2,7 @@ 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.28.1-alpha.0](https://github.com/aws/aws-cdk/compare/v2.28.0-alpha.0...v2.28.1-alpha.0) (2022-06-15) +## [2.28.1-alpha.0](https://github.com/aws/aws-cdk/compare/v2.28.0-alpha.0...v2.28.1-alpha.0) (2022-06-15) ## [2.28.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.27.0-alpha.0...v2.28.0-alpha.0) (2022-06-14) @@ -281,7 +281,7 @@ All notable changes to this project will be documented in this file. See [standa * **lambda-python:** `assetHashType` and `assetHash` properties moved to new `bundling` property. * **lambda-python:** Runtime is now required for `LambdaPython` -* **appsync:** The `CachingConfig#ttl` property is now required. +* **appsync:** The `CachingConfig#ttl` property is now required. [1]: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-resolver-cachingconfig.html#cfn-appsync-resolver-cachingconfig-ttl @@ -313,7 +313,7 @@ All notable changes to this project will be documented in this file. See [standa * **glue:** the grantRead API previously included 'glue:BatchDeletePartition', and now it does not. - + ### Features