From e5997c1b75ccc43e20c48d98dbd61205916a6dfe Mon Sep 17 00:00:00 2001 From: Phillip Rak Date: Thu, 23 Jan 2025 09:38:44 -0700 Subject: [PATCH 1/2] Add entities to shell dependencies Extensions are failing to run in dev mode due to a dependency mismatch after bumping vue to 3.5. Adding entities as a dependency of shell helps to resolve issues that have been experienced. Signed-off-by: Phillip Rak --- shell/package.json | 1 + shell/yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/shell/package.json b/shell/package.json index c98fbce615e..3850af462bc 100644 --- a/shell/package.json +++ b/shell/package.json @@ -77,6 +77,7 @@ "diff2html": "3.4.24", "dompurify": "2.5.4", "element-matches": "^0.1.2", + "entities": "4.5.0", "eslint-config-standard": "16.0.3", "eslint-import-resolver-node": "0.3.4", "eslint-module-utils": "2.6.1", diff --git a/shell/yarn.lock b/shell/yarn.lock index 179a2fa02e5..8471e4a7d4f 100644 --- a/shell/yarn.lock +++ b/shell/yarn.lock @@ -7072,16 +7072,16 @@ enquirer@^2.3.5, enquirer@^2.3.6: ansi-colors "^4.1.1" strip-ansi "^6.0.1" +entities@4.5.0, entities@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48" + integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw== + entities@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55" integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A== -entities@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48" - integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw== - entities@~2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5" From aa5ecf78ee4ce6b6ec9e1eca23c9808962c9af80 Mon Sep 17 00:00:00 2001 From: Phillip Rak Date: Thu, 23 Jan 2025 09:39:29 -0700 Subject: [PATCH 2/2] Bump shell version Signed-off-by: Phillip Rak --- shell/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell/package.json b/shell/package.json index 3850af462bc..1c57d76fa46 100644 --- a/shell/package.json +++ b/shell/package.json @@ -1,6 +1,6 @@ { "name": "@rancher/shell", - "version": "3.0.2-rc.1", + "version": "3.0.2-rc.2", "description": "Rancher Dashboard Shell", "repository": "https://github.com/rancherlabs/dashboard", "license": "Apache-2.0",