From bd60e8771b3facdef27329d9dcf5bf5979570070 Mon Sep 17 00:00:00 2001 From: Romain Marcadier-Muller Date: Thu, 23 May 2019 15:45:07 +0200 Subject: [PATCH] chore: Upgrade to latest jsii (#2619) --- packages/decdk/package-lock.json | 48 ++++--- packages/decdk/package.json | 4 +- tools/awslint/package.json | 2 +- tools/cdk-build-tools/package-lock.json | 161 ++++++++++++++++++++++-- tools/cdk-build-tools/package.json | 4 +- 5 files changed, 188 insertions(+), 31 deletions(-) diff --git a/packages/decdk/package-lock.json b/packages/decdk/package-lock.json index a4319a4d577c7..9e7a5a495d805 100644 --- a/packages/decdk/package-lock.json +++ b/packages/decdk/package-lock.json @@ -3437,28 +3437,48 @@ "dev": true }, "jsii": { - "version": "0.10.5", - "resolved": "https://registry.npmjs.org/jsii/-/jsii-0.10.5.tgz", - "integrity": "sha512-z6yZBxdD5gh9C2w43fN0kmfn6m9c6MeiPLTvR4/H8oPa8icEYaxA3XwoOoDAYMRzUfTMO/f/oocjoFsngf6Jzg==", + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/jsii/-/jsii-0.11.0.tgz", + "integrity": "sha512-6BJKwxiYc+8oHU0+kd3FNvxm1uDXnQrhEwrJfsqKo//pM06TTC93PvXThZZLiIypHDz4iXpO7W6DcFfRmVHXxQ==", "dev": true, "requires": { "case": "^1.6.1", "colors": "^1.3.3", "deep-equal": "^1.0.1", - "fs-extra": "^7.0.1", - "jsii-spec": "^0.10.5", - "log4js": "^4.1.0", + "fs-extra": "^8.0.1", + "jsii-spec": "^0.11.0", + "log4js": "^4.2.0", "semver": "^6.0.0", "sort-json": "^2.0.0", "spdx-license-list": "^6.0.0", - "typescript": "^3.4.3", - "yargs": "^13.2.2" + "typescript": "^3.4.5", + "yargs": "^13.2.4" }, "dependencies": { + "fs-extra": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.0.1.tgz", + "integrity": "sha512-W+XLrggcDzlle47X/XnS7FXrXu9sDo+Ze9zpndeBxdgv88FHLm1HtmkhEwavruS6koanBjp098rUpHs65EmG7A==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + } + }, + "jsii-spec": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/jsii-spec/-/jsii-spec-0.11.0.tgz", + "integrity": "sha512-fJjJceYBgHhyIKLU59MVdoruXNiyNhIFeFE1p1BAwM+s8UQCBXOeziZB9b/+KH2Jde/8/8HdfGC0dU+EdLsARw==", + "dev": true, + "requires": { + "jsonschema": "^1.2.4" + } + }, "semver": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.0.0.tgz", - "integrity": "sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.1.0.tgz", + "integrity": "sha512-kCqEOOHoBcFs/2Ccuk4Xarm/KiWRSLEX9CAZF8xkJ6ZPlIoTZ8V5f7J16vYLJqDbR7KrxTJpR2lqjIEm2Qx9cQ==", "dev": true } } @@ -3617,9 +3637,9 @@ "dev": true }, "log4js": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/log4js/-/log4js-4.2.0.tgz", - "integrity": "sha512-1dJ2ORJcdqbzxvzKM2ceqPBh4O6bbICJpB4dvSEUoMcb14s8MqQ/54zNPqekuN5yjGtxO3GUDTvZfQOQhwdqnA==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/log4js/-/log4js-4.3.0.tgz", + "integrity": "sha512-ivqZBkBvWLJ8rXfhb4E0979olSwnYBPSZy/5WhLNXwntqRgUhxHnqcXGmVw0t+XmLNTr3GAWEzjqHMzu4KM7rA==", "dev": true, "requires": { "date-format": "^2.0.0", diff --git a/packages/decdk/package.json b/packages/decdk/package.json index 16c90e3a038cd..cbe4092c98c01 100644 --- a/packages/decdk/package.json +++ b/packages/decdk/package.json @@ -142,7 +142,7 @@ "@types/yaml": "1.0.2", "@types/yargs": "^13.0.0", "jest": "^24.7.1", - "jsii": "^0.10.5" + "jsii": "^0.11.0" }, "keywords": [ "aws", @@ -152,4 +152,4 @@ "engines": { "node": ">= 8.10.0" } -} \ No newline at end of file +} diff --git a/tools/awslint/package.json b/tools/awslint/package.json index c727c94d33d72..bff40595db4d8 100644 --- a/tools/awslint/package.json +++ b/tools/awslint/package.json @@ -28,7 +28,7 @@ "@types/fs-extra": "^5.0.5", "@types/yargs": "^13.0.0", "tslint": "^5.16.0", - "typescript": "^3.4.3" + "typescript": "^3.4.5" }, "repository": { "type": "git", diff --git a/tools/cdk-build-tools/package-lock.json b/tools/cdk-build-tools/package-lock.json index 3fa37a6a0b57d..31dc042f01d62 100644 --- a/tools/cdk-build-tools/package-lock.json +++ b/tools/cdk-build-tools/package-lock.json @@ -3198,27 +3198,164 @@ "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==" }, "jsii": { - "version": "0.10.5", - "resolved": "https://registry.npmjs.org/jsii/-/jsii-0.10.5.tgz", - "integrity": "sha512-z6yZBxdD5gh9C2w43fN0kmfn6m9c6MeiPLTvR4/H8oPa8icEYaxA3XwoOoDAYMRzUfTMO/f/oocjoFsngf6Jzg==", + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/jsii/-/jsii-0.11.0.tgz", + "integrity": "sha512-6BJKwxiYc+8oHU0+kd3FNvxm1uDXnQrhEwrJfsqKo//pM06TTC93PvXThZZLiIypHDz4iXpO7W6DcFfRmVHXxQ==", "requires": { "case": "^1.6.1", "colors": "^1.3.3", "deep-equal": "^1.0.1", - "fs-extra": "^7.0.1", - "jsii-spec": "^0.10.5", - "log4js": "^4.1.0", + "fs-extra": "^8.0.1", + "jsii-spec": "^0.11.0", + "log4js": "^4.2.0", "semver": "^6.0.0", "sort-json": "^2.0.0", "spdx-license-list": "^6.0.0", - "typescript": "^3.4.3", - "yargs": "^13.2.2" + "typescript": "^3.4.5", + "yargs": "^13.2.4" }, "dependencies": { + "cliui": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", + "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", + "requires": { + "string-width": "^3.1.0", + "strip-ansi": "^5.2.0", + "wrap-ansi": "^5.1.0" + } + }, + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "requires": { + "ms": "^2.1.1" + } + }, + "fs-extra": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.0.1.tgz", + "integrity": "sha512-W+XLrggcDzlle47X/XnS7FXrXu9sDo+Ze9zpndeBxdgv88FHLm1HtmkhEwavruS6koanBjp098rUpHs65EmG7A==", + "requires": { + "graceful-fs": "^4.1.2", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + } + }, + "get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==" + }, + "jsii-spec": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/jsii-spec/-/jsii-spec-0.11.0.tgz", + "integrity": "sha512-fJjJceYBgHhyIKLU59MVdoruXNiyNhIFeFE1p1BAwM+s8UQCBXOeziZB9b/+KH2Jde/8/8HdfGC0dU+EdLsARw==", + "requires": { + "jsonschema": "^1.2.4" + } + }, + "log4js": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/log4js/-/log4js-4.3.0.tgz", + "integrity": "sha512-ivqZBkBvWLJ8rXfhb4E0979olSwnYBPSZy/5WhLNXwntqRgUhxHnqcXGmVw0t+XmLNTr3GAWEzjqHMzu4KM7rA==", + "requires": { + "date-format": "^2.0.0", + "debug": "^4.1.1", + "flatted": "^2.0.0", + "rfdc": "^1.1.2", + "streamroller": "^1.0.5" + } + }, + "ms": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", + "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" + }, "semver": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.0.0.tgz", - "integrity": "sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ==" + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.1.0.tgz", + "integrity": "sha512-kCqEOOHoBcFs/2Ccuk4Xarm/KiWRSLEX9CAZF8xkJ6ZPlIoTZ8V5f7J16vYLJqDbR7KrxTJpR2lqjIEm2Qx9cQ==" + }, + "streamroller": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-1.0.5.tgz", + "integrity": "sha512-iGVaMcyF5PcUY0cPbW3xFQUXnr9O4RZXNBBjhuLZgrjLO4XCLLGfx4T2sGqygSeylUjwgWRsnNbT9aV0Zb8AYw==", + "requires": { + "async": "^2.6.2", + "date-format": "^2.0.0", + "debug": "^3.2.6", + "fs-extra": "^7.0.1", + "lodash": "^4.17.11" + }, + "dependencies": { + "debug": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", + "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "requires": { + "ms": "^2.1.1" + } + }, + "fs-extra": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", + "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", + "requires": { + "graceful-fs": "^4.1.2", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + } + } + } + }, + "string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "requires": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + } + }, + "wrap-ansi": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", + "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", + "requires": { + "ansi-styles": "^3.2.0", + "string-width": "^3.0.0", + "strip-ansi": "^5.0.0" + } + }, + "yargs": { + "version": "13.2.4", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.2.4.tgz", + "integrity": "sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==", + "requires": { + "cliui": "^5.0.0", + "find-up": "^3.0.0", + "get-caller-file": "^2.0.1", + "os-locale": "^3.1.0", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^3.0.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^13.1.0" + } + }, + "yargs-parser": { + "version": "13.1.0", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.0.tgz", + "integrity": "sha512-Yq+32PrijHRri0vVKQEm+ys8mbqWjLiwQkMFNXEENutzLPP0bE4Lcd4iA3OQY5HF+GD3xXxf0MEHb8E4/SA3AA==", + "requires": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + } } } }, @@ -3787,7 +3924,7 @@ "dependencies": { "resolve-from": { "version": "4.0.0", - "resolved": false, + "resolved": "", "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==" }, "yargs-parser": { diff --git a/tools/cdk-build-tools/package.json b/tools/cdk-build-tools/package.json index 1961febbf4823..09bf2873f6435 100644 --- a/tools/cdk-build-tools/package.json +++ b/tools/cdk-build-tools/package.json @@ -40,7 +40,7 @@ "colors": "^1.3.3", "fs-extra": "^7.0.1", "jest": "^24.7.1", - "jsii": "^0.10.5", + "jsii": "^0.11.0", "jsii-diff": "^0.10.5", "jsii-pacmak": "^0.10.5", "nodeunit": "^0.11.3", @@ -48,7 +48,7 @@ "pkglint": "^0.31.0", "ts-jest": "^24.0.2", "tslint": "^5.16.0", - "typescript": "^3.4.3", + "typescript": "^3.4.5", "yargs": "^13.2.2" }, "keywords": [