Skip to content

Commit 6164110

Browse files
Charles7cCharles7c
committed
升级：升级前端依赖，并更换包管理器 yarn => pnpm
1.arco design pro vue 2.6.1 => 2.7.0 2.arco design vue 2.40.1 => 2.44.5 3.vue 3.2.45 => 3.2.47 4.typescript 4.9.4 => 4.9.5 5.其他依赖升级
1 parent 0f49d7b commit 6164110

File tree

8 files changed

+9207
-8702
lines changed

8 files changed

+9207
-8702
lines changed

‎.github/workflows/deploy.yml

+14-9
Original file line numberDiff line numberDiff line change
@@ -58,22 +58,27 @@ jobs:
5858
# 1、检出源码
5959
- name: Checkout
6060
uses: actions/checkout@master
61-
# 2、安装 Node 环境
61+
# 2、安装 PNPM
62+
- name: Setup PNPM
63+
uses: pnpm/action-setup@v2
64+
with:
65+
version: latest
66+
# 3、安装 Node 环境
6267
- name: Setup Node
6368
uses: actions/setup-node@v3
6469
with:
6570
node-version: 16
66-
cache: yarn
67-
cache-dependency-path: ./continew-admin-ui/yarn.lock
68-
# 3、安装依赖
71+
cache: pnpm
72+
cache-dependency-path: ./continew-admin-ui/pnpm-lock.yaml
73+
# 4、安装依赖
6974
- name: Install Dependencies
70-
run: yarn install --frozen-lockfile
75+
run: pnpm i --frozen-lockfile
7176
working-directory: ./continew-admin-ui
72-
# 4、打包
77+
# 5、打包
7378
- name: Build
74-
run: yarn build
79+
run: pnpm build
7580
working-directory: ./continew-admin-ui
76-
# 5、拷贝文件到服务器
81+
# 6、拷贝文件到服务器
7782
- name: Copy
7883
uses: garygrossgarten/github-action-scp@release
7984
with:
@@ -83,7 +88,7 @@ jobs:
8388
password: ${{ secrets.SERVER_PASSWORD }}
8489
local: ./continew-admin-ui/dist
8590
remote: /docker/continew-admin/tmp
86-
# 6、重启前端服务
91+
# 7、重启前端服务
8792
- name: Restart
8893
uses: appleboy/ssh-action@master
8994
with:

‎README.md

+11-11
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ ContiNew Admin 中后台管理框架/脚手架，Continue New Admin，持续以
2929

3030
| 开源平台 | 源码地址 |
3131
| ------------- | ------------------------------------------- |
32-
| GitHub | <a href="https://github.com/Charles7c/continew-admin" target="_blank">https://github.com/Charles7c/continew-admin</a> |
33-
| Gitee（码云） | <a href="https://gitee.com/Charles7c/continew-admin" target="_blank">https://gitee.com/Charles7c/continew-admin</a> |
32+
| GitHub | https://github.com/Charles7c/continew-admin |
33+
| Gitee（码云） | https://gitee.com/Charles7c/continew-admin |
3434

3535
## 主要特性
3636

@@ -76,8 +76,8 @@ ContiNew Admin 中后台管理框架/脚手架，Continue New Admin，持续以
7676
- [ ] 通知管理：提供系统通知管理，设为已读、未读
7777
- [ ] 仪表盘优化：各区块数据动态渲染
7878
- [ ] 网站配置：支持配置系统网站标题、网站 Logo、favicon、版权信息等
79-
- [ ] 依赖升级：升级至最新 Spring Boot 2.x 版本
80-
- [ ] 依赖升级：其他依赖升级
79+
- [x] 依赖升级：升级至最新 Spring Boot 2.x 版本
80+
- [x] 依赖升级：其他依赖升级
8181
- [ ] 其他需求汇集中...
8282

8383
**v1.0.0：** 初步完成中后台管理框架/脚手架的基础功能。
@@ -255,9 +255,9 @@ continew-admin
255255

