Skip to content

Commit

Permalink
Merge branch 'main' into location-route-calculator
Browse files Browse the repository at this point in the history
  • Loading branch information
mazyu36 authored Jun 26, 2024
2 parents 0212a23 + eaa8f3e commit 68be912
Show file tree
Hide file tree
Showing 10 changed files with 70 additions and 53 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/request-cli-integ-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
persist-credentials: false
- name: Find changed cli files
id: changed-cli-files
uses: tj-actions/changed-files@d6babd6899969df1a11d14c368283ea4436bca78
uses: tj-actions/changed-files@cc733854b1f224978ef800d29e4709d5ee2883e4
with:
base_sha: ${{ github.event.pull_request.base.sha }}
files_yaml: |
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.v2.alpha.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.147.1-alpha.0](https://github.com/aws/aws-cdk/compare/v2.147.0-alpha.0...v2.147.1-alpha.0) (2024-06-21)

## [2.147.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.146.0-alpha.0...v2.147.0-alpha.0) (2024-06-20)


Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.v2.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.147.1](https://github.com/aws/aws-cdk/compare/v2.147.0...v2.147.1) (2024-06-21)


### Reverts

* route53 CrossAccountZoneDelegationRecord fails at deployment time with imported `delegatedZone` ([#30440](https://github.com/aws/aws-cdk/issues/30440))" ([#30606](https://github.com/aws/aws-cdk/issues/30606)) ([69eb617](https://github.com/aws/aws-cdk/commit/69eb617b45b5c4e495901d367d85e1edeea57e69)), closes [#30600](https://github.com/aws/aws-cdk/issues/30600)

## [2.147.0](https://github.com/aws/aws-cdk/compare/v2.146.0...v2.147.0) (2024-06-20)


Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
"fs-extra": "^9.1.0",
"graceful-fs": "^4.2.11",
"jest-junit": "^13.2.0",
"jsii-diff": "1.100.0",
"jsii-pacmak": "1.100.0",
"jsii-reflect": "1.100.0",
"jsii-diff": "1.101.0",
"jsii-pacmak": "1.101.0",
"jsii-reflect": "1.101.0",
"lerna": "^8.1.5",
"nx": "^19.3.1",
"patch-package": "^6.5.1",
Expand Down Expand Up @@ -177,4 +177,4 @@
"dependencies": {
"string-width": "^4.2.3"
}
}
}
2 changes: 1 addition & 1 deletion packages/aws-cdk/THIRD_PARTY_LICENSES
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The aws-cdk package includes the following third-party software/licensing:

** @jsii/check-node@1.100.0 - https://www.npmjs.com/package/@jsii/check-node/v/1.100.0 | Apache-2.0
** @jsii/check-node@1.101.0 - https://www.npmjs.com/package/@jsii/check-node/v/1.101.0 | Apache-2.0
jsii
Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.

Expand Down
2 changes: 1 addition & 1 deletion packages/aws-cdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
"@aws-cdk/cloudformation-diff": "0.0.0",
"@aws-cdk/cx-api": "0.0.0",
"@aws-cdk/region-info": "0.0.0",
"@jsii/check-node": "1.100.0",
"@jsii/check-node": "1.101.0",
"archiver": "^5.3.2",
"aws-sdk": "^2.1648.0",
"camelcase": "^6.3.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/awslint/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
"awslint": "bin/awslint"
},
"dependencies": {
"@jsii/spec": "1.100.0",
"@jsii/spec": "1.101.0",
"chalk": "^4",
"fs-extra": "^9.1.0",
"jsii-reflect": "1.100.0",
"jsii-reflect": "1.101.0",
"change-case": "^4.1.2",
"yargs": "^16.2.0"
},
Expand Down
4 changes: 2 additions & 2 deletions tools/@aws-cdk/cdk-build-tools/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@
"jest-junit": "^13.2.0",
"jsii": "~5.4.23",
"jsii-rosetta": "~5.4.23",
"jsii-pacmak": "1.100.0",
"jsii-reflect": "1.100.0",
"jsii-pacmak": "1.101.0",
"jsii-reflect": "1.101.0",
"markdownlint-cli": "^0.41.0",
"nyc": "^15.1.0",
"semver": "^7.6.2",
Expand Down
4 changes: 2 additions & 2 deletions version.v2.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"version": "2.147.0",
"alphaVersion": "2.147.0-alpha.0"
"version": "2.147.1",
"alphaVersion": "2.147.1-alpha.0"
}
88 changes: 48 additions & 40 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4253,10 +4253,18 @@
chalk "^4.1.2"
semver "^7.6.0"

