From c59f1b3f4ab5546a4bce1055f0dd93722c796671 Mon Sep 17 00:00:00 2001 From: Amir Szekely Date: Sun, 10 Nov 2024 22:25:03 -0500 Subject: [PATCH] chore: Upgrade jsii (#229) --- .projen/deps.json | 26 ++++---------- .projen/tasks.json | 4 +-- .projenrc.js | 2 ++ API.md | 2 +- package.json | 12 +++---- yarn.lock | 90 +++++++++++++++++++++++++++------------------- 6 files changed, 70 insertions(+), 66 deletions(-) diff --git a/.projen/deps.json b/.projen/deps.json index 5f254ab..a051071 100644 --- a/.projen/deps.json +++ b/.projen/deps.json @@ -27,12 +27,11 @@ }, { "name": "@types/jest", - "version": "^27", "type": "build" }, { "name": "@types/node", - "version": "^16 <= 16.18.78", + "version": "ts5.5", "type": "build" }, { @@ -81,13 +80,12 @@ "type": "build" }, { - "name": "jest-junit", - "version": "^15", + "name": "jest", "type": "build" }, { - "name": "jest", - "version": "^27", + "name": "jest-junit", + "version": "^15", "type": "build" }, { @@ -105,12 +103,12 @@ }, { "name": "jsii-rosetta", - "version": "1.x", + "version": "5.5.x", "type": "build" }, { "name": "jsii", - "version": "1.x", + "version": "5.5.x", "type": "build" }, { @@ -119,7 +117,6 @@ }, { "name": "ts-jest", - "version": "^27", "type": "build" }, { @@ -128,22 +125,13 @@ }, { "name": "typescript", + "version": "5.5.x", "type": "build" }, { "name": "xterm-benchmark", "type": "build" }, - { - "name": "@types/babel__traverse", - "version": "7.18.2", - "type": "override" - }, - { - "name": "@types/prettier", - "version": "2.6.0", - "type": "override" - }, { "name": "aws-cdk-lib", "version": "^2.87.0", diff --git a/.projen/tasks.json b/.projen/tasks.json index d29ebdd..f4a9918 100644 --- a/.projen/tasks.json +++ b/.projen/tasks.json @@ -478,13 +478,13 @@ }, "steps": [ { - "exec": "npx npm-check-updates@16 --upgrade --target=minor --peer --no-deprecated --dep=dev,peer,prod,optional --filter=@aws-cdk/aws-lambda-python-alpha,@aws-sdk/client-codebuild,@aws-sdk/client-s3,@types/adm-zip,@types/aws-lambda,adm-zip,esbuild,eslint-import-resolver-typescript,eslint-plugin-import,execa,jsii-diff,jsii-pacmak,projen,ts-node,typescript,xterm-benchmark" + "exec": "npx npm-check-updates@16 --upgrade --target=minor --peer --no-deprecated --dep=dev,peer,prod,optional --filter=@aws-cdk/aws-lambda-python-alpha,@aws-sdk/client-codebuild,@aws-sdk/client-s3,@types/adm-zip,@types/aws-lambda,@types/jest,adm-zip,esbuild,eslint-import-resolver-typescript,eslint-plugin-import,execa,jest,jsii-diff,jsii-pacmak,projen,ts-jest,ts-node,xterm-benchmark" }, { "exec": "yarn install --check-files" }, { - "exec": "yarn upgrade @aws-cdk/aws-lambda-python-alpha @aws-sdk/client-codebuild @aws-sdk/client-s3 @stylistic/eslint-plugin @types/adm-zip @types/aws-lambda @types/jest @types/node @typescript-eslint/eslint-plugin @typescript-eslint/parser adm-zip aws-cdk commit-and-tag-version esbuild eslint-import-resolver-typescript eslint-plugin-import eslint execa jest-junit jest jsii-diff jsii-docgen jsii-pacmak jsii-rosetta jsii projen ts-jest ts-node typescript xterm-benchmark aws-cdk-lib constructs" + "exec": "yarn upgrade @aws-cdk/aws-lambda-python-alpha @aws-sdk/client-codebuild @aws-sdk/client-s3 @stylistic/eslint-plugin @types/adm-zip @types/aws-lambda @types/jest @types/node @typescript-eslint/eslint-plugin @typescript-eslint/parser adm-zip aws-cdk commit-and-tag-version esbuild eslint-import-resolver-typescript eslint-plugin-import eslint execa jest jest-junit jsii-diff jsii-docgen jsii-pacmak jsii-rosetta jsii projen ts-jest ts-node typescript xterm-benchmark aws-cdk-lib constructs" }, { "exec": "npx projen" diff --git a/.projenrc.js b/.projenrc.js index d051869..9444cce 100644 --- a/.projenrc.js +++ b/.projenrc.js @@ -100,6 +100,8 @@ const project = new awscdk.AwsCdkConstructLibrary({ tsconfig: { include: ['benchmark/**/*.ts'], }, + jsiiVersion: '5.5.x', + typescriptVersion: '5.5.x', }); // disable automatic releases, but keep workflow that can be triggered manually diff --git a/API.md b/API.md index b1af46d..61433e2 100644 --- a/API.md +++ b/API.md @@ -891,7 +891,7 @@ public readonly type: DependencyPackagerType; ``` - *Type:* DependencyPackagerType -- *Default:* {@link DependencyPackagerType.LAMBDA} +- *Default:* {@link DependencyPackagerType.LAMBDA } Type of dependency packager. diff --git a/package.json b/package.json index 7bf8871..9b20f0e 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "@types/adm-zip": "^0.5.6", "@types/aws-lambda": "^8.10.145", "@types/jest": "^27", - "@types/node": "^16 <= 16.18.78", + "@types/node": "ts5.5", "@typescript-eslint/eslint-plugin": "^8", "@typescript-eslint/parser": "^8", "adm-zip": "^0.5.16", @@ -73,25 +73,21 @@ "execa": "^7.2.0", "jest": "^27", "jest-junit": "^15", - "jsii": "1.x", + "jsii": "5.5.x", "jsii-diff": "^1.104.0", "jsii-docgen": "^10.5.0", "jsii-pacmak": "^1.104.0", - "jsii-rosetta": "1.x", + "jsii-rosetta": "5.5.x", "projen": "^0.90.2", "ts-jest": "^27", "ts-node": "^10.9.2", - "typescript": "^4.9.5", + "typescript": "5.5.x", "xterm-benchmark": "^0.3.1" }, "peerDependencies": { "aws-cdk-lib": "^2.87.0", "constructs": "^10.0.5" }, - "resolutions": { - "@types/babel__traverse": "7.18.2", - "@types/prettier": "2.6.0" - }, "keywords": [ "aws", "aws-cdk", diff --git a/yarn.lock b/yarn.lock index 2bcc568..cf821bb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1395,6 +1395,14 @@ "@jridgewell/resolve-uri" "^3.1.0" "@jridgewell/sourcemap-codec" "^1.4.14" +"@jsii/check-node@1.103.1": + version "1.103.1" + resolved "https://registry.yarnpkg.com/@jsii/check-node/-/check-node-1.103.1.tgz#6eb9147993b9f035ae1730c5821a75872a5e4928" + integrity sha512-Vi6ONm5WXEim98a2DJ6WMlrP/w5AGzXrrQBpGcfVV7cu86DPx1L0OAZnqzGAJE8ly0VfcSXkmxJ9LFcn3jylBQ== + dependencies: + chalk "^4.1.2" + semver "^7.6.3" + "@jsii/check-node@1.104.0": version "1.104.0" resolved "https://registry.yarnpkg.com/@jsii/check-node/-/check-node-1.104.0.tgz#093a616ab4a80abc9b932906c4f68c32362faa6c" @@ -1403,7 +1411,7 @@ chalk "^4.1.2" semver "^7.6.3" -"@jsii/spec@1.104.0", "@jsii/spec@^1.103.1", "@jsii/spec@^1.104.0": +"@jsii/spec@^1.103.1", "@jsii/spec@^1.104.0": version "1.104.0" resolved "https://registry.yarnpkg.com/@jsii/spec/-/spec-1.104.0.tgz#9f1206b3712808ad7cbbdbf6cf333a77a8f3df8c" integrity sha512-7jxU8iRowA3O7Dpn8XAsX8o4Y8Fy8plbEVg0CnjvIQsJh3puI3KFHspXur70OOccfGkoL1TWnXBZ+BwCcvhu1g== @@ -2053,7 +2061,7 @@ "@babel/parser" "^7.1.0" "@babel/types" "^7.0.0" -"@types/babel__traverse@*", "@types/babel__traverse@7.18.2", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6": +"@types/babel__traverse@*", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6": version "7.18.2" resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.18.2.tgz#235bf339d17185bdec25e024ca19cce257cc7309" integrity sha512-FcFaxOr2V5KZCviw1TnutEMVUVsGt4D2hP1TAfXZAMKuHYW3xQhe3jTxNPWutgCJ3/X1c5yX8ZoGVEItxKbwBg== @@ -2131,7 +2139,7 @@ resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-8.2.3.tgz#bbeb55fbc73f28ea6de601fbfa4613f58d785323" integrity sha512-ekGvFhFgrc2zYQoX4JeZPmVzZxw6Dtllga7iGHzfbYIYkAMUx/sAFP2GdFpLff+vdHXu5fl7WX9AT+TtqYcsyw== -"@types/node@*": +"@types/node@*", "@types/node@ts5.5": version "22.9.0" resolved "https://registry.yarnpkg.com/@types/node/-/node-22.9.0.tgz#b7f16e5c3384788542c72dc3d561a7ceae2c0365" integrity sha512-vuyHg81vvWA1Z1ELfvLko2c8f34gyA0zaic0+Rllc5lbCnbSyuvb2Oxpm6TAUAC/2xZN3QGqxBNggD1nNR2AfQ== @@ -2143,17 +2151,12 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.55.tgz#c329cbd434c42164f846b909bd6f85b5537f6240" integrity sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ== -"@types/node@^16 <= 16.18.78": - version "16.18.78" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.78.tgz#3d97264128712f2eb59f1f8456bcfc5d56d8105c" - integrity sha512-2poPMDdsGfvhcLmgJZ85QrIfN6z3PijYRMiV0FWIEUiQW/t/lzH7BEm4vN+HMhjZXbtIKssMcAxTcgu4Rm83YA== - "@types/normalize-package-data@^2.4.0": version "2.4.4" resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz#56e2cc26c397c038fab0e3a917a12d5c5909e901" integrity sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA== -"@types/prettier@2.6.0", "@types/prettier@^2.1.5": +"@types/prettier@^2.1.5": version "2.6.0" resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.6.0.tgz#efcbd41937f9ae7434c714ab698604822d890759" integrity sha512-G/AdOadiZhnJp0jXCaBQU449W2h716OW/EoXeYkCytxKL06X1WCXB4DZpp8TpZ8eyIJVS1cw4lrlkkSYU21cDw== @@ -2263,10 +2266,10 @@ "@typescript-eslint/types" "8.13.0" eslint-visitor-keys "^3.4.3" -"@xmldom/xmldom@^0.8.10": - version "0.8.10" - resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.8.10.tgz#a1337ca426aa61cef9fe15b5b28e340a72f6fa99" - integrity sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw== +"@xmldom/xmldom@^0.9.0": + version "0.9.5" + resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.9.5.tgz#a2c08c3a0c5931daae67dd0385edf2f464d1fee4" + integrity sha512-6g1EwSs8cr8JhP1iBxzyVAWM6BIDvx9Y3FZRIQiMDzgG43Pxi8YkWOZ0nQj2NHgNzgXDZbJewFx/n+YAvMZrfg== JSONStream@^1.3.5: version "1.3.5" @@ -3327,6 +3330,15 @@ 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 + electron-to-chromium@^1.5.41: version "1.5.55" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.55.tgz#73684752aa2e1aa49cafb355a41386c6637e76a9" @@ -5127,42 +5139,43 @@ jsii-reflect@^1.103.1, jsii-reflect@^1.104.0: oo-ascii-tree "^1.104.0" yargs "^16.2.0" -jsii-rosetta@1.x: - version "1.104.0" - resolved "https://registry.yarnpkg.com/jsii-rosetta/-/jsii-rosetta-1.104.0.tgz#3e31098e359d67d3f00a5d7458b57d9fca5b51cd" - integrity sha512-tpGNUoNKJ2zs7gQAypFYSAQ+zEuGG+A604B0gsQiJ7h12iZbBSw4tB7XxRC9ErmBNU8+YiMwYiFcNIoDiiIAEA== +jsii-rosetta@5.5.x: + version "5.5.5" + resolved "https://registry.yarnpkg.com/jsii-rosetta/-/jsii-rosetta-5.5.5.tgz#0205967c02d07599120053bae34caff4ed2226c3" + integrity sha512-eXkY5eJck2XPd+xk6f4uRQ1S1d5/on2GO1H1Rr6WkJW7E51FXltpsmPaXzrAtvNd6doBNd6/X1CM4otEt/nnBA== dependencies: - "@jsii/check-node" "1.104.0" - "@jsii/spec" "1.104.0" - "@xmldom/xmldom" "^0.8.10" + "@jsii/check-node" "1.103.1" + "@jsii/spec" "^1.103.1" + "@xmldom/xmldom" "^0.9.0" + chalk "^4" commonmark "^0.31.1" fast-glob "^3.3.2" - jsii "1.104.0" + jsii "~5.5.0" semver "^7.6.3" semver-intersect "^1.5.0" stream-json "^1.8.0" - typescript "~3.9.10" + typescript "~5.5" workerpool "^6.5.1" - yargs "^16.2.0" + yargs "^17.7.2" -jsii@1.104.0, jsii@1.x: - version "1.104.0" - resolved "https://registry.yarnpkg.com/jsii/-/jsii-1.104.0.tgz#3f7bc416c6d947fa6cfaf6d72d3b513c90b3f532" - integrity sha512-txdalBQAQtcNjV59pL3nz2jYqXsVOBFJjepcXVMAl44Jdh+EKCVpewAW5u7Honq+LSwkcMMszqWmTSIqyXNtuA== +jsii@5.5.x, jsii@~5.5.0: + version "5.5.9" + resolved "https://registry.yarnpkg.com/jsii/-/jsii-5.5.9.tgz#9dbf6ce4038db37e699d687285fac2e190d2caab" + integrity sha512-UBvHIyvvpzYxaPwKDZbJAE53YJ2i5f4W6oolNSZ9vuIOM9lMTDYl5+TGHZv6yt9Ct0kFG0XNq2JbFzgE9l0oJA== dependencies: "@jsii/check-node" "1.104.0" "@jsii/spec" "^1.104.0" case "^1.6.3" chalk "^4" + downlevel-dts "^0.11.0" fast-deep-equal "^3.1.3" - fs-extra "^10.1.0" log4js "^6.9.1" semver "^7.6.3" semver-intersect "^1.5.0" sort-json "^2.0.1" spdx-license-list "^6.9.0" - typescript "~3.9.10" - yargs "^16.2.0" + typescript "~5.5" + yargs "^17.7.2" json-buffer@3.0.1: version "3.0.1" @@ -6209,7 +6222,7 @@ 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.5: +shelljs@^0.8.3, shelljs@^0.8.5: version "0.8.5" resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.5.tgz#de055408d8361bed66c669d2f000538ced8ee20c" integrity sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow== @@ -6779,15 +6792,20 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA== -typescript@^4.2.3, typescript@^4.9.5: +typescript@5.5.x, typescript@~5.5: + version "5.5.4" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.4.tgz#d9852d6c82bad2d2eda4fd74a5762a8f5909e9ba" + integrity sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q== + +typescript@^4.2.3: version "4.9.5" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a" integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g== -typescript@~3.9.10: - version "3.9.10" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.10.tgz#70f3910ac7a51ed6bef79da7800690b19bf778b8" - integrity sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q== +typescript@next: + version "5.8.0-dev.20241110" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.8.0-dev.20241110.tgz#0bf464a4d3389b3fe8bf8afe30769ca45ae7105b" + integrity sha512-0OdrDNPQVyHr/LRSAFbGnuI1a+J72vMFrAsEN2ge8MhW9eihGcqodQrkllBqBLt7dqFUexbK2qOxFun1SUFtQA== uglify-js@^3.1.4: version "3.19.3"