Skip to content

Commit 10e68d6

Browse files
xiaoxian521xiaoxian521
authored
chore: 升级vite至v5 版本，规定node版本>=18.0.0，pnpm版本>=8.6.10 (#738)
1 parent 6e195c8 commit 10e68d6

18 files changed

+2253
-2301
lines changed

‎.eslintignore

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ dist
33
*.d.ts
44
/src/assets
55
package.json
6-
.eslintrc.js
6+
.eslintrc.cjs
77
.prettierrc.js
8-
commitlint.config.js
9-
postcss.config.js
10-
tailwind.config.js
11-
stylelint.config.js
8+
commitlint.config.cjs
9+
postcss.config.cjs
10+
tailwind.config.ts
11+
stylelint.config.cjs
1212
src/components/ReSplitPane/iconfont
1313
src/components/ReFlowChart/src/assets/iconfont

‎.eslintrc.js renamed to ‎.eslintrc.cjs

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
module.exports = {
1+
// @ts-check
2+
const { defineConfig } = require("eslint-define-config");
3+
4+
module.exports = defineConfig({
25
root: true,
36
env: {
47
node: true
@@ -42,7 +45,7 @@ module.exports = {
4245
parser: "vue-eslint-parser",
4346
parserOptions: {
4447
parser: "@typescript-eslint/parser",
45-
ecmaVersion: 2020,
48+
ecmaVersion: "latest",
4649
sourceType: "module",
4750
jsxPragma: "React",
4851
ecmaFeatures: {
@@ -117,4 +120,4 @@ module.exports = {
117120
}
118121
]
119122
}
120-
}
123+
});

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ dist-ssr
55
*.local
66
.eslintcache
77
report.html
8+
vite.config.*.timestamp*
89

910
yarn.lock
1011
npm-debug.log*

‎.lintstagedrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"prettier --cache --ignore-unknown --write",
44
"eslint --cache --fix"
55
],
6-
"{!(package)*.json,*.code-snippets,.!(browserslist)*rc}": [
6+
"{!(package)*.json,*.code-snippets,.!({browserslist,nvm})*rc}": [
77
"prettier --cache --write--parser json"
88
],
99
"package.json": ["prettier --cache --write"],

‎.nvmrc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
v20.9.0

‎.prettierrc.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
module.exports = {
1+
// @ts-check
2+
3+
/** @type {import("prettier").Config} */
4+
export default {
25
bracketSpacing: true,
36
singleQuote: false,
47
arrowParens: "avoid",

‎Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
FROM node:16-alpine as build-stage
1+
FROM node:18-alpine as build-stage
22

33
WORKDIR /app
44
RUN corepack enable
5-
RUN corepack prepare pnpm@7.32.1 --activate
5+
RUN corepack prepare pnpm@8.6.10 --activate
66

77
RUN npm config set registry https://registry.npmmirror.com
88

‎README.en-US.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ After operating the above two commands, open `http://localhost:8080` in the brow
109109
Of course, you can also operate the `docker` project through the [Docker Desktop](https://www.docker.com/products/docker-desktop/) visual interface, as shown below
110110

111111
<p align="center">
112-
<img alt="docker" width="100%" src="https://yiming_chang.gitee.io/pure-admin-doc/img/docker/1.jpg">
112+
<img alt="docker" width="100%" src="https://xiaoxian521.github.io/hyperlink/img/docker-desktop.jpg">
113113
</p>
114114

115115
## Change Log
@@ -170,10 +170,10 @@ In principle, no fees and copyrights are charged, and it is commercially availab
170170

171171
Many thanks to the kind individuals who leave a star. Your support is much appreciated :heart:
172172

173-
[![Stargazers for vue-pure-admin](https://reporoster.com/stars/pure-admin/vue-pure-admin)](https://github.com/pure-admin/vue-pure-admin/stargazers)
173+
[![Stargazers repo roster for @pure-admin/vue-pure-admin](https://bytecrank.com/nastyox/reporoster/php/stargazersSVG.php?user=pure-admin&repo=vue-pure-admin)](https://github.com/pure-admin/vue-pure-admin/stargazers)
174174

175175
## `Fork`
176176

177177
It's so cool that you study hard :heart:
178178

179-
[![Forkers repo roster for vue-pure-admin](https://reporoster.com/forks/pure-admin/vue-pure-admin)](https://github.com/pure-admin/vue-pure-admin/network/members)
179+
[![Forkers repo roster for @pure-admin/vue-pure-admin](https://bytecrank.com/nastyox/reporoster/php/forkersSVG.php?user=pure-admin&repo=vue-pure-admin)](https://github.com/pure-admin/vue-pure-admin/network/members)

‎README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ docker run -dp 8080:80 --name pure-admin vue-pure-admin
109109
当然也可以通过 [Docker Desktop](https://www.docker.com/products/docker-desktop/) 可视化界面去操作 `docker` 项目，如下图
110110

111111
<p align="center">
112-
<img alt="docker" width="100%" src="https://yiming_chang.gitee.io/pure-admin-doc/img/docker/1.jpg">
112+
<img alt="docker" width="100%" src="https://xiaoxian521.github.io/hyperlink/img/docker-desktop.jpg">
113113
</p>
114114

115115
## 更新日志
@@ -170,10 +170,10 @@ docker run -dp 8080:80 --name pure-admin vue-pure-admin
170170

171171
非常感谢留下星星的好心人，感谢您的支持 :heart:
172172

173-
[![Stargazers for vue-pure-admin](https://reporoster.com/stars/pure-admin/vue-pure-admin)](https://github.com/pure-admin/vue-pure-admin/stargazers)
173+
[![Stargazers repo roster for @pure-admin/vue-pure-admin](https://bytecrank.com/nastyox/reporoster/php/stargazersSVG.php?user=pure-admin&repo=vue-pure-admin)](https://github.com/pure-admin/vue-pure-admin/stargazers)
174174

175175
## `Fork`
176176

177177
瞧，那些 `小哥哥` 、`小姐姐` 认真 `学习` 的样子真滴是 `哎呦不错哦` :heart:
178178

179-
[![Forkers repo roster for vue-pure-admin](https://reporoster.com/forks/pure-admin/vue-pure-admin)](https://github.com/pure-admin/vue-pure-admin/network/members)
179+
[![Forkers repo roster for @pure-admin/vue-pure-admin](https://bytecrank.com/nastyox/reporoster/php/forkersSVG.php?user=pure-admin&repo=vue-pure-admin)](https://github.com/pure-admin/vue-pure-admin/network/members)

‎commitlint.config.js renamed to ‎commitlint.config.cjs

File renamed without changes.

‎index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!DOCTYPE html>
1+
<!doctype html>
22
<html lang="en">
33
<head>
44
<meta charset="UTF-8" />

‎package.json

+60-54
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,26 @@
22
"name": "vue-pure-admin",
33
"version": "4.5.0",
44
"private": true,
5+
"type": "module",
6+
"scripts": {
7+
"dev": "NODE_OPTIONS=--max-old-space-size=4096 vite",
8+
"serve": "pnpm dev",
9+
"build": "rimraf dist && NODE_OPTIONS=--max-old-space-size=8192 vite build && generate-version-file",
10+
"build:staging": "rimraf dist && vite build --mode staging",
11+
"report": "rimraf dist && vite build",
12+
"preview": "vite preview",
13+
"preview:build": "pnpm build && vite preview",
14+
"typecheck": "tsc --noEmit && vue-tsc --noEmit --skipLibCheck",
15+
"svgo": "svgo -f src/assets/svg -o src/assets/svg",
16+
"cloc": "NODE_OPTIONS=--max-old-space-size=4096 cloc . --exclude-dir=node_modules --exclude-lang=YAML",
17+
"clean:cache": "rimraf .eslintcache && rimraf node_modules && pnpm install",
18+
"lint:eslint": "eslint --cache --max-warnings 0 \"{src,mock,build}/**/*.{vue,js,ts,tsx}\" --fix",
19+
"lint:prettier": "prettier --write \"src/**/*.{js,ts,json,tsx,css,scss,vue,html,md}\"",
20+
"lint:stylelint": "stylelint --cache --fix \"**/*.{html,vue,css,scss}\" --cache --cache-location node_modules/.cache/stylelint/",
21+
"lint": "pnpm lint:eslint && pnpm lint:prettier && pnpm lint:stylelint",
22+
"prepare": "husky install",
23+
"preinstall": "npx only-allow pnpm"
24+
},
525
"keywords": [
626
"vue-pure-admin",
727
"element-plus",
@@ -13,38 +33,19 @@
1333
"vite"
1434
],
1535
"homepage": "https://github.com/pure-admin/vue-pure-admin",
16-
"bugs": {
17-
"url": "https://github.com/pure-admin/vue-pure-admin/issues"
18-
},
1936
"repository": {
2037
"type": "git",
2138
"url": "git+https://github.com/pure-admin/vue-pure-admin.git"
2239
},
40+
"bugs": {
41+
"url": "https://github.com/pure-admin/vue-pure-admin/issues"
42+
},
2343
"license": "MIT",
2444
"author": {
2545
"name": "xiaoxian521",
2646
"email": "[email protected]",
2747
"url": "https://github.com/xiaoxian521"
2848
},
29-
"scripts": {
30-
"dev": "NODE_OPTIONS=--max-old-space-size=4096 vite",
31-
"serve": "pnpm dev",
32-
"build": "rimraf dist && NODE_OPTIONS=--max-old-space-size=8192 vite build && generate-version-file",
33-
"build:staging": "rimraf dist && vite build --mode staging",
34-
"report": "rimraf dist && vite build",
35-
"preview": "vite preview",
36-
"preview:build": "pnpm build && vite preview",
37-
"typecheck": "tsc --noEmit && vue-tsc --noEmit --skipLibCheck",
38-
"svgo": "svgo -f src/assets/svg -o src/assets/svg",
39-
"cloc": "NODE_OPTIONS=--max-old-space-size=4096 cloc . --exclude-dir=node_modules --exclude-lang=YAML",
40-
"clean:cache": "rimraf .eslintcache && rimraf node_modules && pnpm install",
41-
"lint:eslint": "eslint --cache --max-warnings 0 \"{src,mock,build}/**/*.{vue,js,ts,tsx}\" --fix",
42-
"lint:prettier": "prettier --write \"src/**/*.{js,ts,json,tsx,css,scss,vue,html,md}\"",
43-
"lint:stylelint": "stylelint --cache --fix \"**/*.{html,vue,css,scss}\" --cache --cache-location node_modules/.cache/stylelint/",
44-
"lint": "pnpm lint:eslint && pnpm lint:prettier && pnpm lint:stylelint",
45-
"prepare": "husky install",
46-
"preinstall": "npx only-allow pnpm"
47-
},
4849
"dependencies": {
4950
"@amap/amap-jsapi-loader": "^1.0.1",
5051
"@howdyjs/mouse-menu": "2.0.9",
@@ -53,19 +54,19 @@
5354
"@pureadmin/descriptions": "^1.2.0",
5455
"@pureadmin/table": "^2.3.4",
5556
"@pureadmin/utils": "^1.9.10",
56-
"@vueuse/core": "^10.5.0",
57+
"@vueuse/core": "^10.6.0",
5758
"@vueuse/motion": "^2.0.0",
5859
"@wangeditor/editor": "^5.1.23",
5960
"@wangeditor/editor-for-vue": "^5.1.12",
6061
"@zxcvbn-ts/core": "^3.0.4",
6162
"animate.css": "^4.1.1",
62-
"axios": "^1.6.0",
63+
"axios": "^1.6.1",
6364
"china-area-data": "^5.0.1",
6465
"cropperjs": "^1.6.1",
6566
"dayjs": "^1.11.10",
6667
"echarts": "^5.4.3",
6768
"el-table-infinite-scroll": "^3.0.3",
68-
"element-plus": "^2.4.1",
69+
"element-plus": "^2.4.2",
6970
"intro.js": "^7.2.0",
7071
"js-cookie": "^3.0.5",
7172
"jsbarcode": "^3.11.5",
@@ -81,56 +82,57 @@
8182
"qs": "^6.11.2",
8283
"responsive-storage": "^2.2.0",
8384
"sortablejs": "^1.15.0",
84-
"swiper": "^11.0.3",
85+
"swiper": "^11.0.4",
8586
"typeit": "^8.7.1",
8687
"v-contextmenu": "3.0.0",
8788
"v3-infinite-loading": "^1.3.1",
88-
"version-rocket": "^1.7.0",
89-
"vue": "^3.3.7",
90-
"vue-i18n": "^9.6.2",
89+
"version-rocket": "^1.7.1",
90+
"vue": "^3.3.8",
91+
"vue-i18n": "^9.6.5",
9192
"vue-json-pretty": "^2.2.4",
9293
"vue-pdf-embed": "^1.2.1",
9394
"vue-router": "^4.2.5",
9495
"vue-tippy": "^6.3.1",
9596
"vue-types": "^5.1.1",
9697
"vue-virtual-scroller": "2.0.0-beta.8",
97-
"vue-waterfall-plugin-next": "^2.2.4",
98+
"vue-waterfall-plugin-next": "^2.2.6",
9899
"vue3-danmaku": "^1.6.0",
99100
"vuedraggable": "^4.1.0",
100-
"wavesurfer.js": "^7.4.2",
101+
"wavesurfer.js": "^7.4.5",
101102
"xgplayer": "^3.0.9",
102103
"xlsx": "^0.18.5"
103104
},
104105
"devDependencies": {
105-
"@commitlint/cli": "^17.7.2",
106-
"@commitlint/config-conventional": "^17.7.0",
106+
"@commitlint/cli": "^18.2.0",
107+
"@commitlint/config-conventional": "^18.1.0",
107108
"@faker-js/faker": "^8.2.0",
108109
"@iconify-icons/ep": "^1.2.12",
109110
"@iconify-icons/ri": "^1.2.10",
110111
"@iconify/vue": "^4.1.1",
111-
"@intlify/unplugin-vue-i18n": "^1.4.0",
112+
"@intlify/unplugin-vue-i18n": "^1.5.0",
112113
"@pureadmin/theme": "^3.2.0",
113-
"@types/intro.js": "^5.1.2",
114-
"@types/js-cookie": "^3.0.4",
115-
"@types/node": "^20.8.2",
114+
"@types/intro.js": "^5.1.4",
115+
"@types/js-cookie": "^3.0.6",
116+
"@types/node": "^20.9.0",
116117
"@types/nprogress": "0.2.0",
117-
"@types/qrcode": "^1.5.2",
118-
"@types/qs": "^6.9.8",
119-
"@types/sortablejs": "^1.15.3",
120-
"@typescript-eslint/eslint-plugin": "^6.7.4",
121-
"@typescript-eslint/parser": "^6.7.4",
122-
"@vitejs/plugin-vue": "^4.4.0",
118+
"@types/qrcode": "^1.5.5",
119+
"@types/qs": "^6.9.10",
120+
"@types/sortablejs": "^1.15.5",
121+
"@typescript-eslint/eslint-plugin": "^6.10.0",
122+
"@typescript-eslint/parser": "^6.10.0",
123+
"@vitejs/plugin-vue": "^4.4.1",
123124
"@vitejs/plugin-vue-jsx": "^3.0.2",
124125
"@vue/eslint-config-prettier": "^8.0.0",
125126
"@vue/eslint-config-typescript": "^12.0.0",
126127
"autoprefixer": "^10.4.16",
127128
"cloc": "^2.11.0",
128129
"cssnano": "^6.0.1",
129-
"eslint": "^8.50.0",
130-
"eslint-plugin-prettier": "^5.0.0",
130+
"eslint": "^8.53.0",
131+
"eslint-define-config": "^1.24.1",
132+
"eslint-plugin-prettier": "^5.0.1",
131133
"eslint-plugin-vue": "^9.18.1",
132134
"husky": "^8.0.3",
133-
"lint-staged": "^14.0.1",
135+
"lint-staged": "^15.0.2",
134136
"picocolors": "^1.0.0",
135137
"postcss": "^8.4.31",
136138
"postcss-html": "^1.5.0",
@@ -139,24 +141,23 @@
139141
"prettier": "^3.0.3",
140142
"rimraf": "^5.0.5",
141143
"rollup-plugin-visualizer": "^5.9.2",
142-
"sass": "^1.69.0",
144+
"sass": "^1.69.5",
143145
"sass-loader": "^13.3.2",
144-
"stylelint": "^15.10.3",
146+
"stylelint": "^15.11.0",
145147
"stylelint-config-html": "^1.1.0",
146148
"stylelint-config-recess-order": "^4.3.0",
147149
"stylelint-config-recommended": "^13.0.0",
148-
"stylelint-config-recommended-scss": "^13.0.0",
150+
"stylelint-config-recommended-scss": "^13.1.0",
149151
"stylelint-config-recommended-vue": "^1.5.0",
150152
"stylelint-config-standard": "^34.0.0",
151-
"stylelint-config-standard-scss": "^11.0.0",
153+
"stylelint-config-standard-scss": "^11.1.0",
152154
"stylelint-order": "^6.0.3",
153155
"stylelint-prettier": "^4.0.2",
154-
"stylelint-scss": "^5.2.1",
155-
"svgo": "^3.0.2",
156+
"stylelint-scss": "^5.3.1",
157+
"svgo": "^3.0.3",
156158
"tailwindcss": "^3.3.5",
157-
"terser": "^5.24.0",
158159
"typescript": "^5.2.2",
159-
"vite": "^4.5.0",
160+
"vite": "5.0.0-beta.17",
160161
"vite-plugin-cdn-import": "^0.3.5",
161162
"vite-plugin-compression": "^0.5.1",
162163
"vite-plugin-fake-server": "^2.0.0",
@@ -165,6 +166,11 @@
165166
"vue-eslint-parser": "^9.3.2",
166167
"vue-tsc": "^1.8.22"
167168
},
169+
"engines": {
170+
"node": "^18.0.0 || >=20.0.0",
171+
"pnpm": ">=8.6.10"
172+
},
173+
"packageManager": "[email protected]",
168174
"pnpm": {
169175
"peerDependencyRules": {
170176
"ignoreMissing": [

0 commit comments

Comments
 (0)