From aee2a998c7a6a74b9749ce89a08dfbbc3bb81aab Mon Sep 17 00:00:00 2001 From: Ari Palo Date: Wed, 20 Nov 2024 14:43:03 +0200 Subject: [PATCH 1/2] build: upgrade JSII tooling to 5.4 and verify with pj build --- .projen/deps.json | 4 +-- .projenrc.ts | 2 +- package-lock.json | 78 ++++++++++++++++------------------------------- package.json | 4 +-- 4 files changed, 31 insertions(+), 57 deletions(-) diff --git a/.projen/deps.json b/.projen/deps.json index 4ff851a..1355c0d 100644 --- a/.projen/deps.json +++ b/.projen/deps.json @@ -70,12 +70,12 @@ }, { "name": "jsii-rosetta", - "version": "~5.3.24", + "version": "~5.4.0", "type": "build" }, { "name": "jsii", - "version": "~5.3.24", + "version": "~5.4.0", "type": "build" }, { diff --git a/.projenrc.ts b/.projenrc.ts index eb3a7d6..0f210e9 100644 --- a/.projenrc.ts +++ b/.projenrc.ts @@ -17,7 +17,7 @@ const project = new awscdk.AwsCdkConstructLibrary({ minNodeVersion: nodejsVersion.MIN, maxNodeVersion: nodejsVersion.MAX, projenrcTs: true, - jsiiVersion: '~5.3.24', + jsiiVersion: '~5.4.0', // Metadata stability: 'experimental', author: 'Alma Media', diff --git a/package-lock.json b/package-lock.json index afe36e4..8ef7fd3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31,11 +31,11 @@ "eslint-plugin-import": "^2.31.0", "jest": "^27", "jest-junit": "^15", - "jsii": "~5.3.24", + "jsii": "~5.4.0", "jsii-diff": "^1.105.0", "jsii-docgen": "^10.5.0", "jsii-pacmak": "^1.105.0", - "jsii-rosetta": "~5.3.24", + "jsii-rosetta": "~5.4.0", "projen": "^0.90.3", "ts-jest": "^27", "ts-node": "^10.9.2", @@ -6699,13 +6699,13 @@ } }, "node_modules/jsii": { - "version": "5.3.59", - "resolved": "https://registry.npmjs.org/jsii/-/jsii-5.3.59.tgz", - "integrity": "sha512-iyCZ8L28On420aiSoNGYH4FkQ0a871u1ewL08QfWmTGoFSZalM1763fVdkW8Irio4mofzOYKO/XtTWGdb6Otvw==", + "version": "5.4.43", + "resolved": "https://registry.npmjs.org/jsii/-/jsii-5.4.43.tgz", + "integrity": "sha512-F6YqKnwp411Ay83ylAWhqWIxOQcPWFWifWH+YrEb7eUPAplqPxGyY4ox2p47N+KOF2+OR1FF4eiOll3brXxr8w==", "dev": true, "dependencies": { - "@jsii/check-node": "1.104.0", - "@jsii/spec": "^1.104.0", + "@jsii/check-node": "1.105.0", + "@jsii/spec": "^1.105.0", "case": "^1.6.3", "chalk": "^4", "downlevel-dts": "^0.11.0", @@ -6715,7 +6715,7 @@ "semver-intersect": "^1.5.0", "sort-json": "^2.0.1", "spdx-license-list": "^6.9.0", - "typescript": "~5.3", + "typescript": "~5.4", "yargs": "^17.7.2" }, "bin": { @@ -6874,22 +6874,22 @@ } }, "node_modules/jsii-rosetta": { - "version": "5.3.58", - "resolved": "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-5.3.58.tgz", - "integrity": "sha512-Ght81r9fWX5lfES4DUNruM53sSD8fTU8ReTKEtyIraqrlScbpza6RBAsufoOENSSNwKDyZavJ3Dyc2Ch7brU4A==", + "version": "5.4.45", + "resolved": "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-5.4.45.tgz", + "integrity": "sha512-8ub9p2rts8FF4cz22nivi8yKi6N7SaSSsd712jwhF9HkeEiFbxZwPN+sj1yYRo7h0X38MEkdpCjEniMI+e/85g==", "dev": true, "dependencies": { - "@jsii/check-node": "1.104.0", - "@jsii/spec": "^1.104.0", - "@xmldom/xmldom": "^0.9.4", + "@jsii/check-node": "1.105.0", + "@jsii/spec": "^1.105.0", + "@xmldom/xmldom": "^0.9.5", "chalk": "^4", "commonmark": "^0.31.2", "fast-glob": "^3.3.2", - "jsii": "~5.3.0", + "jsii": "~5.4.0", "semver": "^7.6.3", "semver-intersect": "^1.5.0", - "stream-json": "^1.8.0", - "typescript": "~5.3", + "stream-json": "^1.9.1", + "typescript": "~5.4", "workerpool": "^6.5.1", "yargs": "^17.7.2" }, @@ -6900,19 +6900,6 @@ "node": ">= 18.12.0" } }, - "node_modules/jsii-rosetta/node_modules/@jsii/check-node": { - "version": "1.104.0", - "resolved": "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.104.0.tgz", - "integrity": "sha512-5rAn4y11APxq69DmTKtAACmDuOymcTiz29CE7s0AeWA5jzpxBRhkaj8xwixiSQtkoBFk+Vpoi2eNctCvwLdFaw==", - "dev": true, - "dependencies": { - "chalk": "^4.1.2", - "semver": "^7.6.3" - }, - "engines": { - "node": ">= 14.17.0" - } - }, "node_modules/jsii-rosetta/node_modules/@xmldom/xmldom": { "version": "0.9.5", "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.9.5.tgz", @@ -6937,9 +6924,9 @@ } }, "node_modules/jsii-rosetta/node_modules/typescript": { - "version": "5.3.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz", - "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==", + "version": "5.4.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz", + "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -6976,19 +6963,6 @@ "node": ">=12" } }, - "node_modules/jsii/node_modules/@jsii/check-node": { - "version": "1.104.0", - "resolved": "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.104.0.tgz", - "integrity": "sha512-5rAn4y11APxq69DmTKtAACmDuOymcTiz29CE7s0AeWA5jzpxBRhkaj8xwixiSQtkoBFk+Vpoi2eNctCvwLdFaw==", - "dev": true, - "dependencies": { - "chalk": "^4.1.2", - "semver": "^7.6.3" - }, - "engines": { - "node": ">= 14.17.0" - } - }, "node_modules/jsii/node_modules/cliui": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", @@ -7004,9 +6978,9 @@ } }, "node_modules/jsii/node_modules/typescript": { - "version": "5.3.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz", - "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==", + "version": "5.4.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz", + "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -9697,9 +9671,9 @@ "dev": true }, "node_modules/stream-json": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/stream-json/-/stream-json-1.8.0.tgz", - "integrity": "sha512-HZfXngYHUAr1exT4fxlbc1IOce1RYxp2ldeaf97LYCOPSoOqY/1Psp7iGvpb+6JIOgkra9zDYnPX01hGAHzEPw==", + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/stream-json/-/stream-json-1.9.1.tgz", + "integrity": "sha512-uWkjJ+2Nt/LO9Z/JyKZbMusL8Dkh97uUBTv3AJQ74y07lVahLY4eEFsPsE97pxYBwr8nnjMAIch5eqI0gPShyw==", "dev": true, "dependencies": { "stream-chain": "^2.2.5" diff --git a/package.json b/package.json index 74e14cb..de75b0e 100644 --- a/package.json +++ b/package.json @@ -52,11 +52,11 @@ "eslint-plugin-import": "^2.31.0", "jest": "^27", "jest-junit": "^15", - "jsii": "~5.3.24", + "jsii": "~5.4.0", "jsii-diff": "^1.105.0", "jsii-docgen": "^10.5.0", "jsii-pacmak": "^1.105.0", - "jsii-rosetta": "~5.3.24", + "jsii-rosetta": "~5.4.0", "projen": "^0.90.3", "ts-jest": "^27", "ts-node": "^10.9.2", From 75c9db24afdb7acc2dc80af661f371e139c53f75 Mon Sep 17 00:00:00 2001 From: Ari Palo Date: Wed, 20 Nov 2024 14:45:24 +0200 Subject: [PATCH 2/2] build: upgrade JSII tooling to 5.5 and verify with pj build --- .projen/deps.json | 4 ++-- .projenrc.ts | 2 +- package-lock.json | 34 +++++++++++++++++----------------- package.json | 4 ++-- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.projen/deps.json b/.projen/deps.json index 1355c0d..df6c273 100644 --- a/.projen/deps.json +++ b/.projen/deps.json @@ -70,12 +70,12 @@ }, { "name": "jsii-rosetta", - "version": "~5.4.0", + "version": "~5.5.0", "type": "build" }, { "name": "jsii", - "version": "~5.4.0", + "version": "~5.5.0", "type": "build" }, { diff --git a/.projenrc.ts b/.projenrc.ts index 0f210e9..f640c04 100644 --- a/.projenrc.ts +++ b/.projenrc.ts @@ -17,7 +17,7 @@ const project = new awscdk.AwsCdkConstructLibrary({ minNodeVersion: nodejsVersion.MIN, maxNodeVersion: nodejsVersion.MAX, projenrcTs: true, - jsiiVersion: '~5.4.0', + jsiiVersion: '~5.5.0', // Metadata stability: 'experimental', author: 'Alma Media', diff --git a/package-lock.json b/package-lock.json index 8ef7fd3..681f1e0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31,11 +31,11 @@ "eslint-plugin-import": "^2.31.0", "jest": "^27", "jest-junit": "^15", - "jsii": "~5.4.0", + "jsii": "~5.5.0", "jsii-diff": "^1.105.0", "jsii-docgen": "^10.5.0", "jsii-pacmak": "^1.105.0", - "jsii-rosetta": "~5.4.0", + "jsii-rosetta": "~5.5.0", "projen": "^0.90.3", "ts-jest": "^27", "ts-node": "^10.9.2", @@ -6699,9 +6699,9 @@ } }, "node_modules/jsii": { - "version": "5.4.43", - "resolved": "https://registry.npmjs.org/jsii/-/jsii-5.4.43.tgz", - "integrity": "sha512-F6YqKnwp411Ay83ylAWhqWIxOQcPWFWifWH+YrEb7eUPAplqPxGyY4ox2p47N+KOF2+OR1FF4eiOll3brXxr8w==", + "version": "5.5.10", + "resolved": "https://registry.npmjs.org/jsii/-/jsii-5.5.10.tgz", + "integrity": "sha512-LsZlV3Nf2IkLtwHKs9rLW+0Lo3i7H735f4eVpQ3C5PVuWhklUIWkm6Wa4qf7/ZRK7CniNeIPhPTlL9bc2Np6ug==", "dev": true, "dependencies": { "@jsii/check-node": "1.105.0", @@ -6715,7 +6715,7 @@ "semver-intersect": "^1.5.0", "sort-json": "^2.0.1", "spdx-license-list": "^6.9.0", - "typescript": "~5.4", + "typescript": "~5.5", "yargs": "^17.7.2" }, "bin": { @@ -6874,9 +6874,9 @@ } }, "node_modules/jsii-rosetta": { - "version": "5.4.45", - "resolved": "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-5.4.45.tgz", - "integrity": "sha512-8ub9p2rts8FF4cz22nivi8yKi6N7SaSSsd712jwhF9HkeEiFbxZwPN+sj1yYRo7h0X38MEkdpCjEniMI+e/85g==", + "version": "5.5.14", + "resolved": "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-5.5.14.tgz", + "integrity": "sha512-vEdfrZFImN5hM4BPSljc1gCtHEOu/w0X1/NFjd9q3XHUYtPB/TqYmrcdMlST8A+qTaPIGI7z1GRdz7tyA29y4g==", "dev": true, "dependencies": { "@jsii/check-node": "1.105.0", @@ -6885,11 +6885,11 @@ "chalk": "^4", "commonmark": "^0.31.2", "fast-glob": "^3.3.2", - "jsii": "~5.4.0", + "jsii": "~5.5.0", "semver": "^7.6.3", "semver-intersect": "^1.5.0", "stream-json": "^1.9.1", - "typescript": "~5.4", + "typescript": "~5.5", "workerpool": "^6.5.1", "yargs": "^17.7.2" }, @@ -6924,9 +6924,9 @@ } }, "node_modules/jsii-rosetta/node_modules/typescript": { - "version": "5.4.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz", - "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==", + "version": "5.5.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz", + "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -6978,9 +6978,9 @@ } }, "node_modules/jsii/node_modules/typescript": { - "version": "5.4.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz", - "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==", + "version": "5.5.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz", + "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==", "dev": true, "bin": { "tsc": "bin/tsc", diff --git a/package.json b/package.json index de75b0e..3a8248f 100644 --- a/package.json +++ b/package.json @@ -52,11 +52,11 @@ "eslint-plugin-import": "^2.31.0", "jest": "^27", "jest-junit": "^15", - "jsii": "~5.4.0", + "jsii": "~5.5.0", "jsii-diff": "^1.105.0", "jsii-docgen": "^10.5.0", "jsii-pacmak": "^1.105.0", - "jsii-rosetta": "~5.4.0", + "jsii-rosetta": "~5.5.0", "projen": "^0.90.3", "ts-jest": "^27", "ts-node": "^10.9.2",