From 43ea7d3a7dd28ac616997e459675d272330dd30e Mon Sep 17 00:00:00 2001 From: Romain Marcadier Date: Fri, 16 Jun 2023 20:36:27 +0200 Subject: [PATCH] chore: revert to last known working jsii versions (#26018) --- package.json | 8 +- packages/awslint/package.json | 4 +- packages/cdk-dasm/package.json | 2 +- tools/@aws-cdk/cdk-build-tools/package.json | 4 +- tools/@aws-cdk/cfn2ts/package.json | 2 +- yarn.lock | 138 +++++++++++--------- 6 files changed, 85 insertions(+), 73 deletions(-) diff --git a/package.json b/package.json index 21bdfe196e8b2..01694c45db27b 100644 --- a/package.json +++ b/package.json @@ -22,10 +22,10 @@ "fs-extra": "^9.1.0", "graceful-fs": "^4.2.10", "jest-junit": "^13.2.0", - "jsii-diff": "^1.84.0", - "jsii-pacmak": "^1.84.0", - "jsii-reflect": "^1.84.0", - "jsii-rosetta": "^1.84.0", + "jsii-diff": "^1.74.0", + "jsii-pacmak": "^1.74.0", + "jsii-reflect": "^1.74.0", + "jsii-rosetta": "^1.80.0", "lerna": "^4.0.0", "patch-package": "^6.5.1", "semver": "^6.3.0", diff --git a/packages/awslint/package.json b/packages/awslint/package.json index 132443fd8de04..e6b1e81af0517 100644 --- a/packages/awslint/package.json +++ b/packages/awslint/package.json @@ -18,11 +18,11 @@ "awslint": "bin/awslint" }, "dependencies": { - "@jsii/spec": "^1.84.0", + "@jsii/spec": "^1.74.0", "camelcase": "^6.3.0", "chalk": "^4", "fs-extra": "^9.1.0", - "jsii-reflect": "^1.84.0", + "jsii-reflect": "^1.74.0", "yargs": "^16.2.0" }, "devDependencies": { diff --git a/packages/cdk-dasm/package.json b/packages/cdk-dasm/package.json index cedc65473a6d2..afaffbc842127 100644 --- a/packages/cdk-dasm/package.json +++ b/packages/cdk-dasm/package.json @@ -29,7 +29,7 @@ }, "license": "Apache-2.0", "dependencies": { - "codemaker": "^1.84.0", + "codemaker": "^1.74.0", "yaml": "1.10.2" }, "devDependencies": { diff --git a/tools/@aws-cdk/cdk-build-tools/package.json b/tools/@aws-cdk/cdk-build-tools/package.json index ba8e5bdbf0586..74cf0864fb78f 100644 --- a/tools/@aws-cdk/cdk-build-tools/package.json +++ b/tools/@aws-cdk/cdk-build-tools/package.json @@ -58,8 +58,8 @@ "jest": "^27.5.1", "jest-junit": "^13.2.0", "jsii": "^1.84.0", - "jsii-pacmak": "^1.84.0", - "jsii-reflect": "^1.84.0", + "jsii-pacmak": "^1.74.0", + "jsii-reflect": "^1.74.0", "markdownlint-cli": "^0.33.0", "nyc": "^15.1.0", "semver": "^7.3.8", diff --git a/tools/@aws-cdk/cfn2ts/package.json b/tools/@aws-cdk/cfn2ts/package.json index 2c3022985aadf..32ba3eb13b5e5 100644 --- a/tools/@aws-cdk/cfn2ts/package.json +++ b/tools/@aws-cdk/cfn2ts/package.json @@ -32,7 +32,7 @@ "license": "Apache-2.0", "dependencies": { "@aws-cdk/cfnspec": "0.0.0", - "codemaker": "^1.84.0", + "codemaker": "^1.74.0", "fast-json-patch": "^3.1.1", "fs-extra": "^9.1.0", "yargs": "^16.2.0" diff --git a/yarn.lock b/yarn.lock index f20ac2b0f6687..f8c6edb6cabae 100644 --- a/yarn.lock +++ b/yarn.lock @@ -776,6 +776,14 @@ chalk "^4.1.2" semver "^7.3.8" +"@jsii/check-node@1.80.0": + version "1.80.0" + resolved "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.80.0.tgz#73602eee7625b93b9bd9d39840748a9aa77377ec" + integrity sha512-QWdvFrjoDxSkj0E7CuSD65y0nMk1K48geQ8UxCFy0fz8COERYK3ZOhyDW8K2iOwZp0H3LWa4dByrNZIMt8xVAw== + dependencies: + chalk "^4.1.2" + semver "^7.3.8" + "@jsii/check-node@1.84.0": version "1.84.0" resolved "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.84.0.tgz#cbed3a116b141e8dbef198dc161088bca603de0a" @@ -791,7 +799,14 @@ dependencies: ajv "^8.12.0" -"@jsii/spec@1.84.0", "@jsii/spec@^1.84.0": +"@jsii/spec@1.80.0", "@jsii/spec@^1.80.0": + version "1.80.0" + resolved "https://registry.npmjs.org/@jsii/spec/-/spec-1.80.0.tgz#55ab7c6b610ce76044e21c3c3c1861293055ae5a" + integrity sha512-BkRHjwxwnmRRVA0rx3XFH9iPvEF+AvJGq21uic6qT8lWJEpM82aRse6hGHMofJstP1X3ChRmfmg8JELvHB0gzA== + dependencies: + ajv "^8.12.0" + +"@jsii/spec@^1.84.0": version "1.84.0" resolved "https://registry.npmjs.org/@jsii/spec/-/spec-1.84.0.tgz#75f86e819999a5ee7b1430b274bf88459085bfc2" integrity sha512-P2PCE4jlmuTh5Oj7Be2jdn5qyzIWHX4rcyYspddc0DLZAuLB/LRQYytrxgfdy4+NroGhrPeKPBoF9MwJ5CzfXA== @@ -2410,11 +2425,6 @@ resolved "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.6.tgz#8a1524eb5bd5e965c1e3735476f0262469f71440" integrity sha512-uRjjusqpoqfmRkTaNuLJ2VohVr67Q5YwDATW3VU7PfzTj6IRaihGrYI7zckGZjxQPBIp63nfvJbM+Yu5ICh0Bg== -"@xmldom/xmldom@^0.8.8": - version "0.8.8" - resolved "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.8.tgz#d0d11511cbc1de77e53342ad1546a4d487d6ea72" - integrity sha512-0LNz4EY8B/8xXY86wMrQ4tz6zEHZv9ehFMJPm8u2gq5lQ71cfRKdaKyxfJAx5aUoyzx0qzgURblTisPGgz3d+Q== - "@yarnpkg/lockfile@^1.1.0": version "1.1.0" resolved "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31" @@ -3428,10 +3438,10 @@ co@^4.6.0: resolved "https://registry.npmjs.org/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ== -codemaker@^1.84.0: - version "1.84.0" - resolved "https://registry.npmjs.org/codemaker/-/codemaker-1.84.0.tgz#da95dc297fc4be657baa49fdc3127ce1f057c6f3" - integrity sha512-sOUH3y2q2DEO+gDiBCCoGgkDs8aMY0LTMH0FmHbKpqReZwWDAmWJ0Voc4Thp4Mn380bPku9/ncqyY1a3MZnfEQ== +codemaker@^1.74.0: + version "1.74.0" + resolved "https://registry.npmjs.org/codemaker/-/codemaker-1.74.0.tgz#113d679c5f2d6bc6bb04621448930e48cf8cec40" + integrity sha512-i6fAyWpXAYN/dd8hvzFPJ7+Yb/a23+BmeCu/lPn0KDpDs/KpNKoz/I3Iq9JD4AL9bMc1b7kBeBV+UF6kS6EMEg== dependencies: camelcase "^6.3.0" decamelize "^5.0.1" @@ -6930,33 +6940,33 @@ jsesc@^2.5.1: resolved "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== -jsii-diff@^1.84.0: - version "1.84.0" - resolved "https://registry.npmjs.org/jsii-diff/-/jsii-diff-1.84.0.tgz#c3f148ae2bf9d904ad20b9aa76b337b50aa6d7f4" - integrity sha512-MDw8GNkBtBxlTqMcgUANV/q4h5offJ/KN9gyU5BYK/eXsKs7xa5vBmihOgQWvqx8cnszrTMNhvpnvMSNxcPRzw== +jsii-diff@^1.74.0: + version "1.74.0" + resolved "https://registry.npmjs.org/jsii-diff/-/jsii-diff-1.74.0.tgz#d7e6f94d4c34a74604a74ba204bc6effba7a13a0" + integrity sha512-lMKRnfaJLQywsudp4PIgBDLFsBFSWVxTrvVa2xlNuIOsU2CP87ljX7SonzPNvnwJccBN4nJ1cpJCGTtGNo6xKQ== dependencies: - "@jsii/check-node" "1.84.0" - "@jsii/spec" "^1.84.0" + "@jsii/check-node" "1.74.0" + "@jsii/spec" "^1.74.0" fs-extra "^10.1.0" - jsii-reflect "^1.84.0" - log4js "^6.9.1" + jsii-reflect "^1.74.0" + log4js "^6.7.1" yargs "^16.2.0" -jsii-pacmak@^1.84.0: - version "1.84.0" - resolved "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.84.0.tgz#6501f9968dcd3fe023892cf07da82032e99f8901" - integrity sha512-+EGfpQDPSyDNPWclcOes6dUhwDsn5dG0bBgVb3hpRWZ0uDe7wLCVwGxh7fphx2XtNvTwdNfspTSBLBMqscOYmg== +jsii-pacmak@^1.74.0: + version "1.74.0" + resolved "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.74.0.tgz#78301ea406ea3c74b6a867ead897f1519a2ccced" + integrity sha512-se/HUWjCsaXFGI1K/EGDOHtWbETn4iwm14SuK6LFj5CQu7ZX/aHTBCGFWA3qUwttXaDaBNatmuNQUYSydvKeaA== dependencies: - "@jsii/check-node" "1.84.0" - "@jsii/spec" "^1.84.0" + "@jsii/check-node" "1.74.0" + "@jsii/spec" "^1.74.0" clone "^2.1.2" - codemaker "^1.84.0" + codemaker "^1.74.0" commonmark "^0.30.0" escape-string-regexp "^4.0.0" fs-extra "^10.1.0" - jsii-reflect "^1.84.0" - jsii-rosetta "^1.84.0" - semver "^7.5.1" + jsii-reflect "^1.74.0" + jsii-rosetta "^1.74.0" + semver "^7.3.8" spdx-license-list "^6.6.0" xmlbuilder "^15.1.1" yargs "^16.2.0" @@ -6973,18 +6983,6 @@ jsii-reflect@^1.74.0: oo-ascii-tree "^1.74.0" yargs "^16.2.0" -jsii-reflect@^1.84.0: - version "1.84.0" - resolved "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.84.0.tgz#95b71dabcf3c5fc275e623a29a1d7091fc893e38" - integrity sha512-Iuh0GAxsQscK1re9sWEQHG0wKswnr7ha4EZ8j47Sigo8yBIZNp01P+V0kbZ55bDjiT66Sqqu3jaDJdYzR/5o4w== - dependencies: - "@jsii/check-node" "1.84.0" - "@jsii/spec" "^1.84.0" - chalk "^4" - fs-extra "^10.1.0" - oo-ascii-tree "^1.84.0" - yargs "^16.2.0" - jsii-rosetta@^1.74.0: version "1.74.0" resolved "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.74.0.tgz#700c025c798bb668a88911630a2df87a1169cd32" @@ -7002,20 +7000,20 @@ jsii-rosetta@^1.74.0: workerpool "^6.3.1" yargs "^16.2.0" -jsii-rosetta@^1.84.0: - version "1.84.0" - resolved "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.84.0.tgz#1dca8518f4ae6780beb8d73b54b013a3a1420b8e" - integrity sha512-VrXmc6utiNs3eNTKxVky0LTxoQrsh5GuEGyfj9ihwCkojYBJ3w80PdkMQEeRpWGdaCLEocjpy1X67xgZ4ZbPlg== +jsii-rosetta@^1.80.0: + version "1.80.0" + resolved "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.80.0.tgz#3ac38a79bc3670f9f25d51969e993ff605288ac2" + integrity sha512-7sziqogIHg6TQpMWR9eI8tDj8C+L/tSmsnbc+lASPlzkpHkukuETsgojnP/5Zg1tng8YW1+zvjuGbqVgiEXfzA== dependencies: - "@jsii/check-node" "1.84.0" - "@jsii/spec" "1.84.0" - "@xmldom/xmldom" "^0.8.8" + "@jsii/check-node" "1.80.0" + "@jsii/spec" "1.80.0" + "@xmldom/xmldom" "^0.8.6" commonmark "^0.30.0" fast-glob "^3.2.12" - jsii "1.84.0" - semver "^7.5.1" + jsii "1.80.0" + semver "^7.3.8" semver-intersect "^1.4.0" - stream-json "^1.8.0" + stream-json "^1.7.5" typescript "~3.9.10" workerpool "^6.4.0" yargs "^16.2.0" @@ -7039,7 +7037,26 @@ jsii@1.74.0, jsii@^1.74.0: typescript "~3.9.10" yargs "^16.2.0" -jsii@1.84.0, jsii@^1.84.0: +jsii@1.80.0: + version "1.80.0" + resolved "https://registry.npmjs.org/jsii/-/jsii-1.80.0.tgz#f45a752b630e71e68f65c255440ebec4ae8a6d44" + integrity sha512-mw2xlpnGszpQMYZoHaKFx0TuxAuEW+tIMMVj5xXOsEBFnsc0bdVGkFPytg5VOjOiKK2PA2fAZO/3Y0Vtn3GY+Q== + dependencies: + "@jsii/check-node" "1.80.0" + "@jsii/spec" "^1.80.0" + case "^1.6.3" + chalk "^4" + fast-deep-equal "^3.1.3" + fs-extra "^10.1.0" + log4js "^6.9.1" + semver "^7.3.8" + semver-intersect "^1.4.0" + sort-json "^2.0.1" + spdx-license-list "^6.6.0" + typescript "~3.9.10" + yargs "^16.2.0" + +jsii@^1.84.0: version "1.84.0" resolved "https://registry.npmjs.org/jsii/-/jsii-1.84.0.tgz#57e631c85ac2d4ffcc2f59a9c68591fcfaf5667e" integrity sha512-vtrw3fRrr5Do4LDNxAVXHgtHDyxHvohyzAfBwxcMEYzZ51gJX52wsdlaGE1p0dPe1V9uCAbNQTDKbAMgVJkg0Q== @@ -8608,11 +8625,6 @@ oo-ascii-tree@^1.74.0: resolved "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.74.0.tgz#3581e4f95ff9de13660943e504eaddaa58bf08c0" integrity sha512-tV5BBZhFvALFKY/DMVILN5jDznPRZte0Yoj1hPmbAVGL4VSpsEXx0ZrP8fnFZKbAOyCwWq+PV26n7S5+cP86Xw== -oo-ascii-tree@^1.84.0: - version "1.84.0" - resolved "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.84.0.tgz#82828d8c962b637bffa0d1b8a555c337907837e9" - integrity sha512-8bvsAKFAQ7HwU3lAEDwsKYDkTqsDTsRTkr3J0gvH1U805d2no9rUNYptWzg3oYku5h5mr9Bko+BIh1pjSD8qrg== - open@^7.4.2: version "7.4.2" resolved "https://registry.npmjs.org/open/-/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321" @@ -9926,9 +9938,9 @@ semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.2.0, semver@^6.3.0: integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== semver@^7.5.1: - version "7.5.1" - resolved "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz#c90c4d631cf74720e46b21c1d37ea07edfab91ec" - integrity sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw== + version "7.5.2" + resolved "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz#5b851e66d1be07c1cdaf37dfc856f543325a2beb" + integrity sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ== dependencies: lru-cache "^6.0.0" @@ -10314,10 +10326,10 @@ stream-chain@^2.2.5: resolved "https://registry.npmjs.org/stream-chain/-/stream-chain-2.2.5.tgz#b30967e8f14ee033c5b9a19bbe8a2cba90ba0d09" integrity sha512-1TJmBx6aSWqZ4tx7aTpBDXK0/e2hhcNSTV8+CbFJtDjbb+I1mZ8lHit0Grw9GRT+6JbIrrDd8esncgBi8aBXGA== -stream-json@^1.8.0: - version "1.8.0" - resolved "https://registry.npmjs.org/stream-json/-/stream-json-1.8.0.tgz#53f486b2e3b4496c506131f8d7260ba42def151c" - integrity sha512-HZfXngYHUAr1exT4fxlbc1IOce1RYxp2ldeaf97LYCOPSoOqY/1Psp7iGvpb+6JIOgkra9zDYnPX01hGAHzEPw== +stream-json@^1.7.5: + version "1.7.5" + resolved "https://registry.npmjs.org/stream-json/-/stream-json-1.7.5.tgz#2ff0563011f22cea4f6a28dbfc0344a53c761fe4" + integrity sha512-NSkoVduGakxZ8a+pTPUlcGEeAGQpWL9rKJhOFCV+J/QtdQUEU5vtBgVg6eJXn8JB8RZvpbJWZGvXkhz70MLWoA== dependencies: stream-chain "^2.2.5"