From 04289e9ad4ac7d0f8321982d41769ced6a54cb8d Mon Sep 17 00:00:00 2001
From: Andrew Hammond <445764+ahammond@users.noreply.github.com>
Date: Tue, 20 Feb 2024 11:27:41 -0800
Subject: [PATCH] feat(CdkConstructLibrary): jsii 5.3 [CLK-469895] (#246)

Per https://cdk-dev.slack.com/archives/C01BP9PQHPC/p1707258158509359?thread_ts=1706630565.660129&cid=C01BP9PQHPC
push upgrade of JSII and TypeScript version.
---
 src/clickup-cdk.ts                          | 26 ++++++++++++++-------
 test/__snapshots__/clickup-cdk.test.ts.snap |  6 ++---
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/clickup-cdk.ts b/src/clickup-cdk.ts
index eeb83d76..8ff67258 100644
--- a/src/clickup-cdk.ts
+++ b/src/clickup-cdk.ts
@@ -124,15 +124,23 @@ export module clickupCdk {
       const authorAddress = options.authorAddress || clickupTs.defaults.authorAddress;
       // Theoretically we should be able to just take a default here, but for some reason this is required.
       const repositoryUrl = options.repositoryUrl || `https://github.com/${name.substring(1)}.git`;
-      const mergedOptions = merge(clickupTs.defaults, { jsiiVersion: '5.0.*' }, options, {
-        authorName,
-        authorAddress,
-        name,
-        repositoryUrl,
-        renovatebotOptions: renovateWorkflow.getRenovateOptions(options.renovateOptionsConfig),
-        cdkDiffOptions: cdkDiffWorkflow.getCDKDiffOptions(options.cdkDiffOptionsConfig),
-        codecovBypassOptions: codecovBypassWorkflow.getCodecovBypassOptions(options.codecovBypassOptionsConfig),
-      });
+      const mergedOptions = merge(
+        clickupTs.defaults,
+        {
+          jsiiVersion: '~5.3.0', // Force JSII upgrade CLK-469895
+          typescriptVersion: '~5.3.0',
+        },
+        options,
+        {
+          authorName,
+          authorAddress,
+          name,
+          repositoryUrl,
+          renovatebotOptions: renovateWorkflow.getRenovateOptions(options.renovateOptionsConfig),
+          cdkDiffOptions: cdkDiffWorkflow.getCDKDiffOptions(options.cdkDiffOptionsConfig),
+          codecovBypassOptions: codecovBypassWorkflow.getCodecovBypassOptions(options.codecovBypassOptionsConfig),
+        },
+      );
       super(mergedOptions);
       clickupTs.fixTsNodeDeps(this.package);
       codecov.addCodeCovYml(this);
diff --git a/test/__snapshots__/clickup-cdk.test.ts.snap b/test/__snapshots__/clickup-cdk.test.ts.snap
index 915e635a..54480dbf 100644
--- a/test/__snapshots__/clickup-cdk.test.ts.snap
+++ b/test/__snapshots__/clickup-cdk.test.ts.snap
@@ -23,18 +23,18 @@ exports[`ClickUpCdkConstructLibrary defaults package.json 1`] = `
     "eslint-plugin-prettier": "*",
     "jest": "*",
     "jest-junit": "^15",
-    "jsii": "5.0.*",
+    "jsii": "~5.3.0",
     "jsii-diff": "*",
     "jsii-docgen": "*",
     "jsii-pacmak": "*",
     "jsii-release": "*",
-    "jsii-rosetta": "5.0.*",
+    "jsii-rosetta": "~5.3.0",
     "prettier": "*",
     "projen": "*",
     "standard-version": "^9",
     "ts-jest": "*",
     "ts-node": "^10",
-    "typescript": "*",
+    "typescript": "~5.3.0",
   },
   "engines": {
     "node": ">= 18.17.1",