From 62c34c4bc2ac801bf48f09a535e21c030e2c1b83 Mon Sep 17 00:00:00 2001
From: lyzno1 <92089059+lyzno1@users.noreply.github.com>
Date: Fri, 15 Aug 2025 09:01:18 +0800
Subject: [PATCH] refactor: unify pnpm version management with packageManager
 field (#23943)

---
 .github/workflows/style.yml                          | 4 +++-
 .github/workflows/translate-i18n-base-on-english.yml | 4 +++-
 .github/workflows/web-tests.yml                      | 4 +++-
 web/Dockerfile                                       | 5 ++++-
 web/package.json                                     | 1 +
 5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml
index 54f3f42a2..9aad9558b 100644
--- a/.github/workflows/style.yml
+++ b/.github/workflows/style.yml
@@ -82,7 +82,7 @@ jobs:
       - name: Install pnpm
         uses: pnpm/action-setup@v4
         with:
-          version: 10
+          package_json_file: web/package.json
           run_install: false
 
       - name: Setup NodeJS
@@ -95,10 +95,12 @@ jobs:
 
       - name: Web dependencies
         if: steps.changed-files.outputs.any_changed == 'true'
+        working-directory: ./web
         run: pnpm install --frozen-lockfile
 
       - name: Web style check
         if: steps.changed-files.outputs.any_changed == 'true'
+        working-directory: ./web
         run: pnpm run lint
 
   docker-compose-template:
diff --git a/.github/workflows/translate-i18n-base-on-english.yml b/.github/workflows/translate-i18n-base-on-english.yml
index 4b06174ee..c00483680 100644
--- a/.github/workflows/translate-i18n-base-on-english.yml
+++ b/.github/workflows/translate-i18n-base-on-english.yml
@@ -46,7 +46,7 @@ jobs:
       - name: Install pnpm
         uses: pnpm/action-setup@v4
         with:
-          version: 10
+          package_json_file: web/package.json
           run_install: false
 
       - name: Set up Node.js
@@ -59,10 +59,12 @@ jobs:
 
       - name: Install dependencies
         if: env.FILES_CHANGED == 'true'
+        working-directory: ./web
         run: pnpm install --frozen-lockfile
 
       - name: Generate i18n translations
         if: env.FILES_CHANGED == 'true'
+        working-directory: ./web
         run: pnpm run auto-gen-i18n ${{ env.FILE_ARGS }}
 
       - name: Create Pull Request
diff --git a/.github/workflows/web-tests.yml b/.github/workflows/web-tests.yml
index c3f8fdbaf..d104d6994 100644
--- a/.github/workflows/web-tests.yml
+++ b/.github/workflows/web-tests.yml
@@ -35,7 +35,7 @@ jobs:
         if: steps.changed-files.outputs.any_changed == 'true'
         uses: pnpm/action-setup@v4
         with:
-          version: 10
+          package_json_file: web/package.json
           run_install: false
 
       - name: Setup Node.js
@@ -48,8 +48,10 @@ jobs:
 
       - name: Install dependencies
         if: steps.changed-files.outputs.any_changed == 'true'
+        working-directory: ./web
         run: pnpm install --frozen-lockfile
 
       - name: Run tests
         if: steps.changed-files.outputs.any_changed == 'true'
+        working-directory: ./web
         run: pnpm test
diff --git a/web/Dockerfile b/web/Dockerfile
index d59039528..d284efca8 100644
--- a/web/Dockerfile
+++ b/web/Dockerfile
@@ -6,7 +6,7 @@ LABEL maintainer="takatost@gmail.com"
 # RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
 
 RUN apk add --no-cache tzdata
-RUN npm install -g pnpm@10.13.1
+RUN corepack enable
 ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME:$PATH"
 
@@ -19,6 +19,9 @@ WORKDIR /app/web
 COPY package.json .
 COPY pnpm-lock.yaml .
 
+# Use packageManager from package.json
+RUN corepack install
+
 # if you located in China, you can use taobao registry to speed up
 # RUN pnpm install --frozen-lockfile --registry https://registry.npmmirror.com/
 
diff --git a/web/package.json b/web/package.json
index a49210490..385ae6662 100644
--- a/web/package.json
+++ b/web/package.json
@@ -2,6 +2,7 @@
   "name": "dify-web",
   "version": "1.7.2",
   "private": true,
+  "packageManager": "pnpm@10.14.0",
   "engines": {
     "node": ">=v22.11.0"
   },