dashboard-shell-shell 3.0.5-test.44 → 3.0.5-test.45

package/components/ClusterIconMenu.vue

@@ -168,7 +168,7 @@ export default {
     text-transform: uppercase;
 
     .custom-color-decoration {
-      height: 4px;
+      height: 0px;
       width: 100%;
       margin: 0 auto;
       position: absolute;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dashboard-shell-shell",
-  "version": "3.0.5-test.44",
+  "version": "3.0.5-test.45",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",

package/scripts/build-pkg.sh

@@ -2,7 +2,6 @@
 
 SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 BASE_DIR="$( cd $SCRIPT_DIR && cd ../.. & pwd)"
-SHELL_DIR=$BASE_DIR/shell/
 EXIT_CODE=0
 FORMATS="umd-min"
 
@@ -19,12 +18,18 @@ done
 
 shift $((OPTIND-1))
 
-# Use shell folder in node modules when we have @rancher/shell installed as a node module
-# rather than the use-case of the mono-repo with the shell folder at the top-level
-if [ ! -d ${SHELL_DIR} ]; then
-  SHELL_DIR=$BASE_DIR/node_modules/@rancher/shell/
-  SHELL_DIR=$(cd -P ${SHELL_DIR} && pwd)
+# ---- 修改这里 ----
+# 优先使用顶级 shell 文件夹，如果不存在则使用 node_modules/dashboard-shell-shell
+SHELL_DIR=$BASE_DIR/shell/
+if [ ! -d "${SHELL_DIR}" ]; then
+  SHELL_DIR=$BASE_DIR/node_modules/dashboard-shell-shell/
+  if [ ! -d "${SHELL_DIR}" ]; then
+    echo "Error: dashboard-shell-shell not found in node_modules"
+    exit 1
+  fi
 fi
+# 转为绝对路径，防止符号链接循环
+SHELL_DIR=$(cd -P "${SHELL_DIR}" && pwd)
 
 CREATE_TARBALL=${2}
 
@@ -46,18 +51,14 @@ if [ -d "${BASE_DIR}/pkg/${1}" ]; then
 
   pushd pkg/${1}
 
-  # Check that the .shell link exists and points to the correct place
-  if [ -e ".shell" ]; then
-    LINK=$(readlink .shell)
-    if [ "${LINK}" != "${SHELL_DIR}" ]; then
-      echo ".shell symlink exists but does not point to expected location - please check and fix"
-      popd
-      exit -1
-    fi
-  else
-    ln -s ${SHELL_DIR} .shell
+  # 删除旧的 .shell，防止循环
+  if [ -L ".shell" ] || [ -e ".shell" ]; then
+    rm -rf .shell
   fi
 
+  # 创建新的符号链接
+  ln -s "${SHELL_DIR}" .shell
+
   FILE=index.js
   if [ -f ./index.ts ]; then
     FILE=index.ts
@@ -72,7 +73,7 @@ if [ -d "${BASE_DIR}/pkg/${1}" ]; then
   cp -f ./package.json ${PKG_DIST}/package.json
   node ${SCRIPT_DIR}/pkgfile.js ${PKG_DIST}/package.json
   rm -rf ${PKG_DIST}/*.bak
-  rm .shell
+  rm -rf .shell
 
   popd  
 fi
@@ -81,22 +82,16 @@ if [ $EXIT_CODE -ne 0 ]; then
   exit $EXIT_CODE
 fi
 
-
 if [ -n "${CREATE_TARBALL}" ]; then
   echo $COMMIT $COMMIT_BRANCH > ${PKG_DIST}/version-commit.txt
 
   TARBALL=${NAME}.tar.gz
 
   pushd ${PKG_DIST}
-
   rm -f ../$TARBALL
-
   echo "Compressing to ${TARBALL}..."
-
   tar -czf ../${TARBALL} .
-
   popd
-
 fi
 
 exit $EXIT_CODE

package/scripts/publish-shell.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # 执行命令示例：
-# TAG=shell-pkg-v3.0.5-test.44 ./shell/scripts/publish-shell.sh
+# TAG=shell-pkg-v3.0.5-test.45 ./shell/scripts/publish-shell.sh
 
 set -euo pipefail