From e8be12836cdb73b74cd36e19e5cec52258304933 Mon Sep 17 00:00:00 2001 From: Momo Kornher Date: Fri, 22 Dec 2023 14:21:38 +0000 Subject: [PATCH 1/2] fix(core): core constructs fail with `Error: Cannot find module '../dist/core/.generated'` (#28467) #28251 added new files to `aws-cdk-lib/core/lib/dist/core` but this path was excluded from the npm package, causing the above error. This fix includes the generated file into the package. Closes #28465 Manually tested with a locally build package that includes the fix. image ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license* --- packages/aws-cdk-lib/.npmignore | 5 ++++- .../aws-cdk-lib/core/{lib => }/adr/acknowledge-warnings.md | 0 2 files changed, 4 insertions(+), 1 deletion(-) rename packages/aws-cdk-lib/core/{lib => }/adr/acknowledge-warnings.md (100%) diff --git a/packages/aws-cdk-lib/.npmignore b/packages/aws-cdk-lib/.npmignore index 60e48f52cdd0f..04bd4687b89d0 100644 --- a/packages/aws-cdk-lib/.npmignore +++ b/packages/aws-cdk-lib/.npmignore @@ -16,6 +16,7 @@ coverage build-tools dist !custom-resource-handlers/dist/ +!core/lib/dist/ scripts .LAST_BUILD .LAST_PACKAGE @@ -30,9 +31,11 @@ tsconfig.json # exclude cdk artifacts **/cdk.out junit.xml - !*.lit.ts +# exclude additional documention +core/adr/ + # keep class map for cloudformation-include !cloudformation-include/cfn-types-2-classes.json diff --git a/packages/aws-cdk-lib/core/lib/adr/acknowledge-warnings.md b/packages/aws-cdk-lib/core/adr/acknowledge-warnings.md similarity index 100% rename from packages/aws-cdk-lib/core/lib/adr/acknowledge-warnings.md rename to packages/aws-cdk-lib/core/adr/acknowledge-warnings.md From 557ed28831bec38f753d5352b651097cf0b159f7 Mon Sep 17 00:00:00 2001 From: Momo Kornher Date: Fri, 22 Dec 2023 14:45:11 +0000 Subject: [PATCH 2/2] chore(release): 2.116.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 afc9d44d8dfaa..06f4c22fb8660 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.116.1-alpha.0](https://github.com/aws/aws-cdk/compare/v2.116.0-alpha.0...v2.116.1-alpha.0) (2023-12-22) + ## [2.116.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.115.0-alpha.0...v2.116.0-alpha.0) (2023-12-21) diff --git a/CHANGELOG.v2.md b/CHANGELOG.v2.md index 455f61f07757b..d73963e702114 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.116.1](https://github.com/aws/aws-cdk/compare/v2.116.0...v2.116.1) (2023-12-22) + + +### Bug Fixes + +* **core:** core constructs fail with `Error: Cannot find module '../dist/core/.generated'` ([#28467](https://github.com/aws/aws-cdk/issues/28467)) ([e8be128](https://github.com/aws/aws-cdk/commit/e8be12836cdb73b74cd36e19e5cec52258304933)), closes [#28251](https://github.com/aws/aws-cdk/issues/28251) [#28465](https://github.com/aws/aws-cdk/issues/28465) + ## [2.116.0](https://github.com/aws/aws-cdk/compare/v2.115.0...v2.116.0) (2023-12-21) diff --git a/version.v2.json b/version.v2.json index fc6404509b98e..036be73a62de9 100644 --- a/version.v2.json +++ b/version.v2.json @@ -1,4 +1,4 @@ { - "version": "2.116.0", - "alphaVersion": "2.116.0-alpha.0" + "version": "2.116.1", + "alphaVersion": "2.116.1-alpha.0" } \ No newline at end of file