From 65569ae2c9497f54dc716e73aaac28037002d637 Mon Sep 17 00:00:00 2001 From: Mutahhir Hayat Date: Wed, 5 Feb 2025 13:02:47 +0100 Subject: [PATCH] chore: Update jsii version and dockerfile --- Dockerfile | 2 +- packages/@cdktf/cli-core/package.json | 4 +- packages/cdktf-cli/package.json | 4 +- packages/cdktf/package.json | 2 +- yarn.lock | 69 ++++++++++++++++++++++++--- 5 files changed, 68 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1814932af0..d9f954bff8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # Copyright (c) HashiCorp, Inc. # SPDX-License-Identifier: MPL-2.0 -FROM docker.mirror.hashicorp.services/jsii/superchain:1-bookworm-slim-node18-nightly@sha256:367ea5b9f5c1aa995a806f700eaef24c72f644e5a766ad61eae3c79d10cb2998 +FROM docker.mirror.hashicorp.services/jsii/superchain:1-bookworm-slim-node18-nightly@sha256:dafe98b373385e2cc307b8440b79d6b278698feb873294c4d8ea47866eafd467 USER root diff --git a/packages/@cdktf/cli-core/package.json b/packages/@cdktf/cli-core/package.json index b51f0fbd0f..fa0f96a391 100644 --- a/packages/@cdktf/cli-core/package.json +++ b/packages/@cdktf/cli-core/package.json @@ -65,9 +65,9 @@ "ink-spinner": "4.0.3", "ink-testing-library": "2.1.0", "ink-use-stdout-dimensions": "1.0.5", - "jsii": "5.4.31", + "jsii": "5.4.50", "jsii-pacmak": "1.102.0", - "jsii-rosetta": "5.4.30", + "jsii-rosetta": "5.4.50", "lodash.isequal": "4.5.0", "log4js": "6.9.1", "minimatch": "5.1.6", diff --git a/packages/cdktf-cli/package.json b/packages/cdktf-cli/package.json index 5b998a861f..a96af2de7e 100644 --- a/packages/cdktf-cli/package.json +++ b/packages/cdktf-cli/package.json @@ -53,9 +53,9 @@ "https-proxy-agent": "5.0.1", "ink-select-input": "4.2.2", "ink-table": "3.1.0", - "jsii": "5.4.31", + "jsii": "5.4.50", "jsii-pacmak": "1.102.0", - "jsii-rosetta": "5.4.30", + "jsii-rosetta": "5.4.50", "minimatch": "5.1.6", "node-fetch": "2.7.0", "pidtree": "0.6.0", diff --git a/packages/cdktf/package.json b/packages/cdktf/package.json index 0cc32e91c6..48bec54198 100644 --- a/packages/cdktf/package.json +++ b/packages/cdktf/package.json @@ -117,7 +117,7 @@ "eslint-plugin-jsdoc": "39.9.1", "eslint-plugin-no-instanceof": "1.0.1", "jest": "29.7.0", - "jsii": "5.4.31", + "jsii": "5.4.50", "jsii-docgen": "10.4.20", "jsii-pacmak": "1.102.0", "ts-jest": "29.2.5", diff --git a/yarn.lock b/yarn.lock index f05806af05..b718c81d7d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1324,6 +1324,14 @@ chalk "^4.1.2" semver "^7.6.3" +"@jsii/check-node@1.106.0": + version "1.106.0" + resolved "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.106.0.tgz#5deb20b0bbe0a506c4bd9edf60b17b0a93f83834" + integrity sha512-/T/TUsbHdEbZRFR4Rem9+UXVvgMYncEkrIeC52oIHJ8BDSgqlDsIARio/Eu5DOftF4avSLV/sshR6n19mpK1oA== + dependencies: + chalk "^4.1.2" + semver "^7.6.3" + "@jsii/check-node@1.98.0": version "1.98.0" resolved "https://registry.yarnpkg.com/@jsii/check-node/-/check-node-1.98.0.tgz#140860478009834aa35dc8479a26db1a221439d5" @@ -1339,6 +1347,13 @@ dependencies: ajv "^8.17.1" +"@jsii/spec@^1.106.0": + version "1.106.0" + resolved "https://registry.npmjs.org/@jsii/spec/-/spec-1.106.0.tgz#f40010ec8cde14b7a003dd5b6a46480d9d7e222f" + integrity sha512-pAIvqEGf0YLmtzFtUKWNEGkCmXMHENy7k+rzCD147wnM4jHhvEL1mEvxi99aA2VcmvLYaAYNOs/XozT+s+kLqQ== + dependencies: + ajv "^8.17.1" + "@jsii/spec@^1.98.0": version "1.98.0" resolved "https://registry.yarnpkg.com/@jsii/spec/-/spec-1.98.0.tgz#7495f2d123b95b67ba0da4d3a18cac763d401da2" @@ -2547,6 +2562,11 @@ resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.8.10.tgz#a1337ca426aa61cef9fe15b5b28e340a72f6fa99" integrity sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw== +"@xmldom/xmldom@^0.9.6": + version "0.9.7" + resolved "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.9.7.tgz#f21bebdcde4af682a810062b14585c89bb7fab07" + integrity sha512-syvR8iIJjpTZ/stv7l89UAViwGFh6lbheeOaqSxkYx9YNmIVvPTRH+CT/fpykFtUx5N+8eSMDRvggF9J8GEPzQ== + "@yarnpkg/lockfile@^1.1.0": version "1.1.0" resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31" @@ -3884,6 +3904,15 @@ commonmark@^0.31.1: mdurl "~1.0.1" minimist "~1.2.5" +commonmark@^0.31.2: + version "0.31.2" + resolved "https://registry.npmjs.org/commonmark/-/commonmark-0.31.2.tgz#9d8d5439c82c9a235154d858a53e1a7965d573a5" + integrity sha512-2fRLTyb9r/2835k5cwcAwOj0DEc44FARnMp5veGsJ+mEAZdi52sNopLu07ZyElQUz058H43whzlERDIaaSw4rg== + dependencies: + entities "~3.0.1" + mdurl "~1.0.1" + minimist "~1.2.8" + compare-func@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/compare-func/-/compare-func-2.0.0.tgz#fb65e75edbddfd2e568554e8b5b05fff7a51fcb3" @@ -8395,13 +8424,32 @@ jsii-rosetta@5.4.30: workerpool "^6.5.1" yargs "^17.7.2" -jsii@5.4.31: - version "5.4.31" - resolved "https://registry.yarnpkg.com/jsii/-/jsii-5.4.31.tgz#afe7ff63182421965cab53f055904b559e47e842" - integrity sha512-qxiV/NMucgvHHupZJ36QACejcgZ3qY1FzjVHMOBmDHm+dISZ39p7dH7Hiq2ErMEwCDzdvQgR1OwCsUnrBH6oVQ== +jsii-rosetta@5.4.50: + version "5.4.50" + resolved "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-5.4.50.tgz#f8ba2f2bb2e20bb6e7bacf6ca3c8013c5d12d9c3" + integrity sha512-cNNCs4f9b4QNPf0lDYOyql8UCrmw3irb+TY8+6H2+0QcmvhFVAZAaUP5cAw5/6hMGQj10aWKm/PjOnDD1dIt7w== dependencies: - "@jsii/check-node" "1.102.0" - "@jsii/spec" "^1.102.0" + "@jsii/check-node" "1.106.0" + "@jsii/spec" "^1.106.0" + "@xmldom/xmldom" "^0.9.6" + chalk "^4" + commonmark "^0.31.2" + fast-glob "^3.3.2" + jsii "~5.4.0" + semver "^7.6.3" + semver-intersect "^1.5.0" + stream-json "^1.9.1" + typescript "~5.4" + workerpool "^6.5.1" + yargs "^17.7.2" + +jsii@5.4.50: + version "5.4.50" + resolved "https://registry.npmjs.org/jsii/-/jsii-5.4.50.tgz#8ff2826eae732813dd6e0148fc2d565d693c82b3" + integrity sha512-VEpOjtFykmlEa8+IwxXRZiA1KQueywyiYF8OI/HzCxXR4Asxwd084d4+N1pgDm1eQKQNK5mpj/KjL+VEXsyu8g== + dependencies: + "@jsii/check-node" "1.106.0" + "@jsii/spec" "^1.106.0" case "^1.6.3" chalk "^4" downlevel-dts "^0.11.0" @@ -9214,7 +9262,7 @@ minimist-options@4.1.0: is-plain-obj "^1.1.0" kind-of "^6.0.3" -minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5, minimist@^1.2.6, minimist@~1.2.5: +minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5, minimist@^1.2.6, minimist@~1.2.5, minimist@~1.2.8: version "1.2.8" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== @@ -11706,6 +11754,13 @@ stream-json@^1.8.0: dependencies: stream-chain "^2.2.5" +stream-json@^1.9.1: + version "1.9.1" + resolved "https://registry.npmjs.org/stream-json/-/stream-json-1.9.1.tgz#e3fec03e984a503718946c170db7d74556c2a187" + integrity sha512-uWkjJ+2Nt/LO9Z/JyKZbMusL8Dkh97uUBTv3AJQ74y07lVahLY4eEFsPsE97pxYBwr8nnjMAIch5eqI0gPShyw== + dependencies: + stream-chain "^2.2.5" + streamroller@^3.1.5: version "3.1.5" resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-3.1.5.tgz#1263182329a45def1ffaef58d31b15d13d2ee7ff"