backport fix for PR 11377 (#11394)

rancher · Jul 9, 2024 · a5b0e97 · a5b0e97
1 parent bc56037
commit a5b0e97
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/.github/workflows/check-plugins.yaml b/.github/workflows/check-plugins.yaml
@@ -9,11 +9,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v1
+      uses: actions/checkout@v4
     - name: Setup Node.js
-      uses: actions/setup-node@v2
+      uses: actions/setup-node@v4
       with:
-        node-version: '16.x'
+        node-version: '16.20.2'
     - name: Validate Plugin build system
       run: ./shell/scripts/test-plugins-build.sh
       shell: bash

diff --git a/.github/workflows/storybook.yaml b/.github/workflows/storybook.yaml
@@ -12,11 +12,11 @@ jobs:
   storybook:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Use Node.js
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v4
       with:
-        node-version: '16.x'
+        node-version: '16.20.2'
     - name: Install packages
       run: yarn install
     - name: Build Storybook

diff --git a/shell/creators/app/app.package.json b/shell/creators/app/app.package.json
@@ -8,6 +8,7 @@
   "dependencies": {},
   "resolutions": {
     "**/webpack": "4",
-    "@types/node": "^16"
+    "@types/node": "^16",
+    "glob": "7.2.3"
   }  
 }
diff --git a/shell/package.json b/shell/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rancher/shell",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",

diff --git a/storybook/package.json b/storybook/package.json
@@ -28,5 +28,8 @@
   "dependencies": {
     "tsconfig-paths-webpack-plugin": "^4.0.0",
     "vue-loader": "15.10.1"
+  },
+  "resolutions": {
+    "glob": "7.2.3"
   }
 }