From 99ff0bed09b23fc3e6a5e51be1225072a4f397dd Mon Sep 17 00:00:00 2001 From: Momo Kornher Date: Wed, 5 Nov 2025 09:29:03 +0000 Subject: [PATCH] fix(deps): upgrade to jsii & typescript 5.9 --- .projen/deps.json | 7 +-- .projen/tasks.json | 2 +- .projenrc.ts | 8 +-- package.json | 8 +-- yarn.lock | 136 +++++++++++++++------------------------------ 5 files changed, 54 insertions(+), 107 deletions(-) diff --git a/.projen/deps.json b/.projen/deps.json index bfe5d210..9cd8483e 100644 --- a/.projen/deps.json +++ b/.projen/deps.json @@ -66,17 +66,16 @@ }, { "name": "jsii-pacmak", - "version": "1.102.0", "type": "build" }, { "name": "jsii-rosetta", - "version": "5.4.x", + "version": "5.9.x", "type": "build" }, { "name": "jsii", - "version": "5.4.x", + "version": "5.9.x", "type": "build" }, { @@ -93,7 +92,7 @@ }, { "name": "typescript", - "version": "5.4.x", + "version": "5.9.x", "type": "build" } ], diff --git a/.projen/tasks.json b/.projen/tasks.json index a8b2cc3b..534bc2ac 100644 --- a/.projen/tasks.json +++ b/.projen/tasks.json @@ -364,7 +364,7 @@ }, "steps": [ { - "exec": "npx npm-check-updates@16 --upgrade --target=minor --peer --no-deprecated --dep=dev --filter=@types/jest,eslint-import-resolver-typescript,eslint-plugin-import,jest,jsii-diff,ts-jest,ts-node" + "exec": "npx npm-check-updates@16 --upgrade --target=minor --peer --no-deprecated --dep=dev --filter=@types/jest,eslint-import-resolver-typescript,eslint-plugin-import,jest,jsii-diff,jsii-pacmak,ts-jest,ts-node" }, { "exec": "yarn install --check-files" diff --git a/.projenrc.ts b/.projenrc.ts index 2ccceac1..d822fd4c 100644 --- a/.projenrc.ts +++ b/.projenrc.ts @@ -58,8 +58,8 @@ const project = new CdklabsJsiiProject({ }, autoApproveUpgrades: true, - jsiiVersion: '5.4.x', - typescriptVersion: '5.4.x', + jsiiVersion: '5.9.x', + typescriptVersion: '5.9.x', }); // disable go sumdb so that go deps are resolved directly against github @@ -78,8 +78,4 @@ project.npmignore?.exclude('/scripts/', '.projenrc.ts'); // cdklabs-projen-project-types is overzealous about adding this dependency project.deps.removeDependency('constructs'); -// temporary to -// to resolve https://github.com/aws/jsii/issues/4658 -project.addDevDeps('jsii-pacmak@1.102.0'); - project.synth(); diff --git a/package.json b/package.json index a8ad6085..19322066 100644 --- a/package.json +++ b/package.json @@ -53,15 +53,15 @@ "eslint-plugin-import": "^2.32.0", "jest": "^29", "jest-junit": "^16", - "jsii": "5.4.x", + "jsii": "5.9.x", "jsii-diff": "^1.118.0", "jsii-docgen": "^10.5.0", - "jsii-pacmak": "1.102.0", - "jsii-rosetta": "5.4.x", + "jsii-pacmak": "^1.118.0", + "jsii-rosetta": "5.9.x", "projen": "^0.98.4", "ts-jest": "^29", "ts-node": "^10.9.2", - "typescript": "5.4.x" + "typescript": "5.9.x" }, "keywords": [ "aws", diff --git a/yarn.lock b/yarn.lock index 28ee7228..24f5a44a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -689,31 +689,7 @@ "@jridgewell/resolve-uri" "^3.1.0" "@jridgewell/sourcemap-codec" "^1.4.14" -"@jsii/check-node@1.102.0": - version "1.102.0" - resolved "https://registry.yarnpkg.com/@jsii/check-node/-/check-node-1.102.0.tgz#d5dce81b60411b35d4890e69eee2b86d606c8672" - integrity sha512-uyKjxCe1ou11RJz6koBr5vXtyaGjTA45hF+H88GNW96vms7jKqmYdMm067Az1OKwl38h02lQRQ2tmoEzV7u74w== - dependencies: - chalk "^4.1.2" - semver "^7.6.3" - -"@jsii/check-node@1.106.0": - version "1.106.0" - resolved "https://registry.yarnpkg.com/@jsii/check-node/-/check-node-1.106.0.tgz#5deb20b0bbe0a506c4bd9edf60b17b0a93f83834" - integrity sha512-/T/TUsbHdEbZRFR4Rem9+UXVvgMYncEkrIeC52oIHJ8BDSgqlDsIARio/Eu5DOftF4avSLV/sshR6n19mpK1oA== - dependencies: - chalk "^4.1.2" - semver "^7.6.3" - -"@jsii/check-node@1.107.0": - version "1.107.0" - resolved "https://registry.yarnpkg.com/@jsii/check-node/-/check-node-1.107.0.tgz#359099573cf47e3d2f7be19172fbe49e3e2d11a7" - integrity sha512-ud21048xxEVbbzjFlE7GQSuypW7/8P6Dyu+jjTwp6wGFbnbpxZiupIMdp6eSVSqo9M3rC14SyjNq2liXoSYBZg== - dependencies: - chalk "^4.1.2" - semver "^7.6.3" - -"@jsii/check-node@1.118.0": +"@jsii/check-node@1.118.0", "@jsii/check-node@^1.118.0": version "1.118.0" resolved "https://registry.yarnpkg.com/@jsii/check-node/-/check-node-1.118.0.tgz#0be4fef43c7058764e3b4d146c6fbc80306de6bd" integrity sha512-8IaXtUO6oq3Dmi9rxXqsBRnKxqbe0OARGt4tw46Li7kR5/GXE/DBGPKZ2rOvi2CekOh8b3VGBU+wd84RQciTAA== @@ -721,7 +697,7 @@ chalk "^4.1.2" semver "^7.7.2" -"@jsii/spec@1.118.0", "@jsii/spec@^1.102.0", "@jsii/spec@^1.106.0", "@jsii/spec@^1.107.0", "@jsii/spec@^1.118.0": +"@jsii/spec@1.118.0", "@jsii/spec@^1.118.0": version "1.118.0" resolved "https://registry.yarnpkg.com/@jsii/spec/-/spec-1.118.0.tgz#66d6da3089e002ee3ee89dcc6e9d284a039acf94" integrity sha512-aVe535/sN1EW88DYiEO3r0gqkKJ7ob0yfWC8+c1GVEayAecuvBjmwzzc7oDIIOthZ7PT3OBJ2xPqGqtbCyR3Uw== @@ -1172,7 +1148,7 @@ resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-win32-x64-msvc/-/resolver-binding-win32-x64-msvc-1.11.1.tgz#538b1e103bf8d9864e7b85cc96fa8d6fb6c40777" integrity sha512-lrW200hZdbfRtztbygyaq/6jP6AKE8qQN2KvPcJ+x7wiD038YtnYtZ82IMNJ69GJibV7bwL3y9FgK+5w/pYt6g== -"@xmldom/xmldom@^0.9.7": +"@xmldom/xmldom@^0.9.8": version "0.9.8" resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.9.8.tgz#1471e82bdff9e8f20ee8bbe60d4ffa8a516e78d8" integrity sha512-p96FSY54r+WJ50FIOsCOjyj/wavs8921hG5+kVMmZgKcvIKxMXHTrjNJvRgWa/zuX3B6t2lijLNFaOyuxUH+2A== @@ -1640,7 +1616,7 @@ co@^4.6.0: resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ== -codemaker@^1.102.0: +codemaker@^1.118.0: version "1.118.0" resolved "https://registry.yarnpkg.com/codemaker/-/codemaker-1.118.0.tgz#2587611d167bdece0beff9f2748b2baae04c655b" integrity sha512-d6ddG2oKNwkYBRJtsdEaKbJLBaxZJO0ImSG89wi6j5y549olTB3ERsqGGRZ47HlRuaVpkbOXnG/kb8I6ELxtMA== @@ -1718,7 +1694,7 @@ commit-and-tag-version@^12: yaml "^2.6.0" yargs "^17.7.2" -commonmark@^0.31.1, commonmark@^0.31.2: +commonmark@^0.31.2: version "0.31.2" resolved "https://registry.yarnpkg.com/commonmark/-/commonmark-0.31.2.tgz#9d8d5439c82c9a235154d858a53e1a7965d573a5" integrity sha512-2fRLTyb9r/2835k5cwcAwOj0DEc44FARnMp5veGsJ+mEAZdi52sNopLu07ZyElQUz058H43whzlERDIaaSw4rg== @@ -2127,15 +2103,6 @@ dotgitignore@^2.1.0: find-up "^3.0.0" minimatch "^3.0.4" -downlevel-dts@^0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/downlevel-dts/-/downlevel-dts-0.11.0.tgz#514a2d723009c5845730c1db6c994484c596ed9c" - integrity sha512-vo835pntK7kzYStk7xUHDifiYJvXxVhUapt85uk2AI94gUUAQX9HNRtrcMHNSc3YHJUEHGbYIGsM99uIbgAtxw== - dependencies: - semver "^7.3.2" - shelljs "^0.8.3" - typescript next - dunder-proto@^1.0.0, dunder-proto@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/dunder-proto/-/dunder-proto-1.0.1.tgz#d7ae667e1dc83482f8b70fd0f6eefc50da30f58a" @@ -2816,7 +2783,7 @@ glob-parent@^6.0.2: dependencies: is-glob "^4.0.3" -glob@^7.0.0, glob@^7.1.3, glob@^7.1.4: +glob@^7.1.3, glob@^7.1.4: version "7.2.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== @@ -3802,25 +3769,25 @@ jsii-docgen@^10.5.0: semver "^7.7.3" yargs "^16.2.0" -jsii-pacmak@1.102.0: - version "1.102.0" - resolved "https://registry.yarnpkg.com/jsii-pacmak/-/jsii-pacmak-1.102.0.tgz#ccf7f98f05c2b1bad34a0b90dbf5c479bd45c1a1" - integrity sha512-3/nqBYNH8n/5IWI0sBFBYl1yATokEDUDQtYFLjzk7oXNWpUJ23/encI78Cs55ZS6UXcfWN3xczGLqCWnsgEpnw== +jsii-pacmak@^1.118.0: + version "1.118.0" + resolved "https://registry.yarnpkg.com/jsii-pacmak/-/jsii-pacmak-1.118.0.tgz#a4ad053535ffc4142a544c797272082e98289801" + integrity sha512-RY7l//WI8G3IN2u1R8S6rFDT2jcNwjiR3RWyWu6NtcPchn+V/8aqX+8j1PmyRGfop8qAKcPc0AL3rAx2OmcmAw== dependencies: - "@jsii/check-node" "1.102.0" - "@jsii/spec" "^1.102.0" + "@jsii/check-node" "1.118.0" + "@jsii/spec" "1.118.0" clone "^2.1.2" - codemaker "^1.102.0" - commonmark "^0.31.1" + codemaker "^1.118.0" + commonmark "^0.31.2" escape-string-regexp "^4.0.0" fs-extra "^10.1.0" - jsii-reflect "^1.102.0" - semver "^7.6.3" - spdx-license-list "^6.9.0" + jsii-reflect "^1.118.0" + semver "^7.7.2" + spdx-license-list "^6.10.0" xmlbuilder "^15.1.1" - yargs "^16.2.0" + yargs "^17.7.2" -jsii-reflect@^1.102.0, jsii-reflect@^1.118.0: +jsii-reflect@^1.118.0: version "1.118.0" resolved "https://registry.yarnpkg.com/jsii-reflect/-/jsii-reflect-1.118.0.tgz#ff33ffba10090e5903dd9ddb2a5c6252c1fbf1c3" integrity sha512-P3iASRGS8j87uT66MZ2jQvxPZRLdXBMoSEBECn3+krKCauaZntymXm/iQmWCgTnpt43cwz+eYkY1D3KA1sGjzA== @@ -3832,42 +3799,41 @@ jsii-reflect@^1.102.0, jsii-reflect@^1.118.0: oo-ascii-tree "^1.118.0" yargs "^17.7.2" -jsii-rosetta@5.4.x: - version "5.4.59" - resolved "https://registry.yarnpkg.com/jsii-rosetta/-/jsii-rosetta-5.4.59.tgz#45b00a5c8ad8f036155a9a7ad3ab2796c2621d33" - integrity sha512-B5Ew/GAMGItzbuFyrmGyLSz/BTLk96VKiC7iZUOSSPkO+WBoKvgiP5s8nCbA3fD8KV9jJfmYVmLAELa4zsA2Cw== +jsii-rosetta@5.9.x: + version "5.9.13" + resolved "https://registry.yarnpkg.com/jsii-rosetta/-/jsii-rosetta-5.9.13.tgz#bbcf6cd362a70eac35df2eb0860978d58ef1488b" + integrity sha512-OGmLCKueeKhJAjRwlk8wrSJkk4CKpjHBJNmIt0NlIdOpOsnA3rCeH6cSh26MhiifIPdPeXJMTKcID2frcFf4HQ== dependencies: - "@jsii/check-node" "1.107.0" - "@jsii/spec" "^1.107.0" - "@xmldom/xmldom" "^0.9.7" + "@jsii/check-node" "^1.118.0" + "@jsii/spec" "^1.118.0" + "@xmldom/xmldom" "^0.9.8" chalk "^4" commonmark "^0.31.2" fast-glob "^3.3.3" - jsii "~5.4.0" - semver "^7.7.1" + jsii "~5.9.1" + semver "^7.7.3" semver-intersect "^1.5.0" stream-json "^1.9.1" - typescript "~5.4" + typescript "~5.9" workerpool "^6.5.1" yargs "^17.7.2" -jsii@5.4.x, jsii@~5.4.0: - version "5.4.51" - resolved "https://registry.yarnpkg.com/jsii/-/jsii-5.4.51.tgz#4f22f6669a9bac8b6729b12d659e9b4656691129" - integrity sha512-Hc9H7DoxiUPchNCyTk68HvKIZ+Q1EBO1W8mVJmcxCyx9/ZjmE2jmENuwR1vC7HgSTJa+maLrZRVOJ90aIhsQKQ== +jsii@5.9.x, jsii@~5.9.1: + version "5.9.11" + resolved "https://registry.yarnpkg.com/jsii/-/jsii-5.9.11.tgz#9bdba2be8277b8d343abc1218b354553c78640c1" + integrity sha512-KT6NwKtJkZFxsEaVnWKfiCsne1vhYy4XeCDPIfs+QGaiTAtl0pwv2WXAonBwbvxvXr8lG1H/kj4qzop7/JuGGw== dependencies: - "@jsii/check-node" "1.106.0" - "@jsii/spec" "^1.106.0" + "@jsii/check-node" "1.118.0" + "@jsii/spec" "1.118.0" case "^1.6.3" chalk "^4" - downlevel-dts "^0.11.0" fast-deep-equal "^3.1.3" log4js "^6.9.1" - semver "^7.7.1" + semver "^7.7.3" semver-intersect "^1.5.0" sort-json "^2.0.1" - spdx-license-list "^6.9.0" - typescript "~5.4" + spdx-license-list "^6.10.0" + typescript "~5.9" yargs "^17.7.2" json-buffer@3.0.1: @@ -4891,7 +4857,7 @@ semver@^6.3.0, semver@^6.3.1: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== -semver@^7.0.0, semver@^7.3.2, semver@^7.3.4, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0, semver@^7.6.3, semver@^7.7.1, semver@^7.7.2, semver@^7.7.3: +semver@^7.0.0, semver@^7.3.4, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0, semver@^7.7.1, semver@^7.7.2, semver@^7.7.3: version "7.7.3" resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.3.tgz#4b5f4143d007633a8dc671cd0a6ef9147b8bb946" integrity sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q== @@ -4951,15 +4917,6 @@ shebang-regex@^3.0.0: resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== -shelljs@^0.8.3: - version "0.8.5" - resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.5.tgz#de055408d8361bed66c669d2f000538ced8ee20c" - integrity sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow== - dependencies: - glob "^7.0.0" - interpret "^1.0.0" - rechoir "^0.6.2" - shelljs@^0.9.2: version "0.9.2" resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.9.2.tgz#a8ac724434520cd7ae24d52071e37a18ac2bb183" @@ -5081,7 +5038,7 @@ spdx-license-ids@^3.0.0: resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.22.tgz#abf5a08a6f5d7279559b669f47f0a43e8f3464ef" integrity sha512-4PRT4nh1EImPbt2jASOKHX7PB7I+e4IWNLvkKFDxNhJlfjbYlleYQh285Z/3mPTHSAK/AvdMmw5BNNuYH8ShgQ== -spdx-license-list@^6.9.0: +spdx-license-list@^6.10.0: version "6.10.0" resolved "https://registry.yarnpkg.com/spdx-license-list/-/spdx-license-list-6.10.0.tgz#738249443db42f5fd6780c7c40daecefed7a3adf" integrity sha512-wF3RhDFoqdu14d1Prv6c8aNU0FSRuSFJpNjWeygIZcNZEwPxp7I5/Hwo8j6lSkBKWAIkSQrKefrC5N0lvOP0Gw== @@ -5498,15 +5455,10 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA== -typescript@5.4.x, typescript@~5.4: - version "5.4.5" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.5.tgz#42ccef2c571fdbd0f6718b1d1f5e6e5ef006f611" - integrity sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ== - -typescript@next: - version "6.0.0-dev.20251103" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-6.0.0-dev.20251103.tgz#e8cc8d5f786f561029ef0a628aa95c4a25143290" - integrity sha512-G5POBAyhca9Ie2GfRAJ/xNAk+Fxd8YOaa4A1TXHPzibdQR5Vnn//c3K3rLmIxeqMHOsog0i6ym0zJjOTPIsAsw== +typescript@5.9.x, typescript@~5.9: + version "5.9.3" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.9.3.tgz#5b4f59e15310ab17a216f5d6cf53ee476ede670f" + integrity sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw== uglify-js@^3.1.4: version "3.19.3"