From 1ce437ef928af04120bbd5020571d115237f09f7 Mon Sep 17 00:00:00 2001
From: Nancy <42977925+mantis-toboggan-md@users.noreply.github.com>
Date: Wed, 10 Jan 2024 11:00:36 -0800
Subject: [PATCH] add newer typescript version, fix @shell tsconfig (#21)

* add newer typescript version, fix @shell tsconfig

* bump typescript
---
 package.json           | 13 +++++++++----
 pkg/capi/tsconfig.json |  2 +-
 yarn.lock              |  5 +++++
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 74e1f99..d890389 100644
--- a/package.json
+++ b/package.json
@@ -1,18 +1,23 @@
 {
   "name": "capi-ui",
   "description": "UI for CAPI cluster provisioning using the Rancher Turtles extension",
-  "rancher": { "annotations": { "catalog.cattle.io/display-name": "Rancher Turtles" } },
+  "rancher": {
+    "annotations": {
+      "catalog.cattle.io/display-name": "Rancher Turtles"
+    }
+  },
   "version": "0.1.0",
   "private": false,
   "engines": {
     "node": ">=12"
   },
   "dependencies": {
+    "@rancher/components": "0.1.3",
     "@rancher/shell": "^0.3.24",
+    "@types/lodash": "4.14.184",
     "core-js": "3.21.1",
     "css-loader": "6.7.3",
-    "@types/lodash": "4.14.184",
-    "@rancher/components": "0.1.3"
+    "typescript": "4.5.5"
   },
   "resolutions": {
     "**/webpack": "4",
@@ -27,4 +32,4 @@
     "publish-pkgs": "./node_modules/@rancher/shell/scripts/extension/publish",
     "parse-tag-name": "./node_modules/@rancher/shell/scripts/extension/parse-tag-name"
   }
-}
\ No newline at end of file
+}
diff --git a/pkg/capi/tsconfig.json b/pkg/capi/tsconfig.json
index 09f3601..d66d599 100644
--- a/pkg/capi/tsconfig.json
+++ b/pkg/capi/tsconfig.json
@@ -34,7 +34,7 @@
     ],
     "paths": {
       "@shell/*": [
-        "../../node_modules/@rancher/shell/*"
+        "@rancher/shell/*"
       ],
       "@components/*": [
         "@rancher/components/*"
diff --git a/yarn.lock b/yarn.lock
index da48a00..faeab15 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -16162,6 +16162,11 @@ typescript@4.1.6:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.6.tgz#1becd85d77567c3c741172339e93ce2e69932138"
   integrity sha512-pxnwLxeb/Z5SP80JDRzVjh58KsM6jZHRAOtTpS7sXLS4ogXNKC9ANxHHZqLLeVHZN35jCtI4JdmLLbLiC1kBow==
 
+typescript@4.5.5:
+  version "4.5.5"
+  resolved "https://registry.npmjs.org/typescript/-/typescript-4.5.5.tgz#d8c953832d28924a9e3d37c73d729c846c5896f3"
+  integrity sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA==
+
 typescript@~4.2:
   version "4.2.4"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.4.tgz#8610b59747de028fda898a8aef0e103f156d0961"