256256
| 名称 | 版本 | 简介 |
257257
| :----------------------------------------------------------- | :----------- | :----------------------------------------------------------- |
258-
| <a href="https://cn.vuejs.org/" target="_blank">Vue</a> | 3.2.45 | 渐进式 JavaScript 框架，易学易用，性能出色，适用场景丰富的 Web 前端框架。 |
259-
| <a href="https://www.typescriptlang.org/zh/" target="_blank">TypeScript</a> | 4.9.4 | TypeScript 是微软开发的一个开源的编程语言，通过在 JavaScript 的基础上添加静态类型定义构建而成。 |
260-
| <a href="https://arco.design/vue/docs/start" target="_blank">Arco Design Vue</a> | 2.40.1 | 字节跳动推出的前端 UI 框架，样式美观，组件丰富。 |
258+
| <a href="https://cn.vuejs.org/" target="_blank">Vue</a> | 3.2.47 | 渐进式 JavaScript 框架，易学易用，性能出色，适用场景丰富的 Web 前端框架。 |
259+
| <a href="https://www.typescriptlang.org/zh/" target="_blank">TypeScript</a> | 4.9.5 | TypeScript 是微软开发的一个开源的编程语言，通过在 JavaScript 的基础上添加静态类型定义构建而成。 |
260+
| <a href="https://arco.design/vue/docs/start" target="_blank">Arco Design Vue</a> | 2.44.5 | 字节跳动推出的前端 UI 框架，样式美观，组件丰富。 |
261261
| <a href="https://spring.io/projects/spring-boot" target="_blank">Spring Boot</a> | 2.7.10 | 简化新 Spring 应用的初始搭建以及开发过程。 |
262262
| <a href="https://undertow.io/" target="_blank">Undertow</a> | 2.2.23.Final | 采用 Java 开发的灵活的高性能 Web 服务器，提供包括阻塞和基于 NIO 的非堵塞机制。 |
263263
| <a href="https://sa-token.dev33.cn/" target="_blank">Sa-Token + JWT</a> | 1.34.0 | 轻量级 Java 权限认证框架，让鉴权变得简单、优雅。 |
@@ -369,19 +369,19 @@ git clone https://github.com/Charles7c/continew-admin.git
369369
# 2.在 IDE（Visual Studio Code/WebStorm）中打开前端项目 continew-admin-ui
370370

371371
# 3.配置淘宝源
372-
yarn config set registry https://registry.npm.taobao.org
372+
pnpm config set registry https://registry.npm.taobao.org
373373

374374
# 4.安装依赖
375-
yarn install
375+
pnpm i
376376

377377
# 5.启动程序
378378
# 5.1 启动成功：访问 http://localhost:5173/
379-
yarn dev
379+
pnpm dev
380380

381381
# 6.部署
382382
# 6.1 Docker 部署
383383
# 6.1.1 服务器安装好 docker 及 docker-compose（参考：https://blog.charles7c.top/categories/fragments/2022/10/31/CentOS%E5%AE%89%E8%A3%85Docker）
384-
# 6.1.2 执行 yarn build 进行项目打包，将 dist 目录下的所有文件放到 /docker/continew-admin/web 目录下
384+
# 6.1.2 执行 pnpm build 进行项目打包，将 dist 目录下的所有文件放到 /docker/continew-admin/web 目录下
385385
# 6.1.3 将 docker 目录上传到服务器 / 目录下，并授权（chmod -R 777 /docker）
386386
# 6.1.4 修改 docker-compose.yml 中的 MariaDB 配置、Redis 配置、continew-admin-server 配置、Nginx 配置
387387
# 6.1.5 执行 docker-compose up -d 创建并后台运行所有容器

‎continew-admin-ui/components.d.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
// generated by unplugin-vue-components
2-
// We suggest you to commit this file into source control
1+
/* eslint-disable */
2+
/* prettier-ignore */
3+
// @ts-nocheck
4+
// Generated by unplugin-vue-components
35
// Read more: https://github.com/vuejs/core/pull/3399
46
import '@vue/runtime-core'
57

‎continew-admin-ui/package.json

