From 170b536c6fb29d14ba15e6c65786631a5f4cba70 Mon Sep 17 00:00:00 2001 From: AWS CDK Automation <43080478+aws-cdk-automation@users.noreply.github.com> Date: Wed, 25 Nov 2020 18:22:13 +0100 Subject: [PATCH 01/31] chore: npm-check-updates && yarn upgrade (#2280) Ran npm-check-updates and yarn upgrade to keep the `yarn.lock` file up-to-date. --- .../@jsii/dotnet-runtime-test/package.json | 2 +- packages/@jsii/dotnet-runtime/package.json | 2 +- packages/@jsii/go-runtime/package.json | 2 +- packages/@jsii/integ-test/package.json | 2 +- packages/@jsii/java-runtime/package.json | 2 +- packages/@jsii/kernel/package.json | 2 +- packages/@jsii/runtime/package.json | 2 +- packages/@jsii/spec/package.json | 4 +- .../jsii-calc-base-of-base/package.json | 2 +- packages/@scope/jsii-calc-base/package.json | 2 +- packages/@scope/jsii-calc-lib/package.json | 2 +- packages/codemaker/package.json | 2 +- packages/jsii-calc/package.json | 2 +- packages/jsii-config/package.json | 2 +- packages/jsii-diff/package.json | 2 +- packages/jsii-pacmak/package.json | 2 +- packages/jsii-reflect/package.json | 2 +- packages/jsii-rosetta/package.json | 2 +- packages/jsii/package.json | 2 +- packages/oo-ascii-tree/package.json | 2 +- yarn.lock | 211 +++++++++--------- 21 files changed, 130 insertions(+), 123 deletions(-) diff --git a/packages/@jsii/dotnet-runtime-test/package.json b/packages/@jsii/dotnet-runtime-test/package.json index 3dec364ca3..2f016f89d5 100644 --- a/packages/@jsii/dotnet-runtime-test/package.json +++ b/packages/@jsii/dotnet-runtime-test/package.json @@ -31,7 +31,7 @@ }, "devDependencies": { "@jsii/dotnet-runtime": "^0.0.0", - "@types/node": "^10.17.46", + "@types/node": "^10.17.47", "jsii-calc": "^0.0.0", "jsii-pacmak": "^0.0.0", "typescript": "~3.9.7" diff --git a/packages/@jsii/dotnet-runtime/package.json b/packages/@jsii/dotnet-runtime/package.json index 64efd5e7f9..e5ab2ac0a3 100644 --- a/packages/@jsii/dotnet-runtime/package.json +++ b/packages/@jsii/dotnet-runtime/package.json @@ -39,7 +39,7 @@ }, "devDependencies": { "@jsii/runtime": "^0.0.0", - "@types/node": "^10.17.46", + "@types/node": "^10.17.47", "@types/semver": "^7.3.4", "jsii-build-tools": "^0.0.0", "semver": "^7.3.2", diff --git a/packages/@jsii/go-runtime/package.json b/packages/@jsii/go-runtime/package.json index 032c6d9573..99d5b7a242 100644 --- a/packages/@jsii/go-runtime/package.json +++ b/packages/@jsii/go-runtime/package.json @@ -21,7 +21,7 @@ }, "devDependencies": { "@types/fs-extra": "^8.1.1", - "@types/node": "^10.17.46", + "@types/node": "^10.17.47", "codemaker": "^0.0.0", "fs-extra": "^9.0.1", "jsii-calc": "^0.0.0", diff --git a/packages/@jsii/integ-test/package.json b/packages/@jsii/integ-test/package.json index 14fba1b23a..f58896bc0b 100644 --- a/packages/@jsii/integ-test/package.json +++ b/packages/@jsii/integ-test/package.json @@ -30,7 +30,7 @@ "@types/dotenv": "^8.2.0", "@types/fs-extra": "^8.1.1", "@types/jest": "^26.0.15", - "@types/node": "^10.17.46", + "@types/node": "^10.17.47", "@types/tar": "^4.0.4", "eslint": "^7.14.0", "prettier": "^2.2.0", diff --git a/packages/@jsii/java-runtime/package.json b/packages/@jsii/java-runtime/package.json index 85254a9251..7041a6f6d5 100644 --- a/packages/@jsii/java-runtime/package.json +++ b/packages/@jsii/java-runtime/package.json @@ -33,7 +33,7 @@ }, "devDependencies": { "@jsii/runtime": "^0.0.0", - "@types/node": "^10.17.46", + "@types/node": "^10.17.47", "jsii-build-tools": "^0.0.0", "typescript": "~3.9.7" } diff --git a/packages/@jsii/kernel/package.json b/packages/@jsii/kernel/package.json index f4f1ba7f96..f4fcebdba8 100644 --- a/packages/@jsii/kernel/package.json +++ b/packages/@jsii/kernel/package.json @@ -41,7 +41,7 @@ "@types/fs-extra": "^8.1.1", "@types/jest": "^26.0.15", "@types/jest-expect-message": "^1.0.3", - "@types/node": "^10.17.46", + "@types/node": "^10.17.47", "@types/tar": "^4.0.4", "eslint": "^7.14.0", "jest": "^26.6.3", diff --git a/packages/@jsii/runtime/package.json b/packages/@jsii/runtime/package.json index 11f5ba8a4c..efd7212dec 100644 --- a/packages/@jsii/runtime/package.json +++ b/packages/@jsii/runtime/package.json @@ -41,7 +41,7 @@ "@scope/jsii-calc-base": "^0.0.0", "@scope/jsii-calc-lib": "^0.0.0", "@types/jest": "^26.0.15", - "@types/node": "^10.17.46", + "@types/node": "^10.17.47", "eslint": "^7.14.0", "jest": "^26.6.3", "jsii-build-tools": "^0.0.0", diff --git a/packages/@jsii/spec/package.json b/packages/@jsii/spec/package.json index e77f71ac5d..c03f21a410 100644 --- a/packages/@jsii/spec/package.json +++ b/packages/@jsii/spec/package.json @@ -35,12 +35,12 @@ }, "devDependencies": { "@types/jest": "^26.0.15", - "@types/node": "^10.17.46", + "@types/node": "^10.17.47", "eslint": "^7.14.0", "jest": "^26.6.3", "jsii-build-tools": "^0.0.0", "prettier": "^2.2.0", "typescript": "~3.9.7", - "typescript-json-schema": "^0.43.0" + "typescript-json-schema": "^0.44.0" } } diff --git a/packages/@scope/jsii-calc-base-of-base/package.json b/packages/@scope/jsii-calc-base-of-base/package.json index 9ea5a2b21a..df1933a806 100644 --- a/packages/@scope/jsii-calc-base-of-base/package.json +++ b/packages/@scope/jsii-calc-base-of-base/package.json @@ -30,7 +30,7 @@ "test:update": "npm run build && UPDATE_DIFF=1 npm run test" }, "devDependencies": { - "@types/node": "^10.17.46", + "@types/node": "^10.17.47", "jsii": "^0.0.0", "jsii-build-tools": "^0.0.0", "jsii-rosetta": "^0.0.0", diff --git a/packages/@scope/jsii-calc-base/package.json b/packages/@scope/jsii-calc-base/package.json index b9ec761910..bf595a5e9b 100644 --- a/packages/@scope/jsii-calc-base/package.json +++ b/packages/@scope/jsii-calc-base/package.json @@ -35,7 +35,7 @@ "@scope/jsii-calc-base-of-base": "^0.0.0" }, "devDependencies": { - "@types/node": "^10.17.46", + "@types/node": "^10.17.47", "jsii": "^0.0.0", "jsii-build-tools": "^0.0.0", "jsii-rosetta": "^0.0.0", diff --git a/packages/@scope/jsii-calc-lib/package.json b/packages/@scope/jsii-calc-lib/package.json index 621759ccdb..1874b14ad4 100644 --- a/packages/@scope/jsii-calc-lib/package.json +++ b/packages/@scope/jsii-calc-lib/package.json @@ -39,7 +39,7 @@ "@scope/jsii-calc-base-of-base": "^0.0.0" }, "devDependencies": { - "@types/node": "^10.17.46", + "@types/node": "^10.17.47", "jsii": "^0.0.0", "jsii-build-tools": "^0.0.0", "jsii-rosetta": "^0.0.0", diff --git a/packages/codemaker/package.json b/packages/codemaker/package.json index 026f17079f..321ddc868f 100644 --- a/packages/codemaker/package.json +++ b/packages/codemaker/package.json @@ -38,7 +38,7 @@ "devDependencies": { "@types/fs-extra": "^8.1.1", "@types/jest": "^26.0.15", - "@types/node": "^10.17.46", + "@types/node": "^10.17.47", "eslint": "^7.14.0", "jest": "^26.6.3", "prettier": "^2.2.0", diff --git a/packages/jsii-calc/package.json b/packages/jsii-calc/package.json index 52b63a5982..6ad709944e 100644 --- a/packages/jsii-calc/package.json +++ b/packages/jsii-calc/package.json @@ -49,7 +49,7 @@ "@scope/jsii-calc-lib": "^0.0.0" }, "devDependencies": { - "@types/node": "^10.17.46", + "@types/node": "^10.17.47", "eslint": "^7.14.0", "jsii": "^0.0.0", "jsii-build-tools": "^0.0.0", diff --git a/packages/jsii-config/package.json b/packages/jsii-config/package.json index 11e2166971..af3a6d4146 100644 --- a/packages/jsii-config/package.json +++ b/packages/jsii-config/package.json @@ -22,7 +22,7 @@ "@types/inquirer": "^7.3.1", "@types/jest": "^26.0.15", "@types/jest-expect-message": "^1.0.3", - "@types/node": "^10.17.46", + "@types/node": "^10.17.47", "@types/yargs": "^15.0.10", "eslint": "^7.14.0", "jest": "^26.6.3", diff --git a/packages/jsii-diff/package.json b/packages/jsii-diff/package.json index ac5a740301..62160a786d 100644 --- a/packages/jsii-diff/package.json +++ b/packages/jsii-diff/package.json @@ -44,7 +44,7 @@ "@types/fs-extra": "^8.1.1", "@types/jest": "^26.0.15", "@types/jest-expect-message": "^1.0.3", - "@types/node": "^10.17.46", + "@types/node": "^10.17.47", "@types/tar-fs": "^2.0.0", "@types/yargs": "^15.0.10", "eslint": "^7.14.0", diff --git a/packages/jsii-pacmak/package.json b/packages/jsii-pacmak/package.json index 6a32f06698..f9840964eb 100644 --- a/packages/jsii-pacmak/package.json +++ b/packages/jsii-pacmak/package.json @@ -58,7 +58,7 @@ "@types/commonmark": "^0.27.4", "@types/fs-extra": "^8.1.1", "@types/jest": "^26.0.15", - "@types/node": "^10.17.46", + "@types/node": "^10.17.47", "@types/semver": "^7.3.4", "@types/yargs": "^15.0.10", "eslint": "^7.14.0", diff --git a/packages/jsii-reflect/package.json b/packages/jsii-reflect/package.json index 82fc751894..0f070275c8 100644 --- a/packages/jsii-reflect/package.json +++ b/packages/jsii-reflect/package.json @@ -44,7 +44,7 @@ "@scope/jsii-calc-lib": "^0.0.0", "@types/fs-extra": "^8.1.1", "@types/jest": "^26.0.15", - "@types/node": "^10.17.46", + "@types/node": "^10.17.47", "@types/yargs": "^15.0.10", "eslint": "^7.14.0", "jest": "^26.6.3", diff --git a/packages/jsii-rosetta/package.json b/packages/jsii-rosetta/package.json index cd37daa837..4d1f57fcbd 100644 --- a/packages/jsii-rosetta/package.json +++ b/packages/jsii-rosetta/package.json @@ -20,7 +20,7 @@ "@types/fs-extra": "^8.1.1", "@types/jest": "^26.0.15", "@types/mock-fs": "^4.13.0", - "@types/node": "^10.17.46", + "@types/node": "^10.17.47", "@types/yargs": "^15.0.10", "eslint": "^7.14.0", "jest": "^26.6.3", diff --git a/packages/jsii/package.json b/packages/jsii/package.json index 7e4be54ff6..c799b687cc 100644 --- a/packages/jsii/package.json +++ b/packages/jsii/package.json @@ -53,7 +53,7 @@ "@types/fs-extra": "^8.1.1", "@types/jest": "^26.0.15", "@types/jest-expect-message": "^1.0.3", - "@types/node": "^10.17.46", + "@types/node": "^10.17.47", "@types/semver": "^7.3.4", "@types/yargs": "^15.0.10", "clone": "^2.1.2", diff --git a/packages/oo-ascii-tree/package.json b/packages/oo-ascii-tree/package.json index b3c7031003..a3eca7cf97 100644 --- a/packages/oo-ascii-tree/package.json +++ b/packages/oo-ascii-tree/package.json @@ -32,7 +32,7 @@ }, "devDependencies": { "@types/jest": "^26.0.15", - "@types/node": "^10.17.46", + "@types/node": "^10.17.47", "eslint": "^7.14.0", "jest": "^26.6.3", "jsii-build-tools": "^0.0.0", diff --git a/yarn.lock b/yarn.lock index 1c41bb4c39..2b5b1686c3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10,18 +10,18 @@ "@babel/highlight" "^7.10.4" "@babel/core@^7.0.0-beta.39", "@babel/core@^7.1.0", "@babel/core@^7.7.5": - version "7.12.3" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.3.tgz#1b436884e1e3bff6fb1328dc02b208759de92ad8" - integrity sha512-0qXcZYKZp3/6N2jKYVxZv0aNCsxTSVCiK72DTiTYZAu7sjg73W0/aynWjMbiGd87EQL4WyA8reiJVh92AVla9g== + version "7.12.9" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.9.tgz#fd450c4ec10cdbb980e2928b7aa7a28484593fc8" + integrity sha512-gTXYh3M5wb7FRXQy+FErKFAv90BnlOuNn1QkCK2lREoPAjrQCO49+HVSrFoe5uakFAF5eenS75KbO2vQiLrTMQ== dependencies: "@babel/code-frame" "^7.10.4" - "@babel/generator" "^7.12.1" + "@babel/generator" "^7.12.5" "@babel/helper-module-transforms" "^7.12.1" - "@babel/helpers" "^7.12.1" - "@babel/parser" "^7.12.3" - "@babel/template" "^7.10.4" - "@babel/traverse" "^7.12.1" - "@babel/types" "^7.12.1" + "@babel/helpers" "^7.12.5" + "@babel/parser" "^7.12.7" + "@babel/template" "^7.12.7" + "@babel/traverse" "^7.12.9" + "@babel/types" "^7.12.7" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.1" @@ -31,7 +31,7 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/generator@^7.12.1", "@babel/generator@^7.12.5": +"@babel/generator@^7.12.5": version "7.12.5" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.5.tgz#a2c50de5c8b6d708ab95be5e6053936c1884a4de" integrity sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A== @@ -57,11 +57,11 @@ "@babel/types" "^7.10.4" "@babel/helper-member-expression-to-functions@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz#fba0f2fcff3fba00e6ecb664bb5e6e26e2d6165c" - integrity sha512-k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ== + version "7.12.7" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz#aa77bd0396ec8114e5e30787efa78599d874a855" + integrity sha512-DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw== dependencies: - "@babel/types" "^7.12.1" + "@babel/types" "^7.12.7" "@babel/helper-module-imports@^7.12.1": version "7.12.5" @@ -86,11 +86,11 @@ lodash "^4.17.19" "@babel/helper-optimise-call-expression@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz#50dc96413d594f995a77905905b05893cd779673" - integrity sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg== + version "7.12.7" + resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.7.tgz#7f94ae5e08721a49467346aa04fd22f750033b9c" + integrity sha512-I5xc9oSJ2h59OwyUqjv95HRyzxj53DAubUERgQMrpcCEYQyToeHA+NEcUEsVWB4j53RDeskeBJ0SgRAYHDBckw== dependencies: - "@babel/types" "^7.10.4" + "@babel/types" "^7.12.7" "@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0": version "7.10.4" @@ -126,7 +126,7 @@ resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2" integrity sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw== -"@babel/helpers@^7.12.1": +"@babel/helpers@^7.12.5": version "7.12.5" resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.5.tgz#1a1ba4a768d9b58310eda516c449913fe647116e" integrity sha512-lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA== @@ -144,10 +144,10 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.10.4", "@babel/parser@^7.12.3", "@babel/parser@^7.12.5": - version "7.12.5" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.5.tgz#b4af32ddd473c0bfa643bd7ff0728b8e71b81ea0" - integrity sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ== +"@babel/parser@^7.1.0", "@babel/parser@^7.12.7": + version "7.12.7" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.7.tgz#fee7b39fe809d0e73e5b25eecaf5780ef3d73056" + integrity sha512-oWR02Ubp4xTLCAqPRiNIuMVgNO5Aif/xpXtabhzW2HWUD47XJsAB4Zd/Rg30+XeQA3juXigV7hlquOTmwqLiwg== "@babel/plugin-syntax-async-generators@^7.8.4": version "7.8.4" @@ -240,34 +240,34 @@ dependencies: regenerator-runtime "^0.13.4" -"@babel/template@^7.10.4", "@babel/template@^7.3.3": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz#3251996c4200ebc71d1a8fc405fba940f36ba278" - integrity sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA== +"@babel/template@^7.10.4", "@babel/template@^7.12.7", "@babel/template@^7.3.3": + version "7.12.7" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.7.tgz#c817233696018e39fbb6c491d2fb684e05ed43bc" + integrity sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow== dependencies: "@babel/code-frame" "^7.10.4" - "@babel/parser" "^7.10.4" - "@babel/types" "^7.10.4" + "@babel/parser" "^7.12.7" + "@babel/types" "^7.12.7" -"@babel/traverse@^7.0.0-beta.39", "@babel/traverse@^7.1.0", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.5": - version "7.12.5" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.5.tgz#78a0c68c8e8a35e4cacfd31db8bb303d5606f095" - integrity sha512-xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA== +"@babel/traverse@^7.0.0-beta.39", "@babel/traverse@^7.1.0", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.5", "@babel/traverse@^7.12.9": + version "7.12.9" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.9.tgz#fad26c972eabbc11350e0b695978de6cc8e8596f" + integrity sha512-iX9ajqnLdoU1s1nHt36JDI9KG4k+vmI8WgjK5d+aDTwQbL2fUnzedNedssA645Ede3PM2ma1n8Q4h2ohwXgMXw== dependencies: "@babel/code-frame" "^7.10.4" "@babel/generator" "^7.12.5" "@babel/helper-function-name" "^7.10.4" "@babel/helper-split-export-declaration" "^7.11.0" - "@babel/parser" "^7.12.5" - "@babel/types" "^7.12.5" + "@babel/parser" "^7.12.7" + "@babel/types" "^7.12.7" debug "^4.1.0" globals "^11.1.0" lodash "^4.17.19" -"@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.39", "@babel/types@^7.10.4", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.12.5", "@babel/types@^7.3.0", "@babel/types@^7.3.3": - version "7.12.6" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.6.tgz#ae0e55ef1cce1fbc881cd26f8234eb3e657edc96" - integrity sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA== +"@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.39", "@babel/types@^7.10.4", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3": + version "7.12.7" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.7.tgz#6039ff1e242640a29452c9ae572162ec9a8f5d13" + integrity sha512-MNyI92qZq6jrQkXvtIiykvl4WtoRrVV9MPn+ZfsoEENjiWcBQ3ZSHrkxnJWgWtLX3XXqX5hrSQ+X69wkmesXuQ== dependencies: "@babel/helper-validator-identifier" "^7.10.4" lodash "^4.17.19" @@ -1594,7 +1594,7 @@ jest-diff "^26.0.0" pretty-format "^26.0.0" -"@types/json-schema@*", "@types/json-schema@^7.0.3", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6": +"@types/json-schema@*", "@types/json-schema@^7.0.3", "@types/json-schema@^7.0.6": version "7.0.6" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0" integrity sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw== @@ -1629,14 +1629,14 @@ "@types/node" "*" "@types/node@*", "@types/node@>= 8": - version "14.14.8" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.8.tgz#2127bd81949a95c8b7d3240f3254352d72563aec" - integrity sha512-z/5Yd59dCKI5kbxauAJgw6dLPzW+TNOItNE00PkpzNwUIEwdj/Lsqwq94H5DdYBX7C13aRA0CY32BK76+neEUA== + version "14.14.10" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.10.tgz#5958a82e41863cfc71f2307b3748e3491ba03785" + integrity sha512-J32dgx2hw8vXrSbu4ZlVhn1Nm3GbeCFNw2FWL8S5QKucHGY0cyNwjdQdO+KMBZ4wpmC7KhLCiNsdk1RFRIYUQQ== -"@types/node@^10.17.46": - version "10.17.46" - resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.46.tgz#1cd867ebfe9957ab45951f2f715f8de5f3dab7a3" - integrity sha512-Tice8a+sJtlP9C1EUo0DYyjq52T37b3LexVu3p871+kfIBIN+OQ7PKPei1oF3MgF39olEpUfxaLtD+QFc1k69Q== +"@types/node@^10.17.47": + version "10.17.47" + resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.47.tgz#cc88a242a835789456cfcf374928400d9f4b291c" + integrity sha512-YZ1mMAdUPouBZCdeugjV8y1tqqr28OyL8DYbH5ePCfe9zcXtvbh1wDBy7uzlHkXo3Qi07kpzXfvycvrkby/jXw== "@types/normalize-package-data@^2.4.0": version "2.4.0" @@ -2192,12 +2192,14 @@ array-ify@^1.0.0: integrity sha1-nlKHYrSpBmrRY6aWKjZEGOlibs4= array-includes@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz#cdd67e6852bdf9c1215460786732255ed2459348" - integrity sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ== + version "3.1.2" + resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.2.tgz#a8db03e0b88c8c6aeddc49cb132f9bcab4ebf9c8" + integrity sha512-w2GspexNQpx+PutG3QpT437/BenZBj0M/MZGn5mzv/MofYqo0xmRHzn4lFsoDlWJ+THYsGJmFlW68WlDFx7VRw== dependencies: + call-bind "^1.0.0" define-properties "^1.1.3" - es-abstract "^1.17.0" + es-abstract "^1.18.0-next.1" + get-intrinsic "^1.0.1" is-string "^1.0.5" array-union@^1.0.2: @@ -2617,9 +2619,9 @@ camelcase@^6.0.0, camelcase@^6.2.0: integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg== caniuse-lite@^1.0.30001157: - version "1.0.30001159" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001159.tgz#bebde28f893fa9594dadcaa7d6b8e2aa0299df20" - integrity sha512-w9Ph56jOsS8RL20K9cLND3u/+5WASWdhC/PPrf+V3/HsM3uHOavWOR1Xzakbv4Puo/srmPHudkmCRWM7Aq+/UA== + version "1.0.30001161" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001161.tgz#64f7ffe79ee780b8c92843ff34feb36cea4651e0" + integrity sha512-JharrCDxOqPLBULF9/SPa6yMcBRTjZARJ6sc3cuKrPfyIk64JN6kuMINWqA99Xc8uElMFcROliwtz0n9pYej+g== capture-exit@^2.0.0: version "2.0.0" @@ -3279,16 +3281,16 @@ debug@^2.2.0, debug@^2.3.3, debug@^2.6.9: ms "2.0.0" debug@^3.1.0: - version "3.2.6" - resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" - integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== + version "3.2.7" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" + integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== dependencies: ms "^2.1.1" debug@^4.0.1, debug@^4.1.0, debug@^4.1.1: - version "4.2.0" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz#7f150f93920e94c58f5574c2fd01a3110effe7f1" - integrity sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg== + version "4.3.1" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" + integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== dependencies: ms "2.1.2" @@ -3551,9 +3553,9 @@ ecc-jsbn@~0.1.1: safer-buffer "^2.1.0" electron-to-chromium@^1.3.591: - version "1.3.598" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.598.tgz#8f757018902ab6190323a8c5f6124d854893a35b" - integrity sha512-G5Ztk23/ubLYVPxPXnB1uu105uzIPd4xB/D8ld8x1GaSC9+vU9NZL16nYZya8H77/7CCKKN7dArzJL3pBs8N7A== + version "1.3.607" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.607.tgz#1bff13f1cf89f2fee0d244b8c64a7138f80f3a3b" + integrity sha512-h2SYNaBnlplGS0YyXl8oJWokfcNxVjJANQfMCsQefG6OSuAuNIeW+A8yGT/ci+xRoBb3k2zq1FrOvkgoKBol8g== emittery@^0.7.1: version "0.7.2" @@ -3590,9 +3592,9 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0: once "^1.4.0" enhanced-resolve@^5.3.1: - version "5.3.1" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.3.1.tgz#3f988d0d7775bdc2d96ede321dc81f8249492f57" - integrity sha512-G1XD3MRGrGfNcf6Hg0LVZG7GIKcYkbfHa5QMxt1HDUTdYoXH0JR1xXyg+MaKLF73E9A27uWNVxvFivNRYeUB6w== + version "5.3.2" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.3.2.tgz#142295dda51aaaff049cf256459dc9a82a0b67f3" + integrity sha512-G28GCrglCAH6+EqMN2D+Q2wCUS1O1vVQJBn8ME2I/Api41YBe4vLWWRBOUbwDH7vwzSZdljxwTRVqnf+sm6XqQ== dependencies: graceful-fs "^4.2.4" tapable "^2.0.0" @@ -3631,7 +3633,7 @@ error-ex@^1.2.0, error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -es-abstract@^1.17.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.4, es-abstract@^1.17.5: +es-abstract@^1.17.0-next.1, es-abstract@^1.17.4, es-abstract@^1.17.5: version "1.17.7" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.7.tgz#a4de61b2f66989fc7421676c1cb9787573ace54c" integrity sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g== @@ -4469,7 +4471,7 @@ glob-to-regexp@^0.4.1: resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== -glob@^7.0.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@~7.1.6: +glob@^7.0.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: version "7.1.6" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== @@ -6855,9 +6857,9 @@ osenv@^0.1.4, osenv@^0.1.5: os-tmpdir "^1.0.0" p-each-series@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.1.0.tgz#961c8dd3f195ea96c747e636b262b800a6b1af48" - integrity sha512-ZuRs1miPT4HrjFa+9fRfOFXxGJfORgelKV9f9nNOWw2gl6gVsRaVDOQP0+MI0G0wGKns1Yacsu0GjOFbTK0JFQ== + version "2.2.0" + resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.2.0.tgz#105ab0357ce72b202a8a8b94933672657b5e2a9a" + integrity sha512-ycIL2+1V32th+8scbpTvyHNaHe02z0sjgh91XXjAk+ZeXoPN4Z46DVUnzdso0aX4KckKw0FNNFHdjZ2UsZvxiA== p-finally@^1.0.0: version "1.0.0" @@ -6879,11 +6881,11 @@ p-limit@^2.0.0, p-limit@^2.2.0: p-try "^2.0.0" p-limit@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.0.2.tgz#1664e010af3cadc681baafd3e2a437be7b0fb5fe" - integrity sha512-iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg== + version "3.1.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" + integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== dependencies: - p-try "^2.0.0" + yocto-queue "^0.1.0" p-locate@^2.0.0: version "2.0.0" @@ -8244,20 +8246,20 @@ string.prototype.repeat@^0.2.0: integrity sha1-q6Nt4I3O5qWjN9SbLqHaGyj8Ds8= string.prototype.trimend@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.2.tgz#6ddd9a8796bc714b489a3ae22246a208f37bfa46" - integrity sha512-8oAG/hi14Z4nOVP0z6mdiVZ/wqjDtWSLygMigTzAb+7aPEDTleeFf+WrF+alzecxIRkckkJVn+dTlwzJXORATw== + version "1.0.3" + resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz#a22bd53cca5c7cf44d7c9d5c732118873d6cd18b" + integrity sha512-ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw== dependencies: + call-bind "^1.0.0" define-properties "^1.1.3" - es-abstract "^1.18.0-next.1" string.prototype.trimstart@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.2.tgz#22d45da81015309cd0cdd79787e8919fc5c613e7" - integrity sha512-7F6CdBTl5zyu30BJFdzSTlSlLPwODC23Od+iLoVH8X6+3fvDPPuBVVj9iaB1GOsSTSIgVfsfm27R2FGrAPznWg== + version "1.0.3" + resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz#9b4cb590e123bb36564401d59824298de50fd5aa" + integrity sha512-oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg== dependencies: + call-bind "^1.0.0" define-properties "^1.1.3" - es-abstract "^1.18.0-next.1" string_decoder@^1.1.1: version "1.3.0" @@ -8486,9 +8488,9 @@ terser-webpack-plugin@^5.0.3: terser "^5.3.8" terser@^5.3.8: - version "5.4.0" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.4.0.tgz#9815c0839072d5c894e22c6fc508fbe9f5e7d7e8" - integrity sha512-3dZunFLbCJis9TAF2VnX+VrQLctRUmt1p3W2kCsJuZE4ZgWqh//+1MZ62EanewrqKoUf4zIaDGZAvml4UDc0OQ== + version "5.5.0" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.5.0.tgz#1406fcb4d4bc517add3b22a9694284c040e33448" + integrity sha512-eopt1Gf7/AQyPhpygdKePTzaet31TvQxXvrf7xYUvD/d8qkCJm4SKPDzu+GHK5ZaYTn8rvttfqaZc3swK21e5g== dependencies: commander "^2.20.0" source-map "~0.7.2" @@ -8783,36 +8785,36 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -typescript-json-schema@^0.43.0: - version "0.43.0" - resolved "https://registry.yarnpkg.com/typescript-json-schema/-/typescript-json-schema-0.43.0.tgz#8bd9c832f1f15f006ff933907ce192222fdfd92f" - integrity sha512-4c9IMlIlHYJiQtzL1gh2nIPJEjBgJjDUs50gsnnc+GFyDSK1oFM3uQIBSVosiuA/4t6LSAXDS9vTdqbQC6EcgA== +typescript-json-schema@^0.44.0: + version "0.44.0" + resolved "https://registry.yarnpkg.com/typescript-json-schema/-/typescript-json-schema-0.44.0.tgz#8ec96b26caa5b8744d6cac47ce9aadc3187f4700" + integrity sha512-MC6hEUYmA35F6SQjwrogzjOhrkH0x4f/yCrzb1EQU5EOoEDdu51vsrlkI9oKgLyyC7uWKBOlJsWAFk2RfGFvgQ== dependencies: - "@types/json-schema" "^7.0.5" - glob "~7.1.6" + "@types/json-schema" "^7.0.6" + glob "^7.1.6" json-stable-stringify "^1.0.1" - typescript "~4.0.2" - yargs "^15.4.1" + typescript "^4.1.2" + yargs "^16.1.1" + +typescript@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.2.tgz#6369ef22516fe5e10304aae5a5c4862db55380e9" + integrity sha512-thGloWsGH3SOxv1SoY7QojKi0tc+8FnOmiarEGMbd/lar7QOEd3hvlx3Fp5y6FlDUGl9L+pd4n2e+oToGMmhRQ== typescript@~3.9.7: version "3.9.7" resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz#98d600a5ebdc38f40cb277522f12dc800e9e25fa" integrity sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw== -typescript@~4.0.2: - version "4.0.5" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.5.tgz#ae9dddfd1069f1cb5beb3ef3b2170dd7c1332389" - integrity sha512-ywmr/VrTVCmNTJ6iV2LwIrfG1P+lv6luD8sUJs+2eI9NLGigaN+nUQc13iHqisq7bra9lnmUSYqbJvegraBOPQ== - typical@^5.0.0, typical@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/typical/-/typical-5.2.0.tgz#4daaac4f2b5315460804f0acf6cb69c52bb93066" integrity sha512-dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg== uglify-js@^3.1.4: - version "3.11.6" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.11.6.tgz#144b50d3e05eadd3ad4dd047c60ca541a8cd4e9c" - integrity sha512-oASI1FOJ7BBFkSCNDZ446EgkSuHkOZBuqRFrwXIKWCoXw8ZXQETooTQjkAcBS03Acab7ubCKsXnwuV2svy061g== + version "3.12.0" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.12.0.tgz#b943f129275c41d435eb54b643bbffee71dccf57" + integrity sha512-8lBMSkFZuAK7gGF8LswsXmir8eX8d2AAMOnxSDWjKBx/fBR6MypQjs78m6ML9zQVp1/hD4TBdfeMZMC7nW1TAA== uid-number@0.0.6: version "0.0.6" @@ -9439,3 +9441,8 @@ yn@3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q== + +yocto-queue@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" + integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== From cd3d665b8dbb81c5dca0774dcc51df2bb83fc158 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 27 Nov 2020 06:30:49 +0000 Subject: [PATCH 02/31] chore(deps-dev): bump typescript-json-schema from 0.44.0 to 0.44.1 (#2283) --- packages/@jsii/spec/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/@jsii/spec/package.json b/packages/@jsii/spec/package.json index c03f21a410..46ac67517c 100644 --- a/packages/@jsii/spec/package.json +++ b/packages/@jsii/spec/package.json @@ -41,6 +41,6 @@ "jsii-build-tools": "^0.0.0", "prettier": "^2.2.0", "typescript": "~3.9.7", - "typescript-json-schema": "^0.44.0" + "typescript-json-schema": "^0.44.1" } } diff --git a/yarn.lock b/yarn.lock index 2b5b1686c3..5c399abfe6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8785,10 +8785,10 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -typescript-json-schema@^0.44.0: - version "0.44.0" - resolved "https://registry.yarnpkg.com/typescript-json-schema/-/typescript-json-schema-0.44.0.tgz#8ec96b26caa5b8744d6cac47ce9aadc3187f4700" - integrity sha512-MC6hEUYmA35F6SQjwrogzjOhrkH0x4f/yCrzb1EQU5EOoEDdu51vsrlkI9oKgLyyC7uWKBOlJsWAFk2RfGFvgQ== +typescript-json-schema@^0.44.1: + version "0.44.1" + resolved "https://registry.yarnpkg.com/typescript-json-schema/-/typescript-json-schema-0.44.1.tgz#eeac4ffc6ec271a699e7958038ff49810402698b" + integrity sha512-DKB7rKzubOTXxT2CnQTQoCbS6SgJpqukJr2TWE9FbRK0iJY++wc24Pib3OAzIA+c9WylgfT3CxxCCetDsE55Nw== dependencies: "@types/json-schema" "^7.0.6" glob "^7.1.6" From 07d50686b6d264393735b244aa64b0bb632c097f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Nov 2020 06:31:48 +0000 Subject: [PATCH 03/31] chore(deps-dev): bump prettier from 2.2.0 to 2.2.1 (#2285) --- package.json | 2 +- packages/@jsii/integ-test/package.json | 2 +- packages/@jsii/kernel/package.json | 2 +- packages/@jsii/runtime/package.json | 2 +- packages/@jsii/spec/package.json | 2 +- packages/@scope/jsii-calc-base-of-base/package.json | 2 +- packages/@scope/jsii-calc-base/package.json | 2 +- packages/@scope/jsii-calc-lib/package.json | 2 +- packages/codemaker/package.json | 2 +- packages/jsii-calc/package.json | 2 +- packages/jsii-config/package.json | 2 +- packages/jsii-diff/package.json | 2 +- packages/jsii-pacmak/package.json | 2 +- packages/jsii-reflect/package.json | 2 +- packages/jsii-rosetta/package.json | 2 +- packages/jsii/package.json | 2 +- packages/oo-ascii-tree/package.json | 2 +- yarn.lock | 8 ++++---- 18 files changed, 21 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index beed617ee8..6bf3a3df8c 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "jest-config": "^26.6.3", "jest-expect-message": "^1.0.2", "lerna": "^3.22.1", - "prettier": "^2.2.0", + "prettier": "^2.2.1", "standard-version": "^9.0.0", "ts-jest": "^26.4.4", "ts-node": "^9.0.0", diff --git a/packages/@jsii/integ-test/package.json b/packages/@jsii/integ-test/package.json index f58896bc0b..0bad8b289d 100644 --- a/packages/@jsii/integ-test/package.json +++ b/packages/@jsii/integ-test/package.json @@ -33,7 +33,7 @@ "@types/node": "^10.17.47", "@types/tar": "^4.0.4", "eslint": "^7.14.0", - "prettier": "^2.2.0", + "prettier": "^2.2.1", "typescript": "~3.9.7" } } diff --git a/packages/@jsii/kernel/package.json b/packages/@jsii/kernel/package.json index f4fcebdba8..142b85b32c 100644 --- a/packages/@jsii/kernel/package.json +++ b/packages/@jsii/kernel/package.json @@ -48,7 +48,7 @@ "jest-expect-message": "^1.0.2", "jsii-build-tools": "^0.0.0", "jsii-calc": "^0.0.0", - "prettier": "^2.2.0", + "prettier": "^2.2.1", "ts-jest": "^26.4.4", "typescript": "~3.9.7" } diff --git a/packages/@jsii/runtime/package.json b/packages/@jsii/runtime/package.json index efd7212dec..a46d1a50fa 100644 --- a/packages/@jsii/runtime/package.json +++ b/packages/@jsii/runtime/package.json @@ -46,7 +46,7 @@ "jest": "^26.6.3", "jsii-build-tools": "^0.0.0", "jsii-calc": "^0.0.0", - "prettier": "^2.2.0", + "prettier": "^2.2.1", "source-map-loader": "^1.1.2", "ts-jest": "^26.4.4", "typescript": "~3.9.7", diff --git a/packages/@jsii/spec/package.json b/packages/@jsii/spec/package.json index 46ac67517c..e2e566ff10 100644 --- a/packages/@jsii/spec/package.json +++ b/packages/@jsii/spec/package.json @@ -39,7 +39,7 @@ "eslint": "^7.14.0", "jest": "^26.6.3", "jsii-build-tools": "^0.0.0", - "prettier": "^2.2.0", + "prettier": "^2.2.1", "typescript": "~3.9.7", "typescript-json-schema": "^0.44.1" } diff --git a/packages/@scope/jsii-calc-base-of-base/package.json b/packages/@scope/jsii-calc-base-of-base/package.json index df1933a806..4c6c65a1ed 100644 --- a/packages/@scope/jsii-calc-base-of-base/package.json +++ b/packages/@scope/jsii-calc-base-of-base/package.json @@ -34,7 +34,7 @@ "jsii": "^0.0.0", "jsii-build-tools": "^0.0.0", "jsii-rosetta": "^0.0.0", - "prettier": "^2.2.0" + "prettier": "^2.2.1" }, "jsii": { "outdir": "dist", diff --git a/packages/@scope/jsii-calc-base/package.json b/packages/@scope/jsii-calc-base/package.json index bf595a5e9b..c1319c4cd4 100644 --- a/packages/@scope/jsii-calc-base/package.json +++ b/packages/@scope/jsii-calc-base/package.json @@ -39,7 +39,7 @@ "jsii": "^0.0.0", "jsii-build-tools": "^0.0.0", "jsii-rosetta": "^0.0.0", - "prettier": "^2.2.0" + "prettier": "^2.2.1" }, "jsii": { "metadata": { diff --git a/packages/@scope/jsii-calc-lib/package.json b/packages/@scope/jsii-calc-lib/package.json index 1874b14ad4..e128d98236 100644 --- a/packages/@scope/jsii-calc-lib/package.json +++ b/packages/@scope/jsii-calc-lib/package.json @@ -43,7 +43,7 @@ "jsii": "^0.0.0", "jsii-build-tools": "^0.0.0", "jsii-rosetta": "^0.0.0", - "prettier": "^2.2.0" + "prettier": "^2.2.1" }, "jsii": { "outdir": "dist", diff --git a/packages/codemaker/package.json b/packages/codemaker/package.json index 321ddc868f..4018c8c944 100644 --- a/packages/codemaker/package.json +++ b/packages/codemaker/package.json @@ -41,7 +41,7 @@ "@types/node": "^10.17.47", "eslint": "^7.14.0", "jest": "^26.6.3", - "prettier": "^2.2.0", + "prettier": "^2.2.1", "typescript": "~3.9.7" } } diff --git a/packages/jsii-calc/package.json b/packages/jsii-calc/package.json index 6ad709944e..442f7aa7ab 100644 --- a/packages/jsii-calc/package.json +++ b/packages/jsii-calc/package.json @@ -54,7 +54,7 @@ "jsii": "^0.0.0", "jsii-build-tools": "^0.0.0", "jsii-rosetta": "^0.0.0", - "prettier": "^2.2.0" + "prettier": "^2.2.1" }, "jsii": { "outdir": "dist", diff --git a/packages/jsii-config/package.json b/packages/jsii-config/package.json index af3a6d4146..5a170411f3 100644 --- a/packages/jsii-config/package.json +++ b/packages/jsii-config/package.json @@ -27,7 +27,7 @@ "eslint": "^7.14.0", "jest": "^26.6.3", "jest-expect-message": "^1.0.2", - "prettier": "^2.2.0", + "prettier": "^2.2.1", "typescript": "~3.9.7" }, "dependencies": { diff --git a/packages/jsii-diff/package.json b/packages/jsii-diff/package.json index 62160a786d..be354e7297 100644 --- a/packages/jsii-diff/package.json +++ b/packages/jsii-diff/package.json @@ -52,6 +52,6 @@ "jest-expect-message": "^1.0.2", "jsii": "^0.0.0", "jsii-build-tools": "^0.0.0", - "prettier": "^2.2.0" + "prettier": "^2.2.1" } } diff --git a/packages/jsii-pacmak/package.json b/packages/jsii-pacmak/package.json index f9840964eb..c55a187d3a 100644 --- a/packages/jsii-pacmak/package.json +++ b/packages/jsii-pacmak/package.json @@ -65,7 +65,7 @@ "jest": "^26.6.3", "jsii-build-tools": "^0.0.0", "jsii-calc": "^0.0.0", - "prettier": "^2.2.0", + "prettier": "^2.2.1", "ts-jest": "^26.4.4", "typescript": "~3.9.7" }, diff --git a/packages/jsii-reflect/package.json b/packages/jsii-reflect/package.json index 0f070275c8..b9ed074b36 100644 --- a/packages/jsii-reflect/package.json +++ b/packages/jsii-reflect/package.json @@ -51,7 +51,7 @@ "jsii": "^0.0.0", "jsii-build-tools": "^0.0.0", "jsii-calc": "^0.0.0", - "prettier": "^2.2.0", + "prettier": "^2.2.1", "typescript": "~3.9.7" } } diff --git a/packages/jsii-rosetta/package.json b/packages/jsii-rosetta/package.json index 4d1f57fcbd..9246938176 100644 --- a/packages/jsii-rosetta/package.json +++ b/packages/jsii-rosetta/package.json @@ -28,7 +28,7 @@ "jsii-build-tools": "^0.0.0", "memory-streams": "^0.1.3", "mock-fs": "^4.13.0", - "prettier": "^2.2.0" + "prettier": "^2.2.1" }, "dependencies": { "@jsii/spec": "^0.0.0", diff --git a/packages/jsii/package.json b/packages/jsii/package.json index c799b687cc..258d9168ef 100644 --- a/packages/jsii/package.json +++ b/packages/jsii/package.json @@ -61,7 +61,7 @@ "jest": "^26.6.3", "jest-expect-message": "^1.0.2", "jsii-build-tools": "^0.0.0", - "prettier": "^2.2.0", + "prettier": "^2.2.1", "ts-jest": "^26.4.4" } } diff --git a/packages/oo-ascii-tree/package.json b/packages/oo-ascii-tree/package.json index a3eca7cf97..50fd66c5b4 100644 --- a/packages/oo-ascii-tree/package.json +++ b/packages/oo-ascii-tree/package.json @@ -36,7 +36,7 @@ "eslint": "^7.14.0", "jest": "^26.6.3", "jsii-build-tools": "^0.0.0", - "prettier": "^2.2.0", + "prettier": "^2.2.1", "typescript": "~3.9.7" } } diff --git a/yarn.lock b/yarn.lock index 5c399abfe6..60440fb07d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7195,10 +7195,10 @@ prettier-linter-helpers@^1.0.0: dependencies: fast-diff "^1.1.2" -prettier@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.0.tgz#8a03c7777883b29b37fb2c4348c66a78e980418b" - integrity sha512-yYerpkvseM4iKD/BXLYUkQV5aKt4tQPqaGW6EsZjzyu0r7sVZZNPJW4Y8MyKmicp6t42XUPcBVA+H6sB3gqndw== +prettier@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5" + integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q== pretty-format@^26.0.0, pretty-format@^26.6.2: version "26.6.2" From 34679edf9e17a126a8d45a9ef64993dddf34729b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Nov 2020 09:22:33 +0000 Subject: [PATCH 04/31] chore(deps-dev): bump webpack from 5.6.0 to 5.9.0 (#2286) --- packages/@jsii/runtime/package.json | 2 +- yarn.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/@jsii/runtime/package.json b/packages/@jsii/runtime/package.json index a46d1a50fa..6a8f124333 100644 --- a/packages/@jsii/runtime/package.json +++ b/packages/@jsii/runtime/package.json @@ -51,7 +51,7 @@ "ts-jest": "^26.4.4", "typescript": "~3.9.7", "wasm-loader": "^1.3.0", - "webpack": "^5.6.0", + "webpack": "^5.9.0", "webpack-cli": "^4.2.0" } } diff --git a/yarn.lock b/yarn.lock index 60440fb07d..2b08fe90f5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8420,7 +8420,7 @@ table@^5.2.3: slice-ansi "^2.1.0" string-width "^3.0.0" -tapable@^2.0.0: +tapable@^2.0.0, tapable@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.1.1.tgz#b01cc1902d42a7bb30514e320ce21c456f72fd3f" integrity sha512-Wib1S8m2wdpLbmQz0RBEVosIyvb/ykfKXf3ZIDqvWoMg/zTNm6G/tDSuUM61J1kNCDXWJrLHGSFeMhAG+gAGpQ== @@ -9085,10 +9085,10 @@ webpack-sources@^2.1.1: source-list-map "^2.0.1" source-map "^0.6.1" -webpack@^5.6.0: - version "5.6.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.6.0.tgz#282d10434c403b070ed91d459b385e873b51a07d" - integrity sha512-SIeFuBhuheKElRbd84O35UhKc0nxlgSwtzm2ksZ0BVhRJqxVJxEguT/pYhfiR0le/pxTa1VsCp7EOYyTsa6XOA== +webpack@^5.9.0: + version "5.9.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.9.0.tgz#af2e9cf9d6c7867cdcf214ea3bb5eb77aece6895" + integrity sha512-YnnqIV/uAS5ZrNpctSv378qV7HmbJ74DL+XfvMxzbX1bV9e7eeT6eEWU4wuUw33CNr/HspBh7R/xQlVjTEyAeA== dependencies: "@types/eslint-scope" "^3.7.0" "@types/estree" "^0.0.45" @@ -9110,7 +9110,7 @@ webpack@^5.6.0: neo-async "^2.6.2" pkg-dir "^4.2.0" schema-utils "^3.0.0" - tapable "^2.0.0" + tapable "^2.1.1" terser-webpack-plugin "^5.0.3" watchpack "^2.0.0" webpack-sources "^2.1.1" From 6b306219d026361f4927e0bd69a91edfb9827a2b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Dec 2020 06:39:11 +0000 Subject: [PATCH 05/31] chore(deps-dev): bump typescript-json-schema from 0.44.1 to 0.45.0 (#2288) --- packages/@jsii/spec/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/@jsii/spec/package.json b/packages/@jsii/spec/package.json index e2e566ff10..adc186d156 100644 --- a/packages/@jsii/spec/package.json +++ b/packages/@jsii/spec/package.json @@ -41,6 +41,6 @@ "jsii-build-tools": "^0.0.0", "prettier": "^2.2.1", "typescript": "~3.9.7", - "typescript-json-schema": "^0.44.1" + "typescript-json-schema": "^0.45.0" } } diff --git a/yarn.lock b/yarn.lock index 2b08fe90f5..ec6e8cf5c5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8785,10 +8785,10 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -typescript-json-schema@^0.44.1: - version "0.44.1" - resolved "https://registry.yarnpkg.com/typescript-json-schema/-/typescript-json-schema-0.44.1.tgz#eeac4ffc6ec271a699e7958038ff49810402698b" - integrity sha512-DKB7rKzubOTXxT2CnQTQoCbS6SgJpqukJr2TWE9FbRK0iJY++wc24Pib3OAzIA+c9WylgfT3CxxCCetDsE55Nw== +typescript-json-schema@^0.45.0: + version "0.45.0" + resolved "https://registry.yarnpkg.com/typescript-json-schema/-/typescript-json-schema-0.45.0.tgz#2f244e99518e589a442ee5f9c1d2c85a1ec7dc84" + integrity sha512-4MeX0HIODRd+K1/sIbkPryGXG43PVQ9cvIC8gDYml6yBgcsWLjvPMpTNr9VV+bQwpDLncB8Ie4qSenuKUwNZpg== dependencies: "@types/json-schema" "^7.0.6" glob "^7.1.6" From f4deaa64ea393a1ce89d26a2cb3d44fffa104709 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Dec 2020 08:33:04 +0000 Subject: [PATCH 06/31] chore(deps-dev): bump @typescript-eslint/parser from 4.8.2 to 4.9.0 (#2290) --- package.json | 2 +- yarn.lock | 51 +++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 44 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 6bf3a3df8c..841d84a7b0 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "devDependencies": { "@jest/types": "^26.6.2", "@typescript-eslint/eslint-plugin": "^4.8.2", - "@typescript-eslint/parser": "^4.8.2", + "@typescript-eslint/parser": "^4.9.0", "all-contributors-cli": "^6.19.0", "eslint": "^7.14.0", "eslint-config-prettier": "^6.15.0", diff --git a/yarn.lock b/yarn.lock index ec6e8cf5c5..50f8576f1b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1725,14 +1725,14 @@ eslint-scope "^5.0.0" eslint-utils "^2.0.0" -"@typescript-eslint/parser@^4.8.2": - version "4.8.2" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.8.2.tgz#78dccbe5124de2b8dea2d4c363dee9f769151ca8" - integrity sha512-u0leyJqmclYr3KcXOqd2fmx6SDGBO0MUNHHAjr0JS4Crbb3C3d8dwAdlazy133PLCcPn+aOUFiHn72wcuc5wYw== - dependencies: - "@typescript-eslint/scope-manager" "4.8.2" - "@typescript-eslint/types" "4.8.2" - "@typescript-eslint/typescript-estree" "4.8.2" +"@typescript-eslint/parser@^4.9.0": + version "4.9.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.9.0.tgz#bb65f1214b5e221604996db53ef77c9d62b09249" + integrity sha512-QRSDAV8tGZoQye/ogp28ypb8qpsZPV6FOLD+tbN4ohKUWHD2n/u0Q2tIBnCsGwQCiD94RdtLkcqpdK4vKcLCCw== + dependencies: + "@typescript-eslint/scope-manager" "4.9.0" + "@typescript-eslint/types" "4.9.0" + "@typescript-eslint/typescript-estree" "4.9.0" debug "^4.1.1" "@typescript-eslint/scope-manager@4.8.2": @@ -1743,11 +1743,24 @@ "@typescript-eslint/types" "4.8.2" "@typescript-eslint/visitor-keys" "4.8.2" +"@typescript-eslint/scope-manager@4.9.0": + version "4.9.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.9.0.tgz#5eefe305d6b71d1c85af6587b048426bfd4d3708" + integrity sha512-q/81jtmcDtMRE+nfFt5pWqO0R41k46gpVLnuefqVOXl4QV1GdQoBWfk5REcipoJNQH9+F5l+dwa9Li5fbALjzg== + dependencies: + "@typescript-eslint/types" "4.9.0" + "@typescript-eslint/visitor-keys" "4.9.0" + "@typescript-eslint/types@4.8.2": version "4.8.2" resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.8.2.tgz#c862dd0e569d9478eb82d6aee662ea53f5661a36" integrity sha512-z1/AVcVF8ju5ObaHe2fOpZYEQrwHyZ7PTOlmjd3EoFeX9sv7UekQhfrCmgUO7PruLNfSHrJGQvrW3Q7xQ8EoAw== +"@typescript-eslint/types@4.9.0": + version "4.9.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.9.0.tgz#3fe8c3632abd07095c7458f7451bd14c85d0033c" + integrity sha512-luzLKmowfiM/IoJL/rus1K9iZpSJK6GlOS/1ezKplb7MkORt2dDcfi8g9B0bsF6JoRGhqn0D3Va55b+vredFHA== + "@typescript-eslint/typescript-estree@4.8.2": version "4.8.2" resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.8.2.tgz#eeec34707d8577600fb21661b5287226cc8b3bed" @@ -1762,6 +1775,20 @@ semver "^7.3.2" tsutils "^3.17.1" +"@typescript-eslint/typescript-estree@4.9.0": + version "4.9.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.9.0.tgz#38a98df6ee281cfd6164d6f9d91795b37d9e508c" + integrity sha512-rmDR++PGrIyQzAtt3pPcmKWLr7MA+u/Cmq9b/rON3//t5WofNR4m/Ybft2vOLj0WtUzjn018ekHjTsnIyBsQug== + dependencies: + "@typescript-eslint/types" "4.9.0" + "@typescript-eslint/visitor-keys" "4.9.0" + debug "^4.1.1" + globby "^11.0.1" + is-glob "^4.0.1" + lodash "^4.17.15" + semver "^7.3.2" + tsutils "^3.17.1" + "@typescript-eslint/visitor-keys@4.8.2": version "4.8.2" resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.8.2.tgz#62cd3fbbbf65f8eccfbe6f159eb1b84a243a3f77" @@ -1770,6 +1797,14 @@ "@typescript-eslint/types" "4.8.2" eslint-visitor-keys "^2.0.0" +"@typescript-eslint/visitor-keys@4.9.0": + version "4.9.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.9.0.tgz#f284e9fac43f2d6d35094ce137473ee321f266c8" + integrity sha512-sV45zfdRqQo1A97pOSx3fsjR+3blmwtdCt8LDrXgCX36v4Vmz4KHrhpV6Fo2cRdXmyumxx11AHw0pNJqCNpDyg== + dependencies: + "@typescript-eslint/types" "4.9.0" + eslint-visitor-keys "^2.0.0" + "@webassemblyjs/ast@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964" From d7a111873a200c26021711ecf3e008c0073a2f24 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Dec 2020 09:47:10 +0000 Subject: [PATCH 07/31] chore(deps-dev): bump @typescript-eslint/eslint-plugin (#2289) --- package.json | 2 +- yarn.lock | 61 +++++++++++----------------------------------------- 2 files changed, 14 insertions(+), 49 deletions(-) diff --git a/package.json b/package.json index 841d84a7b0..f4f24fdf83 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ }, "devDependencies": { "@jest/types": "^26.6.2", - "@typescript-eslint/eslint-plugin": "^4.8.2", + "@typescript-eslint/eslint-plugin": "^4.9.0", "@typescript-eslint/parser": "^4.9.0", "all-contributors-cli": "^6.19.0", "eslint": "^7.14.0", diff --git a/yarn.lock b/yarn.lock index 50f8576f1b..7f6f7290a0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1700,28 +1700,28 @@ dependencies: "@types/yargs-parser" "*" -"@typescript-eslint/eslint-plugin@^4.8.2": - version "4.8.2" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.8.2.tgz#cf9102ec800391caa574f589ffe0623cca1d9308" - integrity sha512-gQ06QLV5l1DtvYtqOyFLXD9PdcILYqlrJj2l+CGDlPtmgLUzc1GpqciJFIRvyfvgLALpnxYINFuw+n9AZhPBKQ== +"@typescript-eslint/eslint-plugin@^4.9.0": + version "4.9.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.9.0.tgz#8fde15743413661fdc086c9f1f5d74a80b856113" + integrity sha512-WrVzGMzzCrgrpnQMQm4Tnf+dk+wdl/YbgIgd5hKGa2P+lnJ2MON+nQnbwgbxtN9QDLi8HO+JAq0/krMnjQK6Cw== dependencies: - "@typescript-eslint/experimental-utils" "4.8.2" - "@typescript-eslint/scope-manager" "4.8.2" + "@typescript-eslint/experimental-utils" "4.9.0" + "@typescript-eslint/scope-manager" "4.9.0" debug "^4.1.1" functional-red-black-tree "^1.0.1" regexpp "^3.0.0" semver "^7.3.2" tsutils "^3.17.1" -"@typescript-eslint/experimental-utils@4.8.2": - version "4.8.2" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.8.2.tgz#8909a5732f19329cf5ef0c39766170476bff5e50" - integrity sha512-hpTw6o6IhBZEsQsjuw/4RWmceRyESfAiEzAEnXHKG1X7S5DXFaZ4IO1JO7CW1aQ604leQBzjZmuMI9QBCAJX8Q== +"@typescript-eslint/experimental-utils@4.9.0": + version "4.9.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.9.0.tgz#23a296b85d243afba24e75a43fd55aceda5141f0" + integrity sha512-0p8GnDWB3R2oGhmRXlEnCvYOtaBCijtA5uBfH5GxQKsukdSQyI4opC4NGTUb88CagsoNQ4rb/hId2JuMbzWKFQ== dependencies: "@types/json-schema" "^7.0.3" - "@typescript-eslint/scope-manager" "4.8.2" - "@typescript-eslint/types" "4.8.2" - "@typescript-eslint/typescript-estree" "4.8.2" + "@typescript-eslint/scope-manager" "4.9.0" + "@typescript-eslint/types" "4.9.0" + "@typescript-eslint/typescript-estree" "4.9.0" eslint-scope "^5.0.0" eslint-utils "^2.0.0" @@ -1735,14 +1735,6 @@ "@typescript-eslint/typescript-estree" "4.9.0" debug "^4.1.1" -"@typescript-eslint/scope-manager@4.8.2": - version "4.8.2" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.8.2.tgz#a18388c63ae9c17adde519384f539392f2c4f0d9" - integrity sha512-qHQ8ODi7mMin4Sq2eh/6eu03uVzsf5TX+J43xRmiq8ujng7ViQSHNPLOHGw/Wr5dFEoxq/ubKhzClIIdQy5q3g== - dependencies: - "@typescript-eslint/types" "4.8.2" - "@typescript-eslint/visitor-keys" "4.8.2" - "@typescript-eslint/scope-manager@4.9.0": version "4.9.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.9.0.tgz#5eefe305d6b71d1c85af6587b048426bfd4d3708" @@ -1751,30 +1743,11 @@ "@typescript-eslint/types" "4.9.0" "@typescript-eslint/visitor-keys" "4.9.0" -"@typescript-eslint/types@4.8.2": - version "4.8.2" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.8.2.tgz#c862dd0e569d9478eb82d6aee662ea53f5661a36" - integrity sha512-z1/AVcVF8ju5ObaHe2fOpZYEQrwHyZ7PTOlmjd3EoFeX9sv7UekQhfrCmgUO7PruLNfSHrJGQvrW3Q7xQ8EoAw== - "@typescript-eslint/types@4.9.0": version "4.9.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.9.0.tgz#3fe8c3632abd07095c7458f7451bd14c85d0033c" integrity sha512-luzLKmowfiM/IoJL/rus1K9iZpSJK6GlOS/1ezKplb7MkORt2dDcfi8g9B0bsF6JoRGhqn0D3Va55b+vredFHA== -"@typescript-eslint/typescript-estree@4.8.2": - version "4.8.2" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.8.2.tgz#eeec34707d8577600fb21661b5287226cc8b3bed" - integrity sha512-HToGNwI6fekH0dOw3XEVESUm71Onfam0AKin6f26S2FtUmO7o3cLlWgrIaT1q3vjB3wCTdww3Dx2iGq5wtUOCg== - dependencies: - "@typescript-eslint/types" "4.8.2" - "@typescript-eslint/visitor-keys" "4.8.2" - debug "^4.1.1" - globby "^11.0.1" - is-glob "^4.0.1" - lodash "^4.17.15" - semver "^7.3.2" - tsutils "^3.17.1" - "@typescript-eslint/typescript-estree@4.9.0": version "4.9.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.9.0.tgz#38a98df6ee281cfd6164d6f9d91795b37d9e508c" @@ -1789,14 +1762,6 @@ semver "^7.3.2" tsutils "^3.17.1" -"@typescript-eslint/visitor-keys@4.8.2": - version "4.8.2" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.8.2.tgz#62cd3fbbbf65f8eccfbe6f159eb1b84a243a3f77" - integrity sha512-Vg+/SJTMZJEKKGHW7YC21QxgKJrSbxoYYd3MEUGtW7zuytHuEcksewq0DUmo4eh/CTNrVJGSdIY9AtRb6riWFw== - dependencies: - "@typescript-eslint/types" "4.8.2" - eslint-visitor-keys "^2.0.0" - "@typescript-eslint/visitor-keys@4.9.0": version "4.9.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.9.0.tgz#f284e9fac43f2d6d35094ce137473ee321f266c8" From fe2c24c689c57cf69b740dc5d18cef044e757f3a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Dec 2020 10:56:44 +0000 Subject: [PATCH 08/31] chore(deps): update pip requirement in /packages/@jsii/python-runtime (#2291) --- packages/@jsii/python-runtime/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@jsii/python-runtime/requirements.txt b/packages/@jsii/python-runtime/requirements.txt index 2a731e08db..f42704f9bc 100644 --- a/packages/@jsii/python-runtime/requirements.txt +++ b/packages/@jsii/python-runtime/requirements.txt @@ -1,7 +1,7 @@ black~=20.8b1 pytest~=6.1 pytest-mypy~=0.8 -pip~=20.2 +pip~=20.3 setuptools~=50.3 wheel~=0.35 From 8a8aef14d5c4d745bc75a7581eafe6ec3b8b5f48 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Dec 2020 12:14:03 +0000 Subject: [PATCH 09/31] chore(deps-dev): bump @types/node from 10.17.47 to 10.17.48 (#2287) --- packages/@jsii/dotnet-runtime-test/package.json | 2 +- packages/@jsii/dotnet-runtime/package.json | 2 +- packages/@jsii/go-runtime/package.json | 2 +- packages/@jsii/integ-test/package.json | 2 +- packages/@jsii/java-runtime/package.json | 2 +- packages/@jsii/kernel/package.json | 2 +- packages/@jsii/runtime/package.json | 2 +- packages/@jsii/spec/package.json | 2 +- packages/@scope/jsii-calc-base-of-base/package.json | 2 +- packages/@scope/jsii-calc-base/package.json | 2 +- packages/@scope/jsii-calc-lib/package.json | 2 +- packages/codemaker/package.json | 2 +- packages/jsii-calc/package.json | 2 +- packages/jsii-config/package.json | 2 +- packages/jsii-diff/package.json | 2 +- packages/jsii-pacmak/package.json | 2 +- packages/jsii-reflect/package.json | 2 +- packages/jsii-rosetta/package.json | 2 +- packages/jsii/package.json | 2 +- packages/oo-ascii-tree/package.json | 2 +- yarn.lock | 8 ++++---- 21 files changed, 24 insertions(+), 24 deletions(-) diff --git a/packages/@jsii/dotnet-runtime-test/package.json b/packages/@jsii/dotnet-runtime-test/package.json index 2f016f89d5..70e39521ba 100644 --- a/packages/@jsii/dotnet-runtime-test/package.json +++ b/packages/@jsii/dotnet-runtime-test/package.json @@ -31,7 +31,7 @@ }, "devDependencies": { "@jsii/dotnet-runtime": "^0.0.0", - "@types/node": "^10.17.47", + "@types/node": "^10.17.48", "jsii-calc": "^0.0.0", "jsii-pacmak": "^0.0.0", "typescript": "~3.9.7" diff --git a/packages/@jsii/dotnet-runtime/package.json b/packages/@jsii/dotnet-runtime/package.json index e5ab2ac0a3..dc58802ab1 100644 --- a/packages/@jsii/dotnet-runtime/package.json +++ b/packages/@jsii/dotnet-runtime/package.json @@ -39,7 +39,7 @@ }, "devDependencies": { "@jsii/runtime": "^0.0.0", - "@types/node": "^10.17.47", + "@types/node": "^10.17.48", "@types/semver": "^7.3.4", "jsii-build-tools": "^0.0.0", "semver": "^7.3.2", diff --git a/packages/@jsii/go-runtime/package.json b/packages/@jsii/go-runtime/package.json index 99d5b7a242..4af9028614 100644 --- a/packages/@jsii/go-runtime/package.json +++ b/packages/@jsii/go-runtime/package.json @@ -21,7 +21,7 @@ }, "devDependencies": { "@types/fs-extra": "^8.1.1", - "@types/node": "^10.17.47", + "@types/node": "^10.17.48", "codemaker": "^0.0.0", "fs-extra": "^9.0.1", "jsii-calc": "^0.0.0", diff --git a/packages/@jsii/integ-test/package.json b/packages/@jsii/integ-test/package.json index 0bad8b289d..172fb73cd1 100644 --- a/packages/@jsii/integ-test/package.json +++ b/packages/@jsii/integ-test/package.json @@ -30,7 +30,7 @@ "@types/dotenv": "^8.2.0", "@types/fs-extra": "^8.1.1", "@types/jest": "^26.0.15", - "@types/node": "^10.17.47", + "@types/node": "^10.17.48", "@types/tar": "^4.0.4", "eslint": "^7.14.0", "prettier": "^2.2.1", diff --git a/packages/@jsii/java-runtime/package.json b/packages/@jsii/java-runtime/package.json index 7041a6f6d5..0a9d3edf4a 100644 --- a/packages/@jsii/java-runtime/package.json +++ b/packages/@jsii/java-runtime/package.json @@ -33,7 +33,7 @@ }, "devDependencies": { "@jsii/runtime": "^0.0.0", - "@types/node": "^10.17.47", + "@types/node": "^10.17.48", "jsii-build-tools": "^0.0.0", "typescript": "~3.9.7" } diff --git a/packages/@jsii/kernel/package.json b/packages/@jsii/kernel/package.json index 142b85b32c..5e39c6370e 100644 --- a/packages/@jsii/kernel/package.json +++ b/packages/@jsii/kernel/package.json @@ -41,7 +41,7 @@ "@types/fs-extra": "^8.1.1", "@types/jest": "^26.0.15", "@types/jest-expect-message": "^1.0.3", - "@types/node": "^10.17.47", + "@types/node": "^10.17.48", "@types/tar": "^4.0.4", "eslint": "^7.14.0", "jest": "^26.6.3", diff --git a/packages/@jsii/runtime/package.json b/packages/@jsii/runtime/package.json index 6a8f124333..31167ed339 100644 --- a/packages/@jsii/runtime/package.json +++ b/packages/@jsii/runtime/package.json @@ -41,7 +41,7 @@ "@scope/jsii-calc-base": "^0.0.0", "@scope/jsii-calc-lib": "^0.0.0", "@types/jest": "^26.0.15", - "@types/node": "^10.17.47", + "@types/node": "^10.17.48", "eslint": "^7.14.0", "jest": "^26.6.3", "jsii-build-tools": "^0.0.0", diff --git a/packages/@jsii/spec/package.json b/packages/@jsii/spec/package.json index adc186d156..ca7c6b6335 100644 --- a/packages/@jsii/spec/package.json +++ b/packages/@jsii/spec/package.json @@ -35,7 +35,7 @@ }, "devDependencies": { "@types/jest": "^26.0.15", - "@types/node": "^10.17.47", + "@types/node": "^10.17.48", "eslint": "^7.14.0", "jest": "^26.6.3", "jsii-build-tools": "^0.0.0", diff --git a/packages/@scope/jsii-calc-base-of-base/package.json b/packages/@scope/jsii-calc-base-of-base/package.json index 4c6c65a1ed..adda0aa0f8 100644 --- a/packages/@scope/jsii-calc-base-of-base/package.json +++ b/packages/@scope/jsii-calc-base-of-base/package.json @@ -30,7 +30,7 @@ "test:update": "npm run build && UPDATE_DIFF=1 npm run test" }, "devDependencies": { - "@types/node": "^10.17.47", + "@types/node": "^10.17.48", "jsii": "^0.0.0", "jsii-build-tools": "^0.0.0", "jsii-rosetta": "^0.0.0", diff --git a/packages/@scope/jsii-calc-base/package.json b/packages/@scope/jsii-calc-base/package.json index c1319c4cd4..91d10d7d87 100644 --- a/packages/@scope/jsii-calc-base/package.json +++ b/packages/@scope/jsii-calc-base/package.json @@ -35,7 +35,7 @@ "@scope/jsii-calc-base-of-base": "^0.0.0" }, "devDependencies": { - "@types/node": "^10.17.47", + "@types/node": "^10.17.48", "jsii": "^0.0.0", "jsii-build-tools": "^0.0.0", "jsii-rosetta": "^0.0.0", diff --git a/packages/@scope/jsii-calc-lib/package.json b/packages/@scope/jsii-calc-lib/package.json index e128d98236..cb26e3a6fe 100644 --- a/packages/@scope/jsii-calc-lib/package.json +++ b/packages/@scope/jsii-calc-lib/package.json @@ -39,7 +39,7 @@ "@scope/jsii-calc-base-of-base": "^0.0.0" }, "devDependencies": { - "@types/node": "^10.17.47", + "@types/node": "^10.17.48", "jsii": "^0.0.0", "jsii-build-tools": "^0.0.0", "jsii-rosetta": "^0.0.0", diff --git a/packages/codemaker/package.json b/packages/codemaker/package.json index 4018c8c944..a888cd4d50 100644 --- a/packages/codemaker/package.json +++ b/packages/codemaker/package.json @@ -38,7 +38,7 @@ "devDependencies": { "@types/fs-extra": "^8.1.1", "@types/jest": "^26.0.15", - "@types/node": "^10.17.47", + "@types/node": "^10.17.48", "eslint": "^7.14.0", "jest": "^26.6.3", "prettier": "^2.2.1", diff --git a/packages/jsii-calc/package.json b/packages/jsii-calc/package.json index 442f7aa7ab..eee065ba1d 100644 --- a/packages/jsii-calc/package.json +++ b/packages/jsii-calc/package.json @@ -49,7 +49,7 @@ "@scope/jsii-calc-lib": "^0.0.0" }, "devDependencies": { - "@types/node": "^10.17.47", + "@types/node": "^10.17.48", "eslint": "^7.14.0", "jsii": "^0.0.0", "jsii-build-tools": "^0.0.0", diff --git a/packages/jsii-config/package.json b/packages/jsii-config/package.json index 5a170411f3..75259ef0dd 100644 --- a/packages/jsii-config/package.json +++ b/packages/jsii-config/package.json @@ -22,7 +22,7 @@ "@types/inquirer": "^7.3.1", "@types/jest": "^26.0.15", "@types/jest-expect-message": "^1.0.3", - "@types/node": "^10.17.47", + "@types/node": "^10.17.48", "@types/yargs": "^15.0.10", "eslint": "^7.14.0", "jest": "^26.6.3", diff --git a/packages/jsii-diff/package.json b/packages/jsii-diff/package.json index be354e7297..e81f8e3546 100644 --- a/packages/jsii-diff/package.json +++ b/packages/jsii-diff/package.json @@ -44,7 +44,7 @@ "@types/fs-extra": "^8.1.1", "@types/jest": "^26.0.15", "@types/jest-expect-message": "^1.0.3", - "@types/node": "^10.17.47", + "@types/node": "^10.17.48", "@types/tar-fs": "^2.0.0", "@types/yargs": "^15.0.10", "eslint": "^7.14.0", diff --git a/packages/jsii-pacmak/package.json b/packages/jsii-pacmak/package.json index c55a187d3a..3e01185d11 100644 --- a/packages/jsii-pacmak/package.json +++ b/packages/jsii-pacmak/package.json @@ -58,7 +58,7 @@ "@types/commonmark": "^0.27.4", "@types/fs-extra": "^8.1.1", "@types/jest": "^26.0.15", - "@types/node": "^10.17.47", + "@types/node": "^10.17.48", "@types/semver": "^7.3.4", "@types/yargs": "^15.0.10", "eslint": "^7.14.0", diff --git a/packages/jsii-reflect/package.json b/packages/jsii-reflect/package.json index b9ed074b36..4fb0c62b89 100644 --- a/packages/jsii-reflect/package.json +++ b/packages/jsii-reflect/package.json @@ -44,7 +44,7 @@ "@scope/jsii-calc-lib": "^0.0.0", "@types/fs-extra": "^8.1.1", "@types/jest": "^26.0.15", - "@types/node": "^10.17.47", + "@types/node": "^10.17.48", "@types/yargs": "^15.0.10", "eslint": "^7.14.0", "jest": "^26.6.3", diff --git a/packages/jsii-rosetta/package.json b/packages/jsii-rosetta/package.json index 9246938176..56f837af5e 100644 --- a/packages/jsii-rosetta/package.json +++ b/packages/jsii-rosetta/package.json @@ -20,7 +20,7 @@ "@types/fs-extra": "^8.1.1", "@types/jest": "^26.0.15", "@types/mock-fs": "^4.13.0", - "@types/node": "^10.17.47", + "@types/node": "^10.17.48", "@types/yargs": "^15.0.10", "eslint": "^7.14.0", "jest": "^26.6.3", diff --git a/packages/jsii/package.json b/packages/jsii/package.json index 258d9168ef..26a988d8a3 100644 --- a/packages/jsii/package.json +++ b/packages/jsii/package.json @@ -53,7 +53,7 @@ "@types/fs-extra": "^8.1.1", "@types/jest": "^26.0.15", "@types/jest-expect-message": "^1.0.3", - "@types/node": "^10.17.47", + "@types/node": "^10.17.48", "@types/semver": "^7.3.4", "@types/yargs": "^15.0.10", "clone": "^2.1.2", diff --git a/packages/oo-ascii-tree/package.json b/packages/oo-ascii-tree/package.json index 50fd66c5b4..f03ad0d0c1 100644 --- a/packages/oo-ascii-tree/package.json +++ b/packages/oo-ascii-tree/package.json @@ -32,7 +32,7 @@ }, "devDependencies": { "@types/jest": "^26.0.15", - "@types/node": "^10.17.47", + "@types/node": "^10.17.48", "eslint": "^7.14.0", "jest": "^26.6.3", "jsii-build-tools": "^0.0.0", diff --git a/yarn.lock b/yarn.lock index 7f6f7290a0..f3807313c1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1633,10 +1633,10 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.10.tgz#5958a82e41863cfc71f2307b3748e3491ba03785" integrity sha512-J32dgx2hw8vXrSbu4ZlVhn1Nm3GbeCFNw2FWL8S5QKucHGY0cyNwjdQdO+KMBZ4wpmC7KhLCiNsdk1RFRIYUQQ== -"@types/node@^10.17.47": - version "10.17.47" - resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.47.tgz#cc88a242a835789456cfcf374928400d9f4b291c" - integrity sha512-YZ1mMAdUPouBZCdeugjV8y1tqqr28OyL8DYbH5ePCfe9zcXtvbh1wDBy7uzlHkXo3Qi07kpzXfvycvrkby/jXw== +"@types/node@^10.17.48": + version "10.17.48" + resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.48.tgz#726e7f25d00bf58d79c8f00dd586dd9a10d06a4f" + integrity sha512-Agl6xbYP6FOMDeAsr3QVZ+g7Yzg0uhPHWx0j5g4LFdUBHVtqtU+gH660k/lCEe506jJLOGbEzsnqPDTZGJQLag== "@types/normalize-package-data@^2.4.0": version "2.4.0" From 629e3efb610eab30cc63bd9cd792990d117af59f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Dec 2020 06:31:22 +0000 Subject: [PATCH 10/31] chore(deps): bump deep-equal from 2.0.4 to 2.0.5 (#2292) --- packages/jsii/package.json | 2 +- yarn.lock | 31 ++++++++++++++++--------------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/packages/jsii/package.json b/packages/jsii/package.json index 26a988d8a3..edcbe79ddc 100644 --- a/packages/jsii/package.json +++ b/packages/jsii/package.json @@ -37,7 +37,7 @@ "@jsii/spec": "^0.0.0", "case": "^1.6.3", "colors": "^1.4.0", - "deep-equal": "^2.0.4", + "deep-equal": "^2.0.5", "fs-extra": "^9.0.1", "log4js": "^6.3.0", "semver": "^7.3.2", diff --git a/yarn.lock b/yarn.lock index f3807313c1..ac23920e43 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3332,20 +3332,21 @@ dedent@^0.7.0: resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c" integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw= -deep-equal@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-2.0.4.tgz#6b0b407a074666033169df3acaf128e1c6f3eab6" - integrity sha512-BUfaXrVoCfgkOQY/b09QdO9L3XNoF2XH0A3aY9IQwQL/ZjLOe8FQgCNVl1wiolhsFo8kFdO9zdPViCPbmaJA5w== +deep-equal@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-2.0.5.tgz#55cd2fe326d83f9cbf7261ef0e060b3f724c5cb9" + integrity sha512-nPiRgmbAtm1a3JsnLCf6/SLfXcjyN5v8L1TXzdCmHrXJ4hx+gW/w1YCcn7z8gJtSiDArZCgYtbao3QqLm/N1Sw== dependencies: - es-abstract "^1.18.0-next.1" - es-get-iterator "^1.1.0" + call-bind "^1.0.0" + es-get-iterator "^1.1.1" + get-intrinsic "^1.0.1" is-arguments "^1.0.4" is-date-object "^1.0.2" is-regex "^1.1.1" isarray "^2.0.5" - object-is "^1.1.3" + object-is "^1.1.4" object-keys "^1.1.1" - object.assign "^4.1.1" + object.assign "^4.1.2" regexp.prototype.flags "^1.3.0" side-channel "^1.0.3" which-boxed-primitive "^1.0.1" @@ -3668,7 +3669,7 @@ es-abstract@^1.18.0-next.0, es-abstract@^1.18.0-next.1: string.prototype.trimend "^1.0.1" string.prototype.trimstart "^1.0.1" -es-get-iterator@^1.1.0: +es-get-iterator@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.1.tgz#b93ddd867af16d5118e00881396533c1c6647ad9" integrity sha512-qorBw8Y7B15DVLaJWy6WdEV/ZkieBcu6QCq/xzWzGOKJqgG1j754vXRfZ3NY7HSShneqU43mPB4OkQBTkvHhFw== @@ -6725,13 +6726,13 @@ object-inspect@^1.8.0: resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz#df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0" integrity sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA== -object-is@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.3.tgz#2e3b9e65560137455ee3bd62aec4d90a2ea1cc81" - integrity sha512-teyqLvFWzLkq5B9ki8FVWA902UER2qkxmdA4nLf+wjOLAWgxzCWZNCxpDq9MvE8MmhWNr+I8w3BN49Vx36Y6Xg== +object-is@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.4.tgz#63d6c83c00a43f4cbc9434eb9757c8a5b8565068" + integrity sha512-1ZvAZ4wlF7IyPVOcE1Omikt7UpaFlOQq0HlSti+ZvDH3UiD2brwGMwDbyV43jao2bKJ+4+WdPJHSd7kgzKYVqg== dependencies: + call-bind "^1.0.0" define-properties "^1.1.3" - es-abstract "^1.18.0-next.1" object-keys@^1.0.12, object-keys@^1.1.1: version "1.1.1" @@ -6745,7 +6746,7 @@ object-visit@^1.0.0: dependencies: isobject "^3.0.0" -object.assign@^4.1.1: +object.assign@^4.1.1, object.assign@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940" integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ== From 3cfb9a60acbd436e373aae3cf03623fa943fa0db Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Dec 2020 08:26:18 +0000 Subject: [PATCH 11/31] chore(deps-dev): bump @types/jest from 26.0.15 to 26.0.16 (#2293) --- packages/@jsii/integ-test/package.json | 2 +- packages/@jsii/kernel/package.json | 2 +- packages/@jsii/runtime/package.json | 2 +- packages/@jsii/spec/package.json | 2 +- packages/codemaker/package.json | 2 +- packages/jsii-config/package.json | 2 +- packages/jsii-diff/package.json | 2 +- packages/jsii-pacmak/package.json | 2 +- packages/jsii-reflect/package.json | 2 +- packages/jsii-rosetta/package.json | 2 +- packages/jsii/package.json | 2 +- packages/oo-ascii-tree/package.json | 2 +- yarn.lock | 8 ++++---- 13 files changed, 16 insertions(+), 16 deletions(-) diff --git a/packages/@jsii/integ-test/package.json b/packages/@jsii/integ-test/package.json index 172fb73cd1..daf4cb4db6 100644 --- a/packages/@jsii/integ-test/package.json +++ b/packages/@jsii/integ-test/package.json @@ -29,7 +29,7 @@ "devDependencies": { "@types/dotenv": "^8.2.0", "@types/fs-extra": "^8.1.1", - "@types/jest": "^26.0.15", + "@types/jest": "^26.0.16", "@types/node": "^10.17.48", "@types/tar": "^4.0.4", "eslint": "^7.14.0", diff --git a/packages/@jsii/kernel/package.json b/packages/@jsii/kernel/package.json index 5e39c6370e..e9daf1dd5e 100644 --- a/packages/@jsii/kernel/package.json +++ b/packages/@jsii/kernel/package.json @@ -39,7 +39,7 @@ "@scope/jsii-calc-base": "^0.0.0", "@scope/jsii-calc-lib": "^0.0.0", "@types/fs-extra": "^8.1.1", - "@types/jest": "^26.0.15", + "@types/jest": "^26.0.16", "@types/jest-expect-message": "^1.0.3", "@types/node": "^10.17.48", "@types/tar": "^4.0.4", diff --git a/packages/@jsii/runtime/package.json b/packages/@jsii/runtime/package.json index 31167ed339..5e7771b67a 100644 --- a/packages/@jsii/runtime/package.json +++ b/packages/@jsii/runtime/package.json @@ -40,7 +40,7 @@ "devDependencies": { "@scope/jsii-calc-base": "^0.0.0", "@scope/jsii-calc-lib": "^0.0.0", - "@types/jest": "^26.0.15", + "@types/jest": "^26.0.16", "@types/node": "^10.17.48", "eslint": "^7.14.0", "jest": "^26.6.3", diff --git a/packages/@jsii/spec/package.json b/packages/@jsii/spec/package.json index ca7c6b6335..503d9b0613 100644 --- a/packages/@jsii/spec/package.json +++ b/packages/@jsii/spec/package.json @@ -34,7 +34,7 @@ "jsonschema": "^1.4.0" }, "devDependencies": { - "@types/jest": "^26.0.15", + "@types/jest": "^26.0.16", "@types/node": "^10.17.48", "eslint": "^7.14.0", "jest": "^26.6.3", diff --git a/packages/codemaker/package.json b/packages/codemaker/package.json index a888cd4d50..8ae3dc32a5 100644 --- a/packages/codemaker/package.json +++ b/packages/codemaker/package.json @@ -37,7 +37,7 @@ }, "devDependencies": { "@types/fs-extra": "^8.1.1", - "@types/jest": "^26.0.15", + "@types/jest": "^26.0.16", "@types/node": "^10.17.48", "eslint": "^7.14.0", "jest": "^26.6.3", diff --git a/packages/jsii-config/package.json b/packages/jsii-config/package.json index 75259ef0dd..9e3db8c7a2 100644 --- a/packages/jsii-config/package.json +++ b/packages/jsii-config/package.json @@ -20,7 +20,7 @@ }, "devDependencies": { "@types/inquirer": "^7.3.1", - "@types/jest": "^26.0.15", + "@types/jest": "^26.0.16", "@types/jest-expect-message": "^1.0.3", "@types/node": "^10.17.48", "@types/yargs": "^15.0.10", diff --git a/packages/jsii-diff/package.json b/packages/jsii-diff/package.json index e81f8e3546..735bb174bf 100644 --- a/packages/jsii-diff/package.json +++ b/packages/jsii-diff/package.json @@ -42,7 +42,7 @@ }, "devDependencies": { "@types/fs-extra": "^8.1.1", - "@types/jest": "^26.0.15", + "@types/jest": "^26.0.16", "@types/jest-expect-message": "^1.0.3", "@types/node": "^10.17.48", "@types/tar-fs": "^2.0.0", diff --git a/packages/jsii-pacmak/package.json b/packages/jsii-pacmak/package.json index 3e01185d11..4b6de95a2e 100644 --- a/packages/jsii-pacmak/package.json +++ b/packages/jsii-pacmak/package.json @@ -57,7 +57,7 @@ "@types/clone": "^2.1.0", "@types/commonmark": "^0.27.4", "@types/fs-extra": "^8.1.1", - "@types/jest": "^26.0.15", + "@types/jest": "^26.0.16", "@types/node": "^10.17.48", "@types/semver": "^7.3.4", "@types/yargs": "^15.0.10", diff --git a/packages/jsii-reflect/package.json b/packages/jsii-reflect/package.json index 4fb0c62b89..0a5a5ddc4d 100644 --- a/packages/jsii-reflect/package.json +++ b/packages/jsii-reflect/package.json @@ -43,7 +43,7 @@ "devDependencies": { "@scope/jsii-calc-lib": "^0.0.0", "@types/fs-extra": "^8.1.1", - "@types/jest": "^26.0.15", + "@types/jest": "^26.0.16", "@types/node": "^10.17.48", "@types/yargs": "^15.0.10", "eslint": "^7.14.0", diff --git a/packages/jsii-rosetta/package.json b/packages/jsii-rosetta/package.json index 56f837af5e..097899288a 100644 --- a/packages/jsii-rosetta/package.json +++ b/packages/jsii-rosetta/package.json @@ -18,7 +18,7 @@ "devDependencies": { "@types/commonmark": "^0.27.4", "@types/fs-extra": "^8.1.1", - "@types/jest": "^26.0.15", + "@types/jest": "^26.0.16", "@types/mock-fs": "^4.13.0", "@types/node": "^10.17.48", "@types/yargs": "^15.0.10", diff --git a/packages/jsii/package.json b/packages/jsii/package.json index edcbe79ddc..9cfecc917e 100644 --- a/packages/jsii/package.json +++ b/packages/jsii/package.json @@ -51,7 +51,7 @@ "@types/clone": "^2.1.0", "@types/deep-equal": "^1.0.1", "@types/fs-extra": "^8.1.1", - "@types/jest": "^26.0.15", + "@types/jest": "^26.0.16", "@types/jest-expect-message": "^1.0.3", "@types/node": "^10.17.48", "@types/semver": "^7.3.4", diff --git a/packages/oo-ascii-tree/package.json b/packages/oo-ascii-tree/package.json index f03ad0d0c1..fc9d623e58 100644 --- a/packages/oo-ascii-tree/package.json +++ b/packages/oo-ascii-tree/package.json @@ -31,7 +31,7 @@ "package": "package-js" }, "devDependencies": { - "@types/jest": "^26.0.15", + "@types/jest": "^26.0.16", "@types/node": "^10.17.48", "eslint": "^7.14.0", "jest": "^26.6.3", diff --git a/yarn.lock b/yarn.lock index ac23920e43..33014667f1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1586,10 +1586,10 @@ dependencies: "@types/jest" "*" -"@types/jest@*", "@types/jest@26.x", "@types/jest@^26.0.15": - version "26.0.15" - resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.15.tgz#12e02c0372ad0548e07b9f4e19132b834cb1effe" - integrity sha512-s2VMReFXRg9XXxV+CW9e5Nz8fH2K1aEhwgjUqPPbQd7g95T0laAcvLv032EhFHIa5GHsZ8W7iJEQVaJq6k3Gog== +"@types/jest@*", "@types/jest@26.x", "@types/jest@^26.0.16": + version "26.0.16" + resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.16.tgz#b47abd50f6ed0503f589db8e126fc8eb470cf87c" + integrity sha512-Gp12+7tmKCgv9JjtltxUXokohCAEZfpJaEW5tn871SGRp8I+bRWBonQO7vW5NHwnAHe5dd50+Q4zyKuN35i09g== dependencies: jest-diff "^26.0.0" pretty-format "^26.0.0" From 695ca6646c302a03aad1f580fe1268788a6a2f89 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Dec 2020 09:45:44 +0000 Subject: [PATCH 12/31] chore(deps): bump @octokit/rest from 18.0.9 to 18.0.10 (#2295) --- packages/@jsii/integ-test/package.json | 2 +- yarn.lock | 63 ++++++++++++++++---------- 2 files changed, 39 insertions(+), 26 deletions(-) diff --git a/packages/@jsii/integ-test/package.json b/packages/@jsii/integ-test/package.json index daf4cb4db6..711d36bd07 100644 --- a/packages/@jsii/integ-test/package.json +++ b/packages/@jsii/integ-test/package.json @@ -17,7 +17,7 @@ }, "license": "Apache-2.0", "dependencies": { - "@octokit/rest": "^18.0.9", + "@octokit/rest": "^18.0.10", "dotenv": "^8.2.0", "fs-extra": "^9.0.1", "jest": "^26.6.3", diff --git a/yarn.lock b/yarn.lock index 33014667f1..77f6196ff1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1292,15 +1292,15 @@ dependencies: "@octokit/types" "^5.0.0" -"@octokit/core@^3.0.0": - version "3.2.1" - resolved "https://registry.yarnpkg.com/@octokit/core/-/core-3.2.1.tgz#9e04df3f4e7f825ac0559327490ce34299140af5" - integrity sha512-XfFSDDwv6tclUenS0EmB6iA7u+4aOHBT1Lz4PtQNQQg3hBbNaR/+Uv5URU+egeIuuGAiMRiDyY92G4GBOWOqDA== +"@octokit/core@^3.2.2": + version "3.2.2" + resolved "https://registry.yarnpkg.com/@octokit/core/-/core-3.2.2.tgz#b57667c0a8501641356d479d7e9f1f2ef2a80549" + integrity sha512-cZEP6dC8xpepbAqtdS1GgX88omLer8VQegw5BpQ5fbSrkxgY9Y9K7ratu8ezAd9bD0GVOR1GVWiRzYdxiprU1w== dependencies: "@octokit/auth-token" "^2.4.0" "@octokit/graphql" "^4.3.1" "@octokit/request" "^5.4.0" - "@octokit/types" "^5.0.0" + "@octokit/types" "^6.0.0" before-after-hook "^2.1.0" universal-user-agent "^6.0.0" @@ -1322,6 +1322,11 @@ "@octokit/types" "^5.0.0" universal-user-agent "^6.0.0" +"@octokit/openapi-types@^1.2.0": + version "1.2.2" + resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-1.2.2.tgz#55d927436c07ef148ec927fbf4d55580a19bd68e" + integrity sha512-vrKDLd/Rq4IE16oT+jJkDBx0r29NFkdkU8GwqVSP4RajsAvP23CMGtFhVK0pedUhAiMvG1bGnFcTC/xCKaKgmw== + "@octokit/plugin-enterprise-rest@^6.0.1": version "6.0.1" resolved "https://registry.yarnpkg.com/@octokit/plugin-enterprise-rest/-/plugin-enterprise-rest-6.0.1.tgz#e07896739618dab8da7d4077c658003775f95437" @@ -1334,14 +1339,14 @@ dependencies: "@octokit/types" "^2.0.1" -"@octokit/plugin-paginate-rest@^2.2.0": - version "2.6.0" - resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.6.0.tgz#03416396e7a227b268c5b827365238f620a9c5c1" - integrity sha512-o+O8c1PqsC5++BHXfMZabRRsBIVb34tXPWyQLyp2IXq5MmkxdipS7TXM4Y9ldL1PzY9CTrCsn/lzFFJGM3oRRA== +"@octokit/plugin-paginate-rest@^2.6.1": + version "2.6.1" + resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.6.1.tgz#2412ada6f746535b14cae29ca8265633c353002e" + integrity sha512-DprxhI/8Qf/x9Svy89RUh3szyiLwgHL67S5kNmm5B4AjcWrPpMzB25fMCZeIIaXT463Fdn6fc1Hy6kK7/Hd90Q== dependencies: - "@octokit/types" "^5.5.0" + "@octokit/types" "^6.0.1" -"@octokit/plugin-request-log@^1.0.0": +"@octokit/plugin-request-log@^1.0.0", "@octokit/plugin-request-log@^1.0.2": version "1.0.2" resolved "https://registry.yarnpkg.com/@octokit/plugin-request-log/-/plugin-request-log-1.0.2.tgz#394d59ec734cd2f122431fbaf05099861ece3c44" integrity sha512-oTJSNAmBqyDR41uSMunLQKMX0jmEXbwD1fpz8FG27lScV3RhtGfBa1/BBLym+PxcC16IBlF7KH9vP1BUYxA+Eg== @@ -1354,12 +1359,12 @@ "@octokit/types" "^2.0.1" deprecation "^2.3.1" -"@octokit/plugin-rest-endpoint-methods@4.2.1": - version "4.2.1" - resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-4.2.1.tgz#8224833a45c3394836dc6e86f1e6c49269a2c350" - integrity sha512-QyFr4Bv807Pt1DXZOC5a7L5aFdrwz71UHTYoHVajYV5hsqffWm8FUl9+O7nxRu5PDMtB/IKrhFqTmdBTK5cx+A== +"@octokit/plugin-rest-endpoint-methods@4.3.0": + version "4.3.0" + resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-4.3.0.tgz#cc60fce3add6743fce8ab7333942fb2dd4eac837" + integrity sha512-omU8AfL8QgG4h+TObSSh6dArWzMKiHkG+z18Xtn4zC6WRzUxFvmibWktDYwLePXesd7/AMJR141s1mt+8cfeRA== dependencies: - "@octokit/types" "^5.5.0" + "@octokit/types" "^6.0.0" deprecation "^2.3.1" "@octokit/request-error@^1.0.2": @@ -1416,15 +1421,15 @@ once "^1.4.0" universal-user-agent "^4.0.0" -"@octokit/rest@^18.0.9": - version "18.0.9" - resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-18.0.9.tgz#964d707d914eb34b1787895fdcacff96de47844d" - integrity sha512-CC5+cIx974Ygx9lQNfUn7/oXDQ9kqGiKUC6j1A9bAVZZ7aoTF8K6yxu0pQhQrLBwSl92J6Z3iVDhGhGFgISCZg== +"@octokit/rest@^18.0.10": + version "18.0.10" + resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-18.0.10.tgz#f2f8648a805443ccb185d4c8b7facec9098298c8" + integrity sha512-6CJSM6A7acHK7Ek/6ro4FxKf9qPaiiIruL0eWbxiCCKk6aithn2PPxRlG9kJhT2dfTQpt9rHmfTSCF61eXXyfQ== dependencies: - "@octokit/core" "^3.0.0" - "@octokit/plugin-paginate-rest" "^2.2.0" - "@octokit/plugin-request-log" "^1.0.0" - "@octokit/plugin-rest-endpoint-methods" "4.2.1" + "@octokit/core" "^3.2.2" + "@octokit/plugin-paginate-rest" "^2.6.1" + "@octokit/plugin-request-log" "^1.0.2" + "@octokit/plugin-rest-endpoint-methods" "4.3.0" "@octokit/types@^2.0.0", "@octokit/types@^2.0.1": version "2.16.2" @@ -1433,13 +1438,21 @@ dependencies: "@types/node" ">= 8" -"@octokit/types@^5.0.0", "@octokit/types@^5.0.1", "@octokit/types@^5.5.0": +"@octokit/types@^5.0.0", "@octokit/types@^5.0.1": version "5.5.0" resolved "https://registry.yarnpkg.com/@octokit/types/-/types-5.5.0.tgz#e5f06e8db21246ca102aa28444cdb13ae17a139b" integrity sha512-UZ1pErDue6bZNjYOotCNveTXArOMZQFG6hKJfOnGnulVCMcVVi7YIIuuR4WfBhjo7zgpmzn/BkPDnUXtNx+PcQ== dependencies: "@types/node" ">= 8" +"@octokit/types@^6.0.0", "@octokit/types@^6.0.1": + version "6.0.1" + resolved "https://registry.yarnpkg.com/@octokit/types/-/types-6.0.1.tgz#a43a667ac8fff45012d23b771b7c3199f4491910" + integrity sha512-H/DnTKC+U09en2GFLH/MfAPNDaYb1isieD4Hx4NLpEt/I1PgtZP/8a+Ehc/j9GHuVF/UvGtOVD8AF9XXvws53w== + dependencies: + "@octokit/openapi-types" "^1.2.0" + "@types/node" ">= 8" + "@sinonjs/commons@^1.7.0": version "1.8.1" resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.1.tgz#e7df00f98a203324f6dc7cc606cad9d4a8ab2217" From fd547748e964497f17788abb336ecd308810d9a4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Dec 2020 12:49:06 +0000 Subject: [PATCH 13/31] chore(deps): update wheel requirement in /packages/@jsii/python-runtime (#2296) --- packages/@jsii/python-runtime/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@jsii/python-runtime/requirements.txt b/packages/@jsii/python-runtime/requirements.txt index f42704f9bc..fe77e1405f 100644 --- a/packages/@jsii/python-runtime/requirements.txt +++ b/packages/@jsii/python-runtime/requirements.txt @@ -3,6 +3,6 @@ pytest~=6.1 pytest-mypy~=0.8 pip~=20.3 setuptools~=50.3 -wheel~=0.35 +wheel~=0.36 -e . From 22d7108fe48b3574b7db18167928307d75d24301 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Dec 2020 14:23:19 +0000 Subject: [PATCH 14/31] chore(deps): bump semver from 7.3.2 to 7.3.4 (#2294) --- packages/@jsii/dotnet-runtime/package.json | 2 +- packages/jsii-pacmak/lib/targets/java.ts | 4 +-- .../jsii-pacmak/lib/targets/version-utils.ts | 10 +++--- packages/jsii-pacmak/package.json | 2 +- .../prerelease-identifiers.test.ts.snap | 24 ++++++------- .../__snapshots__/target-dotnet.test.ts.snap | 18 +++++----- .../__snapshots__/target-java.test.ts.snap | 36 +++++++++---------- .../__snapshots__/target-python.test.ts.snap | 20 +++++------ .../test/targets/version-utils.test.ts | 20 +++++------ packages/jsii/package.json | 2 +- yarn.lock | 10 +++--- 11 files changed, 75 insertions(+), 73 deletions(-) diff --git a/packages/@jsii/dotnet-runtime/package.json b/packages/@jsii/dotnet-runtime/package.json index dc58802ab1..26da061bd4 100644 --- a/packages/@jsii/dotnet-runtime/package.json +++ b/packages/@jsii/dotnet-runtime/package.json @@ -42,7 +42,7 @@ "@types/node": "^10.17.48", "@types/semver": "^7.3.4", "jsii-build-tools": "^0.0.0", - "semver": "^7.3.2", + "semver": "^7.3.4", "typescript": "~3.9.7" } } diff --git a/packages/jsii-pacmak/lib/targets/java.ts b/packages/jsii-pacmak/lib/targets/java.ts index 1a979b981f..aa7e7b2778 100644 --- a/packages/jsii-pacmak/lib/targets/java.ts +++ b/packages/jsii-pacmak/lib/targets/java.ts @@ -1037,7 +1037,7 @@ class JavaGenerator extends Generator { { groupId: 'org.apache.maven.plugins', artifactId: 'maven-javadoc-plugin', - version: '3.1.1', + version: '3.2.0', executions: { execution: { id: 'attach-javadocs', @@ -1080,7 +1080,7 @@ class JavaGenerator extends Generator { { groupId: 'org.codehaus.mojo', artifactId: 'versions-maven-plugin', - version: '2.7', + version: '2.8.1', configuration: { generateBackupPoms: false, }, diff --git a/packages/jsii-pacmak/lib/targets/version-utils.ts b/packages/jsii-pacmak/lib/targets/version-utils.ts index 53d22a1a06..1cc5568e7b 100644 --- a/packages/jsii-pacmak/lib/targets/version-utils.ts +++ b/packages/jsii-pacmak/lib/targets/version-utils.ts @@ -168,7 +168,7 @@ function toBracketNotation( const version = set[0].semver.raw; if (!version && range.raw === '>=0.0.0') { // Case where version is '*' - return `[0.0.0,]`; + return `[0.0.0,)`; } switch (set[0].operator || '=') { // "[version]" => means exactly version @@ -176,16 +176,16 @@ function toBracketNotation( return `[${addSuffix(version)}]`; // "(version,]" => means greater than version case '>': - return `(${addSuffix(version)},]`; + return `(${addSuffix(version)},)`; // "[version,]" => means greater than or equal to that version case '>=': - return `[${addSuffix(version)},]`; + return `[${addSuffix(version)},)`; // "[,version)" => means less than version case '<': - return `[,${addSuffix(version, !semver)})`; + return `(,${addSuffix(version, !semver)})`; // "[,version]" => means less than or equal to version case '<=': - return `[,${addSuffix(version)}]`; + return `(,${addSuffix(version)}]`; } } else if (set.length === 2) { const nugetRange = toBracketRange(set[0], set[1]); diff --git a/packages/jsii-pacmak/package.json b/packages/jsii-pacmak/package.json index 4b6de95a2e..a56ceff91a 100644 --- a/packages/jsii-pacmak/package.json +++ b/packages/jsii-pacmak/package.json @@ -45,7 +45,7 @@ "fs-extra": "^9.0.1", "jsii-reflect": "^0.0.0", "jsii-rosetta": "^0.0.0", - "semver": "^7.3.2", + "semver": "^7.3.4", "spdx-license-list": "^6.3.0", "xmlbuilder": "^15.1.1", "yargs": "^16.1.1" diff --git a/packages/jsii-pacmak/test/generated-code/__snapshots__/prerelease-identifiers.test.ts.snap b/packages/jsii-pacmak/test/generated-code/__snapshots__/prerelease-identifiers.test.ts.snap index c4b67e8a5b..8feb75b5ba 100644 --- a/packages/jsii-pacmak/test/generated-code/__snapshots__/prerelease-identifiers.test.ts.snap +++ b/packages/jsii-pacmak/test/generated-code/__snapshots__/prerelease-identifiers.test.ts.snap @@ -198,7 +198,7 @@ exports[`foo@1.2.3 depends on bar@^2.0.0-rc.42: /java/pom.xml 1`] = ` software.amazon.jsii jsii-runtime - [0.0.0,0.0.1) + (,0.0.1) org.jetbrains @@ -254,7 +254,7 @@ exports[`foo@1.2.3 depends on bar@^2.0.0-rc.42: /java/pom.xml 1`] = ` org.apache.maven.plugins maven-javadoc-plugin - 3.1.1 + 3.2.0 attach-javadocs @@ -296,7 +296,7 @@ exports[`foo@1.2.3 depends on bar@^2.0.0-rc.42: /java/pom.xml 1`] = ` org.codehaus.mojo versions-maven-plugin - 2.7 + 2.8.1 false @@ -695,7 +695,7 @@ exports[`foo@1.2.3 depends on bar@^4.5.6-pre.1337: /java/pom.xml 1`] = ` software.amazon.jsii jsii-runtime - [0.0.0,0.0.1) + (,0.0.1) org.jetbrains @@ -751,7 +751,7 @@ exports[`foo@1.2.3 depends on bar@^4.5.6-pre.1337: /java/pom.xml 1`] = ` org.apache.maven.plugins maven-javadoc-plugin - 3.1.1 + 3.2.0 attach-javadocs @@ -793,7 +793,7 @@ exports[`foo@1.2.3 depends on bar@^4.5.6-pre.1337: /java/pom.xml 1`] = ` org.codehaus.mojo versions-maven-plugin - 2.7 + 2.8.1 false @@ -1179,7 +1179,7 @@ exports[`foo@2.0.0-rc.42: /java/pom.xml 1`] = ` software.amazon.jsii jsii-runtime - [0.0.0,0.0.1) + (,0.0.1) org.jetbrains @@ -1235,7 +1235,7 @@ exports[`foo@2.0.0-rc.42: /java/pom.xml 1`] = ` org.apache.maven.plugins maven-javadoc-plugin - 3.1.1 + 3.2.0 attach-javadocs @@ -1277,7 +1277,7 @@ exports[`foo@2.0.0-rc.42: /java/pom.xml 1`] = ` org.codehaus.mojo versions-maven-plugin - 2.7 + 2.8.1 false @@ -1652,7 +1652,7 @@ exports[`foo@4.5.6-pre.1337: /java/pom.xml 1`] = ` software.amazon.jsii jsii-runtime - [0.0.0,0.0.1) + (,0.0.1) org.jetbrains @@ -1708,7 +1708,7 @@ exports[`foo@4.5.6-pre.1337: /java/pom.xml 1`] = ` org.apache.maven.plugins maven-javadoc-plugin - 3.1.1 + 3.2.0 attach-javadocs @@ -1750,7 +1750,7 @@ exports[`foo@4.5.6-pre.1337: /java/pom.xml 1`] = ` org.codehaus.mojo versions-maven-plugin - 2.7 + 2.8.1 false diff --git a/packages/jsii-pacmak/test/generated-code/__snapshots__/target-dotnet.test.ts.snap b/packages/jsii-pacmak/test/generated-code/__snapshots__/target-dotnet.test.ts.snap index 268ccb07d8..e3cf5c9e76 100644 --- a/packages/jsii-pacmak/test/generated-code/__snapshots__/target-dotnet.test.ts.snap +++ b/packages/jsii-pacmak/test/generated-code/__snapshots__/target-dotnet.test.ts.snap @@ -52,8 +52,8 @@ exports[`Generated code for "@scope/jsii-calc-base": /dotnet/Amazon.JSII - - + + 0612,0618 @@ -326,7 +326,7 @@ exports[`Generated code for "@scope/jsii-calc-base-of-base": /dotnet/Ama - + 0612,0618 @@ -618,9 +618,9 @@ exports[`Generated code for "@scope/jsii-calc-lib": /dotnet/Amazon.JSII. - - - + + + 0612,0618 @@ -2275,9 +2275,9 @@ exports[`Generated code for "jsii-calc": /dotnet/Amazon.JSII.Tests.Calcu - - - + + + diff --git a/packages/jsii-pacmak/test/generated-code/__snapshots__/target-java.test.ts.snap b/packages/jsii-pacmak/test/generated-code/__snapshots__/target-java.test.ts.snap index b19b9bfd27..841ec61b7a 100644 --- a/packages/jsii-pacmak/test/generated-code/__snapshots__/target-java.test.ts.snap +++ b/packages/jsii-pacmak/test/generated-code/__snapshots__/target-java.test.ts.snap @@ -67,12 +67,12 @@ exports[`Generated code for "@scope/jsii-calc-base": /java/pom.xml 1`] = software.amazon.jsii.tests calculator-base-of-base - [0.0.0,0.0.1) + (,0.0.1) software.amazon.jsii jsii-runtime - [0.0.0,0.0.1) + (,0.0.1) org.jetbrains @@ -128,7 +128,7 @@ exports[`Generated code for "@scope/jsii-calc-base": /java/pom.xml 1`] = org.apache.maven.plugins maven-javadoc-plugin - 3.1.1 + 3.2.0 attach-javadocs @@ -170,7 +170,7 @@ exports[`Generated code for "@scope/jsii-calc-base": /java/pom.xml 1`] = org.codehaus.mojo versions-maven-plugin - 2.7 + 2.8.1 false @@ -546,7 +546,7 @@ exports[`Generated code for "@scope/jsii-calc-base-of-base": /java/pom.x software.amazon.jsii jsii-runtime - [0.0.0,0.0.1) + (,0.0.1) org.jetbrains @@ -602,7 +602,7 @@ exports[`Generated code for "@scope/jsii-calc-base-of-base": /java/pom.x org.apache.maven.plugins maven-javadoc-plugin - 3.1.1 + 3.2.0 attach-javadocs @@ -644,7 +644,7 @@ exports[`Generated code for "@scope/jsii-calc-base-of-base": /java/pom.x org.codehaus.mojo versions-maven-plugin - 2.7 + 2.8.1 false @@ -1022,17 +1022,17 @@ exports[`Generated code for "@scope/jsii-calc-lib": /java/pom.xml 1`] = software.amazon.jsii.tests calculator-base - [0.0.0,0.0.1) + (,0.0.1) software.amazon.jsii.tests calculator-base-of-base - [0.0.0,0.0.1) + (,0.0.1) software.amazon.jsii jsii-runtime - [0.0.0,0.0.1) + (,0.0.1) org.jetbrains @@ -1088,7 +1088,7 @@ exports[`Generated code for "@scope/jsii-calc-lib": /java/pom.xml 1`] = org.apache.maven.plugins maven-javadoc-plugin - 3.1.1 + 3.2.0 attach-javadocs @@ -1130,7 +1130,7 @@ exports[`Generated code for "@scope/jsii-calc-lib": /java/pom.xml 1`] = org.codehaus.mojo versions-maven-plugin - 2.7 + 2.8.1 false @@ -2815,22 +2815,22 @@ exports[`Generated code for "jsii-calc": /java/pom.xml 1`] = ` software.amazon.jsii.tests calculator-base - [0.0.0,0.0.1) + (,0.0.1) software.amazon.jsii.tests calculator-base-of-base - [0.0.0,0.0.1) + (,0.0.1) software.amazon.jsii.tests calculator-lib - [0.0.0.DEVPREVIEW,0.0.1.DEVPREVIEW) + (,0.0.1.DEVPREVIEW) software.amazon.jsii jsii-runtime - [0.0.0,0.0.1) + (,0.0.1) org.jetbrains @@ -2886,7 +2886,7 @@ exports[`Generated code for "jsii-calc": /java/pom.xml 1`] = ` org.apache.maven.plugins maven-javadoc-plugin - 3.1.1 + 3.2.0 attach-javadocs @@ -2928,7 +2928,7 @@ exports[`Generated code for "jsii-calc": /java/pom.xml 1`] = ` org.codehaus.mojo versions-maven-plugin - 2.7 + 2.8.1 false diff --git a/packages/jsii-pacmak/test/generated-code/__snapshots__/target-python.test.ts.snap b/packages/jsii-pacmak/test/generated-code/__snapshots__/target-python.test.ts.snap index ec8a61b2bd..4917348311 100644 --- a/packages/jsii-pacmak/test/generated-code/__snapshots__/target-python.test.ts.snap +++ b/packages/jsii-pacmak/test/generated-code/__snapshots__/target-python.test.ts.snap @@ -71,9 +71,9 @@ kwargs = json.loads( }, "python_requires": ">=3.6", "install_requires": [ - "jsii>=0.0.0, <0.0.1", + "jsii<0.0.1", "publication>=0.0.3", - "scope.jsii-calc-base-of-base>=0.0.0, <0.0.1" + "scope.jsii-calc-base-of-base<0.0.1" ], "classifiers": [ "Intended Audience :: Developers", @@ -319,7 +319,7 @@ kwargs = json.loads( }, "python_requires": ">=3.6", "install_requires": [ - "jsii>=0.0.0, <0.0.1", + "jsii<0.0.1", "publication>=0.0.3" ], "classifiers": [ @@ -559,10 +559,10 @@ kwargs = json.loads( }, "python_requires": ">=3.6", "install_requires": [ - "jsii>=0.0.0, <0.0.1", + "jsii<0.0.1", "publication>=0.0.3", - "scope.jsii-calc-base-of-base>=0.0.0, <0.0.1", - "scope.jsii-calc-base>=0.0.0, <0.0.1" + "scope.jsii-calc-base-of-base<0.0.1", + "scope.jsii-calc-base<0.0.1" ], "classifiers": [ "Intended Audience :: Developers", @@ -1410,11 +1410,11 @@ kwargs = json.loads( }, "python_requires": ">=3.6", "install_requires": [ - "jsii>=0.0.0, <0.0.1", + "jsii<0.0.1", "publication>=0.0.3", - "scope.jsii-calc-base-of-base>=0.0.0, <0.0.1", - "scope.jsii-calc-base>=0.0.0, <0.0.1", - "scope.jsii-calc-lib>=0.0.0, <0.0.1" + "scope.jsii-calc-base-of-base<0.0.1", + "scope.jsii-calc-base<0.0.1", + "scope.jsii-calc-lib<0.0.1" ], "classifiers": [ "Intended Audience :: Developers", diff --git a/packages/jsii-pacmak/test/targets/version-utils.test.ts b/packages/jsii-pacmak/test/targets/version-utils.test.ts index df5b11b442..0be8b9b615 100644 --- a/packages/jsii-pacmak/test/targets/version-utils.test.ts +++ b/packages/jsii-pacmak/test/targets/version-utils.test.ts @@ -46,30 +46,30 @@ const examples: Record< // Less usual ranges '>0.1.2': { - maven: '(0.1.2,]', - nuget: '(0.1.2,]', + maven: '(0.1.2,)', + nuget: '(0.1.2,)', python: '>0.1.2', }, '>=0.1.2': { - maven: '[0.1.2,]', - nuget: '[0.1.2,]', + maven: '[0.1.2,)', + nuget: '[0.1.2,)', python: '>=0.1.2', }, '<0.1.2': { - maven: '[,0.1.2)', - nuget: '[,0.1.2)', + maven: '(,0.1.2)', + nuget: '(,0.1.2)', python: '<0.1.2', }, '<=0.1.2': { - maven: '[,0.1.2]', - nuget: '[,0.1.2]', + maven: '(,0.1.2]', + nuget: '(,0.1.2]', python: '<=0.1.2', }, // Somewhat unusual ranges '*': { - maven: '[0.0.0,]', - nuget: '[0.0.0,]', + maven: '[0.0.0,)', + nuget: '[0.0.0,)', python: '>=0.0.0', }, '1.2.*': { diff --git a/packages/jsii/package.json b/packages/jsii/package.json index 9cfecc917e..8f3e6d6b37 100644 --- a/packages/jsii/package.json +++ b/packages/jsii/package.json @@ -40,7 +40,7 @@ "deep-equal": "^2.0.5", "fs-extra": "^9.0.1", "log4js": "^6.3.0", - "semver": "^7.3.2", + "semver": "^7.3.4", "semver-intersect": "^1.4.0", "sort-json": "^2.0.0", "spdx-license-list": "^6.3.0", diff --git a/yarn.lock b/yarn.lock index 77f6196ff1..8f82d495cf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7827,10 +7827,12 @@ semver-intersect@^1.4.0: resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== -semver@7.x, semver@^7.1.1, semver@^7.2.1, semver@^7.3.2: - version "7.3.2" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938" - integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ== +semver@7.x, semver@^7.1.1, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4: + version "7.3.4" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97" + integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw== + dependencies: + lru-cache "^6.0.0" semver@^6.0.0, semver@^6.2.0, semver@^6.3.0: version "6.3.0" From 00616753de6fed784f93585c900aa4d103d6db3a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 3 Dec 2020 06:37:15 +0000 Subject: [PATCH 15/31] chore(deps): bump Microsoft.NET.Test.Sdk (#2302) --- packages/@jsii/Directory.Build.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@jsii/Directory.Build.targets b/packages/@jsii/Directory.Build.targets index f13ae6d1eb..98cceb7366 100644 --- a/packages/@jsii/Directory.Build.targets +++ b/packages/@jsii/Directory.Build.targets @@ -11,7 +11,7 @@ - + From 722484cfdfa62f8a64eae929dffa6faee25d110c Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Thu, 3 Dec 2020 11:16:16 +0000 Subject: [PATCH 16/31] docs: add majasb as a contributor (#2304) Adds @majasb as a contributor for bug. This was requested by RomainMuller [in this comment](https://github.com/aws/jsii/issues/2303#issuecomment-737822481) --- .all-contributorsrc | 9 +++++++++ README.md | 1 + 2 files changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 8e173b9f04..e3e0713a5b 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -982,6 +982,15 @@ "contributions": [ "bug" ] + }, + { + "login": "majasb", + "name": "Maja S Bratseth", + "avatar_url": "https://avatars2.githubusercontent.com/u/142510?v=4", + "profile": "https://github.com/majasb", + "contributions": [ + "bug" + ] } ], "repoType": "github", diff --git a/README.md b/README.md index bc45e7232b..b47a36d42c 100644 --- a/README.md +++ b/README.md @@ -485,6 +485,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
Hari Pachuveetil
πŸ“
deccy-mcc
πŸ› +
Maja S Bratseth
πŸ› From 005753c189531eefcdd4fb6934c5ad68addf0c71 Mon Sep 17 00:00:00 2001 From: AWS CDK Automation <43080478+aws-cdk-automation@users.noreply.github.com> Date: Thu, 3 Dec 2020 16:29:23 +0100 Subject: [PATCH 17/31] chore: npm-check-updates && yarn upgrade (#2297) Ran npm-check-updates and yarn upgrade to keep the `yarn.lock` file up-to-date. --- yarn.lock | 160 ++++++++++++++++++++++++++---------------------------- 1 file changed, 77 insertions(+), 83 deletions(-) diff --git a/yarn.lock b/yarn.lock index 8f82d495cf..dbcab11632 100644 --- a/yarn.lock +++ b/yarn.lock @@ -233,7 +233,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/runtime@^7.12.1", "@babel/runtime@^7.7.6": +"@babel/runtime@^7.12.5", "@babel/runtime@^7.7.6": version "7.12.5" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.5.tgz#410e7e487441e1b360c29be715d870d9b985882e" integrity sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg== @@ -1286,11 +1286,11 @@ fastq "^1.6.0" "@octokit/auth-token@^2.4.0": - version "2.4.3" - resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-2.4.3.tgz#b868b5f2366533a7e62933eaa1181a8924228cc4" - integrity sha512-fdGoOQ3kQJh+hrilc0Plg50xSfaCKOeYN9t6dpJKXN9BxhhfquL0OzoQXg3spLYymL5rm29uPeI3KEXRaZQ9zg== + version "2.4.4" + resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-2.4.4.tgz#ee31c69b01d0378c12fd3ffe406030f3d94d3b56" + integrity sha512-LNfGu3Ro9uFAYh10MUZVaT7X2CnNm2C8IDQmabx+3DygYIQjs9FwzFAHN/0t6mu5HEPhxcb1XOuxdpY82vCg2Q== dependencies: - "@octokit/types" "^5.0.0" + "@octokit/types" "^6.0.0" "@octokit/core@^3.2.2": version "3.2.2" @@ -1305,21 +1305,21 @@ universal-user-agent "^6.0.0" "@octokit/endpoint@^6.0.1": - version "6.0.9" - resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-6.0.9.tgz#c6a772e024202b1bd19ab69f90e0536a2598b13e" - integrity sha512-3VPLbcCuqji4IFTclNUtGdp9v7g+nspWdiCUbK3+iPMjJCZ6LEhn1ts626bWLOn0GiDb6j+uqGvPpqLnY7pBgw== + version "6.0.10" + resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-6.0.10.tgz#741ce1fa2f4fb77ce8ebe0c6eaf5ce63f565f8e8" + integrity sha512-9+Xef8nT7OKZglfkOMm7IL6VwxXUQyR7DUSU0LH/F7VNqs8vyd7es5pTfz9E7DwUIx7R3pGscxu1EBhYljyu7Q== dependencies: - "@octokit/types" "^5.0.0" + "@octokit/types" "^6.0.0" is-plain-object "^5.0.0" universal-user-agent "^6.0.0" "@octokit/graphql@^4.3.1": - version "4.5.7" - resolved "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-4.5.7.tgz#f4562dcd9e80ea94602068e85aefac19a88f8578" - integrity sha512-Gk0AR+DcwIK/lK/GX+OQ99UqtenQhcbrhHHfOYlrCQe17ADnX3EKAOKRsAZ9qZvpi5MuwWm/Nm+9aO2kTDSdyA== + version "4.5.8" + resolved "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-4.5.8.tgz#d42373633c3015d0eafce64a8ce196be167fdd9b" + integrity sha512-WnCtNXWOrupfPJgXe+vSmprZJUr0VIu14G58PMlkWGj3cH+KLZEfKMmbUQ6C3Wwx6fdhzVW1CD5RTnBdUHxhhA== dependencies: "@octokit/request" "^5.3.0" - "@octokit/types" "^5.0.0" + "@octokit/types" "^6.0.0" universal-user-agent "^6.0.0" "@octokit/openapi-types@^1.2.0": @@ -1377,22 +1377,22 @@ once "^1.4.0" "@octokit/request-error@^2.0.0": - version "2.0.3" - resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-2.0.3.tgz#b51b200052bf483f6fa56c9e7e3aa51ead36ecd8" - integrity sha512-GgD5z8Btm301i2zfvJLk/mkhvGCdjQ7wT8xF9ov5noQY8WbKZDH9cOBqXzoeKd1mLr1xH2FwbtGso135zGBgTA== + version "2.0.4" + resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-2.0.4.tgz#07dd5c0521d2ee975201274c472a127917741262" + integrity sha512-LjkSiTbsxIErBiRh5wSZvpZqT4t0/c9+4dOe0PII+6jXR+oj/h66s7E4a/MghV7iT8W9ffoQ5Skoxzs96+gBPA== dependencies: - "@octokit/types" "^5.0.1" + "@octokit/types" "^6.0.0" deprecation "^2.0.0" once "^1.4.0" "@octokit/request@^5.2.0", "@octokit/request@^5.3.0", "@octokit/request@^5.4.0": - version "5.4.10" - resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.4.10.tgz#402d2c53768bde12b99348329ba4129746aebb9c" - integrity sha512-egA49HkqEORVGDZGav1mh+VD+7uLgOxtn5oODj6guJk0HCy+YBSYapFkSLFgeYj3Fr18ZULKGURkjyhkAChylw== + version "5.4.11" + resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.4.11.tgz#2536e9095f7e90c9d22a14fed7bb7299a22050c5" + integrity sha512-vskebNjuz4oTdPIv+9cQjHvjk8vjrMv2fOmSo6zr7IIaFHeVsJlG/C07MXiSS/+g/qU1GHjkPG1XW3faz57EoQ== dependencies: "@octokit/endpoint" "^6.0.1" "@octokit/request-error" "^2.0.0" - "@octokit/types" "^5.0.0" + "@octokit/types" "^6.0.0" deprecation "^2.0.0" is-plain-object "^5.0.0" node-fetch "^2.6.1" @@ -1438,13 +1438,6 @@ dependencies: "@types/node" ">= 8" -"@octokit/types@^5.0.0", "@octokit/types@^5.0.1": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@octokit/types/-/types-5.5.0.tgz#e5f06e8db21246ca102aa28444cdb13ae17a139b" - integrity sha512-UZ1pErDue6bZNjYOotCNveTXArOMZQFG6hKJfOnGnulVCMcVVi7YIIuuR4WfBhjo7zgpmzn/BkPDnUXtNx+PcQ== - dependencies: - "@types/node" ">= 8" - "@octokit/types@^6.0.0", "@octokit/types@^6.0.1": version "6.0.1" resolved "https://registry.yarnpkg.com/@octokit/types/-/types-6.0.1.tgz#a43a667ac8fff45012d23b771b7c3199f4491910" @@ -1494,9 +1487,9 @@ "@babel/types" "^7.0.0" "@types/babel__traverse@*", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6": - version "7.0.15" - resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.15.tgz#db9e4238931eb69ef8aab0ad6523d4d4caa39d03" - integrity sha512-Pzh9O3sTK8V6I1olsXpCfj2k/ygO2q1X0vhhnDrEQyYLHZesWz+zMZMVcwXLCYf0U36EtmyYaFGPfXlTtDHe3A== + version "7.0.16" + resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.16.tgz#0bbbf70c7bc4193210dd27e252c51260a37cd6a7" + integrity sha512-S63Dt4CZOkuTmpLGGWtT/mQdVORJOpx6SZWGVaP56dda/0Nx5nEe82K7/LAm8zYr6SfMq+1N2OreIOrHAx656w== dependencies: "@babel/types" "^7.3.0" @@ -1531,9 +1524,9 @@ "@types/estree" "*" "@types/eslint@*": - version "7.2.5" - resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.2.5.tgz#92172ecf490c2fce4b076739693d75f30376d610" - integrity sha512-Dc6ar9x16BdaR3NSxSF7T4IjL9gxxViJq8RmFd+2UAyA+K6ck2W+gUwfgpG/y9TPyUuBL35109bbULpEynvltA== + version "7.2.6" + resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.2.6.tgz#5e9aff555a975596c03a98b59ecd103decc70c3c" + integrity sha512-I+1sYH+NPQ3/tVqCeUSBwTE/0heyvtXqpIopUUArlBm0Kpocb8FbMa3AZ/ASKIFpN3rnEx932TTXDbt9OXsNDw== dependencies: "@types/estree" "*" "@types/json-schema" "*" @@ -2463,15 +2456,15 @@ browser-process-hrtime@^1.0.0: integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow== browserslist@^4.14.5: - version "4.14.7" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.7.tgz#c071c1b3622c1c2e790799a37bb09473a4351cb6" - integrity sha512-BSVRLCeG3Xt/j/1cCGj1019Wbty0H+Yvu2AOuZSuoaUWn3RatbL33Cxk+Q4jRMRAbOm0p7SLravLjpnT6s0vzQ== + version "4.15.0" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.15.0.tgz#3d48bbca6a3f378e86102ffd017d9a03f122bdb0" + integrity sha512-IJ1iysdMkGmjjYeRlDU8PQejVwxvVO5QOfXH7ylW31GO6LwNRSmm/SgRXtNsEXqMLl2e+2H5eEJ7sfynF8TCaQ== dependencies: - caniuse-lite "^1.0.30001157" + caniuse-lite "^1.0.30001164" colorette "^1.2.1" - electron-to-chromium "^1.3.591" + electron-to-chromium "^1.3.612" escalade "^3.1.1" - node-releases "^1.1.66" + node-releases "^1.1.67" bs-logger@0.x: version "0.2.6" @@ -2631,10 +2624,10 @@ camelcase@^6.0.0, camelcase@^6.2.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809" integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg== -caniuse-lite@^1.0.30001157: - version "1.0.30001161" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001161.tgz#64f7ffe79ee780b8c92843ff34feb36cea4651e0" - integrity sha512-JharrCDxOqPLBULF9/SPa6yMcBRTjZARJ6sc3cuKrPfyIk64JN6kuMINWqA99Xc8uElMFcROliwtz0n9pYej+g== +caniuse-lite@^1.0.30001164: + version "1.0.30001164" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001164.tgz#5bbfd64ca605d43132f13cc7fdabb17c3036bfdc" + integrity sha512-G+A/tkf4bu0dSp9+duNiXc7bGds35DioCyC6vgK2m/rjA4Krpy5WeZgZyfH2f0wj2kI6yAWWucyap6oOwmY1mg== capture-exit@^2.0.0: version "2.0.0" @@ -3566,10 +3559,10 @@ ecc-jsbn@~0.1.1: jsbn "~0.1.0" safer-buffer "^2.1.0" -electron-to-chromium@^1.3.591: - version "1.3.607" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.607.tgz#1bff13f1cf89f2fee0d244b8c64a7138f80f3a3b" - integrity sha512-h2SYNaBnlplGS0YyXl8oJWokfcNxVjJANQfMCsQefG6OSuAuNIeW+A8yGT/ci+xRoBb3k2zq1FrOvkgoKBol8g== +electron-to-chromium@^1.3.612: + version "1.3.613" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.613.tgz#5ad7ec1e19d28c81edb6d61b9d4990d1c9716182" + integrity sha512-c3gkahddiUalk7HLhTC7PsKzPZmovYFtgh+g3rZJ+dGokk4n4dzEoOBnoV8VU8ptvnGJMhrjM/lyXKSltqf2hQ== emittery@^0.7.1: version "0.7.2" @@ -4909,9 +4902,9 @@ is-arrayish@^0.2.1: integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= is-bigint@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.0.tgz#73da8c33208d00f130e9b5e15d23eac9215601c4" - integrity sha512-t5mGUXC/xRheCK431ylNiSkGGpBp8bHENBcENTkDT6ppwPzEVxNGZRvgvmOEfbWkFhA7D2GEuE2mmQTr78sl2g== + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.1.tgz#6923051dfcbc764278540b9ce0e6b3213aa5ebc2" + integrity sha512-J0ELF4yHFxHy0cmSxZuheDOz2luOdVvqjwmEcj8H/L1JHeuEDSDbeRP+Dk9kFVk5RTFzbucJ2Kb9F7ixY2QaCg== is-boolean-object@^1.0.0: version "1.0.1" @@ -4936,9 +4929,9 @@ is-ci@^2.0.0: ci-info "^2.0.0" is-core-module@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.1.0.tgz#a4cc031d9b1aca63eecbd18a650e13cb4eeab946" - integrity sha512-YcV7BgVMRFRua2FqQzKtTDMz8iCuLEyGKjr70q8Zm1yy2qKcurbFEd79PAdHV77oL3NrAaOVQIbMmiHQCHB7ZA== + version "2.2.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a" + integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ== dependencies: has "^1.0.3" @@ -5735,11 +5728,11 @@ jsesc@^2.5.1: integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== json-fixer@^1.5.1: - version "1.6.7" - resolved "https://registry.yarnpkg.com/json-fixer/-/json-fixer-1.6.7.tgz#90137a2053d5b4f43bed5419219605c02d38e094" - integrity sha512-fNkDto9hSiuofYNWuOd2G4FjlBiaUihWEWU3gSBSM+lfaynNmsRDijLcXxtnbuoxpU4erDHkMf0XUmoQ4SSEyA== + version "1.6.8" + resolved "https://registry.yarnpkg.com/json-fixer/-/json-fixer-1.6.8.tgz#4a1930af55ca0baa410c3a2cdf2b065ba87121ed" + integrity sha512-VUI3GPVLpM/nYmM1tSuvd3kh36eWvoNO1SFveVQf5k9QJI3kfaoOPVbN7WbpRfvZqa2BFySyVuqSs57laYfIDQ== dependencies: - "@babel/runtime" "^7.12.1" + "@babel/runtime" "^7.12.5" chalk "^4.1.0" pegjs "^0.10.0" @@ -6572,7 +6565,7 @@ node-notifier@^8.0.0: uuid "^8.3.0" which "^2.0.2" -node-releases@^1.1.66: +node-releases@^1.1.67: version "1.1.67" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.67.tgz#28ebfcccd0baa6aad8e8d4d8fe4cbc49ae239c12" integrity sha512-V5QF9noGFl3EymEwUYzO+3NTDpGfQB4ve6Qfnzf3UNydMhjQRVPR1DZTuvWiLzaFJYw2fmDwAfnRNEVb64hSIg== @@ -6735,9 +6728,9 @@ object-copy@^0.1.0: kind-of "^3.0.3" object-inspect@^1.8.0: - version "1.8.0" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz#df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0" - integrity sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA== + version "1.9.0" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.9.0.tgz#c90521d74e1127b67266ded3394ad6116986533a" + integrity sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw== object-is@^1.1.4: version "1.1.4" @@ -6770,12 +6763,13 @@ object.assign@^4.1.1, object.assign@^4.1.2: object-keys "^1.1.1" object.getownpropertydescriptors@^2.0.3: - version "2.1.0" - resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz#369bf1f9592d8ab89d712dced5cb81c7c5352649" - integrity sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg== + version "2.1.1" + resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.1.tgz#0dfda8d108074d9c563e80490c883b6661091544" + integrity sha512-6DtXgZ/lIZ9hqx4GtZETobXLR/ZLaa0aqV0kzbn80Rf8Z2e/XFnhA0I7p07N2wH8bBBltr2xQPi6sbKWAY2Eng== dependencies: + call-bind "^1.0.0" define-properties "^1.1.3" - es-abstract "^1.17.0-next.1" + es-abstract "^1.18.0-next.1" object.pick@^1.3.0: version "1.3.0" @@ -6785,13 +6779,13 @@ object.pick@^1.3.0: isobject "^3.0.1" object.values@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz#68a99ecde356b7e9295a3c5e0ce31dc8c953de5e" - integrity sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA== + version "1.1.2" + resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.2.tgz#7a2015e06fcb0f546bd652486ce8583a4731c731" + integrity sha512-MYC0jvJopr8EK6dPBiO8Nb9mvjdypOachO5REGk6MXzujbBrAisKo3HmdEI6kZDL6fC31Mwee/5YbtMebixeag== dependencies: + call-bind "^1.0.0" define-properties "^1.1.3" - es-abstract "^1.17.0-next.1" - function-bind "^1.1.1" + es-abstract "^1.18.0-next.1" has "^1.0.3" octokit-pagination-methods@^1.1.0: @@ -8093,9 +8087,9 @@ spdx-expression-parse@^3.0.0: spdx-license-ids "^3.0.0" spdx-license-ids@^3.0.0: - version "3.0.6" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz#c80757383c28abf7296744998cbc106ae8b854ce" - integrity sha512-+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw== + version "3.0.7" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz#e9c18a410e5ed7e12442a549fbd8afa767038d65" + integrity sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ== spdx-license-list@^6.3.0: version "6.3.0" @@ -8504,9 +8498,9 @@ terser-webpack-plugin@^5.0.3: terser "^5.3.8" terser@^5.3.8: - version "5.5.0" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.5.0.tgz#1406fcb4d4bc517add3b22a9694284c040e33448" - integrity sha512-eopt1Gf7/AQyPhpygdKePTzaet31TvQxXvrf7xYUvD/d8qkCJm4SKPDzu+GHK5ZaYTn8rvttfqaZc3swK21e5g== + version "5.5.1" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.5.1.tgz#540caa25139d6f496fdea056e414284886fb2289" + integrity sha512-6VGWZNVP2KTUcltUQJ25TtNjx/XgdDsBDKGt8nN0MpydU36LmbPPcMBd2kmtZNNGVVDLg44k7GKeHHj+4zPIBQ== dependencies: commander "^2.20.0" source-map "~0.7.2" @@ -8828,9 +8822,9 @@ typical@^5.0.0, typical@^5.2.0: integrity sha512-dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg== uglify-js@^3.1.4: - version "3.12.0" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.12.0.tgz#b943f129275c41d435eb54b643bbffee71dccf57" - integrity sha512-8lBMSkFZuAK7gGF8LswsXmir8eX8d2AAMOnxSDWjKBx/fBR6MypQjs78m6ML9zQVp1/hD4TBdfeMZMC7nW1TAA== + version "3.12.1" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.12.1.tgz#78307f539f7b9ca5557babb186ea78ad30cc0375" + integrity sha512-o8lHP20KjIiQe5b/67Rh68xEGRrc2SRsCuuoYclXXoC74AfSRGblU1HKzJWH3HxPZ+Ort85fWHpSX7KwBUC9CQ== uid-number@0.0.6: version "0.0.6" @@ -9366,9 +9360,9 @@ xtend@~4.0.1: integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== y18n@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b" - integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w== + version "4.0.1" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz#8db2b83c31c5d75099bb890b23f3094891e247d4" + integrity sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ== y18n@^5.0.5: version "5.0.5" From de6b22287cd78dea0be70ac2c2c148348b2b22b2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 4 Dec 2020 06:31:43 +0000 Subject: [PATCH 18/31] chore(deps-dev): bump ts-node from 9.0.0 to 9.1.0 (#2307) --- package.json | 2 +- packages/@jsii/go-runtime/package.json | 2 +- packages/@jsii/python-runtime/package.json | 2 +- yarn.lock | 14 ++++++++++---- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index f4f24fdf83..992da833ab 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "prettier": "^2.2.1", "standard-version": "^9.0.0", "ts-jest": "^26.4.4", - "ts-node": "^9.0.0", + "ts-node": "^9.1.0", "typescript": "~3.9.7" }, "repository": { diff --git a/packages/@jsii/go-runtime/package.json b/packages/@jsii/go-runtime/package.json index 4af9028614..a9289d7c14 100644 --- a/packages/@jsii/go-runtime/package.json +++ b/packages/@jsii/go-runtime/package.json @@ -26,7 +26,7 @@ "fs-extra": "^9.0.1", "jsii-calc": "^0.0.0", "jsii-pacmak": "^0.0.0", - "ts-node": "^9.0.0", + "ts-node": "^9.1.0", "typescript": "~3.9.7" } } diff --git a/packages/@jsii/python-runtime/package.json b/packages/@jsii/python-runtime/package.json index 0a2879f2e5..520a75b2cb 100644 --- a/packages/@jsii/python-runtime/package.json +++ b/packages/@jsii/python-runtime/package.json @@ -41,7 +41,7 @@ "jsii-build-tools": "^0.0.0", "jsii-calc": "^0.0.0", "jsii-pacmak": "^0.0.0", - "ts-node": "^9.0.0", + "ts-node": "^9.1.0", "typescript": "~3.9.7" } } diff --git a/yarn.lock b/yarn.lock index dbcab11632..72e1fbaa7c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3185,6 +3185,11 @@ cosmiconfig@^5.1.0: js-yaml "^3.13.1" parse-json "^4.0.0" +create-require@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333" + integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ== + cross-spawn@^6.0.0: version "6.0.5" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" @@ -8689,12 +8694,13 @@ ts-jest@^26.4.4: semver "7.x" yargs-parser "20.x" -ts-node@^9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-9.0.0.tgz#e7699d2a110cc8c0d3b831715e417688683460b3" - integrity sha512-/TqB4SnererCDR/vb4S/QvSZvzQMJN8daAslg7MeaiHvD8rDZsSfXmNeNumyZZzMned72Xoq/isQljYSt8Ynfg== +ts-node@^9.1.0: + version "9.1.0" + resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-9.1.0.tgz#95eae4c6d0f94f2545884078e1eb1b14d2155639" + integrity sha512-0yqcL4sgruCvM+w64LiAfNJo6+lHfCYc5Ajj4yiLNkJ9oZ2HWaa+Kso7htYOOxVQ7+csAjdUjffOe9PIqC4pMg== dependencies: arg "^4.1.0" + create-require "^1.1.0" diff "^4.0.1" make-error "^1.1.1" source-map-support "^0.5.17" From e1e678b93925f569f6f68591b1ec65613e8a8bc8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 4 Dec 2020 08:17:59 +0000 Subject: [PATCH 19/31] chore(deps): bump Microsoft.CodeAnalysis.Analyzers (#2312) --- packages/@jsii/Directory.Build.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@jsii/Directory.Build.targets b/packages/@jsii/Directory.Build.targets index 98cceb7366..c87316a31b 100644 --- a/packages/@jsii/Directory.Build.targets +++ b/packages/@jsii/Directory.Build.targets @@ -7,7 +7,7 @@ - + From f844a95c4cae3887b76ed696223bdf99fca12064 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 4 Dec 2020 09:30:54 +0000 Subject: [PATCH 20/31] chore(deps): bump Microsoft.CodeQuality.Analyzers (#2310) --- packages/@jsii/Directory.Build.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@jsii/Directory.Build.targets b/packages/@jsii/Directory.Build.targets index c87316a31b..6b6ef43051 100644 --- a/packages/@jsii/Directory.Build.targets +++ b/packages/@jsii/Directory.Build.targets @@ -8,7 +8,7 @@ - + From a7ff5b1a783dad842419acaa4fd2ba6151aa815e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 4 Dec 2020 10:45:29 +0000 Subject: [PATCH 21/31] chore(deps-dev): bump eslint-plugin-prettier from 3.1.4 to 3.2.0 (#2308) --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 992da833ab..293affd1a4 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "eslint-import-resolver-node": "^0.3.4", "eslint-import-resolver-typescript": "^2.3.0", "eslint-plugin-import": "^2.22.1", - "eslint-plugin-prettier": "^3.1.4", + "eslint-plugin-prettier": "^3.2.0", "jest-circus": "^26.6.3", "jest-config": "^26.6.3", "jest-expect-message": "^1.0.2", diff --git a/yarn.lock b/yarn.lock index 72e1fbaa7c..30fe9d31b8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3800,10 +3800,10 @@ eslint-plugin-import@^2.22.1: resolve "^1.17.0" tsconfig-paths "^3.9.0" -eslint-plugin-prettier@^3.1.4: - version "3.1.4" - resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.4.tgz#168ab43154e2ea57db992a2cd097c828171f75c2" - integrity sha512-jZDa8z76klRqo+TdGDTFJSavwbnWK2ZpqGKNZ+VvweMW516pDUMmQ2koXvxEE4JhzNvTv+radye/bWGBmA6jmg== +eslint-plugin-prettier@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.2.0.tgz#af391b2226fa0e15c96f36c733f6e9035dbd952c" + integrity sha512-kOUSJnFjAUFKwVxuzy6sA5yyMx6+o9ino4gCdShzBNx4eyFRudWRYKCFolKjoM40PEiuU6Cn7wBLfq3WsGg7qg== dependencies: prettier-linter-helpers "^1.0.0" From f29c5f6d5dbed17dea94732b19874350624e8033 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 4 Dec 2020 12:07:07 +0000 Subject: [PATCH 22/31] chore(deps): bump @octokit/rest from 18.0.10 to 18.0.12 (#2313) --- packages/@jsii/integ-test/package.json | 2 +- yarn.lock | 75 +++++++++++++++----------- 2 files changed, 45 insertions(+), 32 deletions(-) diff --git a/packages/@jsii/integ-test/package.json b/packages/@jsii/integ-test/package.json index 711d36bd07..71dbf7a2ed 100644 --- a/packages/@jsii/integ-test/package.json +++ b/packages/@jsii/integ-test/package.json @@ -17,7 +17,7 @@ }, "license": "Apache-2.0", "dependencies": { - "@octokit/rest": "^18.0.10", + "@octokit/rest": "^18.0.12", "dotenv": "^8.2.0", "fs-extra": "^9.0.1", "jest": "^26.6.3", diff --git a/yarn.lock b/yarn.lock index 30fe9d31b8..0fe7e1c505 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1285,22 +1285,22 @@ "@nodelib/fs.scandir" "2.1.3" fastq "^1.6.0" -"@octokit/auth-token@^2.4.0": +"@octokit/auth-token@^2.4.0", "@octokit/auth-token@^2.4.4": version "2.4.4" resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-2.4.4.tgz#ee31c69b01d0378c12fd3ffe406030f3d94d3b56" integrity sha512-LNfGu3Ro9uFAYh10MUZVaT7X2CnNm2C8IDQmabx+3DygYIQjs9FwzFAHN/0t6mu5HEPhxcb1XOuxdpY82vCg2Q== dependencies: "@octokit/types" "^6.0.0" -"@octokit/core@^3.2.2": - version "3.2.2" - resolved "https://registry.yarnpkg.com/@octokit/core/-/core-3.2.2.tgz#b57667c0a8501641356d479d7e9f1f2ef2a80549" - integrity sha512-cZEP6dC8xpepbAqtdS1GgX88omLer8VQegw5BpQ5fbSrkxgY9Y9K7ratu8ezAd9bD0GVOR1GVWiRzYdxiprU1w== +"@octokit/core@^3.2.3": + version "3.2.4" + resolved "https://registry.yarnpkg.com/@octokit/core/-/core-3.2.4.tgz#5791256057a962eca972e31818f02454897fd106" + integrity sha512-d9dTsqdePBqOn7aGkyRFe7pQpCXdibSJ5SFnrTr0axevObZrpz3qkWm7t/NjYv5a66z6vhfteriaq4FRz3e0Qg== dependencies: - "@octokit/auth-token" "^2.4.0" - "@octokit/graphql" "^4.3.1" - "@octokit/request" "^5.4.0" - "@octokit/types" "^6.0.0" + "@octokit/auth-token" "^2.4.4" + "@octokit/graphql" "^4.5.8" + "@octokit/request" "^5.4.12" + "@octokit/types" "^6.0.3" before-after-hook "^2.1.0" universal-user-agent "^6.0.0" @@ -1313,7 +1313,7 @@ is-plain-object "^5.0.0" universal-user-agent "^6.0.0" -"@octokit/graphql@^4.3.1": +"@octokit/graphql@^4.5.8": version "4.5.8" resolved "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-4.5.8.tgz#d42373633c3015d0eafce64a8ce196be167fdd9b" integrity sha512-WnCtNXWOrupfPJgXe+vSmprZJUr0VIu14G58PMlkWGj3cH+KLZEfKMmbUQ6C3Wwx6fdhzVW1CD5RTnBdUHxhhA== @@ -1327,6 +1327,11 @@ resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-1.2.2.tgz#55d927436c07ef148ec927fbf4d55580a19bd68e" integrity sha512-vrKDLd/Rq4IE16oT+jJkDBx0r29NFkdkU8GwqVSP4RajsAvP23CMGtFhVK0pedUhAiMvG1bGnFcTC/xCKaKgmw== +"@octokit/openapi-types@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-2.0.0.tgz#6d8f8ad9db3b75a39115f5def2654df8bed39f28" + integrity sha512-J4bfM7lf8oZvEAdpS71oTvC1ofKxfEZgU5vKVwzZKi4QPiL82udjpseJwxPid9Pu2FNmyRQOX4iEj6W1iOSnPw== + "@octokit/plugin-enterprise-rest@^6.0.1": version "6.0.1" resolved "https://registry.yarnpkg.com/@octokit/plugin-enterprise-rest/-/plugin-enterprise-rest-6.0.1.tgz#e07896739618dab8da7d4077c658003775f95437" @@ -1339,10 +1344,10 @@ dependencies: "@octokit/types" "^2.0.1" -"@octokit/plugin-paginate-rest@^2.6.1": - version "2.6.1" - resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.6.1.tgz#2412ada6f746535b14cae29ca8265633c353002e" - integrity sha512-DprxhI/8Qf/x9Svy89RUh3szyiLwgHL67S5kNmm5B4AjcWrPpMzB25fMCZeIIaXT463Fdn6fc1Hy6kK7/Hd90Q== +"@octokit/plugin-paginate-rest@^2.6.2": + version "2.6.2" + resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.6.2.tgz#45d13dbf5ff8aed54f1a3716b1d57fdc62720c5f" + integrity sha512-3Dy7/YZAwdOaRpGQoNHPeT0VU1fYLpIUdPyvR37IyFLgd6XSij4j9V/xN/+eSjF2KKvmfIulEh9LF1tRPjIiDA== dependencies: "@octokit/types" "^6.0.1" @@ -1359,12 +1364,12 @@ "@octokit/types" "^2.0.1" deprecation "^2.3.1" -"@octokit/plugin-rest-endpoint-methods@4.3.0": - version "4.3.0" - resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-4.3.0.tgz#cc60fce3add6743fce8ab7333942fb2dd4eac837" - integrity sha512-omU8AfL8QgG4h+TObSSh6dArWzMKiHkG+z18Xtn4zC6WRzUxFvmibWktDYwLePXesd7/AMJR141s1mt+8cfeRA== +"@octokit/plugin-rest-endpoint-methods@4.4.1": + version "4.4.1" + resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-4.4.1.tgz#105cf93255432155de078c9efc33bd4e14d1cd63" + integrity sha512-+v5PcvrUcDeFXf8hv1gnNvNLdm4C0+2EiuWt9EatjjUmfriM1pTMM+r4j1lLHxeBQ9bVDmbywb11e3KjuavieA== dependencies: - "@octokit/types" "^6.0.0" + "@octokit/types" "^6.1.0" deprecation "^2.3.1" "@octokit/request-error@^1.0.2": @@ -1385,14 +1390,14 @@ deprecation "^2.0.0" once "^1.4.0" -"@octokit/request@^5.2.0", "@octokit/request@^5.3.0", "@octokit/request@^5.4.0": - version "5.4.11" - resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.4.11.tgz#2536e9095f7e90c9d22a14fed7bb7299a22050c5" - integrity sha512-vskebNjuz4oTdPIv+9cQjHvjk8vjrMv2fOmSo6zr7IIaFHeVsJlG/C07MXiSS/+g/qU1GHjkPG1XW3faz57EoQ== +"@octokit/request@^5.2.0", "@octokit/request@^5.3.0", "@octokit/request@^5.4.12": + version "5.4.12" + resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.4.12.tgz#b04826fa934670c56b135a81447be2c1723a2ffc" + integrity sha512-MvWYdxengUWTGFpfpefBBpVmmEYfkwMoxonIB3sUGp5rhdgwjXL1ejo6JbgzG/QD9B/NYt/9cJX1pxXeSIUCkg== dependencies: "@octokit/endpoint" "^6.0.1" "@octokit/request-error" "^2.0.0" - "@octokit/types" "^6.0.0" + "@octokit/types" "^6.0.3" deprecation "^2.0.0" is-plain-object "^5.0.0" node-fetch "^2.6.1" @@ -1421,15 +1426,15 @@ once "^1.4.0" universal-user-agent "^4.0.0" -"@octokit/rest@^18.0.10": - version "18.0.10" - resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-18.0.10.tgz#f2f8648a805443ccb185d4c8b7facec9098298c8" - integrity sha512-6CJSM6A7acHK7Ek/6ro4FxKf9qPaiiIruL0eWbxiCCKk6aithn2PPxRlG9kJhT2dfTQpt9rHmfTSCF61eXXyfQ== +"@octokit/rest@^18.0.12": + version "18.0.12" + resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-18.0.12.tgz#278bd41358c56d87c201e787e8adc0cac132503a" + integrity sha512-hNRCZfKPpeaIjOVuNJzkEL6zacfZlBPV8vw8ReNeyUkVvbuCvvrrx8K8Gw2eyHHsmd4dPlAxIXIZ9oHhJfkJpw== dependencies: - "@octokit/core" "^3.2.2" - "@octokit/plugin-paginate-rest" "^2.6.1" + "@octokit/core" "^3.2.3" + "@octokit/plugin-paginate-rest" "^2.6.2" "@octokit/plugin-request-log" "^1.0.2" - "@octokit/plugin-rest-endpoint-methods" "4.3.0" + "@octokit/plugin-rest-endpoint-methods" "4.4.1" "@octokit/types@^2.0.0", "@octokit/types@^2.0.1": version "2.16.2" @@ -1446,6 +1451,14 @@ "@octokit/openapi-types" "^1.2.0" "@types/node" ">= 8" +"@octokit/types@^6.0.3", "@octokit/types@^6.1.0": + version "6.1.0" + resolved "https://registry.yarnpkg.com/@octokit/types/-/types-6.1.0.tgz#126197ceb802220fee920d5ea6d568c2c63365cc" + integrity sha512-bMWBmg77MQTiRkOVyf50qK3QECWOEy43rLy/6fTWZ4HEwAhNfqzMcjiBDZAowkILwTrFvzE1CpP6gD0MuPHS+A== + dependencies: + "@octokit/openapi-types" "^2.0.0" + "@types/node" ">= 8" + "@sinonjs/commons@^1.7.0": version "1.8.1" resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.1.tgz#e7df00f98a203324f6dc7cc606cad9d4a8ab2217" From 2ef46d626f32d7ccce162af2bf40c26e937fc518 Mon Sep 17 00:00:00 2001 From: Hsing-Hui Hsu Date: Fri, 4 Dec 2020 05:18:33 -0800 Subject: [PATCH 23/31] chore: add go reserved words (#2300) Fixes #2299 --- By submitting this pull request, I confirm that my contribution is made under the terms of the [Apache 2.0 license]. [Apache 2.0 license]: https://www.apache.org/licenses/LICENSE-2.0 --- docs/typescript-restrictions.md | 94 ++++++++++++++--------------- packages/jsii/lib/reserved-words.ts | 72 ++++++++++++++++++++++ 2 files changed, 119 insertions(+), 47 deletions(-) diff --git a/docs/typescript-restrictions.md b/docs/typescript-restrictions.md index d629bf509f..b1fb961458 100644 --- a/docs/typescript-restrictions.md +++ b/docs/typescript-restrictions.md @@ -20,53 +20,53 @@ element (which will cause a compilation failure if `--fail-on-warnings` is set). The list of reserved words (which are not also reserved in **TypeScript**), derived from [`jsii/lib/reserved-words.ts`] is: -**C#** | **Java** | **Python** ----------------|----------------|--------------- -`abstract` | `abstract` | `False` -`base` | `assert` | `None` -`bool` | `boolean` | `True` -`byte` | `byte` | `and` -`char` | `char` | `assert` -`checked` | `double` | `def` -`decimal` | `final` | `del` -`delegate` | `float` | `elif` -`double` | `goto` | `except` -`event` | `int` | `from` -`explicit` | `long` | `global` -`extern` | `native` | `is` -`fixed` | `short` | `lambda` -`float` | `strictfp` | `nonlocal` -`foreach` | `synchronized` | `not` -`goto` | `throws` | `or` -`implicit` | `transient` | `pass` -`int` | `volatile` | `raise` -`internal` | | -`is` | | -`lock` | | -`long` | | -`namespace` | | -`object` | | -`operator` | | -`out` | | -`override` | | -`params` | | -`readonly` | | -`ref` | | -`sbyte` | | -`sealed` | | -`short` | | -`sizeof` | | -`stackalloc` | | -`string` | | -`struct` | | -`uint` | | -`ulong` | | -`unchecked` | | -`unsafe` | | -`ushort` | | -`using` | | -`virtual` | | -`volatile` | | +**C#** | **Java** | **Python** | **Go** +---------------|----------------|--------------|------------- +`abstract` | `abstract` | `False` | `break` +`base` | `assert` | `None` | `case` +`bool` | `boolean` | `True` | `chan` +`byte` | `byte` | `and` | `const` +`char` | `char` | `assert` | `continue` +`checked` | `double` | `def` | `default` +`decimal` | `final` | `del` | `defer` +`delegate` | `float` | `elif` | `else` +`double` | `goto` | `except` | `fallthrough` +`event` | `int` | `from` | `for` +`explicit` | `long` | `global` | `func` +`extern` | `native` | `is` | `go` +`fixed` | `short` | `lambda` | `goto` +`float` | `strictfp` | `nonlocal` | `if` +`foreach` | `synchronized` | `not` | `import` +`goto` | `throws` | `or` | `interface` +`implicit` | `transient` | `pass` | `map` +`int` | `volatile` | `raise` | `package` +`internal` | | | `range` +`is` | | | `return` +`lock` | | | `select` +`long` | | | `struct` +`namespace` | | | `switch` +`object` | | | `type` +`operator` | | | `var` +`out` | | | +`override` | | | +`params` | | | +`readonly` | | | +`ref` | | | +`sbyte` | | | +`sealed` | | | +`short` | | | +`sizeof` | | | +`stackalloc` | | | +`string` | | | +`struct` | | | +`uint` | | | +`ulong` | | | +`unchecked` | | | +`unsafe` | | | +`ushort` | | | +`using` | | | +`virtual` | | | +`volatile` | | | Code generators from `jsii-pacmak` will try to work around those reserved words when they are encountered, but may resort to using names that could clash with diff --git a/packages/jsii/lib/reserved-words.ts b/packages/jsii/lib/reserved-words.ts index da3371a3f4..c4d6b82bf8 100644 --- a/packages/jsii/lib/reserved-words.ts +++ b/packages/jsii/lib/reserved-words.ts @@ -9,6 +9,10 @@ export function isReservedName(name: string): string[] | undefined { if (PYTHON_RESERVED.has(name)) { reserved.push('Python'); } + + if (GO_RESERVED.has(name)) { + reserved.push('Go'); + } return reserved.length > 0 ? reserved : undefined; } @@ -184,3 +188,71 @@ export const PYTHON_RESERVED = new Set([ 'raise', 'self', ]); + +export const GO_RESERVED = new Set([ + 'break', + 'case', + 'chan', + 'const', + 'continue', + 'default', + 'defer', + 'else', + 'fallthrough', + 'for', + 'func', + 'go', + 'goto', + 'if', + 'import', + 'interface', + 'map', + 'package', + 'range', + 'return', + 'select', + 'struct', + 'switch', + 'type', + 'var', + // constants + 'true', + 'false', + 'iota', + 'nil', + // types + 'int', + 'int8', + 'int16', + 'int32', + 'int64', + 'uint', + 'uint8', + 'uint16', + 'uint32', + 'uint64', + 'uintptr', + 'float32', + 'float64', + 'complex128', + 'complex64', + 'bool', + 'rune', + 'byte', + 'string', + 'error', + // functions + 'make', + 'len', + 'cap', + 'new', + 'append', + 'copy', + 'close', + 'delete', + 'complex', + 'real', + 'imag', + 'panic', + 'recover', +]); From 72b118a128609902fe2f544061240d30bdf484c5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 4 Dec 2020 15:24:24 +0100 Subject: [PATCH 24/31] chore(deps): bump Microsoft.NetCore.Analyzers from 3.3.1 to 3.3.2 in /packages/@jsii/dotnet-runtime-test/test (#2311) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [Microsoft.NetCore.Analyzers](https://github.com/dotnet/roslyn-analyzers) from 3.3.1 to 3.3.2. - [Release notes](https://github.com/dotnet/roslyn-analyzers/releases) - [Changelog](https://github.com/dotnet/roslyn-analyzers/blob/master/PostReleaseActivities.md) - [Commits](https://github.com/dotnet/roslyn-analyzers/compare/v3.3.1...v3.3.2) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: πŸ‘¨πŸ»β€πŸ’» Romain Marcadier --- .github/workflows/main.yml | 10 +++++----- packages/@jsii/Directory.Build.targets | 3 +-- .../Amazon.JSII.Runtime.IntegrationTests.FSharp.fsproj | 3 +++ .../Amazon.JSII.Runtime.IntegrationTests.csproj | 3 +++ .../Amazon.JSII.Analyzers.UnitTests.csproj | 3 +++ .../Amazon.JSII.Analyzers/Amazon.JSII.Analyzers.csproj | 6 ++++-- .../Amazon.JSII.JsonModel/Amazon.JSII.JsonModel.csproj | 4 +++- .../Amazon.JSII.Runtime.UnitTests.csproj | 3 +++ .../src/Amazon.JSII.Runtime/Amazon.JSII.Runtime.csproj | 4 +++- 9 files changed, 28 insertions(+), 11 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8b27a64197..f26ef90d19 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -22,10 +22,10 @@ jobs: runs-on: ubuntu-latest steps: # Set up all of our standard runtimes - - name: Set up .NET 3.1 + - name: Set up .NET 5 uses: actions/setup-dotnet@v1 with: - dotnet-version: '3.1.x' + dotnet-version: '5.0.x' - name: Set up Java 8 uses: actions/setup-java@v1 with: @@ -109,10 +109,10 @@ jobs: runs-on: ubuntu-latest steps: # Set up all of our standard runtimes - - name: Set up .NET 3.1 + - name: Set up .NET 5 uses: actions/setup-dotnet@v1 with: - dotnet-version: '3.1.x' + dotnet-version: '5.0.x' - name: Set up Java 8 uses: actions/setup-java@v1 with: @@ -345,7 +345,7 @@ jobs: - name: Set up .NET 3.1 uses: actions/setup-dotnet@v1 with: - dotnet-version: '3.1.x' + dotnet-version: '5.0.x' - name: Set up Java 8 uses: actions/setup-java@v1 with: diff --git a/packages/@jsii/Directory.Build.targets b/packages/@jsii/Directory.Build.targets index 6b6ef43051..e330b47866 100644 --- a/packages/@jsii/Directory.Build.targets +++ b/packages/@jsii/Directory.Build.targets @@ -2,14 +2,13 @@ - + - diff --git a/packages/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests.FSharp/Amazon.JSII.Runtime.IntegrationTests.FSharp.fsproj b/packages/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests.FSharp/Amazon.JSII.Runtime.IntegrationTests.FSharp.fsproj index 6885d9d77c..0eaff07412 100644 --- a/packages/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests.FSharp/Amazon.JSII.Runtime.IntegrationTests.FSharp.fsproj +++ b/packages/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests.FSharp/Amazon.JSII.Runtime.IntegrationTests.FSharp.fsproj @@ -3,6 +3,9 @@ netcoreapp3.1 + true + AllEnabledByDefault + enable true diff --git a/packages/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests/Amazon.JSII.Runtime.IntegrationTests.csproj b/packages/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests/Amazon.JSII.Runtime.IntegrationTests.csproj index 844685f567..25d75596bf 100644 --- a/packages/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests/Amazon.JSII.Runtime.IntegrationTests.csproj +++ b/packages/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests/Amazon.JSII.Runtime.IntegrationTests.csproj @@ -5,6 +5,9 @@ false + true + AllEnabledByDefault + enable true diff --git a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Analyzers.UnitTests/Amazon.JSII.Analyzers.UnitTests.csproj b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Analyzers.UnitTests/Amazon.JSII.Analyzers.UnitTests.csproj index f1ad302f8f..28791b6179 100644 --- a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Analyzers.UnitTests/Amazon.JSII.Analyzers.UnitTests.csproj +++ b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Analyzers.UnitTests/Amazon.JSII.Analyzers.UnitTests.csproj @@ -5,6 +5,9 @@ false Amazon.JSII.Analyzers.UnitTests + true + AllEnabledByDefault + enable true diff --git a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Analyzers/Amazon.JSII.Analyzers.csproj b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Analyzers/Amazon.JSII.Analyzers.csproj index 45995b8d22..b59a7f6aca 100644 --- a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Analyzers/Amazon.JSII.Analyzers.csproj +++ b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Analyzers/Amazon.JSII.Analyzers.csproj @@ -7,13 +7,15 @@ netstandard2.0 true icon.png + + true + AllEnabledByDefault - @@ -21,7 +23,7 @@ - + diff --git a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.JsonModel/Amazon.JSII.JsonModel.csproj b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.JsonModel/Amazon.JSII.JsonModel.csproj index e7f3556a73..aca3945e0b 100644 --- a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.JsonModel/Amazon.JSII.JsonModel.csproj +++ b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.JsonModel/Amazon.JSII.JsonModel.csproj @@ -7,12 +7,14 @@ [DEPRECATED] .NET JsonModel for JSII icon.png + true + AllEnabledByDefault + enable true - diff --git a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime.UnitTests/Amazon.JSII.Runtime.UnitTests.csproj b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime.UnitTests/Amazon.JSII.Runtime.UnitTests.csproj index 5e27a0d1ae..11594899cf 100644 --- a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime.UnitTests/Amazon.JSII.Runtime.UnitTests.csproj +++ b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime.UnitTests/Amazon.JSII.Runtime.UnitTests.csproj @@ -5,6 +5,9 @@ Amazon.JSII.Runtime.UnitTests false + true + AllEnabledByDefault + enable true diff --git a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Amazon.JSII.Runtime.csproj b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Amazon.JSII.Runtime.csproj index 72153fd8ea..46ae85c051 100644 --- a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Amazon.JSII.Runtime.csproj +++ b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Amazon.JSII.Runtime.csproj @@ -7,6 +7,9 @@ .NET Runtime for JSII icon.png + true + AllEnabledByDefault + enable true @@ -15,7 +18,6 @@ - From 4691ec62464c45cc1cdb6beddefc14e73dbe3242 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 4 Dec 2020 15:25:01 +0100 Subject: [PATCH 25/31] chore(deps-dev): bump @types/yargs from 15.0.10 to 15.0.11 (#2301) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [@types/yargs](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/yargs) from 15.0.10 to 15.0.11. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/yargs) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: πŸ‘¨πŸ»β€πŸ’» Romain Marcadier --- packages/jsii-config/package.json | 2 +- packages/jsii-diff/package.json | 2 +- packages/jsii-pacmak/bin/jsii-pacmak.ts | 14 +++++- packages/jsii-pacmak/package.json | 2 +- packages/jsii-reflect/package.json | 2 +- packages/jsii-rosetta/package.json | 2 +- packages/jsii/bin/jsii.ts | 67 ++++++++++++++----------- packages/jsii/package.json | 2 +- yarn.lock | 8 +-- 9 files changed, 61 insertions(+), 40 deletions(-) diff --git a/packages/jsii-config/package.json b/packages/jsii-config/package.json index 9e3db8c7a2..148ef709f6 100644 --- a/packages/jsii-config/package.json +++ b/packages/jsii-config/package.json @@ -23,7 +23,7 @@ "@types/jest": "^26.0.16", "@types/jest-expect-message": "^1.0.3", "@types/node": "^10.17.48", - "@types/yargs": "^15.0.10", + "@types/yargs": "^15.0.11", "eslint": "^7.14.0", "jest": "^26.6.3", "jest-expect-message": "^1.0.2", diff --git a/packages/jsii-diff/package.json b/packages/jsii-diff/package.json index 735bb174bf..64e89bacf4 100644 --- a/packages/jsii-diff/package.json +++ b/packages/jsii-diff/package.json @@ -46,7 +46,7 @@ "@types/jest-expect-message": "^1.0.3", "@types/node": "^10.17.48", "@types/tar-fs": "^2.0.0", - "@types/yargs": "^15.0.10", + "@types/yargs": "^15.0.11", "eslint": "^7.14.0", "jest": "^26.6.3", "jest-expect-message": "^1.0.2", diff --git a/packages/jsii-pacmak/bin/jsii-pacmak.ts b/packages/jsii-pacmak/bin/jsii-pacmak.ts index 83a1f7d194..04dfb592f4 100644 --- a/packages/jsii-pacmak/bin/jsii-pacmak.ts +++ b/packages/jsii-pacmak/bin/jsii-pacmak.ts @@ -7,8 +7,18 @@ import { VERSION_DESC } from '../lib/version'; (async function main() { const argv = yargs - .usage('Usage: jsii-pacmak [-t target,...] [-o outdir] [package-dir]') .env('JSII_PACMAK') + .command( + ['$0 [PROJECTS...]', 'generate [PROJECTS...]'], + 'Generates jsii bindings for the selected project(s)', + (argv) => + argv.positional('PROJECTS', { + type: 'string', + desc: 'Project(s) to generate', + normalize: true, + default: ['.'], + }), + ) .option('targets', { alias: ['target', 't'], type: 'array', @@ -121,7 +131,7 @@ import { VERSION_DESC } from '../lib/version'; force: argv.force, forceSubdirectory: argv['force-subdirectory'], forceTarget: argv['force-target'], - inputDirectories: argv._, + inputDirectories: argv.PROJECTS, outputDirectory: argv.outdir, parallel: argv.parallel, recurse: argv.recurse, diff --git a/packages/jsii-pacmak/package.json b/packages/jsii-pacmak/package.json index a56ceff91a..9759f32bf6 100644 --- a/packages/jsii-pacmak/package.json +++ b/packages/jsii-pacmak/package.json @@ -60,7 +60,7 @@ "@types/jest": "^26.0.16", "@types/node": "^10.17.48", "@types/semver": "^7.3.4", - "@types/yargs": "^15.0.10", + "@types/yargs": "^15.0.11", "eslint": "^7.14.0", "jest": "^26.6.3", "jsii-build-tools": "^0.0.0", diff --git a/packages/jsii-reflect/package.json b/packages/jsii-reflect/package.json index 0a5a5ddc4d..01ebc5f496 100644 --- a/packages/jsii-reflect/package.json +++ b/packages/jsii-reflect/package.json @@ -45,7 +45,7 @@ "@types/fs-extra": "^8.1.1", "@types/jest": "^26.0.16", "@types/node": "^10.17.48", - "@types/yargs": "^15.0.10", + "@types/yargs": "^15.0.11", "eslint": "^7.14.0", "jest": "^26.6.3", "jsii": "^0.0.0", diff --git a/packages/jsii-rosetta/package.json b/packages/jsii-rosetta/package.json index 097899288a..565792e324 100644 --- a/packages/jsii-rosetta/package.json +++ b/packages/jsii-rosetta/package.json @@ -21,7 +21,7 @@ "@types/jest": "^26.0.16", "@types/mock-fs": "^4.13.0", "@types/node": "^10.17.48", - "@types/yargs": "^15.0.10", + "@types/yargs": "^15.0.11", "eslint": "^7.14.0", "jest": "^26.6.3", "jsii": "^0.0.0", diff --git a/packages/jsii/bin/jsii.ts b/packages/jsii/bin/jsii.ts index 83093c223a..a1ff14fc65 100644 --- a/packages/jsii/bin/jsii.ts +++ b/packages/jsii/bin/jsii.ts @@ -15,39 +15,50 @@ const warningTypes = Object.keys(enabledWarnings); (async () => { const argv = yargs .env('JSII') - .option('watch', { - alias: 'w', - type: 'boolean', - desc: 'Watch for file changes and recompile automatically', - }) + .command(['$0', 'compile'], 'Compiles a jsii/TypeScript project', (argv) => + argv + .positional('PROJECT_ROOT', { + type: 'string', + desc: 'The root of the project to be compiled', + default: '.', + normalize: true, + }) + .option('watch', { + alias: 'w', + type: 'boolean', + desc: 'Watch for file changes and recompile automatically', + }) + .option('project-references', { + alias: 'r', + type: 'boolean', + desc: + 'Generate TypeScript project references (also [package.json].jsii.projectReferences)', + }) + .option('fix-peer-dependencies', { + type: 'boolean', + default: true, + desc: + 'Automatically add missing entries in the peerDependencies section of package.json', + }) + .options('fail-on-warnings', { + alias: 'Werr', + type: 'boolean', + desc: 'Treat warnings as errors', + }) + .option('silence-warnings', { + type: 'array', + default: [], + desc: `List of warnings to silence (warnings: ${warningTypes.join( + ',', + )})`, + }), + ) .option('verbose', { alias: 'v', type: 'count', desc: 'Increase the verbosity of output', global: true, }) - .option('project-references', { - alias: 'r', - type: 'boolean', - desc: - 'Generate TypeScript project references (also [package.json].jsii.projectReferences)', - }) - .option('fix-peer-dependencies', { - type: 'boolean', - default: true, - desc: - 'Automatically add missing entries in the peerDependencies section of package.json', - }) - .options('fail-on-warnings', { - alias: 'Werr', - type: 'boolean', - desc: 'Treat warnings as errors', - }) - .option('silence-warnings', { - type: 'array', - default: [], - desc: `List of warnings to silence (warnings: ${warningTypes.join(',')})`, - }) .help() .version( // eslint-disable-next-line @typescript-eslint/no-require-imports,@typescript-eslint/no-var-requires @@ -57,7 +68,7 @@ const warningTypes = Object.keys(enabledWarnings); _configureLog4js(argv.verbose); const projectRoot = path.normalize( - path.resolve(process.cwd(), argv._[0] ?? '.'), + path.resolve(process.cwd(), argv.PROJECT_ROOT), ); const projectInfo = await loadProjectInfo(projectRoot, { diff --git a/packages/jsii/package.json b/packages/jsii/package.json index 8f3e6d6b37..ba324bfacb 100644 --- a/packages/jsii/package.json +++ b/packages/jsii/package.json @@ -55,7 +55,7 @@ "@types/jest-expect-message": "^1.0.3", "@types/node": "^10.17.48", "@types/semver": "^7.3.4", - "@types/yargs": "^15.0.10", + "@types/yargs": "^15.0.11", "clone": "^2.1.2", "eslint": "^7.14.0", "jest": "^26.6.3", diff --git a/yarn.lock b/yarn.lock index 0fe7e1c505..cb99732031 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1712,10 +1712,10 @@ resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d" integrity sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw== -"@types/yargs@^15.0.0", "@types/yargs@^15.0.10": - version "15.0.10" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.10.tgz#0fe3c8173a0d5c3e780b389050140c3f5ea6ea74" - integrity sha512-z8PNtlhrj7eJNLmrAivM7rjBESG6JwC5xP3RVk12i/8HVP7Xnx/sEmERnRImyEuUaJfO942X0qMOYsoupaJbZQ== +"@types/yargs@^15.0.0", "@types/yargs@^15.0.11": + version "15.0.11" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.11.tgz#361d7579ecdac1527687bcebf9946621c12ab78c" + integrity sha512-jfcNBxHFYJ4nPIacsi3woz1+kvUO6s1CyeEhtnDHBjHUMNj5UlW2GynmnSgiJJEdNg9yW5C8lfoNRZrHGv5EqA== dependencies: "@types/yargs-parser" "*" From 8e1e7bd2a038dc0e3eb6f0b3f9c616da4caa464d Mon Sep 17 00:00:00 2001 From: Romain Marcadier Date: Fri, 4 Dec 2020 16:36:36 +0100 Subject: [PATCH 26/31] fix(java): exception is logged when Java VM is shutting down (#2305) Guards against the `IllegalStateException` that will be thrown upon attempting to remove a shutdown hook during VM shut down. In such cases, the removal is no longer possible nor necessary, so the exception can be safely ignored. Fixes #2303 --- By submitting this pull request, I confirm that my contribution is made under the terms of the [Apache 2.0 license]. [Apache 2.0 license]: https://www.apache.org/licenses/LICENSE-2.0 --- packages/@jsii/java-runtime/pom.xml.t.js | 8 ++++++++ .../src/main/java/software/amazon/jsii/JsiiRuntime.java | 6 +++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/packages/@jsii/java-runtime/pom.xml.t.js b/packages/@jsii/java-runtime/pom.xml.t.js index 55629cbb09..ae0381d875 100644 --- a/packages/@jsii/java-runtime/pom.xml.t.js +++ b/packages/@jsii/java-runtime/pom.xml.t.js @@ -61,6 +61,7 @@ process.stdout.write(` [1.3,1.4-a0) [2.11.3,2.12-a0) + [1.3.2,1.4.0) [13.0.0,20.0-a0) [5.7.0,5.8-a0) [3.5.13,4.0-a0) @@ -119,6 +120,13 @@ process.stdout.write(` \${mockito.version} test + + + + javax.annotation + javax.annotation-api + \${javax-annotations.version} + diff --git a/packages/@jsii/java-runtime/project/src/main/java/software/amazon/jsii/JsiiRuntime.java b/packages/@jsii/java-runtime/project/src/main/java/software/amazon/jsii/JsiiRuntime.java index af79b40ebf..2445020ee8 100644 --- a/packages/@jsii/java-runtime/project/src/main/java/software/amazon/jsii/JsiiRuntime.java +++ b/packages/@jsii/java-runtime/project/src/main/java/software/amazon/jsii/JsiiRuntime.java @@ -221,7 +221,11 @@ synchronized void terminate() { // We shut down already, no need for the shutdown hook anymore if (this.shutdownHook != null) { - Runtime.getRuntime().removeShutdownHook(this.shutdownHook); + try { + Runtime.getRuntime().removeShutdownHook(this.shutdownHook); + } catch (final IllegalStateException ise) { + // VM Shutdown is in progress, removal is now impossible (and unnecessary) + } this.shutdownHook = null; } } catch (final IOException ioe) { From 54801552f1fe0475c779ce03358845fb2a912218 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Dec 2020 06:47:47 +0000 Subject: [PATCH 27/31] chore(deps-dev): bump eslint from 7.14.0 to 7.15.0 (#2316) --- package.json | 2 +- packages/@jsii/integ-test/package.json | 2 +- packages/@jsii/kernel/package.json | 2 +- packages/@jsii/runtime/package.json | 2 +- packages/@jsii/spec/package.json | 2 +- packages/codemaker/package.json | 2 +- packages/jsii-calc/package.json | 2 +- packages/jsii-config/package.json | 2 +- packages/jsii-diff/package.json | 2 +- packages/jsii-pacmak/package.json | 2 +- packages/jsii-reflect/package.json | 2 +- packages/jsii-rosetta/package.json | 2 +- packages/jsii/package.json | 2 +- packages/oo-ascii-tree/package.json | 2 +- yarn.lock | 80 +++++++++++--------------- 15 files changed, 49 insertions(+), 59 deletions(-) diff --git a/package.json b/package.json index 293affd1a4..1898e93a1c 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "@typescript-eslint/eslint-plugin": "^4.9.0", "@typescript-eslint/parser": "^4.9.0", "all-contributors-cli": "^6.19.0", - "eslint": "^7.14.0", + "eslint": "^7.15.0", "eslint-config-prettier": "^6.15.0", "eslint-import-resolver-node": "^0.3.4", "eslint-import-resolver-typescript": "^2.3.0", diff --git a/packages/@jsii/integ-test/package.json b/packages/@jsii/integ-test/package.json index 71dbf7a2ed..eac24c99b3 100644 --- a/packages/@jsii/integ-test/package.json +++ b/packages/@jsii/integ-test/package.json @@ -32,7 +32,7 @@ "@types/jest": "^26.0.16", "@types/node": "^10.17.48", "@types/tar": "^4.0.4", - "eslint": "^7.14.0", + "eslint": "^7.15.0", "prettier": "^2.2.1", "typescript": "~3.9.7" } diff --git a/packages/@jsii/kernel/package.json b/packages/@jsii/kernel/package.json index e9daf1dd5e..abe4635f42 100644 --- a/packages/@jsii/kernel/package.json +++ b/packages/@jsii/kernel/package.json @@ -43,7 +43,7 @@ "@types/jest-expect-message": "^1.0.3", "@types/node": "^10.17.48", "@types/tar": "^4.0.4", - "eslint": "^7.14.0", + "eslint": "^7.15.0", "jest": "^26.6.3", "jest-expect-message": "^1.0.2", "jsii-build-tools": "^0.0.0", diff --git a/packages/@jsii/runtime/package.json b/packages/@jsii/runtime/package.json index 5e7771b67a..9b9da65db7 100644 --- a/packages/@jsii/runtime/package.json +++ b/packages/@jsii/runtime/package.json @@ -42,7 +42,7 @@ "@scope/jsii-calc-lib": "^0.0.0", "@types/jest": "^26.0.16", "@types/node": "^10.17.48", - "eslint": "^7.14.0", + "eslint": "^7.15.0", "jest": "^26.6.3", "jsii-build-tools": "^0.0.0", "jsii-calc": "^0.0.0", diff --git a/packages/@jsii/spec/package.json b/packages/@jsii/spec/package.json index 503d9b0613..c9f8e9ad22 100644 --- a/packages/@jsii/spec/package.json +++ b/packages/@jsii/spec/package.json @@ -36,7 +36,7 @@ "devDependencies": { "@types/jest": "^26.0.16", "@types/node": "^10.17.48", - "eslint": "^7.14.0", + "eslint": "^7.15.0", "jest": "^26.6.3", "jsii-build-tools": "^0.0.0", "prettier": "^2.2.1", diff --git a/packages/codemaker/package.json b/packages/codemaker/package.json index 8ae3dc32a5..7b8d0610db 100644 --- a/packages/codemaker/package.json +++ b/packages/codemaker/package.json @@ -39,7 +39,7 @@ "@types/fs-extra": "^8.1.1", "@types/jest": "^26.0.16", "@types/node": "^10.17.48", - "eslint": "^7.14.0", + "eslint": "^7.15.0", "jest": "^26.6.3", "prettier": "^2.2.1", "typescript": "~3.9.7" diff --git a/packages/jsii-calc/package.json b/packages/jsii-calc/package.json index eee065ba1d..6bcf20ec04 100644 --- a/packages/jsii-calc/package.json +++ b/packages/jsii-calc/package.json @@ -50,7 +50,7 @@ }, "devDependencies": { "@types/node": "^10.17.48", - "eslint": "^7.14.0", + "eslint": "^7.15.0", "jsii": "^0.0.0", "jsii-build-tools": "^0.0.0", "jsii-rosetta": "^0.0.0", diff --git a/packages/jsii-config/package.json b/packages/jsii-config/package.json index 148ef709f6..e3e95b3ed9 100644 --- a/packages/jsii-config/package.json +++ b/packages/jsii-config/package.json @@ -24,7 +24,7 @@ "@types/jest-expect-message": "^1.0.3", "@types/node": "^10.17.48", "@types/yargs": "^15.0.11", - "eslint": "^7.14.0", + "eslint": "^7.15.0", "jest": "^26.6.3", "jest-expect-message": "^1.0.2", "prettier": "^2.2.1", diff --git a/packages/jsii-diff/package.json b/packages/jsii-diff/package.json index 64e89bacf4..370892e75e 100644 --- a/packages/jsii-diff/package.json +++ b/packages/jsii-diff/package.json @@ -47,7 +47,7 @@ "@types/node": "^10.17.48", "@types/tar-fs": "^2.0.0", "@types/yargs": "^15.0.11", - "eslint": "^7.14.0", + "eslint": "^7.15.0", "jest": "^26.6.3", "jest-expect-message": "^1.0.2", "jsii": "^0.0.0", diff --git a/packages/jsii-pacmak/package.json b/packages/jsii-pacmak/package.json index 9759f32bf6..76b0d33121 100644 --- a/packages/jsii-pacmak/package.json +++ b/packages/jsii-pacmak/package.json @@ -61,7 +61,7 @@ "@types/node": "^10.17.48", "@types/semver": "^7.3.4", "@types/yargs": "^15.0.11", - "eslint": "^7.14.0", + "eslint": "^7.15.0", "jest": "^26.6.3", "jsii-build-tools": "^0.0.0", "jsii-calc": "^0.0.0", diff --git a/packages/jsii-reflect/package.json b/packages/jsii-reflect/package.json index 01ebc5f496..5b026f43a2 100644 --- a/packages/jsii-reflect/package.json +++ b/packages/jsii-reflect/package.json @@ -46,7 +46,7 @@ "@types/jest": "^26.0.16", "@types/node": "^10.17.48", "@types/yargs": "^15.0.11", - "eslint": "^7.14.0", + "eslint": "^7.15.0", "jest": "^26.6.3", "jsii": "^0.0.0", "jsii-build-tools": "^0.0.0", diff --git a/packages/jsii-rosetta/package.json b/packages/jsii-rosetta/package.json index 565792e324..4c6c0574d5 100644 --- a/packages/jsii-rosetta/package.json +++ b/packages/jsii-rosetta/package.json @@ -22,7 +22,7 @@ "@types/mock-fs": "^4.13.0", "@types/node": "^10.17.48", "@types/yargs": "^15.0.11", - "eslint": "^7.14.0", + "eslint": "^7.15.0", "jest": "^26.6.3", "jsii": "^0.0.0", "jsii-build-tools": "^0.0.0", diff --git a/packages/jsii/package.json b/packages/jsii/package.json index ba324bfacb..435e6c44bd 100644 --- a/packages/jsii/package.json +++ b/packages/jsii/package.json @@ -57,7 +57,7 @@ "@types/semver": "^7.3.4", "@types/yargs": "^15.0.11", "clone": "^2.1.2", - "eslint": "^7.14.0", + "eslint": "^7.15.0", "jest": "^26.6.3", "jest-expect-message": "^1.0.2", "jsii-build-tools": "^0.0.0", diff --git a/packages/oo-ascii-tree/package.json b/packages/oo-ascii-tree/package.json index fc9d623e58..a4d8716b35 100644 --- a/packages/oo-ascii-tree/package.json +++ b/packages/oo-ascii-tree/package.json @@ -33,7 +33,7 @@ "devDependencies": { "@types/jest": "^26.0.16", "@types/node": "^10.17.48", - "eslint": "^7.14.0", + "eslint": "^7.15.0", "jest": "^26.6.3", "jsii-build-tools": "^0.0.0", "prettier": "^2.2.1", diff --git a/yarn.lock b/yarn.lock index cb99732031..b793ccc552 100644 --- a/yarn.lock +++ b/yarn.lock @@ -286,10 +286,10 @@ exec-sh "^0.3.2" minimist "^1.2.0" -"@eslint/eslintrc@^0.2.1": - version "0.2.1" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.2.1.tgz#f72069c330461a06684d119384435e12a5d76e3c" - integrity sha512-XRUeBZ5zBWLYgSANMpThFddrZZkEbGHgUdt5UJjZfnlN9BGCiUBrf+nvbRupSjMvqzwnQN0qwCmOxITt1cfywA== +"@eslint/eslintrc@^0.2.2": + version "0.2.2" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.2.2.tgz#d01fc791e2fc33e88a29d6f3dc7e93d0cd784b76" + integrity sha512-EfB5OHNYp1F4px/LI/FEnGylop7nOqkQ1LRzCM0KccA2U8tvV8w01KBv37LbO7nW4H+YhKyo2LcJhRwjjV17QQ== dependencies: ajv "^6.12.4" debug "^4.1.1" @@ -1991,7 +1991,7 @@ acorn-globals@^6.0.0: acorn "^7.1.1" acorn-walk "^7.1.1" -acorn-jsx@^5.2.0: +acorn-jsx@^5.3.1: version "5.3.1" resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b" integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng== @@ -3845,13 +3845,13 @@ eslint-visitor-keys@^2.0.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8" integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ== -eslint@^7.14.0: - version "7.14.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.14.0.tgz#2d2cac1d28174c510a97b377f122a5507958e344" - integrity sha512-5YubdnPXrlrYAFCKybPuHIAH++PINe1pmKNc5wQRB9HSbqIK1ywAnntE3Wwua4giKu0bjligf1gLF6qxMGOYRA== +eslint@^7.15.0: + version "7.15.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.15.0.tgz#eb155fb8ed0865fcf5d903f76be2e5b6cd7e0bc7" + integrity sha512-Vr64xFDT8w30wFll643e7cGrIkPEU50yIiI36OdSIDoSGguIeaLzBo0vpGvzo9RECUqq7htURfwEtKqwytkqzA== dependencies: "@babel/code-frame" "^7.0.0" - "@eslint/eslintrc" "^0.2.1" + "@eslint/eslintrc" "^0.2.2" ajv "^6.10.0" chalk "^4.0.0" cross-spawn "^7.0.2" @@ -3861,10 +3861,10 @@ eslint@^7.14.0: eslint-scope "^5.1.1" eslint-utils "^2.1.0" eslint-visitor-keys "^2.0.0" - espree "^7.3.0" + espree "^7.3.1" esquery "^1.2.0" esutils "^2.0.2" - file-entry-cache "^5.0.1" + file-entry-cache "^6.0.0" functional-red-black-tree "^1.0.1" glob-parent "^5.0.0" globals "^12.1.0" @@ -3888,13 +3888,13 @@ eslint@^7.14.0: text-table "^0.2.0" v8-compile-cache "^2.0.3" -espree@^7.3.0: - version "7.3.0" - resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.0.tgz#dc30437cf67947cf576121ebd780f15eeac72348" - integrity sha512-dksIWsvKCixn1yrEXO8UosNSxaDoSYpq9reEjZSbHLpT5hpaCAKTLBwq0RHtLrIr+c0ByiYzWT8KTMRzoRCNlw== +espree@^7.3.0, espree@^7.3.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6" + integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g== dependencies: acorn "^7.4.0" - acorn-jsx "^5.2.0" + acorn-jsx "^5.3.1" eslint-visitor-keys "^1.3.0" esprima@^4.0.0, esprima@^4.0.1: @@ -4134,12 +4134,12 @@ figures@^3.0.0, figures@^3.1.0: dependencies: escape-string-regexp "^1.0.5" -file-entry-cache@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c" - integrity sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g== +file-entry-cache@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.0.tgz#7921a89c391c6d93efec2169ac6bf300c527ea0a" + integrity sha512-fqoO76jZ3ZnYrXLDRxBR1YvOvc0k844kcOg40bgsPrE25LAb/PDqTY+ho64Xh2c8ZXgIKldchCFHczG2UVRcWA== dependencies: - flat-cache "^2.0.1" + flat-cache "^3.0.4" fill-range@^4.0.0: version "4.0.0" @@ -4188,20 +4188,24 @@ find-up@^4.0.0, find-up@^4.1.0: locate-path "^5.0.0" path-exists "^4.0.0" -flat-cache@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0" - integrity sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA== +flat-cache@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11" + integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg== dependencies: - flatted "^2.0.0" - rimraf "2.6.3" - write "1.0.3" + flatted "^3.1.0" + rimraf "^3.0.2" -flatted@^2.0.0, flatted@^2.0.1: +flatted@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138" integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA== +flatted@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.0.tgz#a5d06b4a8b01e3a63771daa5cb7a1903e2e57067" + integrity sha512-tW+UkmtNg/jv9CSofAKvgVcO7c2URjhTdW1ZTkcAritblu8tajiYy7YisnIflEwtKssCtOxpnBRoCB7iap0/TA== + flush-write-stream@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8" @@ -7724,13 +7728,6 @@ rfdc@^1.1.4: resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.1.4.tgz#ba72cc1367a0ccd9cf81a870b3b58bd3ad07f8c2" integrity sha512-5C9HXdzK8EAqN7JDif30jqsBzavB7wLpaubisuQIGHWf2gUXSpzy6ArX/+Da8RjFpagWsCn+pIgxTMAmKw9Zug== -rimraf@2.6.3: - version "2.6.3" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab" - integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA== - dependencies: - glob "^7.1.3" - rimraf@^2.5.4, rimraf@^2.6.2, rimraf@^2.6.3: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" @@ -7738,7 +7735,7 @@ rimraf@^2.5.4, rimraf@^2.6.2, rimraf@^2.6.3: dependencies: glob "^7.1.3" -rimraf@^3.0.0: +rimraf@^3.0.0, rimraf@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== @@ -9341,13 +9338,6 @@ write-pkg@^3.1.0: sort-keys "^2.0.0" write-json-file "^2.2.0" -write@1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3" - integrity sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig== - dependencies: - mkdirp "^0.5.1" - ws@^7.2.3: version "7.4.0" resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.0.tgz#a5dd76a24197940d4a8bb9e0e152bb4503764da7" From 3cd948b1817d58a4a8fbc0131fc0a3af56d6b59e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Dec 2020 09:40:41 +0000 Subject: [PATCH 28/31] chore(deps-dev): bump source-map-loader from 1.1.2 to 1.1.3 (#2317) --- packages/@jsii/runtime/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/@jsii/runtime/package.json b/packages/@jsii/runtime/package.json index 9b9da65db7..1e83e915cd 100644 --- a/packages/@jsii/runtime/package.json +++ b/packages/@jsii/runtime/package.json @@ -47,7 +47,7 @@ "jsii-build-tools": "^0.0.0", "jsii-calc": "^0.0.0", "prettier": "^2.2.1", - "source-map-loader": "^1.1.2", + "source-map-loader": "^1.1.3", "ts-jest": "^26.4.4", "typescript": "~3.9.7", "wasm-loader": "^1.3.0", diff --git a/yarn.lock b/yarn.lock index b793ccc552..c8415c2be1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8029,10 +8029,10 @@ source-list-map@^2.0.1: resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== -source-map-loader@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-1.1.2.tgz#5b782bf08496d3a7f355e1780df0e25190a80991" - integrity sha512-bjf6eSENOYBX4JZDfl9vVLNsGAQ6Uz90fLmOazcmMcyDYOBFsGxPNn83jXezWLY9bJsVAo1ObztxPcV8HAbjVA== +source-map-loader@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-1.1.3.tgz#7dbc2fe7ea09d3e43c51fd9fc478b7f016c1f820" + integrity sha512-6YHeF+XzDOrT/ycFJNI53cgEsp/tHTMl37hi7uVyqFAlTXW109JazaQCkbc+jjoL2637qkH1amLi+JzrIpt5lA== dependencies: abab "^2.0.5" iconv-lite "^0.6.2" From 9b40f16567e37403e4d46d5529aef73b1dfcf8ef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Dec 2020 10:50:02 +0000 Subject: [PATCH 29/31] chore(deps): update setuptools requirement (#2321) --- packages/@jsii/python-runtime/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@jsii/python-runtime/requirements.txt b/packages/@jsii/python-runtime/requirements.txt index fe77e1405f..327ee927a8 100644 --- a/packages/@jsii/python-runtime/requirements.txt +++ b/packages/@jsii/python-runtime/requirements.txt @@ -2,7 +2,7 @@ black~=20.8b1 pytest~=6.1 pytest-mypy~=0.8 pip~=20.3 -setuptools~=50.3 +setuptools~=51.0 wheel~=0.36 -e . From 1a94b859dbde4e002b4b3c04dfedf3ba97804962 Mon Sep 17 00:00:00 2001 From: Romain Marcadier Date: Mon, 7 Dec 2020 12:52:53 +0100 Subject: [PATCH 30/31] fix(runtime): excessive latency introduced by sleep (#2298) When recovering from `EAGAIN`, the `@jsii/runtime` recently added a synchronous sleep for 50 milliseconds. However in large and complex applications, this can add up to a lot of time, as worst case scenario, the sleep can occur before and after each call (once on read, once on write). This change removes the `sleep` until we come up with a better solution. Fixes #2284 --- By submitting this pull request, I confirm that my contribution is made under the terms of the [Apache 2.0 license]. [Apache 2.0 license]: https://www.apache.org/licenses/LICENSE-2.0 --- .all-contributorsrc | 27 ++++ README.md | 194 ++++++++++++----------- packages/@jsii/runtime/jest.config.ts | 4 + packages/@jsii/runtime/lib/sleep.ts | 14 -- packages/@jsii/runtime/lib/sync-stdio.ts | 10 +- 5 files changed, 133 insertions(+), 116 deletions(-) delete mode 100644 packages/@jsii/runtime/lib/sleep.ts diff --git a/.all-contributorsrc b/.all-contributorsrc index e3e0713a5b..005d41080c 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -983,6 +983,33 @@ "bug" ] }, + { + "login": "ThomasSteinbach", + "name": "Thomas Steinbach", + "avatar_url": "https://avatars0.githubusercontent.com/u/1683246?v=4", + "profile": "https://github.com/ThomasSteinbach", + "contributions": [ + "bug" + ] + }, + { + "login": "Ophirr33", + "name": "Ty Coghlan", + "avatar_url": "https://avatars2.githubusercontent.com/u/15920577?v=4", + "profile": "https://ty.coghlan.dev/", + "contributions": [ + "bug" + ] + }, + { + "login": "slotnick", + "name": "Dave Slotnick", + "avatar_url": "https://avatars3.githubusercontent.com/u/918175?v=4", + "profile": "https://github.com/slotnick", + "contributions": [ + "bug" + ] + }, { "login": "majasb", "name": "Maja S Bratseth", diff --git a/README.md b/README.md index b47a36d42c..c7d8b7cf3f 100644 --- a/README.md +++ b/README.md @@ -366,131 +366,135 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - + + + + + +

Abdallah Hodieb
πŸ›
ajnarang
πŸ€”
Alex Pulver
πŸ›
Andy Slezak
πŸ’»
Anshul Guleria
πŸ€”
Ari Palo
πŸ€”
Hamza Assyad
πŸ› πŸ’» πŸ₯… πŸ€” πŸ‘€
AWS CDK Automation
🚧 πŸ‘€
Aaron Costley
πŸ› πŸ’» πŸ₯… πŸ€” πŸ‘€
Abdallah Hodieb
πŸ›
Adam Ruka
πŸ› πŸ’» 🚧 πŸ‘€
Alex Pulver
πŸ›
Andy Slezak
πŸ’»
Anshul Guleria
πŸ€”

AWS CDK Automation
🚧 πŸ‘€
Ben Walters
πŸ€”
BartΕ‚omiej Jurek
πŸ›
Benjamin Maizels
πŸ’» πŸ‘€
Brecht Verhoeve
πŸ€”
CaerusKaru
πŸ’» 🚧
Campion Fellin
πŸ’» β˜•οΈ
Ari Palo
πŸ€”
BartΕ‚omiej Jurek
πŸ›
Ben Walters
πŸ€”
Benjamin Maizels
πŸ’» πŸ‘€
Bill Cauchois
πŸ€”
Brecht Verhoeve
πŸ€”
Breland Miley
πŸ’»

Carter Van Deuren
πŸ›
Christopher Currie
πŸ’» πŸ€”
Raphael
πŸ›
Aaron Costley
πŸ› πŸ’» πŸ₯… πŸ€” πŸ‘€
CyrusNajmabadi
πŸ› πŸ€”
Dongie Agnir
πŸ’» β˜•οΈ πŸ‘€
Daniel Dinu
πŸ› πŸ’»
CaerusKaru
πŸ’» 🚧
Campion Fellin
πŸ’» β˜•οΈ
Carter Van Deuren
πŸ›
Christopher Currie
πŸ’» πŸ€”
CyrusNajmabadi
πŸ› πŸ€”
Daniel Dinu
πŸ› πŸ’»
Daniel Schroeder
πŸ› πŸ’» πŸ“– πŸ€” 🚧

dependabot-preview[bot]
πŸ› 🚧
dependabot[bot]
🚧
dheffx
πŸ›
Shane Witbeck
πŸ€”
Donald Stufft
πŸ› πŸ’» πŸ€” 🐍 πŸ‘€
Junix
πŸ›
Elad Ben-Israel
πŸ› πŸ’» πŸ€” β˜•οΈ 🚧 πŸ‘€ πŸ“’
Dave Slotnick
πŸ›
Donald Stufft
πŸ› πŸ’» πŸ€” 🐍 πŸ‘€
Dongie Agnir
πŸ’» β˜•οΈ πŸ‘€
Eduardo Sena S. Rosa
πŸ›
Elad Ben-Israel
πŸ› πŸ’» πŸ€” β˜•οΈ 🚧 πŸ‘€ πŸ“’
Eli Polonsky
πŸ› πŸ’» πŸ€” 🚧 πŸ‘€
Eric Z. Beard
πŸ“†

Eric Z. Beard
πŸ“†
Fabio Gentile
πŸ›
James Mead
πŸ’»
Jason Fulghum
πŸ€” πŸ“† πŸ‘€
Mitch Garnaat
πŸ› πŸ’» πŸ€” 🐍 πŸ‘€
The Gitter Badger
πŸ’» 🚧
Graham Lea
πŸ€” πŸ‘€
Erik Karlsson
πŸ›
Eugene Kozlov
πŸ’»
Fabio Gentile
πŸ›
Florian Eitel
πŸ€”
Graham Lea
πŸ€” πŸ‘€
Hamza Assyad
πŸ› πŸ’» πŸ₯… πŸ€” πŸ‘€
Hari Pachuveetil
πŸ“

gregswdl
πŸ›
Thorsten Hoeger
πŸ’»
Eli Polonsky
πŸ› πŸ’» πŸ€” 🚧 πŸ‘€
James Siri
πŸ’» 🚧
Jason Del Ponte
πŸšΆβ€β™€οΈ πŸ€” πŸ‘€
Jerry Kindall
πŸ“– πŸ€”
Joseph Lawson
πŸ‘€
Hsing-Hui Hsu
πŸ’» πŸ“– πŸšΆβ€β™€οΈ πŸ€” πŸ‘€
James Mead
πŸ’»
James Siri
πŸ’» 🚧
Jason Del Ponte
πŸšΆβ€β™€οΈ πŸ€” πŸ‘€
Jason Fulghum
πŸ€” πŸ“† πŸ‘€
Jerry Kindall
πŸ“– πŸ€”
Jimmy Gaussen
πŸ€”

Joseph Martin
πŸ›
Justin Taylor
πŸ›
Jon Steinich
πŸ› πŸ€”
Quentin Loos
πŸ€”
Kyle Thomson
β˜•οΈ πŸ‘€
Eugene Kozlov
πŸ’»
Vladimir Shchur
πŸ›
Jon Steinich
πŸ› πŸ€”
Joseph Lawson
πŸ‘€
Joseph Martin
πŸ›
Junix
πŸ›
Justin Taylor
πŸ›
Kyle Thomson
β˜•οΈ πŸ‘€
Leandro Padua
πŸ›

Leandro Padua
πŸ›
Marcos Diez
πŸ›
Matthew Bonig
πŸ› πŸ“
Erik Karlsson
πŸ›
mergify[bot]
🚧
Mike Lane
πŸ›
Breland Miley
πŸ’»
Maja S Bratseth
πŸ›
Marcos Diez
πŸ›
Matthew Bonig
πŸ› πŸ“
Matthew Pirocchi
πŸ’» πŸ₯… πŸ€” πŸ‘€
Mike Lane
πŸ›
Mitch Garnaat
πŸ› πŸ’» πŸ€” 🐍 πŸ‘€
Mitchell Valine
πŸ› πŸ’» πŸšΆβ€β™€οΈ πŸ€” 🚧 πŸ‘€

Matthew Pirocchi
πŸ’» πŸ₯… πŸ€” πŸ‘€
Mitchell Valine
πŸ› πŸ’» πŸšΆβ€β™€οΈ πŸ€” 🚧 πŸ‘€
Neta Nir
πŸ’» πŸ€” 🚧 πŸ‘€
Noah Litov
πŸ’» 🚧 πŸ‘€
Niranjan Jayakar
πŸ› πŸ’» πŸ€” 🚧 πŸ‘€
Nick Lynch
πŸ› πŸ’» 🚧 πŸ‘€
Jimmy Gaussen
πŸ€”
Neta Nir
πŸ’» πŸ€” 🚧 πŸ‘€
Nick Lynch
πŸ› πŸ’» 🚧 πŸ‘€
Niranjan Jayakar
πŸ› πŸ’» πŸ€” 🚧 πŸ‘€
Noah Litov
πŸ’» 🚧 πŸ‘€
PIDZ - Bart
πŸ€”
Petra Barus
πŸ’»
Philip Cali
πŸ€”

Petra Barus
πŸ’»
Philip Cali
πŸ€”
PIDZ - Bart
πŸ€”
Richard H Boyd
πŸ›
Rico Huijbers
πŸ› πŸ’» πŸ€” 🚧 🐍 πŸ‘€
Romain Marcadier
πŸ› πŸ’» 🎨 πŸ₯… πŸšΆβ€β™€οΈ πŸ€” β˜•οΈ 🚧 🐍 πŸ‘€
SADIK KUZU
πŸ‘€
Quentin Loos
πŸ€”
Raphael
πŸ›
Richard H Boyd
πŸ›
Rico Huijbers
πŸ› πŸ’» πŸ€” 🚧 🐍 πŸ‘€
Romain Marcadier
πŸ› πŸ’» 🎨 πŸ₯… πŸšΆβ€β™€οΈ πŸ€” β˜•οΈ 🚧 🐍 πŸ‘€
SADIK KUZU
πŸ‘€
SK
πŸ€”

Sam Goodwin
πŸ‘€
seiyashima42
πŸ› πŸ’» πŸ“–
Tim Wagner
πŸ› πŸ€”
Shiv Lakshminarayan
πŸ’» 🚧 πŸ‘€
SK
πŸ€”
Adam Ruka
πŸ› πŸ’» 🚧 πŸ‘€
Sebastian Korfmann
πŸ› πŸ’» πŸ€”
Sam Fink
πŸ’» πŸ‘€
Sam Goodwin
πŸ‘€
Sebastian Korfmann
πŸ› πŸ’» πŸ€”
Shane Witbeck
πŸ€”
Shiv Lakshminarayan
πŸ’» 🚧 πŸ‘€
Somaya
πŸ’» πŸ€” 🚧 πŸ‘€
The Gitter Badger
πŸ’» 🚧

Hsing-Hui Hsu
πŸ’» πŸ“– πŸšΆβ€β™€οΈ πŸ€” πŸ‘€
Somaya
πŸ’» πŸ€” 🚧 πŸ‘€
Sam Fink
πŸ’» πŸ‘€
sullis
πŸ’»
Thomas Poignant
πŸ›
Tobias Lidskog
πŸ’»
Tyler van Hensbergen
πŸ€”
Thomas Poignant
πŸ›
Thomas Steinbach
πŸ›
Thorsten Hoeger
πŸ’»
Tim Wagner
πŸ› πŸ€”
Tobias Lidskog
πŸ’»
Ty Coghlan
πŸ›
Tyler van Hensbergen
πŸ€”

Daniel Schroeder
πŸ› πŸ’» πŸ“– πŸ€” 🚧
vaneek
πŸ›
Vlad Hrybok
πŸ›
Bill Cauchois
πŸ€”
Florian Eitel
πŸ€”
Yan Zhulanow
πŸ’»
Eduardo Sena S. Rosa
πŸ›
Vlad Hrybok
πŸ›
Vladimir Shchur
πŸ›
Yan Zhulanow
πŸ’»
ajnarang
πŸ€”
deccy-mcc
πŸ›
dependabot-preview[bot]
πŸ› 🚧
dependabot[bot]
🚧

Hari Pachuveetil
πŸ“
deccy-mcc
πŸ›
Maja S Bratseth
πŸ›
dheffx
πŸ›
gregswdl
πŸ›
mergify[bot]
🚧
seiyashima42
πŸ› πŸ’» πŸ“–
sullis
πŸ’»
vaneek
πŸ›
- + + This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. diff --git a/packages/@jsii/runtime/jest.config.ts b/packages/@jsii/runtime/jest.config.ts index 8663425af0..84550ec62b 100644 --- a/packages/@jsii/runtime/jest.config.ts +++ b/packages/@jsii/runtime/jest.config.ts @@ -1,6 +1,10 @@ import { overriddenConfig } from '../../../jest.config'; export default overriddenConfig({ + coveragePathIgnorePatterns: [ + // This cannot be tested in a way that enables collection of coverage + '/lib/sync-stdio.ts', + ], coverageThreshold: { global: { branches: 48, diff --git a/packages/@jsii/runtime/lib/sleep.ts b/packages/@jsii/runtime/lib/sleep.ts deleted file mode 100644 index 002c23cd18..0000000000 --- a/packages/@jsii/runtime/lib/sleep.ts +++ /dev/null @@ -1,14 +0,0 @@ -// We need a shared buffer array for the purpose of this exercise. -const array = new Int32Array(new SharedArrayBuffer(4)); - -/** - * Sleeps for a set amount of time, synchronously. - * - * @param time the amount of time to wait, in milliseconds. - */ -export function sleep(time: number): void { - // `Atomics.wait` will block for `time` milliseconds if `array[0]` still has - // value `0` (which it will, since we just initialized it to that). The return - // value is irrelevant for our business here. - Atomics.wait(array, 0, 0, time); -} diff --git a/packages/@jsii/runtime/lib/sync-stdio.ts b/packages/@jsii/runtime/lib/sync-stdio.ts index e3a57e386a..053e22f382 100644 --- a/packages/@jsii/runtime/lib/sync-stdio.ts +++ b/packages/@jsii/runtime/lib/sync-stdio.ts @@ -1,7 +1,5 @@ import * as fs from 'fs'; -import { sleep } from './sleep'; - // Note: the `process.std{in,out,err}.fd` is not part of the `@types/node` declarations, because // those cannot model how those fields are guaranteed to be absent within the context of worker // threads. The should be present here, but since we must resort to `as any`, we take the extra @@ -53,7 +51,8 @@ export class SyncStdio { if (e.code !== 'EAGAIN') { throw e; } - sleep(50 /*ms*/); + // We'll retry immediately, and possibly thrash the CPU until the buffer was drained. We + // do not currently have a better way around. } } } @@ -96,10 +95,7 @@ function readSync( // attempts, sleeping too much would slow everything to a crawl, and not enough would cause // significant wasting of CPU cycles. case 'EAGAIN': - // Keep trying until it no longer says EAGAIN. We'll be waiting a little before retrying - // in order to avoid thrashing the CPU like there is no tomorrow. This is not entirely - // ideal, but it has to do. - sleep(50 /*ms*/); + // Thrashing the CPU as previously discussed... break; // HACK: in Windows, when STDIN (aka FD#0) is wired to a socket (as is the case when started From 69156c4ffc52dfb11f04a9e3fb36886635e247fe Mon Sep 17 00:00:00 2001 From: AWS CDK Team Date: Mon, 7 Dec 2020 17:12:27 +0000 Subject: [PATCH 31/31] chore(release): 1.16.0 --- CHANGELOG.md | 8 ++++++++ lerna.json | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 13a824d6fc..d72bc68cd1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +## [1.16.0](https://github.com/aws/jsii/compare/v1.15.0...v1.16.0) (2020-12-07) + + +### Bug Fixes + +* **java:** exception is logged when Java VM is shutting down ([#2305](https://github.com/aws/jsii/issues/2305)) ([8e1e7bd](https://github.com/aws/jsii/commit/8e1e7bd2a038dc0e3eb6f0b3f9c616da4caa464d)), closes [#2303](https://github.com/aws/jsii/issues/2303) +* **runtime:** excessive latency introduced by sleep ([#2298](https://github.com/aws/jsii/issues/2298)) ([1a94b85](https://github.com/aws/jsii/commit/1a94b859dbde4e002b4b3c04dfedf3ba97804962)), closes [#2284](https://github.com/aws/jsii/issues/2284) + ## [1.15.0](https://github.com/aws/jsii/compare/v1.14.1...v1.15.0) (2020-11-25) diff --git a/lerna.json b/lerna.json index f5a8bdf203..5baa431d17 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "rejectCycles": true } }, - "version": "1.15.0" + "version": "1.16.0" }