Skip to content

Commit

Permalink
Merge branch 'main' into pages
Browse files Browse the repository at this point in the history
  • Loading branch information
xiaoxian521 committed May 14, 2024
2 parents d9bd2ec + 613d20f commit 097d6cd
Show file tree
Hide file tree
Showing 25 changed files with 6,990 additions and 5,665 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
name: Install pnpm
id: pnpm-install
with:
version: 8.6.10
version: 9
run_install: false

- name: Get pnpm store directory
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
name: Install pnpm
id: pnpm-install
with:
version: 8.6.10
version: 9
run_install: false

- name: Deploy 🔧
Expand Down
2 changes: 1 addition & 1 deletion .lintstagedrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"prettier --cache --ignore-unknown --write",
"eslint --cache --fix"
],
"{!(package)*.json,*.code-snippets,.!({browserslist,nvm})*rc}": [
"{!(package)*.json,*.code-snippets,.!({browserslist,npm,nvm})*rc}": [
"prettier --cache --write--parser json"
],
"package.json": ["prettier --cache --write"],
Expand Down
5 changes: 3 additions & 2 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
shell-emulator=true
shamefully-hoist=true
strict-peer-dependencies=false
shell-emulator=true
enable-pre-post-scripts=false
strict-peer-dependencies=false
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v20.12.2
v20.13.1
14 changes: 14 additions & 0 deletions CHANGELOG.en_US.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
# 5.6.0 (2024-05-14)

### ✔️ Refactor

- Upgrade `pnpm` to `v9` version, requiring `pnpm` version `>=9`

### 🐞 Bug fixes

- Fixed the issue where clicking on an external link would jump twice

### 🍏 Perf

- Optimize `ReSegmented` component

# 5.5.0 (2024-05-07)

### 📄 Docs
Expand Down
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
# 5.6.0 (2024-05-14)

### ✔️ Refactor

- Upgrade `pnpm` to `v9` version, requiring `pnpm` version `>=9`

### 🐞 Bug fixes

- Fixed the issue where clicking on an external link would jump twice

### 🍏 Perf

- Optimize `ReSegmented` component

# 5.5.0 (2024-05-07)

### 📄 Docs
Expand Down
14 changes: 14 additions & 0 deletions CHANGELOG.zh_CN.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
# 5.6.0 (2024-05-14)

### ✔️ Refactor

- 升级`pnpm``v9`版本,规定`pnpm`版本`>=9`

### 🐞 Bug fixes

- 修复点击外链会跳转两次的问题

### 🍏 Perf

- 优化`ReSegmented`组件

# 5.5.0 (2024-05-07)

### 📄 Docs
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM node:18-alpine as build-stage
FROM node:20-alpine as build-stage

WORKDIR /app
RUN corepack enable
RUN corepack prepare pnpm@8.6.10 --activate
RUN corepack prepare pnpm@latest --activate

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

Expand Down
39 changes: 19 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vue-pure-admin",
"version": "5.5.0",
"version": "5.6.0",
"private": true,
"type": "module",
"scripts": {
Expand Down Expand Up @@ -56,7 +56,7 @@
"@pureadmin/table": "^3.1.2",
"@pureadmin/utils": "^2.4.7",
"@vue-flow/background": "^1.3.0",
"@vue-flow/core": "^1.33.6",
"@vue-flow/core": "^1.33.7",
"@vueuse/core": "^10.9.0",
"@vueuse/motion": "^2.1.0",
"@wangeditor/editor": "^5.1.23",
Expand All @@ -69,7 +69,7 @@
"dayjs": "^1.11.11",
"echarts": "^5.5.0",
"el-table-infinite-scroll": "^3.0.3",
"element-plus": "2.7.1",
"element-plus": "^2.7.3",
"intro.js": "^7.2.0",
"js-cookie": "^3.0.5",
"jsbarcode": "^3.11.6",
Expand All @@ -80,18 +80,18 @@
"nprogress": "^0.2.0",
"path": "^0.12.7",
"pinia": "^2.1.7",
"pinyin-pro": "^3.20.3",
"plus-pro-components": "^0.0.11",
"pinyin-pro": "^3.20.4",
"plus-pro-components": "^0.1.3",
"qrcode": "^1.5.3",
"qs": "^6.12.1",
"responsive-storage": "^2.2.0",
"sortablejs": "^1.15.2",
"swiper": "^11.1.1",
"swiper": "^11.1.2",
"typeit": "^8.8.3",
"v-contextmenu": "^3.2.0",
"v3-infinite-loading": "^1.3.1",
"version-rocket": "^1.7.1",
"vue": "^3.4.26",
"vue": "^3.4.27",
"vue-i18n": "^9.13.1",
"vue-json-pretty": "^2.4.0",
"vue-pdf-embed": "^2.0.3",
Expand All @@ -103,8 +103,8 @@
"vue3-danmaku": "^1.6.0",
"vue3-puzzle-vcode": "^1.1.7",
"vuedraggable": "^4.1.0",
"vxe-table": "^4.6.9",
"wavesurfer.js": "^7.7.13",
"vxe-table": "^4.6.12",
"wavesurfer.js": "^7.7.14",
"xgplayer": "^3.0.17",
"xlsx": "^0.18.5"
},
Expand All @@ -123,13 +123,13 @@
"@types/gradient-string": "^1.1.6",
"@types/intro.js": "^5.1.5",
"@types/js-cookie": "^3.0.6",
"@types/node": "^20.12.8",
"@types/node": "^20.12.11",
"@types/nprogress": "^0.2.3",
"@types/qrcode": "^1.5.5",
"@types/qs": "^6.9.15",
"@types/sortablejs": "^1.15.8",
"@typescript-eslint/eslint-plugin": "^7.8.0",
"@typescript-eslint/parser": "^7.8.0",
"@typescript-eslint/eslint-plugin": "^7.9.0",
"@typescript-eslint/parser": "^7.9.0",
"@vitejs/plugin-vue": "^5.0.4",
"@vitejs/plugin-vue-jsx": "^3.1.0",
"autoprefixer": "^10.4.19",
Expand All @@ -140,28 +140,28 @@
"eslint-config-prettier": "^9.1.0",
"eslint-define-config": "^2.1.0",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-vue": "^9.25.0",
"eslint-plugin-vue": "^9.26.0",
"gradient-string": "^2.0.2",
"husky": "^9.0.11",
"lint-staged": "^15.2.2",
"postcss": "^8.4.38",
"postcss-html": "^1.6.0",
"postcss-html": "^1.7.0",
"postcss-import": "^16.1.0",
"postcss-scss": "^4.0.9",
"prettier": "^3.2.5",
"rimraf": "^5.0.5",
"rimraf": "^5.0.7",
"rollup-plugin-visualizer": "^5.12.0",
"sass": "^1.76.0",
"sass": "^1.77.1",
"stylelint": "^16.5.0",
"stylelint-config-recess-order": "^5.0.1",
"stylelint-config-recommended-vue": "^1.5.0",
"stylelint-config-standard-scss": "^13.1.0",
"stylelint-prettier": "^5.0.0",
"svgo": "^3.2.0",
"svgo": "^3.3.2",
"tailwindcss": "^3.4.3",
"typescript": "^5.4.5",
"vite": "^5.2.11",
"vite-plugin-cdn-import": "^0.3.5",
"vite-plugin-cdn-import": "^1.0.1",
"vite-plugin-compression": "^0.5.1",
"vite-plugin-fake-server": "^2.1.1",
"vite-plugin-remove-console": "^2.2.0",
Expand All @@ -172,9 +172,8 @@
},
"engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0",
"pnpm": ">=8.6.10"
"pnpm": ">=9"
},
"packageManager": "[email protected]",
"pnpm": {
"allowedDeprecatedVersions": {
"sourcemap-codec": "*",
Expand Down
Loading

0 comments on commit 097d6cd

Please sign in to comment.