"@jsii/spec@1.100.0", "@jsii/spec@^1.100.0":
version "1.100.0"
resolved "https://registry.npmjs.org/@jsii/spec/-/spec-1.100.0.tgz#44e5c6fb84299664f40479b2ebe11e2aee0b727e"
integrity sha512-4LJCpSkmi3Hfcbmbchv+2JPIquV+cgrkhQcwglBAWqS4liLGbWPwgfHRL22sMXEKXiyXeHfitVwkP+IoGIyJ8g==
"@jsii/check-node@1.101.0":
version "1.101.0"
resolved "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.101.0.tgz#175e5a2b9b31f232fd5df2942dacc4b20820aa93"
integrity sha512-io8u1GAF9XGp2crx0C/WGiJeUnHGw5X0du4fisbrNJHmVVFwcJbBMjbfXKWq+JSzl8fo/JV3F1LqtjsnawKA2A==
dependencies:
chalk "^4.1.2"
semver "^7.6.0"

"@jsii/spec@1.101.0", "@jsii/spec@^1.100.0", "@jsii/spec@^1.101.0":
version "1.101.0"
resolved "https://registry.npmjs.org/@jsii/spec/-/spec-1.101.0.tgz#b1c3488d5df2ee0c355e0a3493e3de4add9d7452"
integrity sha512-855OnjKm4RTzRA78GGTNBG/GLe6X/vHJYD58zg7Rw8rWS7sU6iB65TM/7P7R3cufVew8umjjPjvW7ygS6ZqITQ==
dependencies:
ajv "^8.13.0"

Expand Down Expand Up @@ -7646,9 +7654,9 @@ camelcase@^7.0.1:
integrity sha512-xlx1yCK2Oc1APsPXDL2LdlNP6+uu8OCDdhOBSVT279M/S+y75O30C2VuD8T2ogdePBBl7PfPF4504tnLgX3zfw==

caniuse-lite@^1.0.30001629:
version "1.0.30001636"
resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001636.tgz#b15f52d2bdb95fad32c2f53c0b68032b85188a78"
integrity sha512-bMg2vmr8XBsbL6Lr0UHXy/21m84FTxDLWn2FSqMd5PrlbMxwJlQnC2YWYxVgp66PZE+BBNF2jYQUBKCo1FDeZg==
version "1.0.30001637"
resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001637.tgz#d9fab531493d9ef46a8ff305e9812190ac463f21"
integrity sha512-1x0qRI1mD1o9e+7mBI7XtzFAP4XszbHaVWsMiGbSPLYekKTJF7K+FNk6AsXH4sUpc+qrsI3pVgf1Jdl/uGkuSQ==

canonicalize@^2.0.0:
version "2.0.0"
Expand Down Expand Up @@ -7937,10 +7945,10 @@ co@^4.6.0:
resolved "https://registry.npmjs.org/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==

codemaker@^1.100.0:
version "1.100.0"
resolved "https://registry.npmjs.org/codemaker/-/codemaker-1.100.0.tgz#49c395bb928e89587f223e1d7ae5f6f42c3f4a69"
integrity sha512-EVKV5v2HZf/a2nuRZJ3pMo1BImN6MX/9O22Yo1gQn+DeFbU2TqKnpCu16pTOVg4b4CakbFckeimVzQIqmFGquQ==
codemaker@^1.101.0:
version "1.101.0"
resolved "https://registry.npmjs.org/codemaker/-/codemaker-1.101.0.tgz#27e5e0311f08061618804e485a015eaa860aa718"
integrity sha512-bAg+N4PA8mniJrCpTYFdaFmJA+3fE1Vjgf4o1EnPc07nw6qRcJsr/D9ZZoutEsvw7UM8OmZp4qZxVzpCqRhhQQ==
dependencies:
camelcase "^6.3.0"
decamelize "^5.0.1"
Expand Down Expand Up @@ -11606,46 +11614,46 @@ jsesc@^2.5.1:
resolved "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==

jsii-diff@1.100.0:
version "1.100.0"
resolved "https://registry.npmjs.org/jsii-diff/-/jsii-diff-1.100.0.tgz#aea28ca2360cc6a1f1089c7105fb61076d7b3f4a"
integrity sha512-/Rs2jPmIlcQTwHEuse8SGx/ztSh4F0JYE4OnIBmRZ4ljppPqSGSOoa7pp10IpSmmF2ac+2sgOGuEadwjrDDi4w==
jsii-diff@1.101.0:
version "1.101.0"
resolved "https://registry.npmjs.org/jsii-diff/-/jsii-diff-1.101.0.tgz#d8bf59c522aaf419e9465170db78810a9795f8a9"
integrity sha512-7DvBiLireA91AnWCxt7EcKd04/zp8Rhk8oTYSGtIM57ZNZ+FV7cbrgxmXqja6P1ZXz67N3UAjKC8KdtFXeOqRA==
dependencies:
"@jsii/check-node" "1.100.0"
"@jsii/spec" "^1.100.0"
"@jsii/check-node" "1.101.0"
"@jsii/spec" "^1.101.0"
fs-extra "^10.1.0"
jsii-reflect "^1.100.0"
jsii-reflect "^1.101.0"
log4js "^6.9.1"
yargs "^16.2.0"

