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 Oct 19, 2024
2 parents 9d351ab + a0618c0 commit 5ce380d
Show file tree
Hide file tree
Showing 3 changed files with 1,280 additions and 1,088 deletions.
6 changes: 3 additions & 3 deletions build/info.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import type { Plugin } from "vite";
import gradient from "gradient-string";
import { getPackageSize } from "./utils";
import dayjs, { type Dayjs } from "dayjs";
import duration from "dayjs/plugin/duration";
import gradientString from "gradient-string";
import boxen, { type Options as BoxenOptions } from "boxen";
dayjs.extend(duration);

const welcomeMessage = gradientString("cyan", "magenta").multiline(
const welcomeMessage = gradient(["cyan", "magenta"]).multiline(
`您好! 欢迎使用 pure-admin 开源项目\n我们为您精心准备了下面两个贴心的保姆级文档\nhttps://pure-admin.github.io/pure-admin-doc\nhttps://pure-admin-utils.netlify.app`
);

Expand Down Expand Up @@ -41,7 +41,7 @@ export function viteBuildInfo(): Plugin {
callback: (size: string) => {
console.log(
boxen(
gradientString("cyan", "magenta").multiline(
gradient(["cyan", "magenta"]).multiline(
`🎉 恭喜打包完成(总用时${dayjs
.duration(endTime.diff(startTime))
.format("mm分ss秒")},打包后的大小为${size})`
Expand Down
41 changes: 20 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"dayjs": "^1.11.13",
"echarts": "^5.5.1",
"el-table-infinite-scroll": "^3.0.6",
"element-plus": "^2.8.3",
"element-plus": "^2.8.5",
"intro.js": "^7.2.0",
"js-cookie": "^3.0.5",
"jsbarcode": "^3.11.6",
Expand All @@ -79,9 +79,9 @@
"mqtt": "4.3.7",
"nprogress": "^0.2.0",
"path": "^0.12.7",
"pinia": "^2.2.2",
"pinyin-pro": "^3.24.2",
"plus-pro-components": "^0.1.16",
"pinia": "^2.2.4",
"pinyin-pro": "^3.25.0",
"plus-pro-components": "^0.1.17",
"qrcode": "^1.5.4",
"qs": "^6.13.0",
"responsive-storage": "^2.2.0",
Expand All @@ -91,8 +91,8 @@
"v-contextmenu": "^3.2.0",
"v3-infinite-loading": "^1.3.2",
"version-rocket": "^1.7.3",
"vue": "^3.5.7",
"vue-i18n": "^10.0.1",
"vue": "^3.5.12",
"vue-i18n": "^10.0.4",
"vue-json-pretty": "^2.4.0",
"vue-pdf-embed": "^2.1.0",
"vue-router": "^4.4.5",
Expand All @@ -103,7 +103,7 @@
"vue3-danmaku": "^1.6.1",
"vue3-puzzle-vcode": "^1.1.7",
"vuedraggable": "^4.1.0",
"vxe-table": "4.6.19",
"vxe-table": "4.6.21",
"wavesurfer.js": "^7.8.6",
"xgplayer": "^3.0.20",
"xlsx": "^0.18.5"
Expand All @@ -112,18 +112,17 @@
"@commitlint/cli": "^19.5.0",
"@commitlint/config-conventional": "^19.5.0",
"@commitlint/types": "^19.5.0",
"@eslint/js": "^9.11.0",
"@eslint/js": "^9.12.0",
"@faker-js/faker": "^8.4.1",
"@iconify-icons/ep": "^1.2.12",
"@iconify-icons/ri": "^1.2.10",
"@iconify/vue": "^4.1.2",
"@intlify/unplugin-vue-i18n": "^5.0.0",
"@pureadmin/theme": "^3.2.0",
"@intlify/unplugin-vue-i18n": "^5.2.0",
"@pureadmin/theme": "^3.3.0",
"@types/dagre": "^0.7.52",
"@types/gradient-string": "^1.1.6",
"@types/intro.js": "^5.1.5",
"@types/js-cookie": "^3.0.6",
"@types/node": "^20.16.5",
"@types/node": "^20.16.11",
"@types/nprogress": "^0.2.3",
"@types/qrcode": "^1.5.5",
"@types/qs": "^6.9.16",
Expand All @@ -136,12 +135,12 @@
"boxen": "^8.0.1",
"cssnano": "^7.0.6",
"dagre": "^0.8.5",
"eslint": "^9.11.0",
"eslint": "^9.12.0",
"eslint-config-prettier": "^9.1.0",
"eslint-define-config": "^2.1.0",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-vue": "^9.28.0",
"gradient-string": "^2.0.2",
"eslint-plugin-vue": "^9.29.0",
"gradient-string": "^3.0.0",
"husky": "^9.1.6",
"lint-staged": "^15.2.10",
"postcss": "^8.4.47",
Expand All @@ -151,16 +150,16 @@
"prettier": "^3.3.3",
"rimraf": "^6.0.1",
"rollup-plugin-visualizer": "^5.12.0",
"sass": "1.77.8",
"stylelint": "^16.9.0",
"stylelint-config-recess-order": "^5.1.0",
"sass": "^1.79.5",
"stylelint": "^16.10.0",
"stylelint-config-recess-order": "^5.1.1",
"stylelint-config-recommended-vue": "^1.5.0",
"stylelint-config-standard-scss": "^13.1.0",
"stylelint-prettier": "^5.0.2",
"svgo": "^3.3.2",
"tailwindcss": "^3.4.12",
"typescript": "^5.6.2",
"vite": "^5.4.7",
"tailwindcss": "^3.4.13",
"typescript": "^5.6.3",
"vite": "^5.4.8",
"vite-plugin-cdn-import": "^1.0.1",
"vite-plugin-checker": "^0.8.0",
"vite-plugin-compression": "^0.5.1",
Expand Down
Loading

0 comments on commit 5ce380d

Please sign in to comment.