From 84b0c671f42cd25fa8db24bc00d242015595ff0d Mon Sep 17 00:00:00 2001 From: Chris Rybicki Date: Mon, 16 Sep 2024 17:32:22 -0400 Subject: [PATCH] chore: update to jsii v5.5 --- package.json | 2 +- .../@winglang/jsii-docgen/.projen/deps.json | 2 +- packages/@winglang/jsii-docgen/.projenrc.ts | 2 +- packages/@winglang/jsii-docgen/package.json | 2 +- .../libraries/construct-library/package.json | 2 +- packages/@winglang/sdk/.projen/deps.json | 2 +- packages/@winglang/sdk/.projenrc.ts | 2 +- packages/@winglang/sdk/package.json | 2 +- .../src/fixtures/constructs/package.json | 12 +-- packages/jsii-fixture/package.json | 4 +- .../{jsii@5.3.39.patch => jsii@5.5.4.patch} | 12 +-- pnpm-lock.yaml | 79 ++++++++++++++----- 12 files changed, 80 insertions(+), 43 deletions(-) rename patches/{jsii@5.3.39.patch => jsii@5.5.4.patch} (83%) diff --git a/package.json b/package.json index d36e9aa8d11..22a02a503e6 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "wasi-js@1.7.3": "patches/wasi-js@1.7.3.patch", "mime@3.0.0": "patches/mime@3.0.0.patch", "protobufjs@7.2.5": "patches/protobufjs@7.2.5.patch", - "jsii@5.3.39": "patches/jsii@5.3.39.patch" + "jsii@5.5.4": "patches/jsii@5.5.4.patch" } } } diff --git a/packages/@winglang/jsii-docgen/.projen/deps.json b/packages/@winglang/jsii-docgen/.projen/deps.json index f29ac59239f..5dc8a127ad3 100644 --- a/packages/@winglang/jsii-docgen/.projen/deps.json +++ b/packages/@winglang/jsii-docgen/.projen/deps.json @@ -59,7 +59,7 @@ }, { "name": "jsii", - "version": "~5.3.39", + "version": "~5.5.4", "type": "build" }, { diff --git a/packages/@winglang/jsii-docgen/.projenrc.ts b/packages/@winglang/jsii-docgen/.projenrc.ts index c86a25e23e4..a8db6352843 100644 --- a/packages/@winglang/jsii-docgen/.projenrc.ts +++ b/packages/@winglang/jsii-docgen/.projenrc.ts @@ -17,7 +17,7 @@ const project = new typescript.TypeScriptProject({ devDeps: [ "vitest", "tsx", - "jsii@~5.3.39", + "jsii@~5.5.4", "@types/fs-extra", "@types/semver", "@types/yargs@^16", diff --git a/packages/@winglang/jsii-docgen/package.json b/packages/@winglang/jsii-docgen/package.json index 90ddd133636..430e383a6a3 100644 --- a/packages/@winglang/jsii-docgen/package.json +++ b/packages/@winglang/jsii-docgen/package.json @@ -42,7 +42,7 @@ "eslint-import-resolver-typescript": "^3.6.1", "eslint-plugin-import": "^2.29.1", "eslint-plugin-prettier": "^4.2.1", - "jsii": "~5.3.39", + "jsii": "~5.5.4", "prettier": "^2.8.8", "projen": "^0.71.163", "tsx": "^4.15.7", diff --git a/packages/@winglang/jsii-docgen/test/__fixtures__/libraries/construct-library/package.json b/packages/@winglang/jsii-docgen/test/__fixtures__/libraries/construct-library/package.json index 646bacfca2a..5647b8c8615 100644 --- a/packages/@winglang/jsii-docgen/test/__fixtures__/libraries/construct-library/package.json +++ b/packages/@winglang/jsii-docgen/test/__fixtures__/libraries/construct-library/package.json @@ -43,7 +43,7 @@ "@types/node": "^20.11.0", "@types/prettier": "2.6.0", "constructs": "3.4.344", - "jsii": "~5.3.39", + "jsii": "~5.5.4", "typescript": "^5.5.2" }, "license": "Apache-2.0", diff --git a/packages/@winglang/sdk/.projen/deps.json b/packages/@winglang/sdk/.projen/deps.json index 5ac5b41cc7a..c38b2198449 100644 --- a/packages/@winglang/sdk/.projen/deps.json +++ b/packages/@winglang/sdk/.projen/deps.json @@ -119,7 +119,7 @@ }, { "name": "jsii", - "version": "~5.3.39", + "version": "~5.5.4", "type": "build" }, { diff --git a/packages/@winglang/sdk/.projenrc.ts b/packages/@winglang/sdk/.projenrc.ts index bceaaf1a4d8..7e2d86aaed5 100644 --- a/packages/@winglang/sdk/.projenrc.ts +++ b/packages/@winglang/sdk/.projenrc.ts @@ -137,7 +137,7 @@ const project = new cdk.JsiiProject({ codeCovTokenSecret: "CODECOV_TOKEN", github: false, projenrcTs: true, - jsiiVersion: "~5.3.39", + jsiiVersion: "~5.5.4", }); project.defaultTask!.reset("tsx --tsconfig tsconfig.dev.json .projenrc.ts"); project.deps.removeDependency("ts-node"); diff --git a/packages/@winglang/sdk/package.json b/packages/@winglang/sdk/package.json index 5f4563f976f..8f59d40e1d5 100644 --- a/packages/@winglang/sdk/package.json +++ b/packages/@winglang/sdk/package.json @@ -61,7 +61,7 @@ "eslint-plugin-prettier": "^4.2.1", "eslint-plugin-sort-exports": "^0.8.0", "fs-extra": "^10.1.0", - "jsii": "~5.3.39", + "jsii": "~5.5.4", "jsii-diff": "^1.100.0", "jsii-pacmak": "^1.100.0", "mock-gcs": "^1.2.0", diff --git a/packages/@winglang/wingii/src/fixtures/constructs/package.json b/packages/@winglang/wingii/src/fixtures/constructs/package.json index da07637c86c..7458af1f9c6 100644 --- a/packages/@winglang/wingii/src/fixtures/constructs/package.json +++ b/packages/@winglang/wingii/src/fixtures/constructs/package.json @@ -20,10 +20,10 @@ "eslint-import-resolver-node": "^0.3.6", "eslint-import-resolver-typescript": "^2.7.1", "eslint-plugin-import": "^2.26.0", - "jsii": "~5.3.11", - "jsii-diff": "^1.94.0", - "jsii-docgen": "^10.3.19", - "jsii-pacmak": "^1.94.0", + "jsii": "~5.5.4", + "jsii-diff": "^1.103.1", + "jsii-docgen": "^10.5.4", + "jsii-pacmak": "^1.103.1", "json-schema": "^0.4.0", "npm-check-updates": "^15", "projen": "^0.62.3", @@ -79,7 +79,7 @@ "ignore": true }, "volta": { - "extends": "../../../../../package.json" + "extends": "../../../../../../package.json" }, "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \"pnpm projen\"." -} \ No newline at end of file +} diff --git a/packages/jsii-fixture/package.json b/packages/jsii-fixture/package.json index 50e1e9f2993..995e1b9a01b 100644 --- a/packages/jsii-fixture/package.json +++ b/packages/jsii-fixture/package.json @@ -30,9 +30,9 @@ "private": true, "homepage": "https://github.com/winglang/wing", "devDependencies": { - "jsii": "~5.3.39" + "jsii": "~5.5.4" }, "volta": { "extends": "../../package.json" } -} \ No newline at end of file +} diff --git a/patches/jsii@5.3.39.patch b/patches/jsii@5.5.4.patch similarity index 83% rename from patches/jsii@5.3.39.patch rename to patches/jsii@5.5.4.patch index 163c10f3166..a8985e81ec3 100644 --- a/patches/jsii@5.3.39.patch +++ b/patches/jsii@5.5.4.patch @@ -1,8 +1,8 @@ diff --git a/lib/assembler.js b/lib/assembler.js -index 75fbc9583eb98336f94f3245cc656ba786021472..aee348079ebcffa71d12a412fe32766af97ed9c1 100644 +index a8ae750fa6ec83cd56b84848bcd3cfdd4c297de1..c620930d412b6c87c8f38dcf0cd5f6ce17189d70 100644 --- a/lib/assembler.js +++ b/lib/assembler.js -@@ -1572,7 +1572,12 @@ class Assembler { +@@ -1575,7 +1575,12 @@ class Assembler { return { type: spec.CANONICAL_ANY }; } if (type.symbol.name === 'Array') { @@ -16,7 +16,7 @@ index 75fbc9583eb98336f94f3245cc656ba786021472..aee348079ebcffa71d12a412fe32766a } if (type.symbol.name === '__type' && type.symbol.members) { return { type: _mapType.call(this) }; -@@ -1583,9 +1588,9 @@ class Assembler { +@@ -1586,9 +1591,9 @@ class Assembler { this._diagnostics.push(jsii_diagnostic_1.JsiiDiagnostic.JSII_1002_UNSPECIFIED_PROMISE.create(declaration)); return { type: spec.CANONICAL_ANY }; } @@ -30,15 +30,15 @@ index 75fbc9583eb98336f94f3245cc656ba786021472..aee348079ebcffa71d12a412fe32766a const fqn = this._getFQN(type, declaration, purpose, isThisType); if (fqn == null) { diff --git a/lib/tsconfig/compiler-options.js b/lib/tsconfig/compiler-options.js -index e97343ab6ec9cfccda4b5a0c3780796755eb2b0a..2c1eaad9288c2951cba6410fd344647ebce884b5 100644 +index e7ac0ec99906448c609beff54dc868bf41c2da82..fab0114ba5ae57f71ca987d08b19eb176d3e9b7d 100644 --- a/lib/tsconfig/compiler-options.js +++ b/lib/tsconfig/compiler-options.js -@@ -8,8 +8,9 @@ exports.BASE_COMPILER_OPTIONS = { +@@ -15,8 +15,9 @@ exports.BASE_COMPILER_OPTIONS = { declaration: true, experimentalDecorators: true, incremental: true, - lib: ['lib.es2020.d.ts'], -+ lib: ['lib.es2020.d.ts','lib.dom.d.ts'], ++ lib: ['lib.es2020.d.ts', 'lib.dom.d.ts'], module: ts.ModuleKind.CommonJS, + esModuleInterop: true, noEmitOnError: true, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 24febfdb486..fd2ae854277 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,9 +9,9 @@ overrides: axios@>=0.8.1 <0.28.0: '>=0.28.0' patchedDependencies: - jsii@5.3.39: - hash: wolfkkypbs5h5o2e2c4c7vi7xu - path: patches/jsii@5.3.39.patch + jsii@5.5.4: + hash: in545kl6dgh5zsq3xp2uirvjzq + path: patches/jsii@5.5.4.patch mime@3.0.0: hash: 2he2uszztbibyal6zfzmv2a2oa path: patches/mime@3.0.0.patch @@ -198,8 +198,8 @@ importers: specifier: ^4.2.1 version: 4.2.1(eslint-config-prettier@8.10.0)(eslint@8.57.0)(prettier@2.8.8) jsii: - specifier: ~5.3.39 - version: 5.3.39(patch_hash=wolfkkypbs5h5o2e2c4c7vi7xu) + specifier: ~5.5.4 + version: 5.5.4(patch_hash=in545kl6dgh5zsq3xp2uirvjzq) prettier: specifier: ^2.8.8 version: 2.8.8 @@ -246,8 +246,8 @@ importers: specifier: 3.4.344 version: 3.4.344 jsii: - specifier: ~5.3.39 - version: 5.3.39(patch_hash=wolfkkypbs5h5o2e2c4c7vi7xu) + specifier: ~5.5.4 + version: 5.5.4(patch_hash=in545kl6dgh5zsq3xp2uirvjzq) typescript: specifier: ^5.5.2 version: 5.5.2 @@ -489,8 +489,8 @@ importers: specifier: ^10.1.0 version: 10.1.0 jsii: - specifier: ~5.3.39 - version: 5.3.39(patch_hash=wolfkkypbs5h5o2e2c4c7vi7xu) + specifier: ~5.5.4 + version: 5.5.4(patch_hash=in545kl6dgh5zsq3xp2uirvjzq) jsii-diff: specifier: ^1.100.0 version: 1.100.0 @@ -598,8 +598,8 @@ importers: packages/jsii-fixture: devDependencies: jsii: - specifier: ~5.3.39 - version: 5.3.39(patch_hash=wolfkkypbs5h5o2e2c4c7vi7xu) + specifier: ~5.5.4 + version: 5.5.4(patch_hash=in545kl6dgh5zsq3xp2uirvjzq) packages/ts-fixture: dependencies: @@ -6611,6 +6611,14 @@ packages: semver: 7.6.3 dev: true + /@jsii/check-node@1.103.1: + resolution: {integrity: sha512-Vi6ONm5WXEim98a2DJ6WMlrP/w5AGzXrrQBpGcfVV7cu86DPx1L0OAZnqzGAJE8ly0VfcSXkmxJ9LFcn3jylBQ==} + engines: {node: '>= 14.17.0'} + dependencies: + chalk: 4.1.2 + semver: 7.6.3 + dev: true + /@jsii/check-node@1.95.0: resolution: {integrity: sha512-E5njkBk6X4WrQHtGeO0ed+cvkMxqinQZY83TJZ9RFEIwrndDfj7asMgWkRkYQRF05AlQXks+Eh8wza7ErIl85Q==} engines: {node: '>= 14.17.0'} @@ -6632,6 +6640,13 @@ packages: dependencies: ajv: 8.17.1 + /@jsii/spec@1.103.1: + resolution: {integrity: sha512-14OGYM3DjEBjUOUaih+bwPgkhFnR8L9TSNSM0oE0L0hjWscTapvClqOgMDJ1ID52qkROCAgKl1d71Vmm4v0Buw==} + engines: {node: '>= 14.17.0'} + dependencies: + ajv: 8.17.1 + dev: true + /@juggle/resize-observer@3.4.0: resolution: {integrity: sha512-dfLbk+PwWvFzSxwk3n5ySL0hfBog779o8h68wK/7/APo/7cgyWp5jcXockbxdk5kFRkbeXWm4Fbi9FrdN381sA==} dev: true @@ -14275,7 +14290,7 @@ packages: dependencies: semver: 7.6.3 shelljs: 0.8.5 - typescript: 5.7.0-dev.20240904 + typescript: 5.7.0-dev.20240916 dev: true /dset@3.1.3: @@ -17479,7 +17494,7 @@ packages: chalk: 4.1.2 commonmark: 0.31.0 fast-glob: 3.3.2 - jsii: 5.3.39(patch_hash=wolfkkypbs5h5o2e2c4c7vi7xu) + jsii: 5.3.39 semver: 7.6.3 semver-intersect: 1.5.0 stream-json: 1.8.0 @@ -17496,7 +17511,7 @@ packages: hasBin: true dependencies: '@jsii/check-node': 1.101.0 - '@jsii/spec': 1.101.0 + '@jsii/spec': 1.103.1 '@xmldom/xmldom': 0.8.10 chalk: 4.1.2 commonmark: 0.31.0 @@ -17517,7 +17532,7 @@ packages: hasBin: true dependencies: fs-extra: 9.1.0 - jsii: 5.3.39(patch_hash=wolfkkypbs5h5o2e2c4c7vi7xu) + jsii: 5.3.39 jsii-pacmak: 1.100.0(jsii-rosetta@5.3.28) ncp: 2.0.0 yargs: 15.4.1 @@ -17531,7 +17546,7 @@ packages: hasBin: true dependencies: fs-extra: 9.1.0 - jsii: 5.3.39(patch_hash=wolfkkypbs5h5o2e2c4c7vi7xu) + jsii: 5.3.39 jsii-pacmak: 1.100.0(jsii-rosetta@5.4.25) ncp: 2.0.0 yargs: 15.4.1 @@ -17584,7 +17599,7 @@ packages: - supports-color dev: true - /jsii@5.3.39(patch_hash=wolfkkypbs5h5o2e2c4c7vi7xu): + /jsii@5.3.39: resolution: {integrity: sha512-EzbS/3H73619BLJjjrVd6WKqNrKYYlTuNGa6yqJEyjqV4y8xMg/id8vP7rimE0CYzE75SfYCmIdPES1qz+wvQQ==} engines: {node: '>= 18.12.0'} hasBin: true @@ -17605,7 +17620,6 @@ packages: transitivePeerDependencies: - supports-color dev: true - patched: true /jsii@5.4.26: resolution: {integrity: sha512-vb1k7wsVfgYysXagV6ASStC7I+uEFRttSxpVSlz3HTNaoQYgQwiShkpqhRLlzYw9Pl5jERs+457QTVSj7Ze+zg==} @@ -17613,7 +17627,7 @@ packages: hasBin: true dependencies: '@jsii/check-node': 1.101.0 - '@jsii/spec': 1.101.0 + '@jsii/spec': 1.103.1 case: 1.6.3 chalk: 4.1.2 downlevel-dts: 0.11.0 @@ -17629,6 +17643,29 @@ packages: - supports-color dev: true + /jsii@5.5.4(patch_hash=in545kl6dgh5zsq3xp2uirvjzq): + resolution: {integrity: sha512-ftEKVacc0kLrxCJyCeVJ+C5JYpUY5GBpy4ckt1LgblYQWa1CDu+5qUn2MvD5k8AwnDp36Dm6iQKislhSTOxBkA==} + engines: {node: '>= 18.12.0'} + hasBin: true + dependencies: + '@jsii/check-node': 1.103.1 + '@jsii/spec': 1.103.1 + case: 1.6.3 + chalk: 4.1.2 + 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.5.2 + yargs: 17.7.2 + transitivePeerDependencies: + - supports-color + dev: true + patched: true + /json-bigint@1.0.0: resolution: {integrity: sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==} dependencies: @@ -22575,8 +22612,8 @@ packages: engines: {node: '>=14.17'} hasBin: true - /typescript@5.7.0-dev.20240904: - resolution: {integrity: sha512-iGi6VWFGOuxPvDfwfK1/8C172NWzC5gtC4G2dxqCQehrr86WTfFkc9aWucynaxZdwQNMqG1Iu83bmXD7CNHCmg==} + /typescript@5.7.0-dev.20240916: + resolution: {integrity: sha512-PvqtY2wVBTIlHc0+Vs3w3UNntEzSho0uNm56c8D3mFINC/WFcEyOszkwxjSKyqVwEv62zl6xg+p7Ilt3H6yOJA==} engines: {node: '>=14.17'} hasBin: true dev: true