From b23da5edb401f05d7f1360a526e56be03d12fb1b Mon Sep 17 00:00:00 2001 From: YuCheng Hu Date: Tue, 1 Sep 2026 15:38:31 -0400 Subject: [PATCH 01/13] =?UTF-8?q?=E6=9B=B4=E6=96=B0:=20=E4=BB=8E=E6=B9=98?= =?UTF-8?q?=E5=88=B0=E8=8B=8F=E6=96=87=E6=9C=AC=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/misc/essay/2026/2994-xiang-to-su.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/misc/essay/2026/2994-xiang-to-su.md b/docs/misc/essay/2026/2994-xiang-to-su.md index 1181154..ad90d96 100644 --- a/docs/misc/essay/2026/2994-xiang-to-su.md +++ b/docs/misc/essay/2026/2994-xiang-to-su.md @@ -71,4 +71,4 @@ 湖南和江苏同属中国南方, 是中国地理版图上“**霸蛮火辣”的湘楚文化**与“**温婉灵秀”的江海文化(吴韵汉风**)之间一场跨越千里的深度对话。两地同饮长江水,在历史、现代经济及文旅层面的碰撞,展现了极具张力的互补性与融合力。 -水韵江苏奔赴潇湘,水韵江苏的裙摆,留下好一朵茉莉花。 \ No newline at end of file +水韵江苏奔赴潇湘,留下好一朵茉莉花。 \ No newline at end of file From b21391b9fa19870bc73ee7f265247a96dfa35175 Mon Sep 17 00:00:00 2001 From: YuCheng Hu Date: Mon, 14 Sep 2026 14:54:16 -0400 Subject: [PATCH 02/13] Update the code to fix --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 003fa34..8d2f363 100644 --- a/package.json +++ b/package.json @@ -1,4 +1,5 @@ { + "packageManager": "pnpm@12.4.1", "devDependencies": { "vitepress": "^2.0.0-alpha.17", "vue": "^3.5.38", From 389cb9ae0839568fff6dd1f54b25476febec6936 Mon Sep 17 00:00:00 2001 From: YuCheng Hu Date: Mon, 14 Sep 2026 15:03:36 -0400 Subject: [PATCH 03/13] Update the code to fix --- .idea/checkstyle-idea.xml | 4 ++-- Jenkinsfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.idea/checkstyle-idea.xml b/.idea/checkstyle-idea.xml index 87234f9..398b475 100644 --- a/.idea/checkstyle-idea.xml +++ b/.idea/checkstyle-idea.xml @@ -8,8 +8,8 @@ diff --git a/Jenkinsfile b/Jenkinsfile index 4763306..a8d91df 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -39,7 +39,7 @@ pipeline { // This command should run on the agent to configure the git environment sh 'git config --global url."https://github.com/".insteadOf git://github.com/' sh 'corepack enable' - sh 'corepack prepare pnpm@latest --activate' + sh 'corepack prepare pnpm@12.4.1 --activate' } // git branch: 'main', // credentialsId: 'c9d0ec7c-0749-4588-8960-e96cab84d462', @@ -50,7 +50,7 @@ pipeline { stage("Install") { steps { sh ''' - pnpm clean --lockfile + rm -rf node_modules pnpm install --no-frozen-lockfile || true pnpm approve-builds --all pnpm install --no-frozen-lockfile From 368b3a8344e4d56a3ddd59c7e0a2c473a3e292bd Mon Sep 17 00:00:00 2001 From: YuCheng Hu Date: Mon, 14 Sep 2026 15:17:46 -0400 Subject: [PATCH 04/13] Update the code to fix --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index a8d91df..afd958c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -54,6 +54,7 @@ pipeline { pnpm install --no-frozen-lockfile || true pnpm approve-builds --all pnpm install --no-frozen-lockfile + pnpm --version ''' } } From c3670150e1de7fb4d664c896005250902eb659cb Mon Sep 17 00:00:00 2001 From: YuCheng Hu Date: Mon, 14 Sep 2026 15:19:58 -0400 Subject: [PATCH 05/13] Update the code to fix --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index afd958c..96bac46 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -40,6 +40,7 @@ pipeline { sh 'git config --global url."https://github.com/".insteadOf git://github.com/' sh 'corepack enable' sh 'corepack prepare pnpm@12.4.1 --activate' + sh 'pnpm --version' } // git branch: 'main', // credentialsId: 'c9d0ec7c-0749-4588-8960-e96cab84d462', @@ -54,7 +55,7 @@ pipeline { pnpm install --no-frozen-lockfile || true pnpm approve-builds --all pnpm install --no-frozen-lockfile - pnpm --version + ''' } } From 7a10e71203b6793d1e623f887a1aef6efef7346e Mon Sep 17 00:00:00 2001 From: YuCheng Hu Date: Mon, 14 Sep 2026 15:26:50 -0400 Subject: [PATCH 06/13] Update the code to fix --- Jenkinsfile | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 96bac46..e0bd870 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -38,9 +38,17 @@ pipeline { script { // This command should run on the agent to configure the git environment sh 'git config --global url."https://github.com/".insteadOf git://github.com/' - sh 'corepack enable' - sh 'corepack prepare pnpm@12.4.1 --activate' - sh 'pnpm --version' + sh ''' + node --version + corepack --version + + rm -rf "$HOME/.cache/node/corepack" + + corepack enable + corepack prepare pnpm@12.4.1 --activate + pnpm --version + ''' + } // git branch: 'main', // credentialsId: 'c9d0ec7c-0749-4588-8960-e96cab84d462', From dd6de4eee94cce5256aefbd0101bafba4adf0697 Mon Sep 17 00:00:00 2001 From: YuCheng Hu Date: Mon, 14 Sep 2026 15:35:42 -0400 Subject: [PATCH 07/13] Update the code to fix --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index e0bd870..a230296 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -39,6 +39,7 @@ pipeline { // This command should run on the agent to configure the git environment sh 'git config --global url."https://github.com/".insteadOf git://github.com/' sh ''' + sudo npm install -g corepack@latest node --version corepack --version From 362d5ea3b640d9efef8b56c62576d3fe85bf4aed Mon Sep 17 00:00:00 2001 From: YuCheng Hu Date: Mon, 14 Sep 2026 15:37:06 -0400 Subject: [PATCH 08/13] install npm --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index a230296..3b4236f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -39,7 +39,7 @@ pipeline { // This command should run on the agent to configure the git environment sh 'git config --global url."https://github.com/".insteadOf git://github.com/' sh ''' - sudo npm install -g corepack@latest + npm install -g corepack@latest node --version corepack --version From 58dcb618ae83bd2e8e9370ef342aa3d51c3073d2 Mon Sep 17 00:00:00 2001 From: YuCheng Hu Date: Mon, 14 Sep 2026 15:43:36 -0400 Subject: [PATCH 09/13] =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3b4236f..2f9bd85 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -39,15 +39,20 @@ pipeline { // This command should run on the agent to configure the git environment sh 'git config --global url."https://github.com/".insteadOf git://github.com/' sh ''' - npm install -g corepack@latest - node --version - corepack --version + set -eu - rm -rf "$HOME/.cache/node/corepack" + echo "=== Environment ===" - corepack enable - corepack prepare pnpm@12.4.1 --activate - pnpm --version + node --version + npm --version + + corepack enable + + echo "Corepack:" + corepack --version + + echo "pnpm:" + pnpm --version ''' } From f749971087170f4dc6f8f642edb170dff9ed9698 Mon Sep 17 00:00:00 2001 From: YuCheng Hu Date: Mon, 14 Sep 2026 15:48:59 -0400 Subject: [PATCH 10/13] =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2f9bd85..73b2134 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -39,20 +39,9 @@ pipeline { // This command should run on the agent to configure the git environment sh 'git config --global url."https://github.com/".insteadOf git://github.com/' sh ''' - set -eu + set -eu - echo "=== Environment ===" - - node --version - npm --version - - corepack enable - - echo "Corepack:" - corepack --version - - echo "pnpm:" - pnpm --version + corepack enable ''' } @@ -66,10 +55,8 @@ pipeline { steps { sh ''' rm -rf node_modules - pnpm install --no-frozen-lockfile || true + pnpm install --frozen-lockfile pnpm approve-builds --all - pnpm install --no-frozen-lockfile - ''' } } @@ -91,9 +78,9 @@ pipeline { : env.BRANCH_NAME.replaceAll('/', '-') if (env.BRANCH_NAME == 'main') { - sh 'npx wrangler deploy' + sh 'pnpm exec wrangler deploy' } else { - sh "npx wrangler versions upload --preview-alias ${branchArg}" + sh "pnpm exec wrangler versions upload --preview-alias ${branchArg}" } } } From 25151587b173c757f6a85df25a819c370c9a1e32 Mon Sep 17 00:00:00 2001 From: YuCheng Hu Date: Mon, 14 Sep 2026 15:51:58 -0400 Subject: [PATCH 11/13] =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pnpm-lock.yaml | 158 ++++++++++++++++++++++++++++++++++++++++++++ pnpm-workspace.yaml | 4 ++ 2 files changed, 162 insertions(+) create mode 100644 pnpm-workspace.yaml diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1917050..08768fc 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,3 +1,161 @@ +--- +lockfileVersion: '9.0' + +importers: + + .: + configDependencies: {} + packageManagerDependencies: + pnpm: + specifier: 12.4.1 + version: 12.4.1 + +packages: + + '@pnpm/exe.android-arm64@12.4.1': + resolution: {integrity: sha512-/HwsqXMSmlOfgtV9+O0ratzjV6Vd/8n1hh4rGHpCGmDURvt52MwZxdbhyxP4K03ZfvgSDvotFPr8O+RzE5Eu8A==} + cpu: [arm64] + os: [android] + + '@pnpm/exe.android-x64@12.4.1': + resolution: {integrity: sha512-+l74Qb4c2YjOzNKHXJLg+1wr8xHM1ckkUhnU5KRUK9TJqiiczt6yeTZqqzHIlJ8i6pAoj5V0OJevDRwnQKLgrQ==} + cpu: [x64] + os: [android] + + '@pnpm/exe.darwin-arm64@12.4.1': + resolution: {integrity: sha512-6rkZkT3iGfaxknUdGHraqSWFvTa6N0ajAHluv9Ax0GRWs0sIcGNiFhDopv6xSZCsJZmG483aNS/b6UEDy3blfw==} + cpu: [arm64] + os: [darwin] + + '@pnpm/exe.darwin-x64@12.4.1': + resolution: {integrity: sha512-Vb1CHlR88HghC1qUxjxjs82zQSXnXacPD+btG2CmG8Q/hBU7Q0/b2YWJKSQqZXicunV5khFtfTlAwJddV9RkYA==} + cpu: [x64] + os: [darwin] + + '@pnpm/exe.freebsd-x64@12.4.1': + resolution: {integrity: sha512-iT3iHz3Nl0Sxxj7UPOtZ/aQ81AFsQhjoeWMAlPkSRO04gsgDGAXv3UYxOFaesMWsfNxaGn0A+CITbuCHFF66FA==} + cpu: [x64] + os: [freebsd] + + '@pnpm/exe.linux-arm64-musl@12.4.1': + resolution: {integrity: sha512-aBooZfNXM5f+OGUgCAMFWpE/kAhsWfvmqIyMtHy6zl3aNxyInWrcY/Saln/UElzo7lZWMC0Yktroxd/2J26lNQ==} + cpu: [arm64] + os: [linux] + libc: [musl] + + '@pnpm/exe.linux-arm64@12.4.1': + resolution: {integrity: sha512-TlOdacTTP09BgcMvwWBFRsu8VAjfwqwnslBj+XSq1JFM3ck4f3k+1O/747EuctxZxs3/o785b6Q3s7Pd92Ptsg==} + cpu: [arm64] + os: [linux] + libc: [glibc] + + '@pnpm/exe.linux-ppc64@12.4.1': + resolution: {integrity: sha512-r/ab/MlIBo75oizUP5ITiziCCrnXz4SJwfErLQ+603AshB+Yq7xTMCoMtzTSCAMu6aaymIKkAFtZvd2J75Wq0w==} + cpu: [ppc64] + os: [linux] + libc: [glibc] + + '@pnpm/exe.linux-riscv64@12.4.1': + resolution: {integrity: sha512-C/D1QWdKMiB8+wv/spl1rGITFUuqC+aI/fb6h8NB5sqxsOaGXeYc/g891oCuzggHn6SODk9p+I09hI76x/cMNw==} + cpu: [riscv64] + os: [linux] + libc: [glibc] + + '@pnpm/exe.linux-s390x@12.4.1': + resolution: {integrity: sha512-nxz5zD4yXt94uzbStDk0QTPKW+aE92hH1b5tFXK9ctB1HE9Xcq1vjTiA2LsZMFC6p4gdu5OwQeFqYNAVGa6QlA==} + cpu: [s390x] + os: [linux] + libc: [glibc] + + '@pnpm/exe.linux-x64-musl@12.4.1': + resolution: {integrity: sha512-5AwgFdGhVUg2kIweYGfxzSLEHiIG77PQhZAkXC3TwofQHsu1Wr+TrV5/rNX2PopFnHRzuE581zoB8F6Wle32yg==} + cpu: [x64] + os: [linux] + libc: [musl] + + '@pnpm/exe.linux-x64@12.4.1': + resolution: {integrity: sha512-FJOZuuuQMhp0oLzBtcKkLXknBI92hfkmSnlKc47vfin4HrmfID5khY2lGekL9tCzk1cpR+HShEw/meFl+nHtzQ==} + cpu: [x64] + os: [linux] + libc: [glibc] + + '@pnpm/exe.win32-arm64@12.4.1': + resolution: {integrity: sha512-OO7eKBL9S+xk5hRy+JUUZSNJknGuGe3GEUffsrlC2LbqKF02g+VX1anGIzSbJDvkkdnpJhSlxF5AUz2JzJu2Jw==} + cpu: [arm64] + os: [win32] + + '@pnpm/exe.win32-x64@12.4.1': + resolution: {integrity: sha512-x7gJHZgHo6hp354xCYA2NvoFzYJkHwovt2kVsUBK5EmXULLcP51JGMq09CX+5FRFJUZFKoXjLu3mZWmfP7o6PQ==} + cpu: [x64] + os: [win32] + + pnpm@12.4.1: + resolution: {integrity: sha512-LoHjmdc/6DkNqyXgaqeIq3pZCCSNL1o3D4K0gRR6ano2e/gEj5pv22Rg8hpm8FQt7bi5TKLIcjWWdBkgsWVtTA==} + engines: {node: '>=18.*'} + hasBin: true + +snapshots: + + '@pnpm/exe.android-arm64@12.4.1': + optional: true + + '@pnpm/exe.android-x64@12.4.1': + optional: true + + '@pnpm/exe.darwin-arm64@12.4.1': + optional: true + + '@pnpm/exe.darwin-x64@12.4.1': + optional: true + + '@pnpm/exe.freebsd-x64@12.4.1': + optional: true + + '@pnpm/exe.linux-arm64-musl@12.4.1': + optional: true + + '@pnpm/exe.linux-arm64@12.4.1': + optional: true + + '@pnpm/exe.linux-ppc64@12.4.1': + optional: true + + '@pnpm/exe.linux-riscv64@12.4.1': + optional: true + + '@pnpm/exe.linux-s390x@12.4.1': + optional: true + + '@pnpm/exe.linux-x64-musl@12.4.1': + optional: true + + '@pnpm/exe.linux-x64@12.4.1': + optional: true + + '@pnpm/exe.win32-arm64@12.4.1': + optional: true + + '@pnpm/exe.win32-x64@12.4.1': + optional: true + + pnpm@12.4.1: + optionalDependencies: + '@pnpm/exe.android-arm64': 12.4.1 + '@pnpm/exe.android-x64': 12.4.1 + '@pnpm/exe.darwin-arm64': 12.4.1 + '@pnpm/exe.darwin-x64': 12.4.1 + '@pnpm/exe.freebsd-x64': 12.4.1 + '@pnpm/exe.linux-arm64': 12.4.1 + '@pnpm/exe.linux-arm64-musl': 12.4.1 + '@pnpm/exe.linux-ppc64': 12.4.1 + '@pnpm/exe.linux-riscv64': 12.4.1 + '@pnpm/exe.linux-s390x': 12.4.1 + '@pnpm/exe.linux-x64': 12.4.1 + '@pnpm/exe.linux-x64-musl': 12.4.1 + '@pnpm/exe.win32-arm64': 12.4.1 + '@pnpm/exe.win32-x64': 12.4.1 + +--- lockfileVersion: '9.0' settings: diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml new file mode 100644 index 0000000..2cd53ef --- /dev/null +++ b/pnpm-workspace.yaml @@ -0,0 +1,4 @@ +allowBuilds: + esbuild: set this to true or false + sharp: set this to true or false + workerd: set this to true or false From 7671a56d3a9af447f19ef11c392a2708a876da78 Mon Sep 17 00:00:00 2001 From: YuCheng Hu Date: Mon, 14 Sep 2026 15:52:54 -0400 Subject: [PATCH 12/13] =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pnpm-workspace.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 2cd53ef..0af3f6f 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -1,4 +1,4 @@ allowBuilds: - esbuild: set this to true or false - sharp: set this to true or false - workerd: set this to true or false + esbuild: true + sharp: false + workerd: false From 71ee79f06b99b14047f27f26862159e89bece585 Mon Sep 17 00:00:00 2001 From: YuCheng Hu Date: Wed, 16 Sep 2026 15:28:36 -0400 Subject: [PATCH 13/13] Update build file --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 73b2134..31d7632 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -40,7 +40,6 @@ pipeline { sh 'git config --global url."https://github.com/".insteadOf git://github.com/' sh ''' set -eu - corepack enable '''