From ae982c87ff1d8afd483fd77d0f8ecb728e052348 Mon Sep 17 00:00:00 2001 From: Ari Palo Date: Tue, 19 Nov 2024 21:37:38 +0200 Subject: [PATCH] Revert "build: upgrade jsii to 5.6.0 (latest) and run pj build" This reverts commit a593713ad26b8731c14ddfd10d603ac2a814ad8c. JSII 5.6.0 was released just several hours ago and therefore the jsii ecosystem as a whole is not yet ready for it. See for example: https://github.com/cdklabs/jsii-docgen/issues/1643 --- .projen/deps.json | 4 +- .projenrc.ts | 2 +- package-lock.json | 121 ++++++++++++++++++++++++++++------------------ package.json | 4 +- 4 files changed, 79 insertions(+), 52 deletions(-) diff --git a/.projen/deps.json b/.projen/deps.json index 46ec29e..d4a895d 100644 --- a/.projen/deps.json +++ b/.projen/deps.json @@ -69,12 +69,12 @@ }, { "name": "jsii-rosetta", - "version": "~5.6.0", + "version": "~5.5.0", "type": "build" }, { "name": "jsii", - "version": "~5.6.0", + "version": "~5.5.0", "type": "build" }, { diff --git a/.projenrc.ts b/.projenrc.ts index 34f3feb..acfb16d 100644 --- a/.projenrc.ts +++ b/.projenrc.ts @@ -4,7 +4,7 @@ import { JobPermission } from 'projen/lib/github/workflows-model'; const project = new awscdk.AwsCdkConstructLibrary({ projenrcTs: true, - jsiiVersion: '~5.6.0', + jsiiVersion: '~5.5.0', // Metadata stability: 'experimental', author: 'Alma Media', diff --git a/package-lock.json b/package-lock.json index e42f810..b178ab2 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.6.0", + "jsii": "~5.5.0", "jsii-diff": "^1.105.0", "jsii-docgen": "^10.5.0", "jsii-pacmak": "^1.105.0", - "jsii-rosetta": "~5.6.0", + "jsii-rosetta": "~5.5.0", "projen": "^0.90.3", "ts-jest": "^27", "ts-node": "^10.9.2", @@ -4173,6 +4173,20 @@ "node": ">=4" } }, + "node_modules/downlevel-dts": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/downlevel-dts/-/downlevel-dts-0.11.0.tgz", + "integrity": "sha512-vo835pntK7kzYStk7xUHDifiYJvXxVhUapt85uk2AI94gUUAQX9HNRtrcMHNSc3YHJUEHGbYIGsM99uIbgAtxw==", + "dev": true, + "dependencies": { + "semver": "^7.3.2", + "shelljs": "^0.8.3", + "typescript": "next" + }, + "bin": { + "downlevel-dts": "index.js" + } + }, "node_modules/electron-to-chromium": { "version": "1.4.711", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.711.tgz", @@ -5557,6 +5571,15 @@ "node": ">= 0.4" } }, + "node_modules/interpret": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz", + "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==", + "dev": true, + "engines": { + "node": ">= 0.10" + } + }, "node_modules/is-array-buffer": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz", @@ -6673,22 +6696,23 @@ } }, "node_modules/jsii": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/jsii/-/jsii-5.6.0.tgz", - "integrity": "sha512-XBXAF9a4UF2HE+LMSa+WDuYRNpmZlBxHrXaTVIFumo0oAuKb9eauPd4slwgQnCftyP5iyk8zX/Z2y4I3yQVcfA==", + "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.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", "fast-deep-equal": "^3.1.3", "log4js": "^6.9.1", "semver": "^7.6.3", "semver-intersect": "^1.5.0", "sort-json": "^2.0.1", "spdx-license-list": "^6.9.0", - "typescript": "~5.6", + "typescript": "~5.5", "yargs": "^17.7.2" }, "bin": { @@ -6847,22 +6871,22 @@ } }, "node_modules/jsii-rosetta": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-5.6.0.tgz", - "integrity": "sha512-PSt2PFK1ssLcRAiGnK+k0On61Idh8uTCJcofC+vPr3dOgbVNbtIVI70z9Uw2bOwByrJ+ApHewubi7cWhybEcrA==", + "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.104.0", - "@jsii/spec": "^1.104.0", + "@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.6.0", + "jsii": "~5.5.0", "semver": "^7.6.3", "semver-intersect": "^1.5.0", "stream-json": "^1.9.1", - "typescript": "~5.6", + "typescript": "~5.5", "workerpool": "^6.5.1", "yargs": "^17.7.2" }, @@ -6873,19 +6897,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", @@ -6910,9 +6921,9 @@ } }, "node_modules/jsii-rosetta/node_modules/typescript": { - "version": "5.6.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz", - "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==", + "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", @@ -6949,19 +6960,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", @@ -6977,9 +6975,9 @@ } }, "node_modules/jsii/node_modules/typescript": { - "version": "5.6.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz", - "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==", + "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", @@ -9119,6 +9117,18 @@ "node": ">= 6" } }, + "node_modules/rechoir": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", + "integrity": "sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==", + "dev": true, + "dependencies": { + "resolve": "^1.1.6" + }, + "engines": { + "node": ">= 0.10" + } + }, "node_modules/redent": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz", @@ -9457,6 +9467,23 @@ "node": ">=8" } }, + "node_modules/shelljs": { + "version": "0.8.5", + "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.5.tgz", + "integrity": "sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==", + "dev": true, + "dependencies": { + "glob": "^7.0.0", + "interpret": "^1.0.0", + "rechoir": "^0.6.2" + }, + "bin": { + "shjs": "bin/shjs" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/side-channel": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", diff --git a/package.json b/package.json index 6cce661..478b47a 100644 --- a/package.json +++ b/package.json @@ -52,11 +52,11 @@ "eslint-plugin-import": "^2.31.0", "jest": "^27", "jest-junit": "^15", - "jsii": "~5.6.0", + "jsii": "~5.5.0", "jsii-diff": "^1.105.0", "jsii-docgen": "^10.5.0", "jsii-pacmak": "^1.105.0", - "jsii-rosetta": "~5.6.0", + "jsii-rosetta": "~5.5.0", "projen": "^0.90.3", "ts-jest": "^27", "ts-node": "^10.9.2",