From af06e39ed52c3b90c3caaa5b38b830726606a8bd Mon Sep 17 00:00:00 2001
From: "142vip.cn" <fairy_408@2925.com>
Date: Tue, 31 Oct 2023 19:19:27 +0800
Subject: [PATCH] =?UTF-8?q?fix(CI):=20=E4=BF=AE=E5=A4=8D=E4=BE=9D=E8=B5=96?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E5=BC=82=E5=B8=B8=EF=BC=8CPNPM=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E7=BA=A6=E6=9D=9F=E7=BB=9F=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 14 +++++++-------
 scripts/ci   |  6 +++++-
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 7c7bff9..1f35e5a 100644
--- a/package.json
+++ b/package.json
@@ -1,20 +1,20 @@
 {
   "name": "408CSFamily",
-  "description": "专业代号408，计算机基础知识点合集",
+  "description": "研究生考试408考点、工作面试计算机基础知识合集",
   "version": "0.0.1-alpha.8",
-  "packageManager": "pnpm@8.9.2",
-  "engines": {
-    "node": "^18.x",
-    "pnpm": ">=7.2.1"
-  },
   "author": {
     "name": "Chu Fan",
     "email": "fairy_408@2925.com",
     "url": "https://github.com/142vip"
   },
+  "packageManager": "pnpm@8.9.2",
+  "engines": {
+    "node": "^18.x",
+    "pnpm": "8"
+  },
   "scripts": {
     "preinstall": "chmod +x ./scripts/*",
-    "postinstall": "npm run build:mark-map",
+    "postinstall": "pnpm build:mark-map",
     "prepare": "rm -f .husky/pre-commit && husky install && npx husky add .husky/pre-commit \"./scripts/lint\" && chmod +x .husky/pre-commit",
     "dev": "vuepress dev docs",
     "build": "./scripts/bundle build",
diff --git a/scripts/ci b/scripts/ci
index c27e18a..ceadb08 100755
--- a/scripts/ci
+++ b/scripts/ci
@@ -6,7 +6,8 @@
 ##
 
 # 期望的 pnpm 大版本号
-majorVersionRequired="8"
+majorVersionRequired=$(grep -o '"pnpm": *"[^"]*"' package.json | awk -F'"' '{print $4}')
+echo "期望的 pnpm 大版本号:$majorVersionRequired"
 
 # 检测 pnpm 是否已安装并且大版本号符合要求
 checkPNPMVersion() {
@@ -37,3 +38,6 @@ fi
 
 # 安装项目依赖
 pnpm i --frozen-lockfile --registry https://registry.npmmirror.com
+
+
+