From b0bae4996c76ecd7dbc714052f27fde01f7043d8 Mon Sep 17 00:00:00 2001 From: Ryan Wang Date: Fri, 27 Jun 2025 15:29:24 +0800 Subject: [PATCH] chore: bump pnpm version to 10 (#7597) #### What type of PR is this? /area ui /kind cleanup #### What this PR does / why we need it: Bump pnpm version to 10 #### Does this PR introduce a user-facing change? ```release-note None ``` --- .github/actions/setup-env/action.yaml | 2 +- ui/README.md | 2 +- ui/package.json | 14 ++-- ui/pnpm-lock.yaml | 95 ++++++++++++++++++--------- 4 files changed, 76 insertions(+), 37 deletions(-) diff --git a/.github/actions/setup-env/action.yaml b/.github/actions/setup-env/action.yaml index 182f3da40..6b0e41e21 100644 --- a/.github/actions/setup-env/action.yaml +++ b/.github/actions/setup-env/action.yaml @@ -10,7 +10,7 @@ inputs: pnpm-version: description: pnpm version. required: false - default: "9" + default: "10" java-version: description: Java version. diff --git a/ui/README.md b/ui/README.md index e60bbf4c4..286c84994 100644 --- a/ui/README.md +++ b/ui/README.md @@ -23,7 +23,7 @@ ## 开发环境运行 ```bash -npm install -g pnpm@9 +npm install -g pnpm@10 ``` ```bash diff --git a/ui/package.json b/ui/package.json index 1f3264fdc..a663b30f1 100644 --- a/ui/package.json +++ b/ui/package.json @@ -67,6 +67,7 @@ "@halo-dev/richtext-editor": "workspace:*", "@he-tree/tree-utils": "0.1.0-alpha.6", "@he-tree/vue": "^2.9.4", + "@number-flow/vue": "^0.4.8", "@tanstack/vue-query": "^4.37.1", "@tiptap/extension-character-count": "^2.11.2", "@uppy/core": "^3.11.3", @@ -115,7 +116,6 @@ "devDependencies": { "@iconify/json": "^2.2.343", "@intlify/unplugin-vue-i18n": "^6.0.8", - "@number-flow/vue": "^0.4.8", "@tailwindcss/aspect-ratio": "^0.4.2", "@tailwindcss/container-queries": "^0.1.0", "@tailwindcss/forms": "^0.5.7", @@ -125,7 +125,6 @@ "@types/node": "^18.11.19", "@types/object-hash": "^3.0.6", "@types/qs": "^6.9.7", - "@types/randomstring": "^1.1.8", "@types/ua-parser-js": "^0.7.39", "@typescript/native-preview": "7.0.0-dev.20250619.1", "@vitejs/plugin-vue": "^6.0.0", @@ -170,10 +169,17 @@ "vitest": "^3.1.4", "vue-tsc": "^2.2.10" }, - "packageManager": "pnpm@9.15.0+sha512.76e2379760a4328ec4415815bcd6628dee727af3779aaa4c914e3944156c4299921a89f976381ee107d41f12cfa4b66681ca9c718f0668fa0831ed4c6d8ba56c", + "packageManager": "pnpm@10.12.4+sha512.5ea8b0deed94ed68691c9bad4c955492705c5eeb8a87ef86bc62c74a26b037b08ff9570f108b2e4dbd1dd1a9186fea925e527f141c648e85af45631074680184", "pnpm": { "overrides": { "vite": "npm:rolldown-vite@7.0.0" - } + }, + "onlyBuiltDependencies": [ + "@nestjs/core", + "@openapitools/openapi-generator-cli", + "core-js", + "esbuild", + "vue-demi" + ] } } diff --git a/ui/pnpm-lock.yaml b/ui/pnpm-lock.yaml index 029753998..b7cfc9a41 100644 --- a/ui/pnpm-lock.yaml +++ b/ui/pnpm-lock.yaml @@ -84,6 +84,9 @@ importers: '@he-tree/vue': specifier: ^2.9.4 version: 2.9.4(vue@3.5.16(typescript@5.8.3)) + '@number-flow/vue': + specifier: ^0.4.8 + version: 0.4.8(vue@3.5.16(typescript@5.8.3)) '@tanstack/vue-query': specifier: ^4.37.1 version: 4.37.1(vue@3.5.16(typescript@5.8.3)) @@ -223,9 +226,6 @@ importers: '@intlify/unplugin-vue-i18n': specifier: ^6.0.8 version: 6.0.8(@vue/compiler-dom@3.5.16)(eslint@9.29.0(jiti@2.4.2))(rollup@4.43.0)(typescript@5.8.3)(vue-i18n@11.1.5(vue@3.5.16(typescript@5.8.3)))(vue@3.5.16(typescript@5.8.3)) - '@number-flow/vue': - specifier: ^0.4.8 - version: 0.4.8(vue@3.5.16(typescript@5.8.3)) '@tailwindcss/aspect-ratio': specifier: ^0.4.2 version: 0.4.2(tailwindcss@3.3.0(postcss@8.4.21)) @@ -253,9 +253,6 @@ importers: '@types/qs': specifier: ^6.9.7 version: 6.9.7 - '@types/randomstring': - specifier: ^1.1.8 - version: 1.1.8 '@types/ua-parser-js': specifier: ^0.7.39 version: 0.7.39 @@ -440,7 +437,7 @@ importers: version: 7.6.3(@vue/compiler-core@3.5.16)(vue@3.5.16(typescript@5.8.3)) '@storybook/vue3-vite': specifier: ^7.6.3 - version: 7.6.3(@vue/compiler-core@3.5.16)(rolldown-vite@7.0.0(@types/node@18.13.0)(esbuild@0.25.5)(jiti@2.4.2)(less@4.2.0)(sass-embedded@1.83.0)(terser@5.37.0))(typescript@5.8.3)(vue@3.5.16(typescript@5.8.3)) + version: 7.6.3(@vue/compiler-core@3.5.16)(typescript@5.8.3)(vite@4.5.14(@types/node@20.14.2)(less@4.2.0)(lightningcss@1.30.1)(sass@1.60.0)(terser@5.37.0))(vue@3.5.16(typescript@5.8.3)) react: specifier: ^18.2.0 version: 18.2.0 @@ -3869,7 +3866,7 @@ packages: peerDependencies: '@preact/preset-vite': '*' typescript: '>= 4.3.x' - vite: npm:rolldown-vite@7.0.0 + vite: ^3.0.0 || ^4.0.0 || ^5.0.0 vite-plugin-glimmerx: '*' peerDependenciesMeta: '@preact/preset-vite': @@ -3980,7 +3977,7 @@ packages: resolution: {integrity: sha512-7NupDZn7FNm8SJSfTWOj1mrfyjGNII7bpnlvt1iH88L8UECmIh/gbDoBNi1XcGmPK09nrx3RnFdsxN5PVpeLPQ==} engines: {node: ^14.18 || >=16} peerDependencies: - vite: npm:rolldown-vite@7.0.0 + vite: ^3.0.0 || ^4.0.0 || ^5.0.0 '@storybook/vue3@7.6.3': resolution: {integrity: sha512-XoJOMcRngxOblXGFiaz5oqsCbTy+TVoWrOodjizYfJcMXIceKZrPz+bNI4x6HL5koXrx1HWy5VN187QGqy+RJg==} @@ -4437,9 +4434,6 @@ packages: '@types/qs@6.9.7': resolution: {integrity: sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==} - '@types/randomstring@1.1.8': - resolution: {integrity: sha512-NPOJcW+TTjT9Qiog0UjSoG3Sj24c7EfzZO39BU9E61D7fQtwNmBNblyQhSsK9+5s9Fm0o31rvX+ZyZkpE/c7jA==} - '@types/range-parser@1.2.7': resolution: {integrity: sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==} @@ -4733,21 +4727,21 @@ packages: resolution: {integrity: sha512-wsUq9YvXvXNUsyTWUHEPCGrnrF5bsnvQlg/yKJsALfV4MSVXp9IS9uiCfLXRUSpX806+zaDm2Z9yd6tU9Gaz0A==} engines: {node: ^20.19.0 || >=22.12.0} peerDependencies: - vite: npm:rolldown-vite@7.0.0 + vite: ^5.0.0 || ^6.0.0 || ^7.0.0 vue: ^3.0.0 '@vitejs/plugin-vue@4.2.3': resolution: {integrity: sha512-R6JDUfiZbJA9cMiguQ7jxALsgiprjBeHL5ikpXfJCH62pPHtI+JdJ5xWj6Ev73yXSlYl86+blXn1kZHQ7uElxw==} engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: - vite: npm:rolldown-vite@7.0.0 + vite: ^4.0.0 vue: ^3.2.25 '@vitejs/plugin-vue@6.0.0': resolution: {integrity: sha512-iAliE72WsdhjzTOp2DtvKThq1VBC4REhwRcaA+zPAAph6I+OQhUXv+Xu2KS7ElxYtb7Zc/3R30Hwv1DxEo7NXQ==} engines: {node: ^20.19.0 || >=22.12.0} peerDependencies: - vite: npm:rolldown-vite@7.0.0 + vite: ^5.0.0 || ^6.0.0 || ^7.0.0 vue: ^3.2.25 '@vitest/eslint-plugin@1.2.7': @@ -4769,7 +4763,7 @@ packages: resolution: {integrity: sha512-46ryTE9RZO/rfDd7pEqFl7etuyzekzEhUbTW3BvmeO/BcCMEgq59BKhek3dXDWgAj4oMK6OZi+vRr1wPW6qjEQ==} peerDependencies: msw: ^2.4.9 - vite: npm:rolldown-vite@7.0.0 + vite: ^5.0.0 || ^6.0.0 || ^7.0.0-0 peerDependenciesMeta: msw: optional: true @@ -10438,7 +10432,7 @@ packages: resolution: {integrity: sha512-d4sOM8M/8z7vRXHHq/ebbblfaxENjogAAekcfcDCCwAyvGqnPrc7f4NZbvItS+g4WTgerW0xDwSz5qz11JT3vg==} peerDependencies: typescript: '*' - vite: npm:rolldown-vite@7.0.0 + vite: '*' peerDependenciesMeta: vite: optional: true @@ -10447,19 +10441,19 @@ packages: resolution: {integrity: sha512-R5oVY8xDJjLXLTs2XDYzvYbc/RTZuIwOx2xcFbYf+/VXB6eJuatDgt8jzQ7kZ+IrgwQhe6tU8U2fTyy72C25CQ==} engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: - vite: npm:rolldown-vite@7.0.0 + vite: '>=2.0.0' vite-plugin-html@3.2.2: resolution: {integrity: sha512-vb9C9kcdzcIo/Oc3CLZVS03dL5pDlOFuhGlZYDCJ840BhWl/0nGeZWf3Qy7NlOayscY4Cm/QRgULCQkEZige5Q==} peerDependencies: - vite: npm:rolldown-vite@7.0.0 + vite: '>=2.0.0' vite-plugin-pwa@0.20.0: resolution: {integrity: sha512-/kDZyqF8KqoXRpMUQtR5Atri/7BWayW8Gp7Kz/4bfstsV6zSFTxjREbXZYL7zSuRL40HGA+o2hvUAFRmC+bL7g==} engines: {node: '>=16.0.0'} peerDependencies: '@vite-pwa/assets-generator': ^0.2.4 - vite: npm:rolldown-vite@7.0.0 + vite: ^3.1.0 || ^4.0.0 || ^5.0.0 workbox-build: ^7.1.0 workbox-window: ^7.1.0 peerDependenciesMeta: @@ -10470,7 +10464,35 @@ packages: resolution: {integrity: sha512-3uSvsMwDVFZRitqoWHj0t4137Kz7UynnJeq1EZlRW7e25h2068fyIZX4ORCCOAkfp1FklGxJNVJBkBOD+PZIew==} engines: {node: ^18.0.0 || >=20.0.0} peerDependencies: - vite: npm:rolldown-vite@7.0.0 + vite: ^5.0.0 + + vite@4.5.14: + resolution: {integrity: sha512-+v57oAaoYNnO3hIu5Z/tJRZjq5aHM2zDve9YZ8HngVHbhk66RStobhb1sqPMIPEleV6cNKYK4eGrAbE9Ulbl2g==} + engines: {node: ^14.18.0 || >=16.0.0} + hasBin: true + peerDependencies: + '@types/node': '>= 14' + less: '*' + lightningcss: ^1.21.0 + sass: '*' + stylus: '*' + sugarss: '*' + terser: ^5.4.0 + peerDependenciesMeta: + '@types/node': + optional: true + less: + optional: true + lightningcss: + optional: true + sass: + optional: true + stylus: + optional: true + sugarss: + optional: true + terser: + optional: true vitest@3.2.4: resolution: {integrity: sha512-LUCP5ev3GURDysTWiP47wRRUpLKMOfPh+yKTx3kVIEiu5KOMeqzpnYNsKyOoVrULivR8tLcks4+lga33Whn90A==} @@ -14904,7 +14926,7 @@ snapshots: - encoding - supports-color - '@storybook/builder-vite@7.6.3(rolldown-vite@7.0.0(@types/node@18.13.0)(esbuild@0.25.5)(jiti@2.4.2)(less@4.2.0)(sass-embedded@1.83.0)(terser@5.37.0))(typescript@5.8.3)': + '@storybook/builder-vite@7.6.3(typescript@5.8.3)(vite@4.5.14(@types/node@20.14.2)(less@4.2.0)(lightningcss@1.30.1)(sass@1.60.0)(terser@5.37.0))': dependencies: '@storybook/channels': 7.6.3 '@storybook/client-logger': 7.6.3 @@ -14922,7 +14944,7 @@ snapshots: fs-extra: 11.2.0 magic-string: 0.30.2 rollup: 3.28.0 - vite: rolldown-vite@7.0.0(@types/node@18.13.0)(esbuild@0.25.5)(jiti@2.4.2)(less@4.2.0)(sass-embedded@1.83.0)(terser@5.37.0) + vite: 4.5.14(@types/node@20.14.2)(less@4.2.0)(lightningcss@1.30.1)(sass@1.60.0)(terser@5.37.0) optionalDependencies: typescript: 5.8.3 transitivePeerDependencies: @@ -15264,14 +15286,14 @@ snapshots: '@types/express': 4.17.21 file-system-cache: 2.3.0 - '@storybook/vue3-vite@7.6.3(@vue/compiler-core@3.5.16)(rolldown-vite@7.0.0(@types/node@18.13.0)(esbuild@0.25.5)(jiti@2.4.2)(less@4.2.0)(sass-embedded@1.83.0)(terser@5.37.0))(typescript@5.8.3)(vue@3.5.16(typescript@5.8.3))': + '@storybook/vue3-vite@7.6.3(@vue/compiler-core@3.5.16)(typescript@5.8.3)(vite@4.5.14(@types/node@20.14.2)(less@4.2.0)(lightningcss@1.30.1)(sass@1.60.0)(terser@5.37.0))(vue@3.5.16(typescript@5.8.3))': dependencies: - '@storybook/builder-vite': 7.6.3(rolldown-vite@7.0.0(@types/node@18.13.0)(esbuild@0.25.5)(jiti@2.4.2)(less@4.2.0)(sass-embedded@1.83.0)(terser@5.37.0))(typescript@5.8.3) + '@storybook/builder-vite': 7.6.3(typescript@5.8.3)(vite@4.5.14(@types/node@20.14.2)(less@4.2.0)(lightningcss@1.30.1)(sass@1.60.0)(terser@5.37.0)) '@storybook/core-server': 7.6.3 '@storybook/vue3': 7.6.3(@vue/compiler-core@3.5.16)(vue@3.5.16(typescript@5.8.3)) - '@vitejs/plugin-vue': 4.2.3(rolldown-vite@7.0.0(@types/node@18.13.0)(esbuild@0.25.5)(jiti@2.4.2)(less@4.2.0)(sass-embedded@1.83.0)(terser@5.37.0))(vue@3.5.16(typescript@5.8.3)) + '@vitejs/plugin-vue': 4.2.3(vite@4.5.14(@types/node@20.14.2)(less@4.2.0)(lightningcss@1.30.1)(sass@1.60.0)(terser@5.37.0))(vue@3.5.16(typescript@5.8.3)) magic-string: 0.30.2 - vite: rolldown-vite@7.0.0(@types/node@18.13.0)(esbuild@0.25.5)(jiti@2.4.2)(less@4.2.0)(sass-embedded@1.83.0)(terser@5.37.0) + vite: 4.5.14(@types/node@20.14.2)(less@4.2.0)(lightningcss@1.30.1)(sass@1.60.0)(terser@5.37.0) vue-docgen-api: 4.75.1(vue@3.5.16(typescript@5.8.3)) transitivePeerDependencies: - '@preact/preset-vite' @@ -15746,8 +15768,6 @@ snapshots: '@types/qs@6.9.7': {} - '@types/randomstring@1.1.8': {} - '@types/range-parser@1.2.7': {} '@types/react@18.2.41': @@ -16100,9 +16120,9 @@ snapshots: transitivePeerDependencies: - supports-color - '@vitejs/plugin-vue@4.2.3(rolldown-vite@7.0.0(@types/node@18.13.0)(esbuild@0.25.5)(jiti@2.4.2)(less@4.2.0)(sass-embedded@1.83.0)(terser@5.37.0))(vue@3.5.16(typescript@5.8.3))': + '@vitejs/plugin-vue@4.2.3(vite@4.5.14(@types/node@20.14.2)(less@4.2.0)(lightningcss@1.30.1)(sass@1.60.0)(terser@5.37.0))(vue@3.5.16(typescript@5.8.3))': dependencies: - vite: rolldown-vite@7.0.0(@types/node@18.13.0)(esbuild@0.25.5)(jiti@2.4.2)(less@4.2.0)(sass-embedded@1.83.0)(terser@5.37.0) + vite: 4.5.14(@types/node@20.14.2)(less@4.2.0)(lightningcss@1.30.1)(sass@1.60.0)(terser@5.37.0) vue: 3.5.16(typescript@5.8.3) '@vitejs/plugin-vue@6.0.0(rolldown-vite@7.0.0(@types/node@18.13.0)(esbuild@0.25.5)(jiti@2.4.2)(less@4.2.0)(sass-embedded@1.83.0)(terser@5.37.0))(vue@3.5.16(typescript@5.8.3))': @@ -22423,6 +22443,19 @@ snapshots: picocolors: 1.0.1 vite: rolldown-vite@7.0.0(@types/node@18.13.0)(esbuild@0.25.5)(jiti@2.4.2)(less@4.2.0)(sass-embedded@1.83.0)(terser@5.37.0) + vite@4.5.14(@types/node@20.14.2)(less@4.2.0)(lightningcss@1.30.1)(sass@1.60.0)(terser@5.37.0): + dependencies: + esbuild: 0.18.20 + postcss: 8.5.6 + rollup: 3.28.0 + optionalDependencies: + '@types/node': 20.14.2 + fsevents: 2.3.3 + less: 4.2.0 + lightningcss: 1.30.1 + sass: 1.60.0 + terser: 5.37.0 + vitest@3.2.4(@types/node@18.13.0)(@vitest/ui@3.2.4)(esbuild@0.25.5)(jiti@2.4.2)(jsdom@26.1.0)(less@4.2.0)(sass-embedded@1.83.0)(terser@5.37.0): dependencies: '@types/chai': 5.2.2