Browse Source

chore: upgrade dependencies to the latest version

main
刘凯 1 year ago
parent
commit
704bc82d7c
  1. 1
      .env
  2. 4
      build/generate/generateModifyVars.ts
  3. 4
      build/utils.ts
  4. 34
      build/vite/plugin/html.ts
  5. 9
      build/vite/plugin/index.ts
  6. 0
      commitlint.config.cjs
  7. 6
      eslint.config.js
  8. 86
      package.json
  9. 3641
      pnpm-lock.yaml
  10. 2
      src/components/Icon/src/Icon.vue
  11. 194
      src/router/routes/index.ts
  12. 4
      src/views/base/login/Login.vue
  13. 4
      src/views/base/login/sso.vue
  14. 2
      src/views/base/profile/SecureSetting.vue
  15. 2
      tsconfig.json
  16. 1
      vite.config.ts

1
.env

@ -12,4 +12,3 @@ VITE_GLOB_APP_TENANT_ENABLE = true
# 验证码的开关
VITE_GLOB_APP_CAPTCHA_ENABLE = true

4
build/generate/generateModifyVars.ts

@ -28,7 +28,9 @@ export function generateModifyVars() {
// const modifyVars = getThemeVariables();
const mapToken = defaultAlgorithm(defaultSeed)
const v3Token = convertLegacyToken(mapToken)
// eslint-disable-next-line ts/ban-ts-comment
// @ts-expect-error
const v3Token = convertLegacyToken.default(mapToken)
return {
...v3Token,

4
build/utils.ts

@ -1,6 +1,8 @@
import path, { join } from 'node:path'
import dotenv from 'dotenv'
import { readFile } from 'fs-extra'
import fs from 'fs-extra'
const { readFile } = fs
export function isDevFn(mode: string): boolean {
return mode === 'development'

34
build/vite/plugin/html.ts

@ -1,40 +1,14 @@
/**
* Plugin to minimize and use ejs template syntax in index.html.
* https://github.com/xingyuv/vite-vue-plugin-html
* https://github.com/anncwb/vite-plugin-html
*/
import type { PluginOption } from 'vite'
import { createHtmlPlugin } from 'vite-vue-plugin-html'
import pkg from '../../../package.json'
import { GLOB_CONFIG_FILE_NAME } from '../../constant'
export function configHtmlPlugin(env: ViteEnv, isBuild: boolean) {
const { VITE_GLOB_APP_TITLE, VITE_PUBLIC_PATH } = env
const path = VITE_PUBLIC_PATH.endsWith('/') ? VITE_PUBLIC_PATH : `${VITE_PUBLIC_PATH}/`
const getAppConfigSrc = () => {
return `${path || '/'}${GLOB_CONFIG_FILE_NAME}?v=${pkg.version}-${new Date().getTime()}`
}
import { createHtmlPlugin } from 'vite-plugin-html'
export function configHtmlPlugin({ isBuild }: { isBuild: boolean }) {
const htmlPlugin: PluginOption[] = createHtmlPlugin({
minify: isBuild,
inject: {
// Inject data into ejs template
data: {
title: VITE_GLOB_APP_TITLE,
},
// Embed the generated app.config.js file
tags: isBuild
? [
{
tag: 'script',
attrs: {
src: getAppConfigSrc(),
},
},
]
: [],
},
viteNext: true,
})
return htmlPlugin
}

9
build/vite/plugin/index.ts

@ -1,9 +1,7 @@
import type { PluginOption } from 'vite'
import vue from '@vitejs/plugin-vue'
import vueJsx from '@vitejs/plugin-vue-jsx'
import progress from 'vite-plugin-progress'
import purgeIcons from 'vite-plugin-purge-icons'
import VitePluginCertificate from 'vite-plugin-mkcert'
import UnoCSS from 'unocss/vite'
import { configPwaConfig } from './pwa'
import { configHtmlPlugin } from './html'
@ -21,15 +19,10 @@ export function createVitePlugins(viteEnv: ViteEnv, isBuild: boolean) {
vueJsx(),
// UnoCSS
UnoCSS(),
// 打包进度条
progress(),
VitePluginCertificate({
source: 'coding',
}),
]
// vite-vue-plugin-html
vitePlugins.push(configHtmlPlugin(viteEnv, isBuild))
vitePlugins.push(configHtmlPlugin({ isBuild }))
// vite-plugin-svg-icons
vitePlugins.push(configSvgIconsPlugin(isBuild))

0
commitlint.config.js → commitlint.config.cjs

6
eslint.config.js

@ -1,7 +1,7 @@
const antfu = require('@antfu/eslint-config').default
const unocss = require('@unocss/eslint-plugin')
import antfu from '@antfu/eslint-config'
import unocss from '@unocss/eslint-plugin'
module.exports = antfu(
export default antfu(
{
rules: {
'no-console': 'off',

86
package.json

@ -1,7 +1,8 @@
{
"name": "yudao-ui-admin-vben",
"type": "module",
"version": "1.9.0-snapshot",
"packageManager": "pnpm@8.9.0",
"packageManager": "pnpm@8.10.0",
"author": {
"name": "xingyuv",
"email": "xingyu4j@vip.qq.com",
@ -17,8 +18,8 @@
"url": "https://gitee.com/xingyuv/issues"
},
"engines": {
"node": "^18.0.0 || >=20.0.0",
"pnpm": ">=8.9.0"
"node": ">=18.12.0",
"pnpm": ">=8.10.0"
},
"scripts": {
"commit": "czg",
@ -35,17 +36,16 @@
"gen:icon": "esno ./build/generate/icon/index.ts"
},
"dependencies": {
"@ant-design/colors": "^7.0.0",
"@ant-design/colors": "^7.0.2",
"@ant-design/icons-vue": "^7.0.1",
"@iconify/iconify": "^3.1.1",
"@videojs-player/vue": "^1.0.0",
"@vue/runtime-core": "^3.3.8",
"@vueuse/core": "^10.6.1",
"@zxcvbn-ts/core": "^3.0.4",
"ant-design-vue": "^4.0.7",
"axios": "^1.6.1",
"benz-amr-recorder": "^1.1.5",
"codemirror": "5.65.15",
"ant-design-vue": "~4.0.8",
"axios": "^1.6.4",
"codemirror": "^5.65.16",
"cron-parser": "^4.9.0",
"cropperjs": "^1.6.1",
"crypto-js": "^4.2.0",
@ -55,71 +55,67 @@
"nprogress": "^0.2.0",
"path-to-regexp": "^6.2.1",
"pinia": "^2.1.7",
"pinia-plugin-persistedstate": "^3.2.0",
"pinia-plugin-persistedstate": "^3.2.1",
"print-js": "^1.6.0",
"qs": "^6.11.2",
"resize-observer-polyfill": "^1.5.1",
"sortablejs": "^1.15.0",
"tinymce": "5.10.7",
"vditor": "^3.9.6",
"video.js": "^7.21.5",
"sortablejs": "^1.15.1",
"tinymce": "^5.10.9",
"vditor": "^3.9.8",
"vite-plugin-html": "^3.2.1",
"vue": "^3.3.8",
"vue-i18n": "^9.6.5",
"vue-json-pretty": "^2.2.4",
"vue-i18n": "^9.9.0",
"vue-json-pretty": "^2.3.0",
"vue-router": "^4.2.5",
"vue-types": "^5.1.1",
"vuedraggable": "^4.1.0",
"xlsx": "^0.18.5"
},
"devDependencies": {
"@antfu/eslint-config": "^2.6.1",
"@commitlint/cli": "^18.4.1",
"@commitlint/config-conventional": "^18.4.0",
"@iconify/json": "^2.2.141",
"@purge-icons/generated": "^0.9.0",
"@types/codemirror": "^5.60.13",
"@antfu/eslint-config": "^2.6.2",
"@commitlint/cli": "^18.4.4",
"@commitlint/config-conventional": "^18.4.4",
"@iconify/json": "^2.2.164",
"@purge-icons/generated": "^0.10.0",
"@types/codemirror": "^5.60.15",
"@types/crypto-js": "^4.2.1",
"@types/fs-extra": "^11.0.4",
"@types/inquirer": "^9.0.7",
"@types/lodash-es": "^4.17.11",
"@types/node": "^20.9.0",
"@types/lodash-es": "^4.17.12",
"@types/node": "^20.11.0",
"@types/nprogress": "^0.2.3",
"@types/qs": "^6.9.10",
"@types/qs": "^6.9.11",
"@types/sortablejs": "^1.15.5",
"@unocss/eslint-config": "^0.57.3",
"@vitejs/plugin-vue": "4.4.1",
"@vitejs/plugin-vue-jsx": "^3.0.2",
"@vue/compiler-sfc": "^3.3.8",
"@unocss/eslint-config": "^0.58.3",
"@vitejs/plugin-vue": "^5.0.3",
"@vitejs/plugin-vue-jsx": "^3.1.0",
"@vue/compiler-sfc": "^3.4.10",
"cross-env": "^7.0.3",
"cz-git": "^1.7.1",
"czg": "^1.7.1",
"cz-git": "^1.8.0",
"czg": "^1.8.0",
"dotenv": "^16.3.1",
"eslint": "^8.56.0",
"esno": "^4.0.0",
"fs-extra": "^11.1.1",
"fs-extra": "^11.2.0",
"husky": "^8.0.3",
"inquirer": "^9.2.12",
"less": "^4.2.0",
"lint-staged": "^15.1.0",
"lint-staged": "^15.2.0",
"picocolors": "^1.0.0",
"postcss": "^8.4.31",
"postcss": "^8.4.33",
"postcss-html": "^1.5.0",
"postcss-less": "^6.0.0",
"rimraf": "^5.0.5",
"rollup": "^4.4.0",
"rollup-plugin-visualizer": "^5.9.2",
"terser": "^5.24.0",
"typescript": "^5.2.2",
"unocss": "^0.57.3",
"vite": "^4.5.0",
"rollup-plugin-visualizer": "^5.12.0",
"terser": "^5.26.0",
"typescript": "^5.3.3",
"unocss": "^0.58.3",
"vite": "^5.0.11",
"vite-plugin-compression": "^0.5.1",
"vite-plugin-mkcert": "^1.16.0",
"vite-plugin-progress": "^0.0.7",
"vite-plugin-purge-icons": "^0.9.2",
"vite-plugin-pwa": "^0.16.7",
"vite-plugin-purge-icons": "^0.10.0",
"vite-plugin-pwa": "^0.17.4",
"vite-plugin-svg-icons": "^2.0.1",
"vite-vue-plugin-html": "^1.0.5",
"vue-tsc": "^1.8.22"
"vue-tsc": "^1.8.27"
},
"lint-staged": {
"*.{js,jsx,ts,tsx}": [

3641
pnpm-lock.yaml

File diff suppressed because it is too large Load Diff

2
src/components/Icon/src/Icon.vue

@ -1,7 +1,7 @@
<script lang="ts" setup>
import type { CSSProperties } from 'vue'
import { computed, nextTick, onMounted, ref, unref, watch } from 'vue'
import Iconify from '@purge-icons/generated'
import Iconify from '@iconify/iconify'
import SvgIcon from './SvgIcon.vue'
import { isString } from '@/utils/is'
import { propTypes } from '@/utils/propTypes'

194
src/router/routes/index.ts

@ -71,196 +71,6 @@ export const ProfileRoute: AppRouteRecordRaw = {
],
}
export const CodegenRoute: AppRouteRecordRaw = {
path: '/codegen',
component: LAYOUT,
name: 'CodegenEdit',
meta: {
title: '修改生成配置',
hidden: true,
},
children: [
{
path: 'editTable',
component: () => import('@/views/infra/codegen/EditTable.vue'),
name: 'EditTable',
meta: {
canTo: true,
hidden: true,
noTagsView: false,
icon: 'ant-design:edit-outlined',
title: '修改生成配置',
activeMenu: 'infra/codegen/index',
},
},
],
}
export const JobLogRoute: AppRouteRecordRaw = {
path: '/job',
component: LAYOUT,
name: 'JobL',
meta: {
title: '调度日志',
hidden: true,
},
children: [
{
path: 'job-log',
component: () => import('@/views/infra/job/logger/index.vue'),
name: 'InfraJobLog',
meta: {
canTo: true,
hidden: true,
noTagsView: false,
icon: 'ant-design:bar-chart-outlined',
title: '调度日志',
activeMenu: 'infra/job/index',
},
},
],
}
export const PayRoute: AppRouteRecordRaw = {
path: '/pay',
component: LAYOUT,
name: 'pay',
meta: {
title: '收银台',
hidden: true,
},
children: [
{
path: 'cashier',
component: () => import('@/views/pay/cashier/index.vue'),
name: 'PayCashier',
meta: {
canTo: true,
hidden: true,
noTagsView: false,
icon: 'ant-design:pay-circle-outlined',
title: '收银台',
activeMenu: 'pay/order/index',
},
},
],
}
export const BpmRoute: AppRouteRecordRaw = {
path: '/bpm',
component: LAYOUT,
name: 'bpm',
meta: {
title: '工作流',
hidden: true,
},
children: [
{
path: '/manager/form/edit',
component: () => import('@/views/bpm/form/editor/index.vue'),
name: 'BpmFormEditor',
meta: {
canTo: true,
hidden: true,
noTagsView: false,
icon: 'ant-design:edit-outlined',
title: '设计流程表单',
activeMenu: '/bpm/manager/form',
},
},
{
path: '/manager/model/edit',
component: () => import('@/views/bpm/model/editor/index.vue'),
name: 'BpmModelEditor',
meta: {
canTo: true,
hidden: true,
noTagsView: false,
icon: 'ant-design:edit-outlined',
title: '设计流程',
activeMenu: '/bpm/manager/model',
},
},
{
path: '/manager/definition',
component: () => import('@/views/bpm/definition/index.vue'),
name: 'BpmProcessDefinition',
meta: {
canTo: true,
hidden: true,
noTagsView: false,
icon: 'ant-design:edit-outlined',
title: '流程定义',
activeMenu: '/bpm/manager/model',
},
},
{
path: '/manager/task-assign-rule',
component: () => import('@/views/bpm/taskAssignRule/index.vue'),
name: 'BpmTaskAssignRuleList',
meta: {
canTo: true,
hidden: true,
noTagsView: false,
icon: 'ant-design:edit-outlined',
title: '任务分配规则',
},
},
{
path: '/process-instance/create',
component: () => import('@/views/bpm/processInstance/create/index.vue'),
name: 'BpmProcessInstanceCreate',
meta: {
canTo: true,
hidden: true,
noTagsView: false,
icon: 'ant-design:edit-outlined',
title: '发起流程',
activeMenu: 'bpm/processInstance/create',
},
},
{
path: '/process-instance/detail',
component: () => import('@/views/bpm/processInstance/detail/index.vue'),
name: 'BpmProcessInstanceDetail',
meta: {
canTo: true,
hidden: true,
noTagsView: false,
icon: 'ant-design:edit-outlined',
title: '流程详情',
activeMenu: 'bpm/processInstance/detail',
},
},
{
path: '/bpm/oa/leave/create',
component: () => import('@/views/bpm/oa/leave/create.vue'),
name: 'OALeaveCreate',
meta: {
canTo: true,
hidden: true,
noTagsView: false,
icon: 'ant-design:edit-outlined',
title: '发起 OA 请假',
activeMenu: 'bpm/oa/leave',
},
},
{
path: '/process-instance/detail',
component: () => import('@/views/bpm/oa/leave/detail.vue'),
name: 'OALeaveDetail',
meta: {
canTo: true,
hidden: true,
noTagsView: false,
icon: 'ant-design:edit-outlined',
title: '查看 OA 请假',
activeMenu: 'bpm/oa/leave',
},
},
],
}
// Basic routing without permission
// 未经许可的基本路由
export const basicRoutes = [
@ -268,10 +78,6 @@ export const basicRoutes = [
SSORoute,
RootRoute,
ProfileRoute,
CodegenRoute,
JobLogRoute,
PayRoute,
BpmRoute,
REDIRECT_ROUTE,
PAGE_NOT_FOUND_ROUTE,
]

4
src/views/base/login/Login.vue

@ -42,10 +42,10 @@ const title = computed(() => globSetting?.title ?? '')
<AppLogo class="-enter-x" />
<div class="my-auto">
<img :alt="title" src="@/assets/svg/login-box-bg.svg" class="-enter-x w-1/2 -mt-16">
<div class="-enter-x mt-10 font-medium text-white">
<div class="-enter-x mt-10 text-white font-medium">
<span class="mt-4 inline-block text-3xl"> {{ t('sys.login.signInTitle') }}</span>
</div>
<div class="-enter-x mt-5 font-normal text-white dark:text-gray-500">
<div class="-enter-x mt-5 text-white font-normal dark:text-gray-500">
{{ t('sys.login.signInDesc') }}
</div>
</div>

4
src/views/base/login/sso.vue

@ -38,10 +38,10 @@ const title = computed(() => globSetting?.title ?? '')
<AppLogo class="-enter-x" />
<div class="my-auto">
<img :alt="title" src="@/assets/svg/login-box-bg.svg" class="-enter-x w-1/2 -mt-16">
<div class="-enter-x mt-10 font-medium text-white">
<div class="-enter-x mt-10 text-white font-medium">
<span class="mt-4 inline-block text-3xl"> {{ t('sys.login.signInTitle') }}</span>
</div>
<div class="-enter-x mt-5 font-normal text-white dark:text-gray-500">
<div class="-enter-x mt-5 text-white font-normal dark:text-gray-500">
{{ t('sys.login.signInDesc') }}
</div>
</div>

2
src/views/base/profile/SecureSetting.vue

@ -29,7 +29,7 @@ function handleSuccess() {
<ListItemMeta>
<template #title>
{{ item.title }}
<div v-if="item.extra" class="float-right mr-7.5 mt-2.5 cursor-pointer font-normal text-blue-500">
<div v-if="item.extra" class="float-right mr-7.5 mt-2.5 cursor-pointer text-blue-500 font-normal">
<a-button type="link" @click="handleEdit(item.title)">
{{ item.extra }}
</a-button>

2
tsconfig.json

@ -7,7 +7,7 @@
"experimentalDecorators": true,
"baseUrl": ".",
"module": "ESNext",
"moduleResolution": "node",
"moduleResolution": "Bundler",
"paths": {
"@/*": ["src/*"]
},

1
vite.config.ts

@ -36,7 +36,6 @@ export default ({ command, mode }: ConfigEnv): UserConfig => {
base: VITE_PUBLIC_PATH,
root,
server: {
https: false,
// Listening on all local IPs
host: true,
port: VITE_PORT,