jsii-pacmak@1.100.0:
version "1.100.0"
resolved "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.100.0.tgz#72a52bb0fbf30c43acfa0312ebc94182939e5152"
integrity sha512-MxB4UYwpRjxZ/2y+LPy5HVkBciubU4T8d3A3mnj6Pj5lQfe3VZ9pStYHNTsv0q5J8xg4uIcc8/RhFHj1mzk2oA==
jsii-pacmak@1.101.0:
version "1.101.0"
resolved "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.101.0.tgz#8ad183be51d5a79e455253b27ae596efcb8a3b35"
integrity sha512-07a04KtOj+Kmx+5XQVD1JG6QOh6JNqFWh4bbzMDKiFx7JoHhQnLq07b/OlUpCuP7J7Q9WaXXYM59EUQpXO07wg==
dependencies:
"@jsii/check-node" "1.100.0"
"@jsii/spec" "^1.100.0"
"@jsii/check-node" "1.101.0"
"@jsii/spec" "^1.101.0"
clone "^2.1.2"
codemaker "^1.100.0"
codemaker "^1.101.0"
commonmark "^0.31.0"
escape-string-regexp "^4.0.0"
fs-extra "^10.1.0"
jsii-reflect "^1.100.0"
jsii-reflect "^1.101.0"
semver "^7.6.0"
spdx-license-list "^6.9.0"
xmlbuilder "^15.1.1"
yargs "^16.2.0"

jsii-reflect@1.100.0, jsii-reflect@^1.100.0:
version "1.100.0"
resolved "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.100.0.tgz#82b21ad160a7c3d830ec8990b6cba52da7910049"
integrity sha512-4hicwZirzhSqFRpX/USpvy6RewDi5mCkDESLjBSNpnGWhc3oVByX3x/KJyKQdjEfjVkflHWxSGJEA0qEMoXFUw==
jsii-reflect@1.101.0, jsii-reflect@^1.100.0, jsii-reflect@^1.101.0:
version "1.101.0"
resolved "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.101.0.tgz#e96fa687ba9db5c4b70995839aacceea11abc288"
integrity sha512-ZCFb+laktj/ekNadUYksf+jLZq4fjoQeNe344GwslJOaemGjgAeqy0atV2H8nvTYU8ubszFApUPpdoRvtxgdPw==
dependencies:
"@jsii/check-node" "1.100.0"
"@jsii/spec" "^1.100.0"
"@jsii/check-node" "1.101.0"
"@jsii/spec" "^1.101.0"
chalk "^4"
fs-extra "^10.1.0"
oo-ascii-tree "^1.100.0"
oo-ascii-tree "^1.101.0"
yargs "^16.2.0"

jsii-rosetta@~5.4.23:
Expand Down Expand Up @@ -13640,10 +13648,10 @@ onetime@^5.1.0, onetime@^5.1.2:
dependencies:
mimic-fn "^2.1.0"

oo-ascii-tree@^1.100.0:
version "1.100.0"
resolved "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.100.0.tgz#1104a689c1143346de2c46d889e306ade721a061"
integrity sha512-Y/C4AN9IVjsIyNQ1iK4x65xe2AV9q0MtXlYAOKZLA2ZscOzZJbRNi0BzcpmeMb/DSIAFm9M5kaxLqdAKpETbHg==
oo-ascii-tree@^1.101.0:
version "1.101.0"
resolved "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.101.0.tgz#bd14acf6a71430c02443f865975ec0c4b4ff03aa"
integrity sha512-hNE9Nfvo4HLa9/dAiaiXUm64KHUvgBa7jPftsb8gZdTv1G1wSMMnd9j7SMcRzaMbDEqi+0cfgeBSIcsKy+k0vA==

open@^7.4.2:
version "7.4.2"
Expand Down Expand Up @@ -16138,9 +16146,9 @@ typescript@^3.9.10, typescript@^3.9.5, typescript@^3.9.7:
integrity sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==

typescript@next:
version "5.6.0-dev.20240625"
resolved "https://registry.npmjs.org/typescript/-/typescript-5.6.0-dev.20240625.tgz#5af212a230bcb26df3d888afe08f5da271aa9f70"
integrity sha512-oFZTblDS6JxI4fqkiSKhm8uGXjZQ/aTqOiVTkNtttRoKySMDPdchADEl0+AclDFRJt92BGw6NQG5Q5PGs6dDxg==
version "5.6.0-dev.20240626"
resolved "https://registry.npmjs.org/typescript/-/typescript-5.6.0-dev.20240626.tgz#1ec6397a6ca9b96d9c49d95bd22cde03166dca7e"
integrity sha512-OUmoaUrtJEMGnxr8luc4sBdJFMFl1rZHdG0h7lOT1J62RBkYiD/LfQJKaH7GcywgMA+oaONUb75kIHi3s8czkg==

typescript@~5.1.0:
version "5.1.6"
Expand Down

0 comments on commit 68be912

Please sign in to comment.