From b70fe6aa65ff6e042e8f786f783fc2b86d513898 Mon Sep 17 00:00:00 2001 From: zhangtao <9480807882@qq.com> Date: Sun, 17 Aug 2025 01:21:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?build:=20=E5=B0=86=20npm=20=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2=E4=B8=BA=20pnpm=20=E4=BB=A5=E6=8F=90=E5=8D=87?= =?UTF-8?q?=E5=AE=89=E8=A3=85=E9=80=9F=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deploy.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/deploy.sh b/deploy.sh index a6826d59..8b0ada40 100644 --- a/deploy.sh +++ b/deploy.sh @@ -93,9 +93,9 @@ build_image() { if [ -d "frontend" ]; then cd frontend || { log "❌ 无法进入前端目录" "ERROR"; exit 1; } log "📦 安装前端依赖..." "INFO" - npm install || { log "❌ 前端依赖安装失败" "ERROR"; exit 1; } + pnpm install || { log "❌ 前端依赖安装失败" "ERROR"; exit 1; } log "🔨 打包前端工程..." "INFO" - npm run build || { log "❌ 前端工程打包失败" "ERROR"; exit 1; } + pnpm run build || { log "❌ 前端工程打包失败" "ERROR"; exit 1; } log "✅ 前端工程打包成功" "INFO" cd .. || { log "❌ 无法返回项目根目录" "ERROR"; exit 1; } fi @@ -104,9 +104,9 @@ build_image() { if [ -d "fastapp" ]; then cd fastapp || { log "❌ 无法进入小程序目录" "ERROR"; exit 1; } log "📦 安装小程序依赖..." "INFO" - npm install || { log "❌ 小程序依赖安装失败" "ERROR"; exit 1; } + pnpm install || { log "❌ 小程序依赖安装失败" "ERROR"; exit 1; } log "🔨 打包小程序工程..." "INFO" - npm run build:h5 || { log "❌ 小程序工程打包失败" "ERROR"; exit 1; } + pnpm run build:h5 || { log "❌ 小程序工程打包失败" "ERROR"; exit 1; } log "✅ 小程序工程打包成功" "INFO" cd .. || { log "❌ 无法返回项目根目录" "ERROR"; exit 1; } fi @@ -115,9 +115,9 @@ build_image() { if [ -d "fastdocs" ]; then cd fastdocs || { log "❌ 无法进入项目文档目录" "ERROR"; exit 1; } log "📦 安装项目文档依赖..." "INFO" - npm install || { log "❌ 项目文档依赖安装失败" "ERROR"; exit 1; } + pnpm install || { log "❌ 项目文档依赖安装失败" "ERROR"; exit 1; } log "🔨 打包项目文档..." "INFO" - npm run docs:build || { log "❌ 项目文档打包生成失败" "ERROR"; exit 1; } + pnpm run docs:build || { log "❌ 项目文档打包生成失败" "ERROR"; exit 1; } log "✅ 项目文档打包成功" "INFO" cd .. || { log "❌ 无法返回项目根目录" "ERROR"; exit 1; } fi From 5cf3fb60f9ed53074a5f97e7d1b1d2b9f8ccd45c Mon Sep 17 00:00:00 2001 From: zhangtao <9480807882@qq.com> Date: Sun, 17 Aug 2025 01:24:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?build:=20=E6=9B=B4=E6=96=B0=20package.json?= =?UTF-8?q?=20=E4=B8=AD=E7=9A=84=E5=8C=85=E7=AE=A1=E7=90=86=E5=99=A8?= =?UTF-8?q?=E5=92=8C=E5=BC=95=E6=93=8E=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将 fastapp 和 fastdocs 的 packageManager 统一更新为 pnpm@9.15.3 同时更新 engines 字段中的 node、npm 和 pnpm 版本要求 --- fastapp/package.json | 6 ++++-- fastdocs/package.json | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/fastapp/package.json b/fastapp/package.json index 1ea3572f..e524fafa 100644 --- a/fastapp/package.json +++ b/fastapp/package.json @@ -46,9 +46,11 @@ "resolutions": { "bin-wrapper": "npm:bin-wrapper-china" }, + "packageManager": "pnpm@9.15.3", "engines": { - "node": ">=18", - "pnpm": ">=7.30" + "node": ">=18.0.0", + "npm": ">=10.0.0", + "pnpm": ">=8.1.0" }, "scripts": { "dev:app": "uni -p app", diff --git a/fastdocs/package.json b/fastdocs/package.json index 424532a1..d542d4cf 100644 --- a/fastdocs/package.json +++ b/fastdocs/package.json @@ -16,10 +16,11 @@ "devDependencies": { "vitepress": "2.0.0-alpha.11" }, - "packageManager": "npm@11.2.0", + "packageManager": "pnpm@9.15.3", "engines": { "node": ">=18.0.0", - "npm": ">=10.0.0" + "npm": ">=10.0.0", + "pnpm": ">=8.1.0" }, "repository": { "type": "git",