diff --git a/.projen/deps.json b/.projen/deps.json index a4c9aaed..009e8d8d 100644 --- a/.projen/deps.json +++ b/.projen/deps.json @@ -2,7 +2,6 @@ "dependencies": [ { "name": "@types/jest", - "version": "^27", "type": "build" }, { @@ -52,13 +51,12 @@ "type": "build" }, { - "name": "jest-junit", - "version": "^15", + "name": "jest", "type": "build" }, { - "name": "jest", - "version": "^27", + "name": "jest-junit", + "version": "^15", "type": "build" }, { @@ -75,12 +73,12 @@ }, { "name": "jsii-rosetta", - "version": "1.x", + "version": "~5.0.0", "type": "build" }, { "name": "jsii", - "version": "1.x", + "version": "~5.0.0", "type": "build" }, { @@ -103,7 +101,6 @@ }, { "name": "ts-jest", - "version": "^27", "type": "build" }, { @@ -122,16 +119,6 @@ "name": "jszip", "type": "bundled" }, - { - "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.86.0", diff --git a/.projenrc.ts b/.projenrc.ts index fd1dcf61..4b77b8f7 100644 --- a/.projenrc.ts +++ b/.projenrc.ts @@ -13,14 +13,15 @@ const project = new pj.awscdk.AwsCdkConstructLibrary({ projenrcTs: true, - releaseEveryCommit: true, - enablePRAutoMerge: true, + releaseTrigger: pj.release.ReleaseTrigger.continuous(), catalog: { twitter: 'pgarbe', }, cdkVersion: '2.86.0', + jsiiVersion: '~5.0.0', + // cdkVersionPinning: true, // cdkDependenciesAsDeps: false, diff --git a/package.json b/package.json index db7016a8..c7501dab 100644 --- a/package.json +++ b/package.json @@ -48,11 +48,11 @@ "eslint-plugin-import": "^2.27.5", "jest": "^27", "jest-junit": "^15", - "jsii": "1.x", + "jsii": "~5.0.0", "jsii-diff": "^1.85.0", "jsii-docgen": "^7.2.9", "jsii-pacmak": "^1.85.0", - "jsii-rosetta": "1.x", + "jsii-rosetta": "~5.0.0", "npm-check-updates": "^16", "pre-commit": "^1.2.2", "projen": "^0.71.146", @@ -73,10 +73,6 @@ "aws-sdk", "jszip" ], - "resolutions": { - "@types/babel__traverse": "7.18.2", - "@types/prettier": "2.6.0" - }, "keywords": [ "cdk", "ecr" diff --git a/tsconfig.json b/tsconfig.json deleted file mode 100644 index ac5eb3b5..00000000 --- a/tsconfig.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "compilerOptions": { - "outDir": "lib", - "rootDir": "src", - "declarationMap": false, - "inlineSourceMap": true, - "inlineSources": true, - "alwaysStrict": true, - "charset": "utf8", - "declaration": true, - "experimentalDecorators": true, - "incremental": true, - "lib": [ - "es2020" - ], - "module": "CommonJS", - "newLine": "lf", - "noEmitOnError": true, - "noFallthroughCasesInSwitch": true, - "noImplicitAny": true, - "noImplicitReturns": true, - "noImplicitThis": true, - "noUnusedLocals": true, - "noUnusedParameters": true, - "resolveJsonModule": true, - "skipLibCheck": true, - "strict": true, - "strictNullChecks": true, - "strictPropertyInitialization": true, - "stripInternal": false, - "target": "ES2020", - "composite": false, - "tsBuildInfoFile": "lib/tsconfig.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ], - "exclude": [ - "node_modules" - ], - "_generated_by_jsii_": "Generated by jsii - safe to delete, and ideally should be in .gitignore" -} diff --git a/yarn.lock b/yarn.lock index 09eda34e..6401d217 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1002,7 +1002,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== @@ -1091,7 +1091,7 @@ resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301" integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw== -"@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== @@ -1202,7 +1202,7 @@ "@typescript-eslint/types" "5.62.0" eslint-visitor-keys "^3.3.0" -"@xmldom/xmldom@^0.8.8": +"@xmldom/xmldom@^0.8.10", "@xmldom/xmldom@^0.8.8": version "0.8.10" resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.8.10.tgz#a1337ca426aa61cef9fe15b5b28e340a72f6fa99" integrity sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw== @@ -2397,6 +2397,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 + eastasianwidth@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb" @@ -2796,6 +2805,17 @@ fast-glob@^3.2.12, fast-glob@^3.2.9: merge2 "^1.3.0" micromatch "^4.0.4" +fast-glob@^3.3.1: + version "3.3.1" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.1.tgz#784b4e897340f3dbbef17413b3f11acf03c874c4" + integrity sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg== + dependencies: + "@nodelib/fs.stat" "^2.0.2" + "@nodelib/fs.walk" "^1.2.3" + glob-parent "^5.1.2" + merge2 "^1.3.0" + micromatch "^4.0.4" + fast-json-patch@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/fast-json-patch/-/fast-json-patch-3.1.1.tgz#85064ea1b1ebf97a3f7ad01e23f9337e72c66947" @@ -4337,7 +4357,7 @@ jsii-reflect@^1.80.0, jsii-reflect@^1.85.0: oo-ascii-tree "^1.85.0" yargs "^16.2.0" -jsii-rosetta@1.x, jsii-rosetta@^1.80.0, jsii-rosetta@^1.85.0: +jsii-rosetta@^1.80.0, jsii-rosetta@^1.85.0: version "1.85.0" resolved "https://registry.yarnpkg.com/jsii-rosetta/-/jsii-rosetta-1.85.0.tgz#c4ba8d5c426a4743c4dafbaaa960b6c2e6cf1b59" integrity sha512-3kGi7xZjA7fpVYmbn2VXvDA6iuva47ffdqyb28DhYxVWnlEJgff8XWuvQJSqrtxEcJF60dVD58N79pPghyvOgg== @@ -4355,7 +4375,26 @@ jsii-rosetta@1.x, jsii-rosetta@^1.80.0, jsii-rosetta@^1.85.0: workerpool "^6.4.0" yargs "^16.2.0" -jsii@1.85.0, jsii@1.x: +jsii-rosetta@~5.0.0: + version "5.0.18" + resolved "https://registry.yarnpkg.com/jsii-rosetta/-/jsii-rosetta-5.0.18.tgz#15b96fce5e316ceba04699a7a31f195e3e0aa048" + integrity sha512-OKixUn3ehPyUGOVJJS588DZKV777/yqwv8mj2fU+L3QcYyTIVgKqSPvrXjLghw9trF/NgUBHySIzsghj0gU8qg== + dependencies: + "@jsii/check-node" "1.85.0" + "@jsii/spec" "^1.85.0" + "@xmldom/xmldom" "^0.8.10" + chalk "^4" + commonmark "^0.30.0" + fast-glob "^3.3.1" + jsii "~5.0.5" + semver "^7.5.4" + semver-intersect "^1.4.0" + stream-json "^1.8.0" + typescript "~5.0.4" + workerpool "^6.4.0" + yargs "^17.7.2" + +jsii@1.85.0: version "1.85.0" resolved "https://registry.yarnpkg.com/jsii/-/jsii-1.85.0.tgz#a70d5b2b5842fb8f029de3d0848fea356a2bd6b5" integrity sha512-RKB3qZwIXafNUiILD+rKI1EQDtHtfpHN78VVVnfLcp1uAkPLA5zVVqy6cKu2cpAmlz8R5hzIFsw4uEnWA+XE4w== @@ -4374,6 +4413,25 @@ jsii@1.85.0, jsii@1.x: typescript "~3.9.10" yargs "^16.2.0" +jsii@~5.0.0, jsii@~5.0.5: + version "5.0.18" + resolved "https://registry.yarnpkg.com/jsii/-/jsii-5.0.18.tgz#d076505ef296353f5de690ab0b250196773fc4c4" + integrity sha512-YrZPfv0K9kKHoqRwiFlr+a9C/BVEhEpRQ0j/9Tm0YR9j8QZxOyHfvifHDiJvfcmu9rNOLFlwh5KXsW5+IIGxbw== + dependencies: + "@jsii/check-node" "1.85.0" + "@jsii/spec" "^1.85.0" + case "^1.6.3" + chalk "^4" + downlevel-dts "^0.11.0" + fast-deep-equal "^3.1.3" + log4js "^6.9.1" + semver "^7.5.4" + semver-intersect "^1.4.0" + sort-json "^2.0.1" + spdx-license-list "^6.6.0" + typescript "~5.0.4" + yargs "^17.7.2" + json-buffer@3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13" @@ -5900,7 +5958,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== @@ -6582,11 +6640,21 @@ typescript@^4.9.5: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a" integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g== +typescript@next: + version "5.2.0-dev.20230724" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.2.0-dev.20230724.tgz#1957fb44c3c9884c911ab47b883eb29c983f0f7f" + integrity sha512-imp5MKTFe3BmE+opYLWqglHjPJ3HQtmwcFX0zYKhky/m/ncUpMqnVnjZSoncvTkKGI8s4Ng88LqOEgvLa4brFg== + 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@~5.0.4: + version "5.0.4" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.0.4.tgz#b217fd20119bd61a94d4011274e0ab369058da3b" + integrity sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw== + uglify-js@^3.1.4: version "3.17.4" resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.17.4.tgz#61678cf5fa3f5b7eb789bb345df29afb8257c22c"