Skip to content

Commit 0837c1a

Browse files
authored
fix: revert jsii to version 1.69.0 (#22715)
jsii 1.70.0 introduced a regression, requiring the wrong type: #22688 #22689 #22711 Revert to 1.69.0 ---- ### 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*
1 parent 1f6eb1f commit 0837c1a

File tree

8 files changed

+115
-38
lines changed

8 files changed

+115
-38
lines changed

package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
"fs-extra": "^9.1.0",
2424
"graceful-fs": "^4.2.10",
2525
"jest-junit": "^13.2.0",
26-
"jsii-diff": "^1.70.0",
27-
"jsii-pacmak": "^1.70.0",
28-
"jsii-reflect": "^1.70.0",
29-
"jsii-rosetta": "^1.70.0",
26+
"jsii-diff": "1.69.0",
27+
"jsii-pacmak": "1.69.0",
28+
"jsii-reflect": "1.69.0",
29+
"jsii-rosetta": "1.69.0",
3030
"lerna": "^4.0.0",
3131
"patch-package": "^6.5.0",
3232
"semver": "^6.3.0",

packages/aws-cdk/THIRD_PARTY_LICENSES

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The aws-cdk package includes the following third-party software/licensing:
22

3-
** @jsii/check-node@1.70.0 - https://www.npmjs.com/package/@jsii/check-node/v/1.70.0 | Apache-2.0
3+
** @jsii/check-node@1.69.0 - https://www.npmjs.com/package/@jsii/check-node/v/1.69.0 | Apache-2.0
44
jsii
55
Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
66

packages/aws-cdk/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
"@aws-cdk/cloudformation-diff": "0.0.0",
9797
"@aws-cdk/cx-api": "0.0.0",
9898
"@aws-cdk/region-info": "0.0.0",
99-
"@jsii/check-node": "1.70.0",
99+
"@jsii/check-node": "1.69.0",
100100
"archiver": "^5.3.1",
101101
"aws-sdk": "^2.1211.0",
102102
"camelcase": "^6.3.0",

packages/awslint/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
"awslint": "bin/awslint"
1919
},
2020
"dependencies": {
21-
"@jsii/spec": "^1.70.0",
21+
"@jsii/spec": "1.69.0",
2222
"camelcase": "^6.3.0",
2323
"chalk": "^4",
2424
"fs-extra": "^9.1.0",
25-
"jsii-reflect": "^1.70.0",
25+
"jsii-reflect": "1.69.0",
2626
"yargs": "^16.2.0"
2727
},
2828
"devDependencies": {

packages/cdk-dasm/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
},
3131
"license": "Apache-2.0",
3232
"dependencies": {
33-
"codemaker": "^1.70.0",
33+
"codemaker": "1.69.0",
3434
"yaml": "1.10.2"
3535
},
3636
"devDependencies": {

tools/@aws-cdk/cdk-build-tools/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@
5757
"fs-extra": "^9.1.0",
5858
"jest": "^27.5.1",
5959
"jest-junit": "^13.2.0",
60-
"jsii": "^1.70.0",
61-
"jsii-pacmak": "^1.70.0",
62-
"jsii-reflect": "^1.70.0",
60+
"jsii": "1.69.0",
61+
"jsii-pacmak": "1.69.0",
62+
"jsii-reflect": "1.69.0",
6363
"markdownlint-cli": "^0.32.2",
6464
"nyc": "^15.1.0",
6565
"semver": "^7.3.8",

tools/@aws-cdk/cfn2ts/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"license": "Apache-2.0",
3333
"dependencies": {
3434
"@aws-cdk/cfnspec": "0.0.0",
35-
"codemaker": "^1.70.0",
35+
"codemaker": "1.69.0",
3636
"fast-json-patch": "^3.1.1",
3737
"fs-extra": "^9.1.0",
3838
"yargs": "^16.2.0"

yarn.lock

+102-25
Original file line numberDiff line numberDiff line change
@@ -666,6 +666,14 @@
666666
"@jridgewell/resolve-uri" "3.1.0"
667667
"@jridgewell/sourcemap-codec" "1.4.14"
668668

669+
670+
version "1.69.0"
671+
resolved "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.69.0.tgz#74f4db123f5dd1d4dd3d30cfa54a0a75d8b94d9d"
672+
integrity sha512-a+g42wsMM1SB91f+/ZGqtEccaCfJkpfbKYczzLM8tN7P00TGHraTFBqd/G6jndRw4mrR+T+3GaAKlzmNLqYIUg==
673+
dependencies:
674+
chalk "^4.1.2"
675+
semver "^7.3.7"
676+
669677
670678
version "1.70.0"
671679
resolved "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.70.0.tgz#b482e949fdd6dc0191934bb1b76ad80989cafeba"
@@ -674,7 +682,14 @@
674682
chalk "^4.1.2"
675683
semver "^7.3.8"
676684

677-
"@jsii/[email protected]", "@jsii/spec@^1.70.0":
685+
686+
version "1.69.0"
687+
resolved "https://registry.npmjs.org/@jsii/spec/-/spec-1.69.0.tgz#aff2db2d930b04fb832a04ecb8f166b1cf21982f"
688+
integrity sha512-Dj41jQc6GgbXHyc/IzhmKdrMJSuF7hetRmCkwMvj0/T2WWNAUK/UNNw40QnksfIhB8yooDAoMqGVU/71fbDyaA==
689+
dependencies:
690+
ajv "^8.11.0"
691+
692+
"@jsii/[email protected]", "@jsii/spec@^1.69.0", "@jsii/spec@^1.70.0":
678693
version "1.70.0"
679694
resolved "https://registry.npmjs.org/@jsii/spec/-/spec-1.70.0.tgz#9c9392397fa1d1a6fccd004bef3e8c0e92b45c15"
680695
integrity sha512-2l09VaZvT8OLRMwtVm+JxzrzpO6+eR4Scn9B8+zvE9NptX5jN+X68V0VngDuWTJqHs7ntbYCmHQDWuLm0bPr1A==
@@ -2221,6 +2236,11 @@
22212236
"@typescript-eslint/types" "5.41.0"
22222237
eslint-visitor-keys "^3.3.0"
22232238

2239+
"@xmldom/xmldom@^0.8.2":
2240+
version "0.8.5"
2241+
resolved "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.5.tgz#7f4b797cfda39355b512b4cfcc66b49b5d93d5f3"
2242+
integrity sha512-0dpjDLeCXYThL2YhqZcd/spuwoH+dmnFoND9ZxZkAYxp1IJUB2GP16ow2MJRsjVxy8j1Qv8BJRmN5GKnbDKCmQ==
2243+
22242244
"@xmldom/xmldom@^0.8.3":
22252245
version "0.8.3"
22262246
resolved "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.3.tgz#beaf980612532aa9a3004aff7e428943aeaa0711"
@@ -2602,7 +2622,7 @@ available-typed-arrays@^1.0.5:
26022622
resolved "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7"
26032623
integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
26042624

2605-
aws-cdk-lib@^2.47.0:
2625+
26062626
version "2.47.0"
26072627
resolved "https://registry.npmjs.org/aws-cdk-lib/-/aws-cdk-lib-2.47.0.tgz#0f4f6adf2439caffd26686393a6e58ced3995833"
26082628
integrity sha512-XnxA7FMhJljsj6OtMMDbUi5lPPYcrehAxqpui5b2Nv2cBWhiG7Wb5baOuQy7niyPhZEX03A4k0vYFas/nnB91g==
@@ -3230,7 +3250,16 @@ co@^4.6.0:
32303250
resolved "https://registry.npmjs.org/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
32313251
integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==
32323252

3233-
codemaker@^1.70.0:
3253+
3254+
version "1.69.0"
3255+
resolved "https://registry.npmjs.org/codemaker/-/codemaker-1.69.0.tgz#e8432ee60bf84ac59630be8390a18a422eb8707c"
3256+
integrity sha512-FbJeIr6isHvABZ56wdujvRLQOJOmS6MoptN4ylLKDNr/dp/+tzpa9kY2R2Y7eWxMW5sTYFBNsVJDpErMcMwhig==
3257+
dependencies:
3258+
camelcase "^6.3.0"
3259+
decamelize "^5.0.1"
3260+
fs-extra "^10.1.0"
3261+
3262+
codemaker@^1.69.0:
32343263
version "1.70.0"
32353264
resolved "https://registry.npmjs.org/codemaker/-/codemaker-1.70.0.tgz#37fe0745556a65a45789a6ce3b6cf6ee77b989ce"
32363265
integrity sha512-ZiS349YLSwzoe9ZVfupMBd794x3IO4Au6JsyYCchFjbBCzU10TllLigFWSQuVKXBpaBk3I6QhaDuK+JsosDKsg==
@@ -6732,38 +6761,50 @@ jsesc@^2.5.1:
67326761
resolved "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
67336762
integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
67346763

6735-
jsii-diff@^1.70.0:
6736-
version "1.70.0"
6737-
resolved "https://registry.npmjs.org/jsii-diff/-/jsii-diff-1.70.0.tgz#67c67f713401d82799b52d997d104f20f74d4f75"
6738-
integrity sha512-of9otOfqkK/nAX7YwGu7OCifbXVkm2KvIvuMCotfAa8lqpiFnXJOi1On52mT8Vx31op74Mn15RLAO/k8DsFgzA==
6764+
jsii-diff@1.69.0:
6765+
version "1.69.0"
6766+
resolved "https://registry.npmjs.org/jsii-diff/-/jsii-diff-1.69.0.tgz#2f9663f439e57e10f97066978789a1452a8b3ad4"
6767+
integrity sha512-QIJzD9Kr77M1xD8l7CHTfJubk9qxzTEtVwI5ISEK49+p67Ho2Sxp5rncdXBYoruXD/FmO1CT52aNmNHiNbhkig==
67396768
dependencies:
6740-
"@jsii/check-node" "1.70.0"
6741-
"@jsii/spec" "^1.70.0"
6769+
"@jsii/check-node" "1.69.0"
6770+
"@jsii/spec" "^1.69.0"
67426771
fs-extra "^10.1.0"
6743-
jsii-reflect "^1.70.0"
6744-
log4js "^6.7.0"
6772+
jsii-reflect "^1.69.0"
6773+
log4js "^6.6.1"
67456774
yargs "^16.2.0"
67466775

6747-
jsii-pacmak@^1.70.0:
6748-
version "1.70.0"
6749-
resolved "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.70.0.tgz#2971d3469097994b74c4bb08918b88db398bc6f6"
6750-
integrity sha512-BbfIT21BVx1QB1EBLytHxO/CeI+zseI2sp+7wA/Uzfg7U1zS7DoqvsGjZwdl0RvinIJOvkzS55vP5qY5i7btcA==
6776+
jsii-pacmak@1.69.0:
6777+
version "1.69.0"
6778+
resolved "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.69.0.tgz#e72a7c92b00ab86eb754450f97a411474ba4521a"
6779+
integrity sha512-dMNyKOV+5mlRm7nT1UjpbXiYCPwHfiULH0JnBQWpGZBD3k8o9vVbMlV4oecxufTVrZH9DH39Mh+GQjR9yS9g1w==
67516780
dependencies:
6752-
"@jsii/check-node" "1.70.0"
6753-
"@jsii/spec" "^1.70.0"
6781+
"@jsii/check-node" "1.69.0"
6782+
"@jsii/spec" "^1.69.0"
67546783
clone "^2.1.2"
6755-
codemaker "^1.70.0"
6784+
codemaker "^1.69.0"
67566785
commonmark "^0.30.0"
67576786
escape-string-regexp "^4.0.0"
67586787
fs-extra "^10.1.0"
6759-
jsii-reflect "^1.70.0"
6760-
jsii-rosetta "^1.70.0"
6761-
semver "^7.3.8"
6788+
jsii-reflect "^1.69.0"
6789+
jsii-rosetta "^1.69.0"
6790+
semver "^7.3.7"
67626791
spdx-license-list "^6.6.0"
67636792
xmlbuilder "^15.1.1"
67646793
yargs "^16.2.0"
67656794

6766-
jsii-reflect@^1.70.0:
6795+
6796+
version "1.69.0"
6797+
resolved "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.69.0.tgz#72d12449d64628086241768f71c0b592fddf007a"
6798+
integrity sha512-gQA4Yu3OlHVmD1X8ysYwgolV5JKS8WbY8p9AKCUQsNbflxUGpYwJrX/Otl+VdiYnIhBZ7+v+VvOG9eYGMUH6IQ==
6799+
dependencies:
6800+
"@jsii/check-node" "1.69.0"
6801+
"@jsii/spec" "^1.69.0"
6802+
chalk "^4"
6803+
fs-extra "^10.1.0"
6804+
oo-ascii-tree "^1.69.0"
6805+
yargs "^16.2.0"
6806+
6807+
jsii-reflect@^1.69.0, jsii-reflect@^1.70.0:
67676808
version "1.70.0"
67686809
resolved "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.70.0.tgz#09929607ebe3380a56d5187978b9da9a8686a97d"
67696810
integrity sha512-1enHoO6/G5o6RB+lzbQEUkXBFoZZRGJCfgYboLcYiH0tITX/FjipeTR9Wgkh9QumwdlBlMTXuxEPyRFVjQ7jcg==
@@ -6775,7 +6816,24 @@ jsii-reflect@^1.70.0:
67756816
oo-ascii-tree "^1.70.0"
67766817
yargs "^16.2.0"
67776818

6778-
jsii-rosetta@^1.70.0:
6819+
6820+
version "1.69.0"
6821+
resolved "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.69.0.tgz#f2b4ca0f1da310e2ac17a2228938e1b09268d823"
6822+
integrity sha512-zAvvzRShVMmUxNRLtbR4HShGEn17kyiED5XSo1CrVu4JzG6I7YEtYO1WrNFe1XTh76Bbi4OoamZm3Um91DPtXg==
6823+
dependencies:
6824+
"@jsii/check-node" "1.69.0"
6825+
"@jsii/spec" "1.69.0"
6826+
"@xmldom/xmldom" "^0.8.2"
6827+
commonmark "^0.30.0"
6828+
fast-glob "^3.2.12"
6829+
jsii "1.69.0"
6830+
semver "^7.3.7"
6831+
semver-intersect "^1.4.0"
6832+
typescript "~3.9.10"
6833+
workerpool "^6.2.1"
6834+
yargs "^16.2.0"
6835+
6836+
jsii-rosetta@^1.69.0, jsii-rosetta@^1.70.0:
67796837
version "1.70.0"
67806838
resolved "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.70.0.tgz#2618c4661410638f7a7ae432359e512bede94076"
67816839
integrity sha512-iLfogMZ7tTP0g6iMGPHZOHCjn5+K4agb6oalFYbN8iUXVgf+DwKCOGTIN0TxNpy3YFvb4YhCWVENdYPDu/5Nvw==
@@ -6792,6 +6850,25 @@ jsii-rosetta@^1.70.0:
67926850
workerpool "^6.2.1"
67936851
yargs "^16.2.0"
67946852

6853+
6854+
version "1.69.0"
6855+
resolved "https://registry.npmjs.org/jsii/-/jsii-1.69.0.tgz#f3ec71ea710db8d3a0d677d39c32aa55930a903c"
6856+
integrity sha512-gusMQ8inlV2/51KsZmZ/H+FeoExrloksgeg8ohvIgF3tvqZKZDh0LvJFGNEeqcJzr+P1OZ3KHVEUI2M0XXicRw==
6857+
dependencies:
6858+
"@jsii/check-node" "1.69.0"
6859+
"@jsii/spec" "^1.69.0"
6860+
case "^1.6.3"
6861+
chalk "^4"
6862+
fast-deep-equal "^3.1.3"
6863+
fs-extra "^10.1.0"
6864+
log4js "^6.6.1"
6865+
semver "^7.3.7"
6866+
semver-intersect "^1.4.0"
6867+
sort-json "^2.0.1"
6868+
spdx-license-list "^6.6.0"
6869+
typescript "~3.9.10"
6870+
yargs "^16.2.0"
6871+
67956872
[email protected], jsii@^1.70.0:
67966873
version "1.70.0"
67976874
resolved "https://registry.npmjs.org/jsii/-/jsii-1.70.0.tgz#ad5265f9d5a2f02c212deae987c2fe4426e8f73f"
@@ -7249,7 +7326,7 @@ log-symbols@^4.1.0:
72497326
chalk "^4.1.0"
72507327
is-unicode-supported "^0.1.0"
72517328

7252-
log4js@^6.7.0:
7329+
log4js@^6.6.1, log4js@^6.7.0:
72537330
version "6.7.0"
72547331
resolved "https://registry.npmjs.org/log4js/-/log4js-6.7.0.tgz#fff671a74b2f6e956d135c3c756c79072809a23b"
72557332
integrity sha512-KA0W9ffgNBLDj6fZCq/lRbgR6ABAodRIDHrZnS48vOtfKa4PzWImb0Md1lmGCdO3n3sbCm/n1/WmrNlZ8kCI3Q==
@@ -8307,7 +8384,7 @@ onetime@^5.1.0, onetime@^5.1.2:
83078384
dependencies:
83088385
mimic-fn "^2.1.0"
83098386

8310-
oo-ascii-tree@^1.70.0:
8387+
oo-ascii-tree@^1.69.0, oo-ascii-tree@^1.70.0:
83118388
version "1.70.0"
83128389
resolved "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.70.0.tgz#30ce0ee1a17b420cbba47a6989f1a69f30749d20"
83138390
integrity sha512-vu/NGcQKC6f3fz2C7qmDW1WP2WFK3CvG1JbweyKlnRsZrdbY0VCH9RKsNaoYUTu9tzafCZ4HWeLEkgXALQMsUg==

0 commit comments

Comments
 (0)