+25-26
Original file line numberDiff line numberDiff line change
@@ -29,71 +29,70 @@
2929
]
3030
},
3131
"dependencies": {
32-
"@arco-design/web-vue": "^2.40.1",
33-
"@vueuse/core": "^9.9.0",
34-
"arco-design-pro-vue": "^2.6.1",
32+
"@arco-design/web-vue": "^2.44.5",
33+
"@vueuse/core": "^9.13.0",
3534
"axios": "^0.24.0",
3635
"crypto-js": "^4.1.1",
3736
"dayjs": "^1.11.7",
38-
"echarts": "^5.4.0",
39-
"jsencrypt": "^3.3.1",
37+
"echarts": "^5.4.2",
38+
"jsencrypt": "^3.3.2",
4039
"lodash": "^4.17.21",
4140
"mitt": "^3.0.0",
4241
"nprogress": "^0.2.0",
43-
"pinia": "^2.0.28",
42+
"pinia": "^2.0.33",
4443
"query-string": "^8.1.0",
4544
"sortablejs": "^1.15.0",
46-
"vue": "^3.2.45",
47-
"vue-echarts": "^6.3.3",
45+
"vue": "^3.2.47",
46+
"vue-echarts": "^6.5.4",
4847
"vue-i18n": "^9.2.2",
49-
"vue-json-pretty": "^2.2.3",
48+
"vue-json-pretty": "^2.2.4",
5049
"vue-router": "^4.1.6"
5150
},
5251
"devDependencies": {
53-
"@commitlint/cli": "^17.3.0",
54-
"@commitlint/config-conventional": "^17.3.0",
52+
"@commitlint/cli": "^17.5.0",
53+
"@commitlint/config-conventional": "^17.4.4",
5554
"@types/crypto-js": "^4.1.1",
5655
"@types/lodash": "^4.14.191",
5756
"@types/mockjs": "^1.0.7",
5857
"@types/nprogress": "^0.2.0",
59-
"@types/sortablejs": "^1.15.0",
60-
"@typescript-eslint/eslint-plugin": "^5.47.1",
61-
"@typescript-eslint/parser": "^5.47.1",
58+
"@types/sortablejs": "^1.15.1",
59+
"@typescript-eslint/eslint-plugin": "^5.56.0",
60+
"@typescript-eslint/parser": "^5.46.0",
6261
"@vitejs/plugin-vue": "^3.1.2",
6362
"@vitejs/plugin-vue-jsx": "^2.0.1",
6463
"@vue/babel-plugin-jsx": "^1.1.1",
6564
"consola": "^2.15.3",
6665
"cross-env": "^7.0.3",
67-
"eslint": "^8.30.0",
66+
"eslint": "^8.36.0",
6867
"eslint-config-airbnb-base": "^15.0.0",
69-
"eslint-config-prettier": "^8.5.0",
68+
"eslint-config-prettier": "^8.8.0",
7069
"eslint-import-resolver-typescript": "^3.5.2",
71-
"eslint-plugin-import": "^2.26.0",
70+
"eslint-plugin-import": "^2.27.5",
7271
"eslint-plugin-prettier": "^4.2.1",
73-
"eslint-plugin-vue": "^9.8.0",
72+
"eslint-plugin-vue": "^9.10.0",
7473
"less": "^4.1.3",
75-
"lint-staged": "^13.1.0",
74+
"lint-staged": "^13.2.0",
7675
"mockjs": "^1.1.0",
7776
"postcss-html": "^1.5.0",
78-
"prettier": "^2.8.1",
79-
"rollup": "^3.9.1",
80-
"rollup-plugin-visualizer": "^5.8.2",
77+
"prettier": "^2.8.7",
78+
"rollup": "^3.20.2",
79+
"rollup-plugin-visualizer": "^5.9.0",
8180
"stylelint": "^14.13.0",
82-
"stylelint-config-prettier": "^9.0.3",
81+
"stylelint-config-prettier": "^9.0.5",
8382
"stylelint-config-rational-order": "^0.1.2",
8483
"stylelint-config-recommended-vue": "^1.4.0",
8584
"stylelint-config-standard": "^29.0.0",
8685
"stylelint-order": "^5.0.0",
87-
"typescript": "^4.9.4",
88-
"unplugin-vue-components": "^0.22.8",
86+
"typescript": "^4.9.5",
87+
"unplugin-vue-components": "^0.24.1",
8988
"vite": "^3.2.5",
9089
"vite-plugin-compression": "^0.5.1",
9190
"vite-plugin-eslint": "^1.8.1",
9291
"vite-plugin-imagemin": "^0.6.1",
9392
"vite-plugin-style-import": "1.4.1",
9493
"vite-plugin-svg-icons": "^2.0.1",
9594
"vite-svg-loader": "^3.6.0",
96-
"vue-tsc": "^1.0.14"
95+
"vue-tsc": "^1.2.0"
9796
},
9897
"engines": {
9998
"node": ">=14.0.0"

0 commit comments

Comments
 (0)