diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 00000000..4f75c951 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,5 @@ +node_modules +.git +.gitignore +*.md +dist diff --git a/.env.production b/.env.production index d4ddf677..402ad3fd 100644 --- a/.env.production +++ b/.env.production @@ -1,6 +1,4 @@ #生产环境 -NODE_ENV = 'production' - VITE_APP_URL = '/' # office 服务代理地址 diff --git a/.eslintrc.cjs b/.eslintrc.cjs index c711e9dc..73a97f64 100644 --- a/.eslintrc.cjs +++ b/.eslintrc.cjs @@ -33,6 +33,7 @@ module.exports = { defineExpose: 'readonly', withDefaults: 'readonly', defineOptions: 'readonly', + defineModel: 'readonly', }, rules: { 'no-undefined': ['error'], diff --git a/.evnrc b/.evnrc new file mode 100644 index 00000000..8c543496 --- /dev/null +++ b/.evnrc @@ -0,0 +1,2 @@ +layout shell zsh +layout_fnm diff --git a/.github/workflows/push-build.yaml b/.github/workflows/push-build.yaml index fc17bef3..47aa02f4 100644 --- a/.github/workflows/push-build.yaml +++ b/.github/workflows/push-build.yaml @@ -2,13 +2,14 @@ on: - push - pull_request + jobs: cache-and-install: runs-on: ${{ matrix.os }} strategy: fail-fast: false matrix: - node-version: [ 16.x, 18.x ] + node-version: [ 18.x ] os: [ ubuntu-latest, windows-latest, macos-latest ] experimental: [ true ] diff --git a/.nvmrc b/.nvmrc new file mode 100644 index 00000000..68c98aa7 --- /dev/null +++ b/.nvmrc @@ -0,0 +1 @@ +v18.18.2 \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 0afc4049..64ded944 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,154 @@ # CHANGE LOG +## 4.4.3 + +更新 `vue` 版本至 `3.3.10`。 + +补充了一些代码的注释（慢慢还账-，-）。 + +## Feats + +- 更新 `vue` 版本至 `3.3.10` +- 新增 `useElementFullscreen` 方法，用于全屏元素。但是该全屏区别于浏览器全屏元素，仅是网页全屏效果 +- 使用 `useElementFullscreen` 方法重构 `maximize` 方法 +- `changeMenuModelValue` + - 现在方法支持第三个参数配置跳转时，是否携带参数 + - 避免递归查找的时候，一些不必要的操作，优化性能 + +## Fixes + +- 修复了通过 `url` 携带参数跳转页面，参数可能会被拦截并且丢失的问题 +- 修复了 `url` 跳转页面导致多次更新的问题 + +## 4.4.2 + +这是一个具有破坏性更新的版本，如果你使用了该模板，那么你需要做一些改动。 + +详细拆分 `hooks` 包的方法。以前的划分方式不太合理，所以进行了一次大的重构。并且新增了一些方法。现在按照方法功能进行分包，更加详细。 + +剔除 `h` 函数渲染，因为该方法不会受到 `vue` 的编译优化。 + +针对 `MenuTag` 的定位滚动效果做了优化，现在滚动效果更加平滑。 + +补充了一些代码的注释（慢慢还账-，-）。 + +### Feats + +- 重新划分 `hooks` 包，按照功能进行拆分，并且新增一些包 + - `useAppMenu` 方法更名为 `useAppNavigation` + - `useMenuTag` 方法更名为 `useSiderBar` + - `useRootRoute` 方法更名为 `useAppRoot` + - `useMainPage` 包移除 + - 新增 `useMaximize`, `useSpinning`, `useTheme`, `useWatermark` 方法 + - 新增 `components` 包，用于存放模板二次封装组件、`NaiveUI` 组件的一些 `hooks` 方法 + - 每个方法包导出对应的 `ReturnType` 类型 +- `Breadcrumb` 组件新增过渡效果，现在切换路由时会有过渡动画，视觉效果更友好 +- 移除 `getVariable` 方法 +- 移除 `utils/element` 包部分方法 + - `on` + - `off` +- 移除 `changeSwitcher` 方法，使用 `updateSettingState` 方法代替 +- `useContextmenuCoordinate` 方法支持配置项 +- `MenuTag` 的定位滚动现在支持过渡效果 + +## Fixes + +- 修复 `setRootRoute` 方法执行时提示只读错误导致不能正常修改的问题 + +## 4.4.1 + +更新 `vite` 版本至 `5.0.4`。同步修复了一些小问题。 + +基础性能优化，根据开发模式与构建模式拆分插件启用。避免某些仅仅需要在构建模式的插件在开发模式下也被启用。 + +新增预构建插件列表。 + +### Feats + +- 补充 components 包组件的 `props` 类型导出 +- 补充 `__DEV__` 全局变量 +- 优化 `precision` 包中的基本运算方法，并且将小数点默认保留 `8` 位 + - 新增 `isCurrency` 方法检测是否为 `currency.js` 对象 +- 按照构建模式与开发模式拆分插件启用 +- 新增预构建列表 + +## Fixes + +- 修复 `i18n fallbackLocale` 错误配置为 `SYSTEM_DEFAULT_LOCAL` 的问题 +- 修复 `SYSTEM_DEFAULT_LOCAL` 类型定义错误问题 + +## 4.4.0 + +补充了几个组件。并且更改了组件的导入、导出方式，由从前很恶心的一个个导入，变为 `import { RIcon } from '@/components'`。 + +替换了过时的 `nvm`，使用 `fnm` 替代，并且配置了一些文件让你能够自动切换 `node` 版本，前提是你也装了对应的插件。 + +由于 `WebStorm` 一直提示可以缩短路径，强迫症患者表示受不了了，就全部改了（可能遗漏）。 + +升级 `node` 版本至 `18.18.2`。 + +### Feats + +- 新增组件 + - RModal + - width：配置 modal 宽度 + - cardWidth：配置 preset 为 card 的宽度 + - dialogWidth：配置 preset 为 dialog 的宽度 + - fullscreen：配置 preset 为 card 并且配置 fullscreen 为 true 则可以获得全屏效果 + - dad：启用拖拽效果。仅在 preset 为 card, dialog 时生效（基于 interactjs 实现） +- 修改 `components` 包组件的导出方式，也修改组件的使用方式 +- 新增 `layoutContentSpinning` 全局属性，用于管理加载动画效果。区别于 `globalMainLayoutLoad` 会强制刷新页面，该属性仅会触发加载动画。并且基于该属性拓展 `openSpin`, `closeSpin` 方法 +- 更新 `vite` 版本至 `5.0.2` + +### Fixes + +- 修复国际化切换，由于字段的错误配置导致缓存一直提示 `Fall back to translate` 的问题 +- 修复锁屏不能正常打开、关闭的问题 + +## 4.3.4 + +更新了 MenuTag 的样式，现在有更加细腻的过渡动画。 + +针对 `utils` 下的方法，修复 `utils/element` 中的部分方法因为 `ref` 注册 `dom` 的时候不能正确的触发方法的问题。并且修复了部分方法类型的不准确问题；补充了一些示例。 + +由于 vite 不再支持显式声明 .env=production 配置文件 NODE_ENV=production，所以该版本移除了配置文件的 NODE_ENV 声明。 + +修复构建提示循环依赖问题。 + +### Feats + +- 更新了 MenuTag 的动画效果 +- 基于 `print-js` 与 `vue hooks` 开发新 `print` 方法，存放于 `utils/basic` +- 移除 .env.production 文件的 NODE_ENV 显式声明 +- 优化构建 chunk + +### Fixes + +- 修复 `utils/element` 方法不能正确获取 `ref` 绑定 `dom` 的问题 +- 修复设置界面抛出只读警告问题 +- 修复构建提示循环依赖问题 + +## 4.3.3 + +紧跟尤大大脚步，更新 `vite` 版本至 `5.0.0` 版本！与此同时，更新了配套所有插件！ + +更新 ROOT_ROUTE 的一些使用方法，该配置方法与原有的方式不变，但是有一个新的功能点则是，该配置项会传递给 global-variable 的 globalRootRoute 属性。并且更改模板原有获取 path 的方法，改为响应式获取。当你要进行动态的维护 Root Route 的时候，该方法可能可以帮助到你 `useAppRoot`。 + +如果你在更新版本后出现一些奇奇怪怪的问题，不要犹豫，直接删除 `node_modules` 后再重新安装依赖，这是缓存导致的问题。 + +### Feats + +- 更新 `vite` 版本至 `5.0.0` +- 升级所有配套插件 +- 升级 ROOT_ROUTE 配置与使用 + +### Fixes + +- 修复不能正确关闭标签页问题 +- 修复不能正确识别是否能关闭标签页问题 +- 修复 `closeAll` 方法导致标签页闪烁问题 +- 修改 useVueRouter 注册时机，避免该方法使用的 HMR 报错问题 + ## 4.3.2 升级 `vue` 版本至最新 `v3.3.8`。 @@ -262,7 +411,7 @@ const demo2 = null - 默认开启 autoChangeTheme 功能 - 支持配置 throttleWait 节流等待时间，默认 500ms - 支持通过配置 `desginConfig.echartTheme` 属性指定 `echart theme`。并且只需按照约定方式注册的主题，只需要指定主题名称，即可完成 `light` `dark` 两种主题指定 - - RayChartInst 新增 dispose render 方法，允许手动渲染与卸载 chart 图 + - RChartInst 新增 dispose render 方法，允许手动渲染与卸载 chart 图 - 新增 animation 属性，如果为 true 则会强制触发渲染过渡动画。该配置受 `options.animation` 属性影响，如果该配置为 false 则不会启用过渡动画 - 移除反转色功能 - 新增图标页面 diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..f9cba20b --- /dev/null +++ b/Dockerfile @@ -0,0 +1,11 @@ +FROM debian:11 +COPY . /app +WORKDIR /app +RUN apt-get update +RUN apt-get install -y wget curl make sudo unzip +RUN curl -fsSL https://deb.nodesource.com/setup_18.x | sudo -E bash - +RUN apt-get install -y nodejs +RUN npm i -g pnpm +RUN pnpm install +EXPOSE 9527 +CMD [ "pnpm", "dev" ] diff --git a/README-ZH.md b/README-ZH.md index fd83355e..5d3051e7 100644 --- a/README-ZH.md +++ b/README-ZH.md @@ -1,5 +1,5 @@
- Ray Template

+ Ray Template

LICENSE
@@ -9,13 +9,14 @@ 简体中文 | [English](https://github.com/XiaoDaiGua-Ray/ray-template/blob/main/README.md) -一个基于 vite4.x & ts(x) & pinia & vue3.x 的中后台模板 +一个 `免费`、`高效`、`特性完整` 并且基于 vite5.x & ts(x) & pinia & vue3.x 等最新技术的中后台模板。 ## ✨ 特性 -- **最新技术栈**：使用 vue3.x/vite4.x/pinia 等前端前沿技术开发 +- **靠爱发电**：几乎包含市面常见的模板特性并且全部免费使用 +- **最新技术栈**：使用 vue3.x/vite5.x/pinia 等前端前沿技术开发 - **TypeScript**：应用程序级 JavaScript 的语言 - **主题**：可配置的主题 - **国际化**：内置完善的国际化方案 @@ -26,6 +27,7 @@ - **缓存**：任意深度页面缓存 - **SVG**：内置 svg icon 解决方案 - **独立的 Data Methods Views**：解耦管理的数据、方法、视图，放心二次开发 +- **模板专属 hooks**：基于模板特性封装的 hooks 让你更加方便的使用模板一些功能 ## 🪄 预览地址 diff --git a/README.md b/README.md index 8be2fc95..5681e392 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@
- Ray Template

+ Ray Template

LICENSE
@@ -9,23 +9,25 @@ English | [简体中文](https://github.com/XiaoDaiGua-Ray/ray-template/blob/main/README-ZH.md) -A middle and backend template based on vite4.x & ts(x) & pinia & vue3.x +A `free`, `efficient`, `complete with features` middle and backend template based on the latest technologies such as vite5.x & ts(x) & pinia & vue3.x. ## ✨ Feature -- **Latest Technology Stack**：Developed using front-end cutting-edge technologies such as vue3.x/vite4.x/pinia -- **TypeScript**：The language for application-level JavaScript -- **App Theme**：Configurable themes -- **Globalization**：Built-in complete internationalization solution -- **Mock Data**：Built-in Mock data scheme -- **Permissions**：Built-in complete dynamic routing permission generation solution -- **Components**：Secondary encapsulation of multiple commonly used components +- **Power by love**: Contains almost all common template features on the market and all are free to use. +- **Latest Technology Stack**：Developed using front-end cutting-edge technologies such as vue3.x/vite5.x/pinia. +- **TypeScript**：The language for application-level JavaScript. +- **App Theme**：Configurable themes. +- **Globalization**：Built-in complete internationalization solution. +- **Mock Data**：Built-in Mock data scheme. +- **Permissions**：Built-in complete dynamic routing permission generation solution. +- **Components**：Secondary encapsulation of multiple commonly used components. - **Axios Request**：Secondary encapsulation of the axios library, supporting functions such as cancellation, anti-shake, automatic repeat cancellation, etc. -- **Page Cache**：Arbitrarily deep page cache -- **SVG**：Built-in svg icon solution -- **Standalone Data Methods Views**：Decoupled management of data, methods, and views allows for secondary development with confidence +- **Page Cache**：Arbitrarily deep page cache. +- **SVG**：Built-in svg icon solution. +- **Standalone Data Methods Views**：Decoupled management of data, methods, and views allows for secondary development with confidence. +- **Template Specific Hooks** : Hooks based on the template feature package make it easier to use some of the features of the template. ## 🪄 Preview diff --git a/cfg.ts b/cfg.ts index c48f1cb3..6e18a501 100644 --- a/cfg.ts +++ b/cfg.ts @@ -88,7 +88,6 @@ const config: AppConfigExport = { host: '0.0.0.0', port: 9527, open: false, - https: false, strictPort: false, fs: { strict: false, diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 00000000..8392aeb8 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,14 @@ +version: '3' + +services: + ray-template: + build: . + container_name: ray-template + restart: unless-stopped + environment: + - TZ=Asia/Shanghai + ports: + - "9527:9527" + # if you want to persist +# volumes: +# - ./app:/app diff --git a/package.json b/package.json old mode 100644 new mode 100755 index 19b8cc1d..55412dea --- a/package.json +++ b/package.json @@ -1,15 +1,15 @@ { "name": "ray-template", "private": false, - "version": "4.3.2", + "version": "4.4.3", "type": "module", "engines": { - "node": ">=16.0.0", + "node": "^18.0.0 || >=20.0.0", "pnpm": ">=8.0.0" }, "scripts": { "dev": "vite", - "build": "vue-tsc --noEmit && vite build --mode production", + "build": "vue-tsc --noEmit && vite build", "preview": "vite preview", "test": "vue-tsc --noEmit && vite build --mode test", "dev-build": "vue-tsc --noEmit && vite build --mode development", @@ -24,74 +24,76 @@ ] }, "dependencies": { - "@vueuse/core": "^9.13.0", + "@vueuse/core": "^10.6.1", "awesome-qr": "2.1.5-rc.0", - "axios": "^1.2.0", + "axios": "^1.5.0", "clipboard": "^2.0.11", "crypto-js": "^4.1.1", "currency.js": "^2.0.4", - "dayjs": "^1.11.7", + "dayjs": "^1.11.10", "echarts": "^5.4.3", + "interactjs": "1.10.21", "lodash-es": "^4.17.21", "mockjs": "1.1.0", "naive-ui": "^2.35.0", - "pinia": "^2.1.4", - "pinia-plugin-persistedstate": "^3.1.0", + "pinia": "^2.1.6", + "pinia-plugin-persistedstate": "^3.2.0", "print-js": "^1.6.0", - "vue": "^3.3.8", + "vue": "^3.3.10", "vue-hooks-plus": "1.8.5", - "vue-i18n": "^9.2.2", + "vue-i18n": "^9.7.1", "vue-router": "^4.2.4", "xlsx": "^0.18.5" }, "devDependencies": { - "@babel/core": "^7.20.2", - "@babel/eslint-parser": "^7.19.1", - "@commitlint/cli": "^17.4.2", - "@commitlint/config-conventional": "^17.4.2", - "@intlify/unplugin-vue-i18n": "^0.12.1", + "@babel/core": "^7.23.2", + "@babel/eslint-parser": "^7.22.11", + "@commitlint/cli": "^17.7.1", + "@commitlint/config-conventional": "^17.7.0", + "@interactjs/types": "1.10.21", + "@intlify/unplugin-vue-i18n": "^1.5.0", "@types/crypto-js": "^4.1.1", - "@types/lodash-es": "^4.17.7", + "@types/lodash-es": "^4.17.11", "@types/mockjs": "1.0.7", - "@typescript-eslint/eslint-plugin": "^5.61.0", - "@typescript-eslint/parser": "^5.61.0", - "@vitejs/plugin-vue": "^4.2.3", - "@vitejs/plugin-vue-jsx": "^3.0.1", + "@typescript-eslint/eslint-plugin": "^6.5.0", + "@typescript-eslint/parser": "^6.5.0", + "@vitejs/plugin-vue": "^4.4.1", + "@vitejs/plugin-vue-jsx": "^3.0.2", "@vue-hooks-plus/resolvers": "1.2.4", - "@vue/eslint-config-prettier": "^7.1.0", + "@vue/eslint-config-prettier": "^8.0.0", "@vue/eslint-config-typescript": "^11.0.3", - "autoprefixer": "^10.4.8", - "depcheck": "^1.4.3", - "eslint": "^8.44.0", - "eslint-config-prettier": "^8.8.0", - "eslint-config-standard-with-typescript": "^23.0.0", - "eslint-plugin-import": "^2.25.2", - "eslint-plugin-n": "^15.0.0", - "eslint-plugin-prettier": "^4.2.1", - "eslint-plugin-promise": "^6.0.0", - "eslint-plugin-vue": "^9.15.1", + "autoprefixer": "^10.4.15", + "depcheck": "^1.4.5", + "eslint": "^8.52.0", + "eslint-config-prettier": "^9.0.0", + "eslint-config-standard-with-typescript": "^39.0.0", + "eslint-plugin-import": "^2.29.0", + "eslint-plugin-n": "^16.2.0", + "eslint-plugin-prettier": "^5.0.1", + "eslint-plugin-promise": "^6.1.1", + "eslint-plugin-vue": "^9.18.1", "husky": "^8.0.3", - "lint-staged": "^13.1.0", - "postcss": "^8.1.0", + "lint-staged": "^15.1.0", + "postcss": "^8.4.31", "postcss-px-to-viewport-8-plugin": "1.2.2", - "prettier": "^2.7.1", - "rollup-plugin-visualizer": "^5.8.3", - "sass": "1.54.3", + "prettier": "^3.0.3", + "rollup-plugin-visualizer": "^5.9.2", + "sass": "1.69.5", "svg-sprite-loader": "^6.0.11", - "typescript": "^5.0.2", - "unplugin-auto-import": "^0.15.0", - "unplugin-vue-components": "^0.25.1", - "vite": "^4.4.9", - "vite-plugin-cdn2": "0.12.4", + "typescript": "^5.2.2", + "unplugin-auto-import": "^0.16.6", + "unplugin-vue-components": "^0.25.2", + "vite": "^5.0.4", + "vite-plugin-cdn2": "0.15.2", "vite-plugin-compression": "^0.5.1", - "vite-plugin-ejs": "^1.6.4", + "vite-plugin-ejs": "^1.7.0", "vite-plugin-eslint": "1.8.1", - "vite-plugin-imp": "^2.3.1", - "vite-plugin-inspect": "^0.7.26", - "vite-plugin-mock-dev-server": "1.3.0", + "vite-plugin-imp": "^2.4.0", + "vite-plugin-inspect": "^0.7.38", + "vite-plugin-mock-dev-server": "1.3.4", "vite-plugin-svg-icons": "^2.0.1", "vite-svg-loader": "^4.0.0", - "vue-tsc": "^1.8.4" + "vue-tsc": "^1.8.8" }, "description": "", "main": "index.ts", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e9ee2f70..187c6154 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -6,13 +6,13 @@ settings: dependencies: '@vueuse/core': - specifier: ^9.13.0 - version: 9.13.0(vue@3.3.8) + specifier: ^10.6.1 + version: 10.6.1(vue@3.3.10) awesome-qr: specifier: 2.1.5-rc.0 version: 2.1.5-rc.0 axios: - specifier: ^1.2.0 + specifier: ^1.5.0 version: 1.5.0 clipboard: specifier: ^2.0.11 @@ -24,11 +24,14 @@ dependencies: specifier: ^2.0.4 version: 2.0.4 dayjs: - specifier: ^1.11.7 - version: 1.11.9 + specifier: ^1.11.10 + version: 1.11.10 echarts: specifier: ^5.4.3 version: 5.4.3 + interactjs: + specifier: 1.10.21 + version: 1.10.21 lodash-es: specifier: ^4.17.21 version: 4.17.21 @@ -37,174 +40,177 @@ dependencies: version: 1.1.0 naive-ui: specifier: ^2.35.0 - version: 2.35.0(vue@3.3.8) + version: 2.35.0(vue@3.3.10) pinia: - specifier: ^2.1.4 - version: 2.1.6(typescript@5.0.2)(vue@3.3.8) + specifier: ^2.1.6 + version: 2.1.6(typescript@5.2.2)(vue@3.3.10) pinia-plugin-persistedstate: - specifier: ^3.1.0 + specifier: ^3.2.0 version: 3.2.0(pinia@2.1.6) print-js: specifier: ^1.6.0 version: 1.6.0 vue: - specifier: ^3.3.8 - version: 3.3.8(typescript@5.0.2) + specifier: ^3.3.10 + version: 3.3.10(typescript@5.2.2) vue-hooks-plus: specifier: 1.8.5 - version: 1.8.5(vue@3.3.8) + version: 1.8.5(vue@3.3.10) vue-i18n: - specifier: ^9.2.2 - version: 9.2.2(vue@3.3.8) + specifier: ^9.7.1 + version: 9.7.1(vue@3.3.10) vue-router: specifier: ^4.2.4 - version: 4.2.4(vue@3.3.8) + version: 4.2.4(vue@3.3.10) xlsx: specifier: ^0.18.5 version: 0.18.5 devDependencies: '@babel/core': - specifier: ^7.20.2 - version: 7.22.11 + specifier: ^7.23.2 + version: 7.23.2 '@babel/eslint-parser': - specifier: ^7.19.1 - version: 7.22.11(@babel/core@7.22.11)(eslint@8.48.0) + specifier: ^7.22.11 + version: 7.22.11(@babel/core@7.23.2)(eslint@8.52.0) '@commitlint/cli': - specifier: ^17.4.2 + specifier: ^17.7.1 version: 17.7.1 '@commitlint/config-conventional': - specifier: ^17.4.2 + specifier: ^17.7.0 version: 17.7.0 + '@interactjs/types': + specifier: 1.10.21 + version: 1.10.21 '@intlify/unplugin-vue-i18n': - specifier: ^0.12.1 - version: 0.12.3(vue-i18n@9.2.2) + specifier: ^1.5.0 + version: 1.5.0(vue-i18n@9.7.1) '@types/crypto-js': specifier: ^4.1.1 version: 4.1.1 '@types/lodash-es': - specifier: ^4.17.7 - version: 4.17.8 + specifier: ^4.17.11 + version: 4.17.11 '@types/mockjs': specifier: 1.0.7 version: 1.0.7 '@typescript-eslint/eslint-plugin': - specifier: ^5.61.0 - version: 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.48.0)(typescript@5.0.2) + specifier: ^6.5.0 + version: 6.5.0(@typescript-eslint/parser@6.5.0)(eslint@8.52.0)(typescript@5.2.2) '@typescript-eslint/parser': - specifier: ^5.61.0 - version: 5.62.0(eslint@8.48.0)(typescript@5.0.2) + specifier: ^6.5.0 + version: 6.5.0(eslint@8.52.0)(typescript@5.2.2) '@vitejs/plugin-vue': - specifier: ^4.2.3 - version: 4.3.4(vite@4.4.9)(vue@3.3.8) + specifier: ^4.4.1 + version: 4.4.1(vite@5.0.4)(vue@3.3.10) '@vitejs/plugin-vue-jsx': - specifier: ^3.0.1 - version: 3.0.2(vite@4.4.9)(vue@3.3.8) + specifier: ^3.0.2 + version: 3.0.2(vite@5.0.4)(vue@3.3.10) '@vue-hooks-plus/resolvers': specifier: 1.2.4 version: 1.2.4(vue-hooks-plus@1.8.5) '@vue/eslint-config-prettier': - specifier: ^7.1.0 - version: 7.1.0(eslint@8.48.0)(prettier@2.8.8) + specifier: ^8.0.0 + version: 8.0.0(eslint@8.52.0)(prettier@3.0.3) '@vue/eslint-config-typescript': specifier: ^11.0.3 - version: 11.0.3(eslint-plugin-vue@9.17.0)(eslint@8.48.0)(typescript@5.0.2) + version: 11.0.3(eslint-plugin-vue@9.18.1)(eslint@8.52.0)(typescript@5.2.2) autoprefixer: - specifier: ^10.4.8 - version: 10.4.15(postcss@8.4.29) + specifier: ^10.4.15 + version: 10.4.15(postcss@8.4.31) depcheck: - specifier: ^1.4.3 + specifier: ^1.4.5 version: 1.4.5 eslint: - specifier: ^8.44.0 - version: 8.48.0 + specifier: ^8.52.0 + version: 8.52.0 eslint-config-prettier: - specifier: ^8.8.0 - version: 8.10.0(eslint@8.48.0) + specifier: ^9.0.0 + version: 9.0.0(eslint@8.52.0) eslint-config-standard-with-typescript: - specifier: ^23.0.0 - version: 23.0.0(@typescript-eslint/eslint-plugin@5.62.0)(eslint-plugin-import@2.28.1)(eslint-plugin-n@15.7.0)(eslint-plugin-promise@6.1.1)(eslint@8.48.0)(typescript@5.0.2) + specifier: ^39.0.0 + version: 39.0.0(@typescript-eslint/eslint-plugin@6.5.0)(eslint-plugin-import@2.29.0)(eslint-plugin-n@16.2.0)(eslint-plugin-promise@6.1.1)(eslint@8.52.0)(typescript@5.2.2) eslint-plugin-import: - specifier: ^2.25.2 - version: 2.28.1(@typescript-eslint/parser@5.62.0)(eslint@8.48.0) + specifier: ^2.29.0 + version: 2.29.0(@typescript-eslint/parser@6.5.0)(eslint@8.52.0) eslint-plugin-n: - specifier: ^15.0.0 - version: 15.7.0(eslint@8.48.0) + specifier: ^16.2.0 + version: 16.2.0(eslint@8.52.0) eslint-plugin-prettier: - specifier: ^4.2.1 - version: 4.2.1(eslint-config-prettier@8.10.0)(eslint@8.48.0)(prettier@2.8.8) + specifier: ^5.0.1 + version: 5.0.1(eslint-config-prettier@9.0.0)(eslint@8.52.0)(prettier@3.0.3) eslint-plugin-promise: - specifier: ^6.0.0 - version: 6.1.1(eslint@8.48.0) + specifier: ^6.1.1 + version: 6.1.1(eslint@8.52.0) eslint-plugin-vue: - specifier: ^9.15.1 - version: 9.17.0(eslint@8.48.0) + specifier: ^9.18.1 + version: 9.18.1(eslint@8.52.0) husky: specifier: ^8.0.3 version: 8.0.3 lint-staged: - specifier: ^13.1.0 - version: 13.3.0 + specifier: ^15.1.0 + version: 15.1.0 postcss: - specifier: ^8.1.0 - version: 8.4.29 + specifier: ^8.4.31 + version: 8.4.31 postcss-px-to-viewport-8-plugin: specifier: 1.2.2 version: 1.2.2 prettier: - specifier: ^2.7.1 - version: 2.8.8 + specifier: ^3.0.3 + version: 3.0.3 rollup-plugin-visualizer: - specifier: ^5.8.3 + specifier: ^5.9.2 version: 5.9.2 sass: - specifier: 1.54.3 - version: 1.54.3 + specifier: 1.69.5 + version: 1.69.5 svg-sprite-loader: specifier: ^6.0.11 version: 6.0.11 typescript: - specifier: ^5.0.2 - version: 5.0.2 + specifier: ^5.2.2 + version: 5.2.2 unplugin-auto-import: - specifier: ^0.15.0 - version: 0.15.3(@vueuse/core@9.13.0) + specifier: ^0.16.6 + version: 0.16.6(@vueuse/core@10.6.1) unplugin-vue-components: - specifier: ^0.25.1 - version: 0.25.1(vue@3.3.8) + specifier: ^0.25.2 + version: 0.25.2(vue@3.3.10) vite: - specifier: ^4.4.9 - version: 4.4.9(@types/node@20.4.7)(sass@1.54.3) + specifier: ^5.0.4 + version: 5.0.4(@types/node@20.4.7)(sass@1.69.5) vite-plugin-cdn2: - specifier: 0.12.4 - version: 0.12.4 + specifier: 0.15.2 + version: 0.15.2 vite-plugin-compression: specifier: ^0.5.1 - version: 0.5.1(vite@4.4.9) + version: 0.5.1(vite@5.0.4) vite-plugin-ejs: - specifier: ^1.6.4 - version: 1.6.4 + specifier: ^1.7.0 + version: 1.7.0(vite@5.0.4) vite-plugin-eslint: specifier: 1.8.1 - version: 1.8.1(eslint@8.48.0)(vite@4.4.9) + version: 1.8.1(eslint@8.52.0)(vite@5.0.4) vite-plugin-imp: - specifier: ^2.3.1 - version: 2.4.0(vite@4.4.9) + specifier: ^2.4.0 + version: 2.4.0(vite@5.0.4) vite-plugin-inspect: - specifier: ^0.7.26 - version: 0.7.38(vite@4.4.9) + specifier: ^0.7.38 + version: 0.7.38(vite@5.0.4) vite-plugin-mock-dev-server: - specifier: 1.3.0 - version: 1.3.0(vite@4.4.9) + specifier: 1.3.4 + version: 1.3.4(vite@5.0.4) vite-plugin-svg-icons: specifier: ^2.0.1 - version: 2.0.1(vite@4.4.9) + version: 2.0.1(vite@5.0.4) vite-svg-loader: specifier: ^4.0.0 version: 4.0.0 vue-tsc: - specifier: ^1.8.4 - version: 1.8.8(typescript@5.0.2) + specifier: ^1.8.8 + version: 1.8.8(typescript@5.2.2) packages: @@ -238,21 +244,21 @@ packages: engines: {node: '>=6.9.0'} dev: true - /@babel/core@7.22.11: - resolution: {integrity: sha512-lh7RJrtPdhibbxndr6/xx0w8+CVlY5FJZiaSz908Fpy+G0xkBFTvwLcKJFF4PJxVfGhVWNebikpWGnOoC71juQ==} + /@babel/core@7.23.2: + resolution: {integrity: sha512-n7s51eWdaWZ3vGT2tD4T7J6eJs3QoBXydv7vkUM06Bf1cbVD2Kc2UrkzhiQwobfV7NwOnQXYL7UBJ5VPU+RGoQ==} engines: {node: '>=6.9.0'} dependencies: '@ampproject/remapping': 2.2.1 '@babel/code-frame': 7.22.13 - '@babel/generator': 7.22.10 - '@babel/helper-compilation-targets': 7.22.10 - '@babel/helper-module-transforms': 7.22.9(@babel/core@7.22.11) - '@babel/helpers': 7.22.11 - '@babel/parser': 7.22.13 - '@babel/template': 7.22.5 - '@babel/traverse': 7.22.11 - '@babel/types': 7.22.11 - convert-source-map: 1.9.0 + '@babel/generator': 7.23.3 + '@babel/helper-compilation-targets': 7.22.15 + '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.2) + '@babel/helpers': 7.23.2 + '@babel/parser': 7.23.3 + '@babel/template': 7.22.15 + '@babel/traverse': 7.23.3 + '@babel/types': 7.23.3 + convert-source-map: 2.0.0 debug: 4.3.4 gensync: 1.0.0-beta.2 json5: 2.2.3 @@ -261,25 +267,35 @@ packages: - supports-color dev: true - /@babel/eslint-parser@7.22.11(@babel/core@7.22.11)(eslint@8.48.0): + /@babel/eslint-parser@7.22.11(@babel/core@7.23.2)(eslint@8.52.0): resolution: {integrity: sha512-YjOYZ3j7TjV8OhLW6NCtyg8G04uStATEUe5eiLuCZaXz2VSDQ3dsAtm2D+TuQyAqNMUK2WacGo0/uma9Pein1w==} engines: {node: ^10.13.0 || ^12.13.0 || >=14.0.0} peerDependencies: '@babel/core': ^7.11.0 eslint: ^7.5.0 || ^8.0.0 dependencies: - '@babel/core': 7.22.11 + '@babel/core': 7.23.2 '@nicolo-ribaudo/eslint-scope-5-internals': 5.1.1-v1 - eslint: 8.48.0 + eslint: 8.52.0 eslint-visitor-keys: 2.1.0 semver: 6.3.1 dev: true - /@babel/generator@7.22.10: - resolution: {integrity: sha512-79KIf7YiWjjdZ81JnLujDRApWtl7BxTqWD88+FFdQEIOG8LJ0etDOM7CXuIgGJa55sGOwZVwuEsaLEm0PJ5/+A==} + /@babel/generator@7.22.15: + resolution: {integrity: sha512-Zu9oWARBqeVOW0dZOjXc3JObrzuqothQ3y/n1kUtrjCoCPLkXUwMvOo/F/TCfoHMbWIFlWwpZtkZVb9ga4U2pA==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.22.11 + '@babel/types': 7.23.3 + '@jridgewell/gen-mapping': 0.3.3 + '@jridgewell/trace-mapping': 0.3.19 + jsesc: 2.5.2 + dev: true + + /@babel/generator@7.23.3: + resolution: {integrity: sha512-keeZWAV4LU3tW0qRi19HRpabC/ilM0HRBBzf9/k8FFiG4KVpiv0FIy4hHfLfFQZNhziCTPTmd59zoyv6DNISzg==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/types': 7.23.3 '@jridgewell/gen-mapping': 0.3.3 '@jridgewell/trace-mapping': 0.3.19 jsesc: 2.5.2 @@ -292,35 +308,40 @@ packages: '@babel/types': 7.23.3 dev: true - /@babel/helper-compilation-targets@7.22.10: - resolution: {integrity: sha512-JMSwHD4J7SLod0idLq5PKgI+6g/hLD/iuWBq08ZX49xE14VpVEojJ5rHWptpirV2j020MvypRLAXAO50igCJ5Q==} + /@babel/helper-compilation-targets@7.22.15: + resolution: {integrity: sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==} engines: {node: '>=6.9.0'} dependencies: '@babel/compat-data': 7.22.9 - '@babel/helper-validator-option': 7.22.5 + '@babel/helper-validator-option': 7.22.15 browserslist: 4.21.10 lru-cache: 5.1.1 semver: 6.3.1 dev: true - /@babel/helper-create-class-features-plugin@7.22.11(@babel/core@7.22.11): - resolution: {integrity: sha512-y1grdYL4WzmUDBRGK0pDbIoFd7UZKoDurDzWEoNMYoj1EL+foGRQNyPWDcC+YyegN5y1DUsFFmzjGijB3nSVAQ==} + /@babel/helper-create-class-features-plugin@7.22.15(@babel/core@7.23.2): + resolution: {integrity: sha512-jKkwA59IXcvSaiK2UN45kKwSC9o+KuoXsBDvHvU/7BecYIp8GQ2UwrVvFgJASUT+hBnwJx6MhvMCuMzwZZ7jlg==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 dependencies: - '@babel/core': 7.22.11 + '@babel/core': 7.23.2 '@babel/helper-annotate-as-pure': 7.22.5 '@babel/helper-environment-visitor': 7.22.5 '@babel/helper-function-name': 7.22.5 - '@babel/helper-member-expression-to-functions': 7.22.5 + '@babel/helper-member-expression-to-functions': 7.22.15 '@babel/helper-optimise-call-expression': 7.22.5 - '@babel/helper-replace-supers': 7.22.9(@babel/core@7.22.11) + '@babel/helper-replace-supers': 7.22.9(@babel/core@7.23.2) '@babel/helper-skip-transparent-expression-wrappers': 7.22.5 '@babel/helper-split-export-declaration': 7.22.6 semver: 6.3.1 dev: true + /@babel/helper-environment-visitor@7.22.20: + resolution: {integrity: sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==} + engines: {node: '>=6.9.0'} + dev: true + /@babel/helper-environment-visitor@7.22.5: resolution: {integrity: sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==} engines: {node: '>=6.9.0'} @@ -330,40 +351,48 @@ packages: resolution: {integrity: sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==} engines: {node: '>=6.9.0'} dependencies: - '@babel/template': 7.22.5 - '@babel/types': 7.22.11 + '@babel/template': 7.22.15 + '@babel/types': 7.23.3 + dev: true + + /@babel/helper-function-name@7.23.0: + resolution: {integrity: sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/template': 7.22.15 + '@babel/types': 7.23.3 dev: true /@babel/helper-hoist-variables@7.22.5: resolution: {integrity: sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.22.11 + '@babel/types': 7.23.3 dev: true - /@babel/helper-member-expression-to-functions@7.22.5: - resolution: {integrity: sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ==} + /@babel/helper-member-expression-to-functions@7.22.15: + resolution: {integrity: sha512-qLNsZbgrNh0fDQBCPocSL8guki1hcPvltGDv/NxvUoABwFq7GkKSu1nRXeJkVZc+wJvne2E0RKQz+2SQrz6eAA==} engines: {node: '>=6.9.0'} dependencies: '@babel/types': 7.23.3 dev: true - /@babel/helper-module-imports@7.22.5: - resolution: {integrity: sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==} + /@babel/helper-module-imports@7.22.15: + resolution: {integrity: sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.22.11 + '@babel/types': 7.23.3 dev: true - /@babel/helper-module-transforms@7.22.9(@babel/core@7.22.11): - resolution: {integrity: sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==} + /@babel/helper-module-transforms@7.23.3(@babel/core@7.23.2): + resolution: {integrity: sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 dependencies: - '@babel/core': 7.22.11 - '@babel/helper-environment-visitor': 7.22.5 - '@babel/helper-module-imports': 7.22.5 + '@babel/core': 7.23.2 + '@babel/helper-environment-visitor': 7.22.20 + '@babel/helper-module-imports': 7.22.15 '@babel/helper-simple-access': 7.22.5 '@babel/helper-split-export-declaration': 7.22.6 '@babel/helper-validator-identifier': 7.22.20 @@ -381,15 +410,15 @@ packages: engines: {node: '>=6.9.0'} dev: true - /@babel/helper-replace-supers@7.22.9(@babel/core@7.22.11): + /@babel/helper-replace-supers@7.22.9(@babel/core@7.23.2): resolution: {integrity: sha512-LJIKvvpgPOPUThdYqcX6IXRuIcTkcAub0IaDRGCZH0p5GPUp7PhRU9QVgFcDDd51BaPkk77ZjqFwh6DZTAEmGg==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 dependencies: - '@babel/core': 7.22.11 + '@babel/core': 7.23.2 '@babel/helper-environment-visitor': 7.22.5 - '@babel/helper-member-expression-to-functions': 7.22.5 + '@babel/helper-member-expression-to-functions': 7.22.15 '@babel/helper-optimise-call-expression': 7.22.5 dev: true @@ -397,7 +426,7 @@ packages: resolution: {integrity: sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.22.11 + '@babel/types': 7.23.3 dev: true /@babel/helper-skip-transparent-expression-wrappers@7.22.5: @@ -411,29 +440,34 @@ packages: resolution: {integrity: sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.22.11 + '@babel/types': 7.23.3 dev: true /@babel/helper-string-parser@7.22.5: resolution: {integrity: sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==} engines: {node: '>=6.9.0'} + dev: true + + /@babel/helper-string-parser@7.23.4: + resolution: {integrity: sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==} + engines: {node: '>=6.9.0'} /@babel/helper-validator-identifier@7.22.20: resolution: {integrity: sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==} engines: {node: '>=6.9.0'} - /@babel/helper-validator-option@7.22.5: - resolution: {integrity: sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==} + /@babel/helper-validator-option@7.22.15: + resolution: {integrity: sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA==} engines: {node: '>=6.9.0'} dev: true - /@babel/helpers@7.22.11: - resolution: {integrity: sha512-vyOXC8PBWaGc5h7GMsNx68OH33cypkEDJCHvYVVgVbbxJDROYVtexSk0gK5iCF1xNjRIN2s8ai7hwkWDq5szWg==} + /@babel/helpers@7.23.2: + resolution: {integrity: sha512-lzchcp8SjTSVe/fPmLwtWVBFC7+Tbn8LGHDVfDp9JGxpAY5opSaEFgt8UQvrnECWOTdji2mOWMz1rOhkHscmGQ==} engines: {node: '>=6.9.0'} dependencies: - '@babel/template': 7.22.5 - '@babel/traverse': 7.22.11 - '@babel/types': 7.22.11 + '@babel/template': 7.22.15 + '@babel/traverse': 7.23.3 + '@babel/types': 7.23.3 transitivePeerDependencies: - supports-color dev: true @@ -447,14 +481,6 @@ packages: js-tokens: 4.0.0 dev: true - /@babel/parser@7.22.13: - resolution: {integrity: sha512-3l6+4YOvc9wx7VlCSw4yQfcBo01ECA8TicQfbnCPuCEpRQrf+gTUyGdxNw+pyTUyywp6JRD1w0YQs9TpBXYlkw==} - engines: {node: '>=6.0.0'} - hasBin: true - dependencies: - '@babel/types': 7.22.11 - dev: true - /@babel/parser@7.22.5: resolution: {integrity: sha512-DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q==} engines: {node: '>=6.0.0'} @@ -469,68 +495,76 @@ packages: hasBin: true dependencies: '@babel/types': 7.23.3 + dev: true - /@babel/plugin-syntax-jsx@7.22.5(@babel/core@7.22.11): + /@babel/parser@7.23.5: + resolution: {integrity: sha512-hOOqoiNXrmGdFbhgCzu6GiURxUgM27Xwd/aPuu8RfHEZPBzL1Z54okAHAQjXfcQNwvrlkAmAp4SlRTZ45vlthQ==} + engines: {node: '>=6.0.0'} + hasBin: true + dependencies: + '@babel/types': 7.23.5 + + /@babel/plugin-syntax-jsx@7.22.5(@babel/core@7.23.2): resolution: {integrity: sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.22.11 + '@babel/core': 7.23.2 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-syntax-typescript@7.22.5(@babel/core@7.22.11): + /@babel/plugin-syntax-typescript@7.22.5(@babel/core@7.23.2): resolution: {integrity: sha512-1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.22.11 + '@babel/core': 7.23.2 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-typescript@7.22.11(@babel/core@7.22.11): - resolution: {integrity: sha512-0E4/L+7gfvHub7wsbTv03oRtD69X31LByy44fGmFzbZScpupFByMcgCJ0VbBTkzyjSJKuRoGN8tcijOWKTmqOA==} + /@babel/plugin-transform-typescript@7.22.15(@babel/core@7.23.2): + resolution: {integrity: sha512-1uirS0TnijxvQLnlv5wQBwOX3E1wCFX7ITv+9pBV2wKEk4K+M5tqDaoNXnTH8tjEIYHLO98MwiTWO04Ggz4XuA==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.22.11 + '@babel/core': 7.23.2 '@babel/helper-annotate-as-pure': 7.22.5 - '@babel/helper-create-class-features-plugin': 7.22.11(@babel/core@7.22.11) + '@babel/helper-create-class-features-plugin': 7.22.15(@babel/core@7.23.2) '@babel/helper-plugin-utils': 7.22.5 - '@babel/plugin-syntax-typescript': 7.22.5(@babel/core@7.22.11) + '@babel/plugin-syntax-typescript': 7.22.5(@babel/core@7.23.2) dev: true - /@babel/runtime@7.22.15: - resolution: {integrity: sha512-T0O+aa+4w0u06iNmapipJXMV4HoUir03hpx3/YqXXhu9xim3w+dVphjFWl1OH8NbZHw5Lbm9k45drDkgq2VNNA==} + /@babel/runtime@7.23.2: + resolution: {integrity: sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg==} engines: {node: '>=6.9.0'} dependencies: regenerator-runtime: 0.14.0 dev: false - /@babel/template@7.22.5: - resolution: {integrity: sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==} + /@babel/template@7.22.15: + resolution: {integrity: sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==} engines: {node: '>=6.9.0'} dependencies: '@babel/code-frame': 7.22.13 - '@babel/parser': 7.22.13 - '@babel/types': 7.22.11 + '@babel/parser': 7.23.3 + '@babel/types': 7.23.3 dev: true - /@babel/traverse@7.22.11: - resolution: {integrity: sha512-mzAenteTfomcB7mfPtyi+4oe5BZ6MXxWcn4CX+h4IRJ+OOGXBrWU6jDQavkQI9Vuc5P+donFabBfFCcmWka9lQ==} + /@babel/traverse@7.22.19: + resolution: {integrity: sha512-ZCcpVPK64krfdScRbpxF6xA5fz7IOsfMwx1tcACvCzt6JY+0aHkBk7eIU8FRDSZRU5Zei6Z4JfgAxN1bqXGECg==} engines: {node: '>=6.9.0'} dependencies: '@babel/code-frame': 7.22.13 - '@babel/generator': 7.22.10 + '@babel/generator': 7.22.15 '@babel/helper-environment-visitor': 7.22.5 '@babel/helper-function-name': 7.22.5 '@babel/helper-hoist-variables': 7.22.5 '@babel/helper-split-export-declaration': 7.22.6 - '@babel/parser': 7.22.13 - '@babel/types': 7.22.11 + '@babel/parser': 7.23.3 + '@babel/types': 7.23.3 debug: 4.3.4 globals: 11.12.0 transitivePeerDependencies: @@ -542,7 +576,7 @@ packages: engines: {node: '>=6.9.0'} dependencies: '@babel/code-frame': 7.22.13 - '@babel/generator': 7.22.10 + '@babel/generator': 7.22.15 '@babel/helper-environment-visitor': 7.22.5 '@babel/helper-function-name': 7.22.5 '@babel/helper-hoist-variables': 7.22.5 @@ -555,13 +589,22 @@ packages: - supports-color dev: true - /@babel/types@7.22.11: - resolution: {integrity: sha512-siazHiGuZRz9aB9NpHy9GOs9xiQPKnMzgdr493iI1M67vRXpnEq8ZOOKzezC5q7zwuQ6sDhdSp4SD9ixKSqKZg==} + /@babel/traverse@7.23.3: + resolution: {integrity: sha512-+K0yF1/9yR0oHdE0StHuEj3uTPzwwbrLGfNOndVJVV2TqA5+j3oljJUb4nmB954FLGjNem976+B+eDuLIjesiQ==} engines: {node: '>=6.9.0'} dependencies: - '@babel/helper-string-parser': 7.22.5 - '@babel/helper-validator-identifier': 7.22.20 - to-fast-properties: 2.0.0 + '@babel/code-frame': 7.22.13 + '@babel/generator': 7.23.3 + '@babel/helper-environment-visitor': 7.22.20 + '@babel/helper-function-name': 7.23.0 + '@babel/helper-hoist-variables': 7.22.5 + '@babel/helper-split-export-declaration': 7.22.6 + '@babel/parser': 7.23.3 + '@babel/types': 7.23.3 + debug: 4.3.4 + globals: 11.12.0 + transitivePeerDependencies: + - supports-color dev: true /@babel/types@7.23.3: @@ -571,6 +614,15 @@ packages: '@babel/helper-string-parser': 7.22.5 '@babel/helper-validator-identifier': 7.22.20 to-fast-properties: 2.0.0 + dev: true + + /@babel/types@7.23.5: + resolution: {integrity: sha512-ON5kSOJwVO6xXVRTvOI0eOnWe7VdUcIpsovGo9U/Br4Ie4UVFQTboO2cYnDhAGU6Fp+UxSiT+pMft0SMHfuq6w==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/helper-string-parser': 7.23.4 + '@babel/helper-validator-identifier': 7.22.20 + to-fast-properties: 2.0.0 /@commitlint/cli@17.7.1: resolution: {integrity: sha512-BCm/AT06SNCQtvFv921iNhudOHuY16LswT0R3OeolVGLk8oP+Rk9TfQfgjH7QPMjhvp76bNqGFEcpKojxUNW1g==} @@ -661,13 +713,13 @@ packages: '@types/node': 20.4.7 chalk: 4.1.2 cosmiconfig: 8.2.0 - cosmiconfig-typescript-loader: 4.4.0(@types/node@20.4.7)(cosmiconfig@8.2.0)(ts-node@10.9.1)(typescript@5.0.2) + cosmiconfig-typescript-loader: 4.4.0(@types/node@20.4.7)(cosmiconfig@8.2.0)(ts-node@10.9.1)(typescript@5.2.2) lodash.isplainobject: 4.0.6 lodash.merge: 4.6.2 lodash.uniq: 4.5.0 resolve-from: 5.0.0 - ts-node: 10.9.1(@types/node@20.4.7)(typescript@5.0.2) - typescript: 5.0.2 + ts-node: 10.9.1(@types/node@20.4.7)(typescript@5.2.2) + typescript: 5.2.2 transitivePeerDependencies: - '@swc/core' - '@swc/wasm' @@ -755,20 +807,20 @@ packages: css-render: 0.15.12 dev: false - /@css-render/vue3-ssr@0.15.12(vue@3.3.8): + /@css-render/vue3-ssr@0.15.12(vue@3.3.10): resolution: {integrity: sha512-AQLGhhaE0F+rwybRCkKUdzBdTEM/5PZBYy+fSYe1T9z9+yxMuV/k7ZRqa4M69X+EI1W8pa4kc9Iq2VjQkZx4rg==} peerDependencies: vue: ^3.0.11 dependencies: - vue: 3.3.8(typescript@5.0.2) + vue: 3.3.10(typescript@5.2.2) dev: false /@emotion/hash@0.8.0: resolution: {integrity: sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==} dev: false - /@esbuild/android-arm64@0.18.20: - resolution: {integrity: sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==} + /@esbuild/android-arm64@0.19.5: + resolution: {integrity: sha512-5d1OkoJxnYQfmC+Zd8NBFjkhyCNYwM4n9ODrycTFY6Jk1IGiZ+tjVJDDSwDt77nK+tfpGP4T50iMtVi4dEGzhQ==} engines: {node: '>=12'} cpu: [arm64] os: [android] @@ -776,8 +828,17 @@ packages: dev: true optional: true - /@esbuild/android-arm@0.18.20: - resolution: {integrity: sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==} + /@esbuild/android-arm64@0.19.7: + resolution: {integrity: sha512-YEDcw5IT7hW3sFKZBkCAQaOCJQLONVcD4bOyTXMZz5fr66pTHnAet46XAtbXAkJRfIn2YVhdC6R9g4xa27jQ1w==} + engines: {node: '>=12'} + cpu: [arm64] + os: [android] + requiresBuild: true + dev: true + optional: true + + /@esbuild/android-arm@0.19.5: + resolution: {integrity: sha512-bhvbzWFF3CwMs5tbjf3ObfGqbl/17ict2/uwOSfr3wmxDE6VdS2GqY/FuzIPe0q0bdhj65zQsvqfArI9MY6+AA==} engines: {node: '>=12'} cpu: [arm] os: [android] @@ -785,8 +846,17 @@ packages: dev: true optional: true - /@esbuild/android-x64@0.18.20: - resolution: {integrity: sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==} + /@esbuild/android-arm@0.19.7: + resolution: {integrity: sha512-YGSPnndkcLo4PmVl2tKatEn+0mlVMr3yEpOOT0BeMria87PhvoJb5dg5f5Ft9fbCVgtAz4pWMzZVgSEGpDAlww==} + engines: {node: '>=12'} + cpu: [arm] + os: [android] + requiresBuild: true + dev: true + optional: true + + /@esbuild/android-x64@0.19.5: + resolution: {integrity: sha512-9t+28jHGL7uBdkBjL90QFxe7DVA+KGqWlHCF8ChTKyaKO//VLuoBricQCgwhOjA1/qOczsw843Fy4cbs4H3DVA==} engines: {node: '>=12'} cpu: [x64] os: [android] @@ -794,8 +864,17 @@ packages: dev: true optional: true - /@esbuild/darwin-arm64@0.18.20: - resolution: {integrity: sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==} + /@esbuild/android-x64@0.19.7: + resolution: {integrity: sha512-jhINx8DEjz68cChFvM72YzrqfwJuFbfvSxZAk4bebpngGfNNRm+zRl4rtT9oAX6N9b6gBcFaJHFew5Blf6CvUw==} + engines: {node: '>=12'} + cpu: [x64] + os: [android] + requiresBuild: true + dev: true + optional: true + + /@esbuild/darwin-arm64@0.19.5: + resolution: {integrity: sha512-mvXGcKqqIqyKoxq26qEDPHJuBYUA5KizJncKOAf9eJQez+L9O+KfvNFu6nl7SCZ/gFb2QPaRqqmG0doSWlgkqw==} engines: {node: '>=12'} cpu: [arm64] os: [darwin] @@ -803,8 +882,17 @@ packages: dev: true optional: true - /@esbuild/darwin-x64@0.18.20: - resolution: {integrity: sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==} + /@esbuild/darwin-arm64@0.19.7: + resolution: {integrity: sha512-dr81gbmWN//3ZnBIm6YNCl4p3pjnabg1/ZVOgz2fJoUO1a3mq9WQ/1iuEluMs7mCL+Zwv7AY5e3g1hjXqQZ9Iw==} + engines: {node: '>=12'} + cpu: [arm64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /@esbuild/darwin-x64@0.19.5: + resolution: {integrity: sha512-Ly8cn6fGLNet19s0X4unjcniX24I0RqjPv+kurpXabZYSXGM4Pwpmf85WHJN3lAgB8GSth7s5A0r856S+4DyiA==} engines: {node: '>=12'} cpu: [x64] os: [darwin] @@ -812,8 +900,17 @@ packages: dev: true optional: true - /@esbuild/freebsd-arm64@0.18.20: - resolution: {integrity: sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==} + /@esbuild/darwin-x64@0.19.7: + resolution: {integrity: sha512-Lc0q5HouGlzQEwLkgEKnWcSazqr9l9OdV2HhVasWJzLKeOt0PLhHaUHuzb8s/UIya38DJDoUm74GToZ6Wc7NGQ==} + engines: {node: '>=12'} + cpu: [x64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /@esbuild/freebsd-arm64@0.19.5: + resolution: {integrity: sha512-GGDNnPWTmWE+DMchq1W8Sd0mUkL+APvJg3b11klSGUDvRXh70JqLAO56tubmq1s2cgpVCSKYywEiKBfju8JztQ==} engines: {node: '>=12'} cpu: [arm64] os: [freebsd] @@ -821,8 +918,17 @@ packages: dev: true optional: true - /@esbuild/freebsd-x64@0.18.20: - resolution: {integrity: sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==} + /@esbuild/freebsd-arm64@0.19.7: + resolution: {integrity: sha512-+y2YsUr0CxDFF7GWiegWjGtTUF6gac2zFasfFkRJPkMAuMy9O7+2EH550VlqVdpEEchWMynkdhC9ZjtnMiHImQ==} + engines: {node: '>=12'} + cpu: [arm64] + os: [freebsd] + requiresBuild: true + dev: true + optional: true + + /@esbuild/freebsd-x64@0.19.5: + resolution: {integrity: sha512-1CCwDHnSSoA0HNwdfoNY0jLfJpd7ygaLAp5EHFos3VWJCRX9DMwWODf96s9TSse39Br7oOTLryRVmBoFwXbuuQ==} engines: {node: '>=12'} cpu: [x64] os: [freebsd] @@ -830,8 +936,17 @@ packages: dev: true optional: true - /@esbuild/linux-arm64@0.18.20: - resolution: {integrity: sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==} + /@esbuild/freebsd-x64@0.19.7: + resolution: {integrity: sha512-CdXOxIbIzPJmJhrpmJTLx+o35NoiKBIgOvmvT+jeSadYiWJn0vFKsl+0bSG/5lwjNHoIDEyMYc/GAPR9jxusTA==} + engines: {node: '>=12'} + cpu: [x64] + os: [freebsd] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-arm64@0.19.5: + resolution: {integrity: sha512-o3vYippBmSrjjQUCEEiTZ2l+4yC0pVJD/Dl57WfPwwlvFkrxoSO7rmBZFii6kQB3Wrn/6GwJUPLU5t52eq2meA==} engines: {node: '>=12'} cpu: [arm64] os: [linux] @@ -839,8 +954,17 @@ packages: dev: true optional: true - /@esbuild/linux-arm@0.18.20: - resolution: {integrity: sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==} + /@esbuild/linux-arm64@0.19.7: + resolution: {integrity: sha512-inHqdOVCkUhHNvuQPT1oCB7cWz9qQ/Cz46xmVe0b7UXcuIJU3166aqSunsqkgSGMtUCWOZw3+KMwI6otINuC9g==} + engines: {node: '>=12'} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-arm@0.19.5: + resolution: {integrity: sha512-lrWXLY/vJBzCPC51QN0HM71uWgIEpGSjSZZADQhq7DKhPcI6NH1IdzjfHkDQws2oNpJKpR13kv7/pFHBbDQDwQ==} engines: {node: '>=12'} cpu: [arm] os: [linux] @@ -848,8 +972,17 @@ packages: dev: true optional: true - /@esbuild/linux-ia32@0.18.20: - resolution: {integrity: sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==} + /@esbuild/linux-arm@0.19.7: + resolution: {integrity: sha512-Y+SCmWxsJOdQtjcBxoacn/pGW9HDZpwsoof0ttL+2vGcHokFlfqV666JpfLCSP2xLxFpF1lj7T3Ox3sr95YXww==} + engines: {node: '>=12'} + cpu: [arm] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-ia32@0.19.5: + resolution: {integrity: sha512-MkjHXS03AXAkNp1KKkhSKPOCYztRtK+KXDNkBa6P78F8Bw0ynknCSClO/ztGszILZtyO/lVKpa7MolbBZ6oJtQ==} engines: {node: '>=12'} cpu: [ia32] os: [linux] @@ -857,8 +990,17 @@ packages: dev: true optional: true - /@esbuild/linux-loong64@0.18.20: - resolution: {integrity: sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==} + /@esbuild/linux-ia32@0.19.7: + resolution: {integrity: sha512-2BbiL7nLS5ZO96bxTQkdO0euGZIUQEUXMTrqLxKUmk/Y5pmrWU84f+CMJpM8+EHaBPfFSPnomEaQiG/+Gmh61g==} + engines: {node: '>=12'} + cpu: [ia32] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-loong64@0.19.5: + resolution: {integrity: sha512-42GwZMm5oYOD/JHqHska3Jg0r+XFb/fdZRX+WjADm3nLWLcIsN27YKtqxzQmGNJgu0AyXg4HtcSK9HuOk3v1Dw==} engines: {node: '>=12'} cpu: [loong64] os: [linux] @@ -866,8 +1008,17 @@ packages: dev: true optional: true - /@esbuild/linux-mips64el@0.18.20: - resolution: {integrity: sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==} + /@esbuild/linux-loong64@0.19.7: + resolution: {integrity: sha512-BVFQla72KXv3yyTFCQXF7MORvpTo4uTA8FVFgmwVrqbB/4DsBFWilUm1i2Oq6zN36DOZKSVUTb16jbjedhfSHw==} + engines: {node: '>=12'} + cpu: [loong64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-mips64el@0.19.5: + resolution: {integrity: sha512-kcjndCSMitUuPJobWCnwQ9lLjiLZUR3QLQmlgaBfMX23UEa7ZOrtufnRds+6WZtIS9HdTXqND4yH8NLoVVIkcg==} engines: {node: '>=12'} cpu: [mips64el] os: [linux] @@ -875,8 +1026,17 @@ packages: dev: true optional: true - /@esbuild/linux-ppc64@0.18.20: - resolution: {integrity: sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==} + /@esbuild/linux-mips64el@0.19.7: + resolution: {integrity: sha512-DzAYckIaK+pS31Q/rGpvUKu7M+5/t+jI+cdleDgUwbU7KdG2eC3SUbZHlo6Q4P1CfVKZ1lUERRFP8+q0ob9i2w==} + engines: {node: '>=12'} + cpu: [mips64el] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-ppc64@0.19.5: + resolution: {integrity: sha512-yJAxJfHVm0ZbsiljbtFFP1BQKLc8kUF6+17tjQ78QjqjAQDnhULWiTA6u0FCDmYT1oOKS9PzZ2z0aBI+Mcyj7Q==} engines: {node: '>=12'} cpu: [ppc64] os: [linux] @@ -884,8 +1044,17 @@ packages: dev: true optional: true - /@esbuild/linux-riscv64@0.18.20: - resolution: {integrity: sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==} + /@esbuild/linux-ppc64@0.19.7: + resolution: {integrity: sha512-JQ1p0SmUteNdUaaiRtyS59GkkfTW0Edo+e0O2sihnY4FoZLz5glpWUQEKMSzMhA430ctkylkS7+vn8ziuhUugQ==} + engines: {node: '>=12'} + cpu: [ppc64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-riscv64@0.19.5: + resolution: {integrity: sha512-5u8cIR/t3gaD6ad3wNt1MNRstAZO+aNyBxu2We8X31bA8XUNyamTVQwLDA1SLoPCUehNCymhBhK3Qim1433Zag==} engines: {node: '>=12'} cpu: [riscv64] os: [linux] @@ -893,8 +1062,17 @@ packages: dev: true optional: true - /@esbuild/linux-s390x@0.18.20: - resolution: {integrity: sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==} + /@esbuild/linux-riscv64@0.19.7: + resolution: {integrity: sha512-xGwVJ7eGhkprY/nB7L7MXysHduqjpzUl40+XoYDGC4UPLbnG+gsyS1wQPJ9lFPcxYAaDXbdRXd1ACs9AE9lxuw==} + engines: {node: '>=12'} + cpu: [riscv64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-s390x@0.19.5: + resolution: {integrity: sha512-Z6JrMyEw/EmZBD/OFEFpb+gao9xJ59ATsoTNlj39jVBbXqoZm4Xntu6wVmGPB/OATi1uk/DB+yeDPv2E8PqZGw==} engines: {node: '>=12'} cpu: [s390x] os: [linux] @@ -902,8 +1080,17 @@ packages: dev: true optional: true - /@esbuild/linux-x64@0.18.20: - resolution: {integrity: sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==} + /@esbuild/linux-s390x@0.19.7: + resolution: {integrity: sha512-U8Rhki5PVU0L0nvk+E8FjkV8r4Lh4hVEb9duR6Zl21eIEYEwXz8RScj4LZWA2i3V70V4UHVgiqMpszXvG0Yqhg==} + engines: {node: '>=12'} + cpu: [s390x] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-x64@0.19.5: + resolution: {integrity: sha512-psagl+2RlK1z8zWZOmVdImisMtrUxvwereIdyJTmtmHahJTKb64pAcqoPlx6CewPdvGvUKe2Jw+0Z/0qhSbG1A==} engines: {node: '>=12'} cpu: [x64] os: [linux] @@ -911,8 +1098,17 @@ packages: dev: true optional: true - /@esbuild/netbsd-x64@0.18.20: - resolution: {integrity: sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==} + /@esbuild/linux-x64@0.19.7: + resolution: {integrity: sha512-ZYZopyLhm4mcoZXjFt25itRlocKlcazDVkB4AhioiL9hOWhDldU9n38g62fhOI4Pth6vp+Mrd5rFKxD0/S+7aQ==} + engines: {node: '>=12'} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/netbsd-x64@0.19.5: + resolution: {integrity: sha512-kL2l+xScnAy/E/3119OggX8SrWyBEcqAh8aOY1gr4gPvw76la2GlD4Ymf832UCVbmuWeTf2adkZDK+h0Z/fB4g==} engines: {node: '>=12'} cpu: [x64] os: [netbsd] @@ -920,8 +1116,17 @@ packages: dev: true optional: true - /@esbuild/openbsd-x64@0.18.20: - resolution: {integrity: sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==} + /@esbuild/netbsd-x64@0.19.7: + resolution: {integrity: sha512-/yfjlsYmT1O3cum3J6cmGG16Fd5tqKMcg5D+sBYLaOQExheAJhqr8xOAEIuLo8JYkevmjM5zFD9rVs3VBcsjtQ==} + engines: {node: '>=12'} + cpu: [x64] + os: [netbsd] + requiresBuild: true + dev: true + optional: true + + /@esbuild/openbsd-x64@0.19.5: + resolution: {integrity: sha512-sPOfhtzFufQfTBgRnE1DIJjzsXukKSvZxloZbkJDG383q0awVAq600pc1nfqBcl0ice/WN9p4qLc39WhBShRTA==} engines: {node: '>=12'} cpu: [x64] os: [openbsd] @@ -929,8 +1134,17 @@ packages: dev: true optional: true - /@esbuild/sunos-x64@0.18.20: - resolution: {integrity: sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==} + /@esbuild/openbsd-x64@0.19.7: + resolution: {integrity: sha512-MYDFyV0EW1cTP46IgUJ38OnEY5TaXxjoDmwiTXPjezahQgZd+j3T55Ht8/Q9YXBM0+T9HJygrSRGV5QNF/YVDQ==} + engines: {node: '>=12'} + cpu: [x64] + os: [openbsd] + requiresBuild: true + dev: true + optional: true + + /@esbuild/sunos-x64@0.19.5: + resolution: {integrity: sha512-dGZkBXaafuKLpDSjKcB0ax0FL36YXCvJNnztjKV+6CO82tTYVDSH2lifitJ29jxRMoUhgkg9a+VA/B03WK5lcg==} engines: {node: '>=12'} cpu: [x64] os: [sunos] @@ -938,8 +1152,17 @@ packages: dev: true optional: true - /@esbuild/win32-arm64@0.18.20: - resolution: {integrity: sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==} + /@esbuild/sunos-x64@0.19.7: + resolution: {integrity: sha512-JcPvgzf2NN/y6X3UUSqP6jSS06V0DZAV/8q0PjsZyGSXsIGcG110XsdmuWiHM+pno7/mJF6fjH5/vhUz/vA9fw==} + engines: {node: '>=12'} + cpu: [x64] + os: [sunos] + requiresBuild: true + dev: true + optional: true + + /@esbuild/win32-arm64@0.19.5: + resolution: {integrity: sha512-dWVjD9y03ilhdRQ6Xig1NWNgfLtf2o/STKTS+eZuF90fI2BhbwD6WlaiCGKptlqXlURVB5AUOxUj09LuwKGDTg==} engines: {node: '>=12'} cpu: [arm64] os: [win32] @@ -947,8 +1170,17 @@ packages: dev: true optional: true - /@esbuild/win32-ia32@0.18.20: - resolution: {integrity: sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==} + /@esbuild/win32-arm64@0.19.7: + resolution: {integrity: sha512-ZA0KSYti5w5toax5FpmfcAgu3ZNJxYSRm0AW/Dao5up0YV1hDVof1NvwLomjEN+3/GMtaWDI+CIyJOMTRSTdMw==} + engines: {node: '>=12'} + cpu: [arm64] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /@esbuild/win32-ia32@0.19.5: + resolution: {integrity: sha512-4liggWIA4oDgUxqpZwrDhmEfAH4d0iljanDOK7AnVU89T6CzHon/ony8C5LeOdfgx60x5cnQJFZwEydVlYx4iw==} engines: {node: '>=12'} cpu: [ia32] os: [win32] @@ -956,8 +1188,17 @@ packages: dev: true optional: true - /@esbuild/win32-x64@0.18.20: - resolution: {integrity: sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==} + /@esbuild/win32-ia32@0.19.7: + resolution: {integrity: sha512-CTOnijBKc5Jpk6/W9hQMMvJnsSYRYgveN6O75DTACCY18RA2nqka8dTZR+x/JqXCRiKk84+5+bRKXUSbbwsS0A==} + engines: {node: '>=12'} + cpu: [ia32] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /@esbuild/win32-x64@0.19.5: + resolution: {integrity: sha512-czTrygUsB/jlM8qEW5MD8bgYU2Xg14lo6kBDXW6HdxKjh8M5PzETGiSHaz9MtbXBYDloHNUAUW2tMiKW4KM9Mw==} engines: {node: '>=12'} cpu: [x64] os: [win32] @@ -965,18 +1206,27 @@ packages: dev: true optional: true - /@eslint-community/eslint-utils@4.4.0(eslint@8.48.0): + /@esbuild/win32-x64@0.19.7: + resolution: {integrity: sha512-gRaP2sk6hc98N734luX4VpF318l3w+ofrtTu9j5L8EQXF+FzQKV6alCOHMVoJJHvVK/mGbwBXfOL1HETQu9IGQ==} + engines: {node: '>=12'} + cpu: [x64] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /@eslint-community/eslint-utils@4.4.0(eslint@8.52.0): resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.0.0 || ^7.0.0 || >=8.0.0 dependencies: - eslint: 8.48.0 + eslint: 8.52.0 eslint-visitor-keys: 3.4.3 dev: true - /@eslint-community/regexpp@4.8.0: - resolution: {integrity: sha512-JylOEEzDiOryeUnFbQz+oViCXS0KsvR1mvHkoMiu5+UiBvy+RYX7tzlIIIEstF/gVa2tj9AQXk3dgnxv6KxhFg==} + /@eslint-community/regexpp@4.10.0: + resolution: {integrity: sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==} engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} dev: true @@ -987,7 +1237,7 @@ packages: ajv: 6.12.6 debug: 4.3.4 espree: 9.6.1 - globals: 13.21.0 + globals: 13.23.0 ignore: 5.2.4 import-fresh: 3.3.0 js-yaml: 4.1.0 @@ -997,16 +1247,16 @@ packages: - supports-color dev: true - /@eslint/js@8.48.0: - resolution: {integrity: sha512-ZSjtmelB7IJfWD2Fvb7+Z+ChTIKWq6kjda95fLcQKNS5aheVHn4IkfgRQE3sIIzTcSLwLcLZUD9UBt+V7+h+Pw==} + /@eslint/js@8.52.0: + resolution: {integrity: sha512-mjZVbpaeMZludF2fsWLD0Z9gCref1Tk4i9+wddjRvpUNqqcndPkBD09N/Mapey0b3jaXbLm2kICwFv2E64QinA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /@humanwhocodes/config-array@0.11.11: - resolution: {integrity: sha512-N2brEuAadi0CcdeMXUkhbZB84eskAc8MEX1By6qEchoVywSgXPIjou4rYsl0V3Hj0ZnuGycGCjdNgockbzeWNA==} + /@humanwhocodes/config-array@0.11.13: + resolution: {integrity: sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==} engines: {node: '>=10.10.0'} dependencies: - '@humanwhocodes/object-schema': 1.2.1 + '@humanwhocodes/object-schema': 2.0.1 debug: 4.3.4 minimatch: 3.1.2 transitivePeerDependencies: @@ -1018,12 +1268,15 @@ packages: engines: {node: '>=12.22'} dev: true - /@humanwhocodes/object-schema@1.2.1: - resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==} + /@humanwhocodes/object-schema@2.0.1: + resolution: {integrity: sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==} dev: true - /@intlify/bundle-utils@7.1.0(vue-i18n@9.2.2): - resolution: {integrity: sha512-Q88Wl2T8oaRXls8Yr6l807jZM88mceJvK7QS6gKdU8/pf3gTpU9XmcYORDgAv6h5WKQMoaFjNVf5+SWLfTAysA==} + /@interactjs/types@1.10.21: + resolution: {integrity: sha512-U5N3eg9m3rLO9PrQkAaLKsSlCTRxpuMyhPBdMpicPH09icW/kIjLWQcDa3tP/I57zG0yxG6zBFREAcrjyIB3Bw==} + + /@intlify/bundle-utils@7.4.0(vue-i18n@9.7.1): + resolution: {integrity: sha512-AQfjBe2HUxzyN8ignIk3WhhSuVcSuirgzOzkd17nb337rCbI4Gv/t1R60UUyIqFoFdviLb/wLcDUzTD/xXjv9w==} engines: {node: '>= 14.16'} peerDependencies: petite-vue-i18n: '*' @@ -1034,65 +1287,52 @@ packages: vue-i18n: optional: true dependencies: - '@intlify/message-compiler': 9.3.0-beta.27 - '@intlify/shared': 9.3.0-beta.27 - acorn: 8.10.0 + '@intlify/message-compiler': 9.7.0 + '@intlify/shared': 9.7.0 + acorn: 8.11.2 escodegen: 2.1.0 estree-walker: 2.0.2 jsonc-eslint-parser: 2.3.0 - magic-string: 0.30.3 + magic-string: 0.30.5 mlly: 1.4.1 source-map-js: 1.0.2 - vue-i18n: 9.2.2(vue@3.3.8) + vue-i18n: 9.7.1(vue@3.3.10) yaml-eslint-parser: 1.2.2 dev: true - /@intlify/core-base@9.2.2: - resolution: {integrity: sha512-JjUpQtNfn+joMbrXvpR4hTF8iJQ2sEFzzK3KIESOx+f+uwIjgw20igOyaIdhfsVVBCds8ZM64MoeNSx+PHQMkA==} - engines: {node: '>= 14'} - dependencies: - '@intlify/devtools-if': 9.2.2 - '@intlify/message-compiler': 9.2.2 - '@intlify/shared': 9.2.2 - '@intlify/vue-devtools': 9.2.2 - - /@intlify/devtools-if@9.2.2: - resolution: {integrity: sha512-4ttr/FNO29w+kBbU7HZ/U0Lzuh2cRDhP8UlWOtV9ERcjHzuyXVZmjyleESK6eVP60tGC9QtQW9yZE+JeRhDHkg==} - engines: {node: '>= 14'} - dependencies: - '@intlify/shared': 9.2.2 - - /@intlify/message-compiler@9.2.2: - resolution: {integrity: sha512-IUrQW7byAKN2fMBe8z6sK6riG1pue95e5jfokn8hA5Q3Bqy4MBJ5lJAofUsawQJYHeoPJ7svMDyBaVJ4d0GTtA==} - engines: {node: '>= 14'} - dependencies: - '@intlify/shared': 9.2.2 - source-map: 0.6.1 - - /@intlify/message-compiler@9.3.0-beta.27: - resolution: {integrity: sha512-GC8rSbd7V67Zu+a9Z0bpV4riBek11YCURJU50YaEhV4Ub2JHEPtoYxK5r2eIsq/kp+M2hJyGLiC4NJUrGa2VwQ==} + /@intlify/core-base@9.7.1: + resolution: {integrity: sha512-jPJTeECEhqQ7g//8g3Fb79j5SzSSRqlFCWD6pcX94uMLXU+L1m07gVZnnvzoJBnaMyJHiiwxOqZVfvu6rQfLvw==} engines: {node: '>= 16'} dependencies: - '@intlify/shared': 9.3.0-beta.27 + '@intlify/message-compiler': 9.7.1 + '@intlify/shared': 9.7.1 + + /@intlify/message-compiler@9.7.0: + resolution: {integrity: sha512-/YdZCio2L2tCM5bZ2eMHbSEIQNPh1QqvZIOLI/yCVKXLscis7O0SsR2nmuU/DfCJ3iSeI8juw82C2wLvfsAeww==} + engines: {node: '>= 16'} + dependencies: + '@intlify/shared': 9.7.0 source-map-js: 1.0.2 dev: true - /@intlify/shared@9.2.2: - resolution: {integrity: sha512-wRwTpsslgZS5HNyM7uDQYZtxnbI12aGiBZURX3BTR9RFIKKRWpllTsgzHWvj3HKm3Y2Sh5LPC1r0PDCKEhVn9Q==} - engines: {node: '>= 14'} + /@intlify/message-compiler@9.7.1: + resolution: {integrity: sha512-HfIr2Hn/K7b0Zv4kGqkxAxwtipyxAwhI9a3krN5cuhH/G9gkaik7of1PdzjR3Mix43t2onBiKYQyaU7mo7e0aA==} + engines: {node: '>= 16'} + dependencies: + '@intlify/shared': 9.7.1 + source-map-js: 1.0.2 - /@intlify/shared@9.3.0-beta.24: - resolution: {integrity: sha512-AKxJ8s7eKIQWkNaf4wyyoLRwf4puCuQgjSChlDJm5JBEt6T8HGgnYTJLRXu6LD/JACn3Qwu6hM/XRX1c9yvjmQ==} + /@intlify/shared@9.7.0: + resolution: {integrity: sha512-PUkEuk//YKu4CHS5ah3mNa3XL/+TZj6rAY/6yYN+GCNFd2u+uWUkeuwE4Q6t8dydRWlErOePHHS0KyNoof/oBw==} engines: {node: '>= 16'} dev: true - /@intlify/shared@9.3.0-beta.27: - resolution: {integrity: sha512-hPMsmVCs+ZUVHHU5VORG6LopzXZT7zmyVNqc9OQG80YpA/N4lT/pkJ4B6DTNIsv2C7mwfGM7RdK+0qPki43YgA==} + /@intlify/shared@9.7.1: + resolution: {integrity: sha512-CBKnHzlUYGrk5QII9q4nElAQKO5cX1rRx8VmSWXltyOZjbkGHXYQTHULn6KwRi+CypuBCfmPkyPBHMzosypIeg==} engines: {node: '>= 16'} - dev: true - /@intlify/unplugin-vue-i18n@0.12.3(vue-i18n@9.2.2): - resolution: {integrity: sha512-0riPtSfTM58JmGNMmJho/aHD2z3K24BESYAmkLvKlo61/LbaPvnjYU1DbSbJEm6bSjE2oEjUj+di3QaYxXei/w==} + /@intlify/unplugin-vue-i18n@1.5.0(vue-i18n@9.7.1): + resolution: {integrity: sha512-jW0MCCdwxybxcwjEfCunAcKjVoxyO3i+cnLL6v+MNGRLUHqrpELF6zQAJUhgAK2afhY7mCliy8RxTFWKdXm26w==} engines: {node: '>= 14.16'} peerDependencies: petite-vue-i18n: '*' @@ -1106,10 +1346,10 @@ packages: vue-i18n-bridge: optional: true dependencies: - '@intlify/bundle-utils': 7.1.0(vue-i18n@9.2.2) - '@intlify/shared': 9.3.0-beta.24 + '@intlify/bundle-utils': 7.4.0(vue-i18n@9.7.1) + '@intlify/shared': 9.7.0 '@rollup/pluginutils': 5.0.4 - '@vue/compiler-sfc': 3.3.4 + '@vue/compiler-sfc': 3.3.8 debug: 4.3.4 fast-glob: 3.3.1 js-yaml: 4.1.0 @@ -1118,19 +1358,12 @@ packages: picocolors: 1.0.0 source-map-js: 1.0.2 unplugin: 1.4.0 - vue-i18n: 9.2.2(vue@3.3.8) + vue-i18n: 9.7.1(vue@3.3.10) transitivePeerDependencies: - rollup - supports-color dev: true - /@intlify/vue-devtools@9.2.2: - resolution: {integrity: sha512-+dUyqyCHWHb/UcvY1MlIpO87munedm3Gn6E9WWYdWrMuYLcoIoOEVDWSS8xSwtlPU+kA+MEQTP6Q1iI/ocusJg==} - engines: {node: '>= 14'} - dependencies: - '@intlify/core-base': 9.2.2 - '@intlify/shared': 9.2.2 - /@jridgewell/gen-mapping@0.3.3: resolution: {integrity: sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==} engines: {node: '>=6.0.0'} @@ -1216,25 +1449,26 @@ packages: fastq: 1.15.0 dev: true - /@nolyfill/es-aggregate-error@1.0.21: - resolution: {integrity: sha512-1P+7535ZSQAD/BoSmeu+xv9eOZA5oCQ3e40rO5ZVbFZBafWR+WoZJsoEwlzUDsZz9iFFIKQiMsrSsN4HbUMtTQ==} - engines: {node: '>=12.4.0'} - dependencies: - '@nolyfill/shared': 1.0.21 - dev: true - - /@nolyfill/shared@1.0.21: - resolution: {integrity: sha512-qDc/NoaFU23E0hhiDPeUrvWzTXIPE+RbvRQtRWSeHHNmCIgYI9HS1jKzNYNJxv4jvZ/1VmM3L6rNVxbj+LBMNA==} - dev: true - - /@pengzhanbo/utils@1.0.8: - resolution: {integrity: sha512-WhPE8XrTNQbjpPdWkdIgjVqdQDL+QDkUWoQ9NM+idFNnWKfTV3Nlh5FkD7+ZtzEUg1rY2uK2d5KRmOzaJmPJtA==} + /@pengzhanbo/utils@1.0.9: + resolution: {integrity: sha512-OTILjdqL5fjaROE/7ecYNgbrxvwjho4zoRnulSn05AyE+HrbcC+l9BdgT7WHt3pZvePdKXwNg4g7HnIRwuwgEQ==} dependencies: throttle-debounce: 5.0.0 dev: true - /@polka/url@1.0.0-next.21: - resolution: {integrity: sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==} + /@pkgr/utils@2.4.2: + resolution: {integrity: sha512-POgTXhjrTfbTV63DiFXav4lBHiICLKKwDeaKn9Nphwj7WH6m0hMMCaJkMyRWjgtPFyRKRVoMXXjczsTQRDEhYw==} + engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0} + dependencies: + cross-spawn: 7.0.3 + fast-glob: 3.3.1 + is-glob: 4.0.3 + open: 9.1.0 + picocolors: 1.0.0 + tslib: 2.6.2 + dev: true + + /@polka/url@1.0.0-next.23: + resolution: {integrity: sha512-C16M+IYz0rgRhWZdCmK+h58JMv8vijAA61gmz2rspCSwKwzBebpdcsiUmwrtJRdphuY30i6BSLEOP8ppbNLyLg==} dev: true /@rollup/pluginutils@4.2.1: @@ -1259,6 +1493,102 @@ packages: picomatch: 2.3.1 dev: true + /@rollup/rollup-android-arm-eabi@4.5.2: + resolution: {integrity: sha512-ee7BudTwwrglFYSc3UnqInDDjCLWHKrFmGNi4aK7jlEyg4CyPa1DCMrZfsN1O13YT76UFEqXz2CoN7BCGpUlJw==} + cpu: [arm] + os: [android] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-android-arm64@4.5.2: + resolution: {integrity: sha512-xOuhj9HHtn8128ir8veoQsBbAUBasDbHIBniYTEx02pAmu9EXL+ZjJqngnNEy6ZgZ4h1JwL33GMNu3yJL5Mzow==} + cpu: [arm64] + os: [android] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-darwin-arm64@4.5.2: + resolution: {integrity: sha512-NTGJWoL8bKyqyWFn9/RzSv4hQ4wTbaAv0lHHRwf4OnpiiP4P8W0jiXbm8Nc5BCXKmWAwuvJY82mcIU2TayC20g==} + cpu: [arm64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-darwin-x64@4.5.2: + resolution: {integrity: sha512-hlKqj7bpPvU15sZo4za14u185lpMzdwWLMc9raMqPK4wywt0wR23y1CaVQ4oAFXat3b5/gmRntyfpwWTKl+vvA==} + cpu: [x64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-linux-arm-gnueabihf@4.5.2: + resolution: {integrity: sha512-7ZIZx8c3u+pfI0ohQsft/GywrXez0uR6dUP0JhBuCK3sFO5TfdLn/YApnVkvPxuTv3+YKPIZend9Mt7Cz6sS3Q==} + cpu: [arm] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-linux-arm64-gnu@4.5.2: + resolution: {integrity: sha512-7Pk/5mO11JW/cH+a8lL/i0ZxmRGrbpYqN0VwO2DHhU+SJWWOH2zE1RAcPaj8KqiwC8DCDIJOSxjV9+9lLb6aeA==} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-linux-arm64-musl@4.5.2: + resolution: {integrity: sha512-KrRnuG5phJx756e62wxvWH2e+TK84MP2IVuPwfge+GBvWqIUfVzFRn09TKruuQBXzZp52Vyma7FjMDkwlA9xpg==} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-linux-x64-gnu@4.5.2: + resolution: {integrity: sha512-My+53GasPa2D2tU5dXiyHYwrELAUouSfkNlZ3bUKpI7btaztO5vpALEs3mvFjM7aKTvEbc7GQckuXeXIDKQ0fg==} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-linux-x64-musl@4.5.2: + resolution: {integrity: sha512-/f0Q6Sc+Vw54Ws6N8fxaEe4R7at3b8pFyv+O/F2VaQ4hODUJcRUcCBJh6zuqtgQQt7w845VTkGLFgWZkP3tUoQ==} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-win32-arm64-msvc@4.5.2: + resolution: {integrity: sha512-NCKuuZWLht6zj7s6EIFef4BxCRX1GMr83S2W4HPCA0RnJ4iHE4FS1695q6Ewoa6A9nFjJe1//yUu0kgBU07Edw==} + cpu: [arm64] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-win32-ia32-msvc@4.5.2: + resolution: {integrity: sha512-J5zL3riR4AOyU/J3M/i4k/zZ8eP1yT+nTmAKztCXJtnI36jYH0eepvob22mAQ/kLwfsK2TB6dbyVY1F8c/0H5A==} + cpu: [ia32] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-win32-x64-msvc@4.5.2: + resolution: {integrity: sha512-pL0RXRHuuGLhvs7ayX/SAHph1hrDPXOM5anyYUQXWJEENxw3nfHkzv8FfVlEVcLyKPAEgDRkd6RKZq2SMqS/yg==} + cpu: [x64] + os: [win32] + requiresBuild: true + dev: true + optional: true + /@trysound/sax@0.2.0: resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==} engines: {node: '>=10.13.0'} @@ -1288,7 +1618,7 @@ packages: resolution: {integrity: sha512-sdPRb9K6iL5XZOmBubg8yiFp5yS/JdUDQsq5e6h95km91MCYMuvp7mh1fjPEYUhvHepKpZOjnEaMBR4PxjWDzg==} dependencies: '@types/estree': 1.0.1 - '@types/json-schema': 7.0.12 + '@types/json-schema': 7.0.14 dev: true /@types/estree@1.0.1: @@ -1298,8 +1628,8 @@ packages: /@types/js-cookie@3.0.3: resolution: {integrity: sha512-Xe7IImK09HP1sv2M/aI+48a20VX+TdRJucfq4vfRVy6nWN8PYPOEnlMRSgxJAgYQIXJVL8dZ4/ilAM7dWNaOww==} - /@types/json-schema@7.0.12: - resolution: {integrity: sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==} + /@types/json-schema@7.0.14: + resolution: {integrity: sha512-U3PUjAudAdJBeC2pgN8uTIKgxrb4nlDF3SF0++EldXQvQBGkpFZMSnwQiIoDU77tv45VgNkl/L4ouD+rEomujw==} dev: true /@types/json5@0.0.29: @@ -1310,25 +1640,13 @@ packages: resolution: {integrity: sha512-dHsSjSlU/EWEEbeNADr3FtZZOAXPkFPUO457QCnoNqcZQXNqNEu/svQd0Nritvd3wNff4vvC/f4e6xgX3Llt8A==} dev: false - /@types/lodash-es@4.17.8: - resolution: {integrity: sha512-euY3XQcZmIzSy7YH5+Unb3b2X12Wtk54YWINBvvGQ5SmMvwb11JQskGsfkH/5HXK77Kr8GF0wkVDIxzAisWtog==} - dependencies: - '@types/lodash': 4.14.197 - dev: true - - /@types/lodash-es@4.17.9: - resolution: {integrity: sha512-ZTcmhiI3NNU7dEvWLZJkzG6ao49zOIjEgIE0RgV7wbPxU0f2xT3VSAHw2gmst8swH6V0YkLRGp4qPlX/6I90MQ==} + /@types/lodash-es@4.17.11: + resolution: {integrity: sha512-eCw8FYAWHt2DDl77s+AMLLzPn310LKohruumpucZI4oOFJkIgnlaJcy23OKMJxx4r9PeTF13Gv6w+jqjWQaYUg==} dependencies: '@types/lodash': 4.14.199 - dev: false - - /@types/lodash@4.14.197: - resolution: {integrity: sha512-BMVOiWs0uNxHVlHBgzTIqJYmj+PgCo4euloGF+5m4okL3rEYzM2EEv78mw8zWSMM57dM7kVIgJ2QDvwHSoCI5g==} - dev: true /@types/lodash@4.14.199: resolution: {integrity: sha512-Vrjz5N5Ia4SEzWWgIVwnHNEnb1UE1XMkvY5DGXrAeOGE9imk0hgTHh5GyDjLDJi9OTCn9oo9dXH1uToK1VRfrg==} - dev: false /@types/minimatch@3.0.5: resolution: {integrity: sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==} @@ -1346,8 +1664,8 @@ packages: resolution: {integrity: sha512-bUBrPjEry2QUTsnuEjzjbS7voGWCc30W0qzgMf90GPeDGFRakvrz47ju+oqDAKCXLUCe39u57/ORMl/O/04/9g==} dev: true - /@types/node@20.5.7: - resolution: {integrity: sha512-dP7f3LdZIysZnmvP3ANJYTSwg+wLLl8p7RqniVlV7j+oXSXAbt9h0WIBFmJy5inWZoX9wZN6eXx+YXd9Rh3RBA==} + /@types/node@20.5.9: + resolution: {integrity: sha512-PcGNd//40kHAS3sTlzKB9C9XL4K0sTup8nbG5lC14kzEteTNuAFh9u5nA0o5TWnSG2r/JNPRXFVcHJIIeRlmqQ==} dev: true /@types/normalize-package-data@2.4.1: @@ -1358,20 +1676,20 @@ packages: resolution: {integrity: sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==} dev: true - /@types/semver@7.5.1: - resolution: {integrity: sha512-cJRQXpObxfNKkFAZbJl2yjWtJCqELQIdShsogr1d2MilP8dKD9TE/nEKHkJgUNHdGKCQaf9HbIynuV2csLGVLg==} + /@types/semver@7.5.4: + resolution: {integrity: sha512-MMzuxN3GdFwskAnb6fz0orFvhfqi752yjaXylr0Rp4oDg5H0Zn1IuyRhDVvYOwAXoJirx2xuS16I3WjxnAIHiQ==} dev: true /@types/svgo@2.6.4: resolution: {integrity: sha512-l4cmyPEckf8moNYHdJ+4wkHvFxjyW6ulm9l4YGaOxeyBWPhBOT0gvni1InpFPdzx1dKf/2s62qGITwxNWnPQng==} dependencies: - '@types/node': 20.5.7 + '@types/node': 20.5.9 dev: true - /@types/web-bluetooth@0.0.16: - resolution: {integrity: sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ==} + /@types/web-bluetooth@0.0.20: + resolution: {integrity: sha512-g9gZnnXVq7gM7v3tJCWV/qw7w+KeOlSHAhgF9RytFyifW6AF61hdT2ucrYhPq9hLs5JIryeupHV3qGk95dH9ow==} - /@typescript-eslint/eslint-plugin@5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.48.0)(typescript@5.0.2): + /@typescript-eslint/eslint-plugin@5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.52.0)(typescript@5.2.2): resolution: {integrity: sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -1382,24 +1700,53 @@ packages: typescript: optional: true dependencies: - '@eslint-community/regexpp': 4.8.0 - '@typescript-eslint/parser': 5.62.0(eslint@8.48.0)(typescript@5.0.2) + '@eslint-community/regexpp': 4.10.0 + '@typescript-eslint/parser': 5.62.0(eslint@8.52.0)(typescript@5.2.2) '@typescript-eslint/scope-manager': 5.62.0 - '@typescript-eslint/type-utils': 5.62.0(eslint@8.48.0)(typescript@5.0.2) - '@typescript-eslint/utils': 5.62.0(eslint@8.48.0)(typescript@5.0.2) + '@typescript-eslint/type-utils': 5.62.0(eslint@8.52.0)(typescript@5.2.2) + '@typescript-eslint/utils': 5.62.0(eslint@8.52.0)(typescript@5.2.2) debug: 4.3.4 - eslint: 8.48.0 + eslint: 8.52.0 graphemer: 1.4.0 ignore: 5.2.4 natural-compare-lite: 1.4.0 semver: 7.5.4 - tsutils: 3.21.0(typescript@5.0.2) - typescript: 5.0.2 + tsutils: 3.21.0(typescript@5.2.2) + typescript: 5.2.2 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/parser@5.62.0(eslint@8.48.0)(typescript@5.0.2): + /@typescript-eslint/eslint-plugin@6.5.0(@typescript-eslint/parser@6.5.0)(eslint@8.52.0)(typescript@5.2.2): + resolution: {integrity: sha512-2pktILyjvMaScU6iK3925uvGU87E+N9rh372uGZgiMYwafaw9SXq86U04XPq3UH6tzRvNgBsub6x2DacHc33lw==} + engines: {node: ^16.0.0 || >=18.0.0} + peerDependencies: + '@typescript-eslint/parser': ^6.0.0 || ^6.0.0-alpha + eslint: ^7.0.0 || ^8.0.0 + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + dependencies: + '@eslint-community/regexpp': 4.10.0 + '@typescript-eslint/parser': 6.5.0(eslint@8.52.0)(typescript@5.2.2) + '@typescript-eslint/scope-manager': 6.5.0 + '@typescript-eslint/type-utils': 6.5.0(eslint@8.52.0)(typescript@5.2.2) + '@typescript-eslint/utils': 6.5.0(eslint@8.52.0)(typescript@5.2.2) + '@typescript-eslint/visitor-keys': 6.5.0 + debug: 4.3.4 + eslint: 8.52.0 + graphemer: 1.4.0 + ignore: 5.2.4 + natural-compare: 1.4.0 + semver: 7.5.4 + ts-api-utils: 1.0.3(typescript@5.2.2) + typescript: 5.2.2 + transitivePeerDependencies: + - supports-color + dev: true + + /@typescript-eslint/parser@5.62.0(eslint@8.52.0)(typescript@5.2.2): resolution: {integrity: sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -1411,10 +1758,31 @@ packages: dependencies: '@typescript-eslint/scope-manager': 5.62.0 '@typescript-eslint/types': 5.62.0 - '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.0.2) + '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.2.2) debug: 4.3.4 - eslint: 8.48.0 - typescript: 5.0.2 + eslint: 8.52.0 + typescript: 5.2.2 + transitivePeerDependencies: + - supports-color + dev: true + + /@typescript-eslint/parser@6.5.0(eslint@8.52.0)(typescript@5.2.2): + resolution: {integrity: sha512-LMAVtR5GN8nY0G0BadkG0XIe4AcNMeyEy3DyhKGAh9k4pLSMBO7rF29JvDBpZGCmp5Pgz5RLHP6eCpSYZJQDuQ==} + engines: {node: ^16.0.0 || >=18.0.0} + peerDependencies: + eslint: ^7.0.0 || ^8.0.0 + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + dependencies: + '@typescript-eslint/scope-manager': 6.5.0 + '@typescript-eslint/types': 6.5.0 + '@typescript-eslint/typescript-estree': 6.5.0(typescript@5.2.2) + '@typescript-eslint/visitor-keys': 6.5.0 + debug: 4.3.4 + eslint: 8.52.0 + typescript: 5.2.2 transitivePeerDependencies: - supports-color dev: true @@ -1427,7 +1795,15 @@ packages: '@typescript-eslint/visitor-keys': 5.62.0 dev: true - /@typescript-eslint/type-utils@5.62.0(eslint@8.48.0)(typescript@5.0.2): + /@typescript-eslint/scope-manager@6.5.0: + resolution: {integrity: sha512-A8hZ7OlxURricpycp5kdPTH3XnjG85UpJS6Fn4VzeoH4T388gQJ/PGP4ole5NfKt4WDVhmLaQ/dBLNDC4Xl/Kw==} + engines: {node: ^16.0.0 || >=18.0.0} + dependencies: + '@typescript-eslint/types': 6.5.0 + '@typescript-eslint/visitor-keys': 6.5.0 + dev: true + + /@typescript-eslint/type-utils@5.62.0(eslint@8.52.0)(typescript@5.2.2): resolution: {integrity: sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -1437,12 +1813,32 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.0.2) - '@typescript-eslint/utils': 5.62.0(eslint@8.48.0)(typescript@5.0.2) + '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.2.2) + '@typescript-eslint/utils': 5.62.0(eslint@8.52.0)(typescript@5.2.2) debug: 4.3.4 - eslint: 8.48.0 - tsutils: 3.21.0(typescript@5.0.2) - typescript: 5.0.2 + eslint: 8.52.0 + tsutils: 3.21.0(typescript@5.2.2) + typescript: 5.2.2 + transitivePeerDependencies: + - supports-color + dev: true + + /@typescript-eslint/type-utils@6.5.0(eslint@8.52.0)(typescript@5.2.2): + resolution: {integrity: sha512-f7OcZOkRivtujIBQ4yrJNIuwyCQO1OjocVqntl9dgSIZAdKqicj3xFDqDOzHDlGCZX990LqhLQXWRnQvsapq8A==} + engines: {node: ^16.0.0 || >=18.0.0} + peerDependencies: + eslint: ^7.0.0 || ^8.0.0 + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + dependencies: + '@typescript-eslint/typescript-estree': 6.5.0(typescript@5.2.2) + '@typescript-eslint/utils': 6.5.0(eslint@8.52.0)(typescript@5.2.2) + debug: 4.3.4 + eslint: 8.52.0 + ts-api-utils: 1.0.3(typescript@5.2.2) + typescript: 5.2.2 transitivePeerDependencies: - supports-color dev: true @@ -1452,7 +1848,12 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /@typescript-eslint/typescript-estree@5.62.0(typescript@5.0.2): + /@typescript-eslint/types@6.5.0: + resolution: {integrity: sha512-eqLLOEF5/lU8jW3Bw+8auf4lZSbbljHR2saKnYqON12G/WsJrGeeDHWuQePoEf9ro22+JkbPfWQwKEC5WwLQ3w==} + engines: {node: ^16.0.0 || >=18.0.0} + dev: true + + /@typescript-eslint/typescript-estree@5.62.0(typescript@5.2.2): resolution: {integrity: sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -1467,25 +1868,46 @@ packages: globby: 11.1.0 is-glob: 4.0.3 semver: 7.5.4 - tsutils: 3.21.0(typescript@5.0.2) - typescript: 5.0.2 + tsutils: 3.21.0(typescript@5.2.2) + typescript: 5.2.2 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/utils@5.62.0(eslint@8.48.0)(typescript@5.0.2): + /@typescript-eslint/typescript-estree@6.5.0(typescript@5.2.2): + resolution: {integrity: sha512-q0rGwSe9e5Kk/XzliB9h2LBc9tmXX25G0833r7kffbl5437FPWb2tbpIV9wAATebC/018pGa9fwPDuvGN+LxWQ==} + engines: {node: ^16.0.0 || >=18.0.0} + peerDependencies: + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + dependencies: + '@typescript-eslint/types': 6.5.0 + '@typescript-eslint/visitor-keys': 6.5.0 + debug: 4.3.4 + globby: 11.1.0 + is-glob: 4.0.3 + semver: 7.5.4 + ts-api-utils: 1.0.3(typescript@5.2.2) + typescript: 5.2.2 + transitivePeerDependencies: + - supports-color + dev: true + + /@typescript-eslint/utils@5.62.0(eslint@8.52.0)(typescript@5.2.2): resolution: {integrity: sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@8.48.0) - '@types/json-schema': 7.0.12 - '@types/semver': 7.5.1 + '@eslint-community/eslint-utils': 4.4.0(eslint@8.52.0) + '@types/json-schema': 7.0.14 + '@types/semver': 7.5.4 '@typescript-eslint/scope-manager': 5.62.0 '@typescript-eslint/types': 5.62.0 - '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.0.2) - eslint: 8.48.0 + '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.2.2) + eslint: 8.52.0 eslint-scope: 5.1.1 semver: 7.5.4 transitivePeerDependencies: @@ -1493,6 +1915,25 @@ packages: - typescript dev: true + /@typescript-eslint/utils@6.5.0(eslint@8.52.0)(typescript@5.2.2): + resolution: {integrity: sha512-9nqtjkNykFzeVtt9Pj6lyR9WEdd8npPhhIPM992FWVkZuS6tmxHfGVnlUcjpUP2hv8r4w35nT33mlxd+Be1ACQ==} + engines: {node: ^16.0.0 || >=18.0.0} + peerDependencies: + eslint: ^7.0.0 || ^8.0.0 + dependencies: + '@eslint-community/eslint-utils': 4.4.0(eslint@8.52.0) + '@types/json-schema': 7.0.14 + '@types/semver': 7.5.4 + '@typescript-eslint/scope-manager': 6.5.0 + '@typescript-eslint/types': 6.5.0 + '@typescript-eslint/typescript-estree': 6.5.0(typescript@5.2.2) + eslint: 8.52.0 + semver: 7.5.4 + transitivePeerDependencies: + - supports-color + - typescript + dev: true + /@typescript-eslint/visitor-keys@5.62.0: resolution: {integrity: sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -1501,31 +1942,43 @@ packages: eslint-visitor-keys: 3.4.3 dev: true - /@vitejs/plugin-vue-jsx@3.0.2(vite@4.4.9)(vue@3.3.8): + /@typescript-eslint/visitor-keys@6.5.0: + resolution: {integrity: sha512-yCB/2wkbv3hPsh02ZS8dFQnij9VVQXJMN/gbQsaaY+zxALkZnxa/wagvLEFsAWMPv7d7lxQmNsIzGU1w/T/WyA==} + engines: {node: ^16.0.0 || >=18.0.0} + dependencies: + '@typescript-eslint/types': 6.5.0 + eslint-visitor-keys: 3.4.3 + dev: true + + /@ungap/structured-clone@1.2.0: + resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==} + dev: true + + /@vitejs/plugin-vue-jsx@3.0.2(vite@5.0.4)(vue@3.3.10): resolution: {integrity: sha512-obF26P2Z4Ogy3cPp07B4VaW6rpiu0ue4OT2Y15UxT5BZZ76haUY9guOsZV3uWh/I6xc+VeiW+ZVabRE82FyzWw==} engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: vite: ^4.0.0 vue: ^3.0.0 dependencies: - '@babel/core': 7.22.11 - '@babel/plugin-transform-typescript': 7.22.11(@babel/core@7.22.11) - '@vue/babel-plugin-jsx': 1.1.5(@babel/core@7.22.11) - vite: 4.4.9(@types/node@20.4.7)(sass@1.54.3) - vue: 3.3.8(typescript@5.0.2) + '@babel/core': 7.23.2 + '@babel/plugin-transform-typescript': 7.22.15(@babel/core@7.23.2) + '@vue/babel-plugin-jsx': 1.1.5(@babel/core@7.23.2) + vite: 5.0.4(@types/node@20.4.7)(sass@1.69.5) + vue: 3.3.10(typescript@5.2.2) transitivePeerDependencies: - supports-color dev: true - /@vitejs/plugin-vue@4.3.4(vite@4.4.9)(vue@3.3.8): - resolution: {integrity: sha512-ciXNIHKPriERBisHFBvnTbfKa6r9SAesOYXeGDzgegcvy9Q4xdScSHAmKbNT0M3O0S9LKhIf5/G+UYG4NnnzYw==} + /@vitejs/plugin-vue@4.4.1(vite@5.0.4)(vue@3.3.10): + resolution: {integrity: sha512-HCQG8VDFDM7YDAdcj5QI5DvUi+r6xvo9LgvYdk7LSkUNwdpempdB5horkMSZsbdey9Ywsf5aaU8kEPw9M5kREA==} engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: vite: ^4.0.0 vue: ^3.2.25 dependencies: - vite: 4.4.9(@types/node@20.4.7)(sass@1.54.3) - vue: 3.3.8(typescript@5.0.2) + vite: 5.0.4(@types/node@20.4.7)(sass@1.69.5) + vue: 3.3.10(typescript@5.2.2) dev: true /@volar/language-core@1.10.1: @@ -1553,24 +2006,24 @@ packages: vue-hooks-plus: ^1.5.2 dependencies: local-pkg: 0.4.3 - vue-hooks-plus: 1.8.5(vue@3.3.8) + vue-hooks-plus: 1.8.5(vue@3.3.10) dev: true /@vue/babel-helper-vue-transform-on@1.1.5: resolution: {integrity: sha512-SgUymFpMoAyWeYWLAY+MkCK3QEROsiUnfaw5zxOVD/M64KQs8D/4oK6Q5omVA2hnvEOE0SCkH2TZxs/jnnUj7w==} dev: true - /@vue/babel-plugin-jsx@1.1.5(@babel/core@7.22.11): + /@vue/babel-plugin-jsx@1.1.5(@babel/core@7.23.2): resolution: {integrity: sha512-nKs1/Bg9U1n3qSWnsHhCVQtAzI6aQXqua8j/bZrau8ywT1ilXQbK4FwEJGmU8fV7tcpuFvWmmN7TMmV1OBma1g==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.22.11 - '@babel/helper-module-imports': 7.22.5 - '@babel/plugin-syntax-jsx': 7.22.5(@babel/core@7.22.11) - '@babel/template': 7.22.5 - '@babel/traverse': 7.22.11 - '@babel/types': 7.22.11 + '@babel/core': 7.23.2 + '@babel/helper-module-imports': 7.22.15 + '@babel/plugin-syntax-jsx': 7.22.5(@babel/core@7.23.2) + '@babel/template': 7.22.15 + '@babel/traverse': 7.22.19 + '@babel/types': 7.23.3 '@vue/babel-helper-vue-transform-on': 1.1.5 camelcase: 6.3.0 html-tags: 3.3.1 @@ -1579,14 +2032,13 @@ packages: - supports-color dev: true - /@vue/compiler-core@3.3.4: - resolution: {integrity: sha512-cquyDNvZ6jTbf/+x+AgM2Arrp6G4Dzbb0R64jiG804HRMfRiFXWI6kqUVqZ6ZR0bQhIoQjB4+2bhNtVwndW15g==} + /@vue/compiler-core@3.3.10: + resolution: {integrity: sha512-doe0hODR1+i1menPkRzJ5MNR6G+9uiZHIknK3Zn5OcIztu6GGw7u0XUzf3AgB8h/dfsZC9eouzoLo3c3+N/cVA==} dependencies: - '@babel/parser': 7.22.13 - '@vue/shared': 3.3.4 + '@babel/parser': 7.23.5 + '@vue/shared': 3.3.10 estree-walker: 2.0.2 source-map-js: 1.0.2 - dev: true /@vue/compiler-core@3.3.8: resolution: {integrity: sha512-hN/NNBUECw8SusQvDSqqcVv6gWq8L6iAktUR0UF3vGu2OhzRqcOiAno0FmBJWwxhYEXRlQJT5XnoKsVq1WZx4g==} @@ -1595,35 +2047,35 @@ packages: '@vue/shared': 3.3.8 estree-walker: 2.0.2 source-map-js: 1.0.2 - - /@vue/compiler-dom@3.3.4: - resolution: {integrity: sha512-wyM+OjOVpuUukIq6p5+nwHYtj9cFroz9cwkfmP9O1nzH68BenTTv0u7/ndggT8cIQlnBeOo6sUT/gvHcIkLA5w==} - dependencies: - '@vue/compiler-core': 3.3.4 - '@vue/shared': 3.3.4 dev: true + /@vue/compiler-dom@3.3.10: + resolution: {integrity: sha512-NCrqF5fm10GXZIK0GrEAauBqdy+F2LZRt3yNHzrYjpYBuRssQbuPLtSnSNjyR9luHKkWSH8we5LMB3g+4z2HvA==} + dependencies: + '@vue/compiler-core': 3.3.10 + '@vue/shared': 3.3.10 + /@vue/compiler-dom@3.3.8: resolution: {integrity: sha512-+PPtv+p/nWDd0AvJu3w8HS0RIm/C6VGBIRe24b9hSyNWOAPEUosFZ5diwawwP8ip5sJ8n0Pe87TNNNHnvjs0FQ==} dependencies: '@vue/compiler-core': 3.3.8 '@vue/shared': 3.3.8 - - /@vue/compiler-sfc@3.3.4: - resolution: {integrity: sha512-6y/d8uw+5TkCuzBkgLS0v3lSM3hJDntFEiUORM11pQ/hKvkhSKZrXW6i69UyXlJQisJxuUEJKAWEqWbWsLeNKQ==} - dependencies: - '@babel/parser': 7.22.13 - '@vue/compiler-core': 3.3.4 - '@vue/compiler-dom': 3.3.4 - '@vue/compiler-ssr': 3.3.4 - '@vue/reactivity-transform': 3.3.4 - '@vue/shared': 3.3.4 - estree-walker: 2.0.2 - magic-string: 0.30.3 - postcss: 8.4.29 - source-map-js: 1.0.2 dev: true + /@vue/compiler-sfc@3.3.10: + resolution: {integrity: sha512-xpcTe7Rw7QefOTRFFTlcfzozccvjM40dT45JtrE3onGm/jBLZ0JhpKu3jkV7rbDFLeeagR/5RlJ2Y9SvyS0lAg==} + dependencies: + '@babel/parser': 7.23.5 + '@vue/compiler-core': 3.3.10 + '@vue/compiler-dom': 3.3.10 + '@vue/compiler-ssr': 3.3.10 + '@vue/reactivity-transform': 3.3.10 + '@vue/shared': 3.3.10 + estree-walker: 2.0.2 + magic-string: 0.30.5 + postcss: 8.4.32 + source-map-js: 1.0.2 + /@vue/compiler-sfc@3.3.8: resolution: {integrity: sha512-WMzbUrlTjfYF8joyT84HfwwXo+8WPALuPxhy+BZ6R4Aafls+jDBnSz8PDz60uFhuqFbl3HxRfxvDzrUf3THwpA==} dependencies: @@ -1637,39 +2089,39 @@ packages: magic-string: 0.30.5 postcss: 8.4.31 source-map-js: 1.0.2 - - /@vue/compiler-ssr@3.3.4: - resolution: {integrity: sha512-m0v6oKpup2nMSehwA6Uuu+j+wEwcy7QmwMkVNVfrV9P2qE5KshC6RwOCq8fjGS/Eak/uNb8AaWekfiXxbBB6gQ==} - dependencies: - '@vue/compiler-dom': 3.3.4 - '@vue/shared': 3.3.4 dev: true + /@vue/compiler-ssr@3.3.10: + resolution: {integrity: sha512-12iM4jA4GEbskwXMmPcskK5wImc2ohKm408+o9iox3tfN9qua8xL0THIZtoe9OJHnXP4eOWZpgCAAThEveNlqQ==} + dependencies: + '@vue/compiler-dom': 3.3.10 + '@vue/shared': 3.3.10 + /@vue/compiler-ssr@3.3.8: resolution: {integrity: sha512-hXCqQL/15kMVDBuoBYpUnSYT8doDNwsjvm3jTefnXr+ytn294ySnT8NlsFHmTgKNjwpuFy7XVV8yTeLtNl/P6w==} dependencies: '@vue/compiler-dom': 3.3.8 '@vue/shared': 3.3.8 - - /@vue/devtools-api@6.5.0: - resolution: {integrity: sha512-o9KfBeaBmCKl10usN4crU53fYtC1r7jJwdGKjPT24t348rHxgfpZ0xL3Xm/gLUYnc0oTp8LAmrxOeLyu6tbk2Q==} + dev: true /@vue/devtools-api@6.5.1: resolution: {integrity: sha512-+KpckaAQyfbvshdDW5xQylLni1asvNSGme1JFs8I1+/H5pHEhqUKMEQD/qn3Nx5+/nycBq11qAEi8lk+LXI2dA==} - /@vue/eslint-config-prettier@7.1.0(eslint@8.48.0)(prettier@2.8.8): - resolution: {integrity: sha512-Pv/lVr0bAzSIHLd9iz0KnvAr4GKyCEl+h52bc4e5yWuDVtLgFwycF7nrbWTAQAS+FU6q1geVd07lc6EWfJiWKQ==} + /@vue/eslint-config-prettier@8.0.0(eslint@8.52.0)(prettier@3.0.3): + resolution: {integrity: sha512-55dPqtC4PM/yBjhAr+yEw6+7KzzdkBuLmnhBrDfp4I48+wy+Giqqj9yUr5T2uD/BkBROjjmqnLZmXRdOx/VtQg==} peerDependencies: - eslint: '>= 7.28.0' - prettier: '>= 2.0.0' + eslint: '>= 8.0.0' + prettier: '>= 3.0.0' dependencies: - eslint: 8.48.0 - eslint-config-prettier: 8.10.0(eslint@8.48.0) - eslint-plugin-prettier: 4.2.1(eslint-config-prettier@8.10.0)(eslint@8.48.0)(prettier@2.8.8) - prettier: 2.8.8 + eslint: 8.52.0 + eslint-config-prettier: 8.10.0(eslint@8.52.0) + eslint-plugin-prettier: 5.0.1(eslint-config-prettier@8.10.0)(eslint@8.52.0)(prettier@3.0.3) + prettier: 3.0.3 + transitivePeerDependencies: + - '@types/eslint' dev: true - /@vue/eslint-config-typescript@11.0.3(eslint-plugin-vue@9.17.0)(eslint@8.48.0)(typescript@5.0.2): + /@vue/eslint-config-typescript@11.0.3(eslint-plugin-vue@9.18.1)(eslint@8.52.0)(typescript@5.2.2): resolution: {integrity: sha512-dkt6W0PX6H/4Xuxg/BlFj5xHvksjpSlVjtkQCpaYJBIEuKj2hOVU7r+TIe+ysCwRYFz/lGqvklntRkCAibsbPw==} engines: {node: ^14.17.0 || >=16.0.0} peerDependencies: @@ -1680,17 +2132,17 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/eslint-plugin': 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.48.0)(typescript@5.0.2) - '@typescript-eslint/parser': 5.62.0(eslint@8.48.0)(typescript@5.0.2) - eslint: 8.48.0 - eslint-plugin-vue: 9.17.0(eslint@8.48.0) - typescript: 5.0.2 - vue-eslint-parser: 9.3.1(eslint@8.48.0) + '@typescript-eslint/eslint-plugin': 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.52.0)(typescript@5.2.2) + '@typescript-eslint/parser': 5.62.0(eslint@8.52.0)(typescript@5.2.2) + eslint: 8.52.0 + eslint-plugin-vue: 9.18.1(eslint@8.52.0) + typescript: 5.2.2 + vue-eslint-parser: 9.3.1(eslint@8.52.0) transitivePeerDependencies: - supports-color dev: true - /@vue/language-core@1.8.8(typescript@5.0.2): + /@vue/language-core@1.8.8(typescript@5.2.2): resolution: {integrity: sha512-i4KMTuPazf48yMdYoebTkgSOJdFraE4pQf0B+FTOFkbB+6hAfjrSou/UmYWRsWyZV6r4Rc6DDZdI39CJwL0rWw==} peerDependencies: typescript: '*' @@ -1705,19 +2157,18 @@ packages: '@vue/shared': 3.3.8 minimatch: 9.0.3 muggle-string: 0.3.1 - typescript: 5.0.2 + typescript: 5.2.2 vue-template-compiler: 2.7.14 dev: true - /@vue/reactivity-transform@3.3.4: - resolution: {integrity: sha512-MXgwjako4nu5WFLAjpBnCj/ieqcjE2aJBINUNQzkZQfzIZA4xn+0fV1tIYBJvvva3N3OvKGofRLvQIwEQPpaXw==} + /@vue/reactivity-transform@3.3.10: + resolution: {integrity: sha512-0xBdk+CKHWT+Gev8oZ63Tc0qFfj935YZx+UAynlutnrDZ4diFCVFMWixn65HzjE3S1iJppWOo6Tt1OzASH7VEg==} dependencies: - '@babel/parser': 7.22.13 - '@vue/compiler-core': 3.3.4 - '@vue/shared': 3.3.4 + '@babel/parser': 7.23.5 + '@vue/compiler-core': 3.3.10 + '@vue/shared': 3.3.10 estree-walker: 2.0.2 - magic-string: 0.30.3 - dev: true + magic-string: 0.30.5 /@vue/reactivity-transform@3.3.8: resolution: {integrity: sha512-49CvBzmZNtcHua0XJ7GdGifM8GOXoUMOX4dD40Y5DxI3R8OUhMlvf2nvgUAcPxaXiV5MQQ1Nwy09ADpnLQUqRw==} @@ -1727,74 +2178,81 @@ packages: '@vue/shared': 3.3.8 estree-walker: 2.0.2 magic-string: 0.30.5 + dev: true + + /@vue/reactivity@3.3.10: + resolution: {integrity: sha512-H5Z7rOY/JLO+e5a6/FEXaQ1TMuOvY4LDVgT+/+HKubEAgs9qeeZ+NhADSeEtrNQeiKLDuzeKc8v0CUFpB6Pqgw==} + dependencies: + '@vue/shared': 3.3.10 /@vue/reactivity@3.3.8: resolution: {integrity: sha512-ctLWitmFBu6mtddPyOKpHg8+5ahouoTCRtmAHZAXmolDtuZXfjL2T3OJ6DL6ezBPQB1SmMnpzjiWjCiMYmpIuw==} dependencies: '@vue/shared': 3.3.8 + dev: true - /@vue/runtime-core@3.3.8: - resolution: {integrity: sha512-qurzOlb6q26KWQ/8IShHkMDOuJkQnQcTIp1sdP4I9MbCf9FJeGVRXJFr2mF+6bXh/3Zjr9TDgURXrsCr9bfjUw==} + /@vue/runtime-core@3.3.10: + resolution: {integrity: sha512-DZ0v31oTN4YHX9JEU5VW1LoIVgFovWgIVb30bWn9DG9a7oA415idcwsRNNajqTx8HQJyOaWfRKoyuP2P2TYIag==} dependencies: - '@vue/reactivity': 3.3.8 - '@vue/shared': 3.3.8 + '@vue/reactivity': 3.3.10 + '@vue/shared': 3.3.10 - /@vue/runtime-dom@3.3.8: - resolution: {integrity: sha512-Noy5yM5UIf9UeFoowBVgghyGGPIDPy1Qlqt0yVsUdAVbqI8eeMSsTqBtauaEoT2UFXUk5S64aWVNJN4MJ2vRdA==} + /@vue/runtime-dom@3.3.10: + resolution: {integrity: sha512-c/jKb3ny05KJcYk0j1m7Wbhrxq7mZYr06GhKykDMNRRR9S+/dGT8KpHuNQjv3/8U4JshfkAk6TpecPD3B21Ijw==} dependencies: - '@vue/runtime-core': 3.3.8 - '@vue/shared': 3.3.8 + '@vue/runtime-core': 3.3.10 + '@vue/shared': 3.3.10 csstype: 3.1.2 - /@vue/server-renderer@3.3.8(vue@3.3.8): - resolution: {integrity: sha512-zVCUw7RFskvPuNlPn/8xISbrf0zTWsTSdYTsUTN1ERGGZGVnRxM2QZ3x1OR32+vwkkCm0IW6HmJ49IsPm7ilLg==} + /@vue/server-renderer@3.3.10(vue@3.3.10): + resolution: {integrity: sha512-0i6ww3sBV3SKlF3YTjSVqKQ74xialMbjVYGy7cOTi7Imd8ediE7t72SK3qnvhrTAhOvlQhq6Bk6nFPdXxe0sAg==} peerDependencies: - vue: 3.3.8 + vue: 3.3.10 dependencies: - '@vue/compiler-ssr': 3.3.8 - '@vue/shared': 3.3.8 - vue: 3.3.8(typescript@5.0.2) + '@vue/compiler-ssr': 3.3.10 + '@vue/shared': 3.3.10 + vue: 3.3.10(typescript@5.2.2) - /@vue/shared@3.3.4: - resolution: {integrity: sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ==} - dev: true + /@vue/shared@3.3.10: + resolution: {integrity: sha512-2y3Y2J1a3RhFa0WisHvACJR2ncvWiVHcP8t0Inxo+NKz+8RKO4ZV8eZgCxRgQoA6ITfV12L4E6POOL9HOU5nqw==} /@vue/shared@3.3.8: resolution: {integrity: sha512-8PGwybFwM4x8pcfgqEQFy70NaQxASvOC5DJwLQfpArw1UDfUXrJkdxD3BhVTMS+0Lef/TU7YO0Jvr0jJY8T+mw==} + dev: true - /@vue/typescript@1.8.8(typescript@5.0.2): + /@vue/typescript@1.8.8(typescript@5.2.2): resolution: {integrity: sha512-jUnmMB6egu5wl342eaUH236v8tdcEPXXkPgj+eI/F6JwW/lb+yAU6U07ZbQ3MVabZRlupIlPESB7ajgAGixhow==} dependencies: '@volar/typescript': 1.10.1 - '@vue/language-core': 1.8.8(typescript@5.0.2) + '@vue/language-core': 1.8.8(typescript@5.2.2) transitivePeerDependencies: - typescript dev: true - /@vueuse/core@9.13.0(vue@3.3.8): - resolution: {integrity: sha512-pujnclbeHWxxPRqXWmdkKV5OX4Wk4YeK7wusHqRwU0Q7EFusHoqNA/aPhB6KCh9hEqJkLAJo7bb0Lh9b+OIVzw==} + /@vueuse/core@10.6.1(vue@3.3.10): + resolution: {integrity: sha512-Pc26IJbqgC9VG1u6VY/xrXXfxD33hnvxBnKrLlA2LJlyHII+BSrRoTPJgGYq7qZOu61itITFUnm6QbacwZ4H8Q==} dependencies: - '@types/web-bluetooth': 0.0.16 - '@vueuse/metadata': 9.13.0 - '@vueuse/shared': 9.13.0(vue@3.3.8) - vue-demi: 0.14.5(vue@3.3.8) + '@types/web-bluetooth': 0.0.20 + '@vueuse/metadata': 10.6.1 + '@vueuse/shared': 10.6.1(vue@3.3.10) + vue-demi: 0.14.6(vue@3.3.10) transitivePeerDependencies: - '@vue/composition-api' - vue - /@vueuse/metadata@9.13.0: - resolution: {integrity: sha512-gdU7TKNAUVlXXLbaF+ZCfte8BjRJQWPCa2J55+7/h+yDtzw3vOoGQDRXzI6pyKyo6bXFT5/QoPE4hAknExjRLQ==} + /@vueuse/metadata@10.6.1: + resolution: {integrity: sha512-qhdwPI65Bgcj23e5lpGfQsxcy0bMjCAsUGoXkJ7DsoeDUdasbZ2DBa4dinFCOER3lF4gwUv+UD2AlA11zdzMFw==} - /@vueuse/shared@9.13.0(vue@3.3.8): - resolution: {integrity: sha512-UrnhU+Cnufu4S6JLCPZnkWh0WwZGUp72ktOF2DFptMlOs3TOdVv8xJN53zhHGARmVOsz5KqOls09+J1NR6sBKw==} + /@vueuse/shared@10.6.1(vue@3.3.10): + resolution: {integrity: sha512-TECVDTIedFlL0NUfHWncf3zF9Gc4VfdxfQc8JFwoVZQmxpONhLxFrlm0eHQeidHj4rdTPL3KXJa0TZCk1wnc5Q==} dependencies: - vue-demi: 0.14.5(vue@3.3.8) + vue-demi: 0.14.6(vue@3.3.10) transitivePeerDependencies: - '@vue/composition-api' - vue - /@xn-sakina/rml-darwin-arm64@1.0.0: - resolution: {integrity: sha512-h5uRBrpjeurdl1GgSwrmgvTzy0kwWfwNueFp8ZH1wRsd49uGufWjs5HChyJroU8agxY3bebKbmBf9e/zVQZIcg==} + /@xn-sakina/rml-darwin-arm64@2.1.1: + resolution: {integrity: sha512-Ljog63oD8+riz/3zLN0pAgvJSaFTpJY4KxrH+TJnfEbUoRb7ZhmGEpYGl5imi43/9yNkGyAoF41ysIHxg0yEAw==} engines: {node: '>=14'} cpu: [arm64] os: [darwin] @@ -1802,8 +2260,8 @@ packages: dev: true optional: true - /@xn-sakina/rml-darwin-x64@1.0.0: - resolution: {integrity: sha512-TpjqplOMaCJDT0Cvey5RxYSw/t8lEUdCrMm8JENGLhTrDNcRtmYyfuBHWXUQpHFwkNyEUlOUsxugdbBRew/PiQ==} + /@xn-sakina/rml-darwin-x64@2.1.1: + resolution: {integrity: sha512-uLeZKZFiygZntppOjbfGzU3YsFmx4joW/6UlKfCKwelrTrtKa3bYMz55NuFc2RW7IuuNrGEILwz+ZPUdfv3ykA==} engines: {node: '>=14'} cpu: [x64] os: [darwin] @@ -1811,8 +2269,8 @@ packages: dev: true optional: true - /@xn-sakina/rml-linux-arm-gnueabihf@1.0.0: - resolution: {integrity: sha512-m3yMuaKt5+mo/lVKhgUM4Uel5cfz6EJoleaooJqHBYQzxlFcj42YOb6hcJEmLizVPiAmU7uwdqO/2uERwwssAw==} + /@xn-sakina/rml-linux-arm-gnueabihf@2.1.1: + resolution: {integrity: sha512-Ou/h5ma/jsbgcWS//BdRh4bb/5RFRjebc1Yrlm6iyqSRNJqnY58hEl8pc9feOSkrjorvc8aAe5CWZPf7sZrzrA==} engines: {node: '>=14'} cpu: [arm] os: [linux] @@ -1820,8 +2278,8 @@ packages: dev: true optional: true - /@xn-sakina/rml-linux-arm64-gnu@1.0.0: - resolution: {integrity: sha512-qyQG1GiPCU5HPLjIpL0D82GLIf73tDcpv3WUtK9EDrIV66ElcBKM94tWcO7Vy4FuPX2u/RMAexYzzGwQDon1OQ==} + /@xn-sakina/rml-linux-arm64-gnu@2.1.1: + resolution: {integrity: sha512-hmNtRDxxNc9LVEr/tlzgHOG2wKM0w1rPdIu2zvIVpVi8JUFcenEcHGLrezFlQg8NK/BMQiAmMmMpxhB9Mr4wpA==} engines: {node: '>=14'} cpu: [arm64] os: [linux] @@ -1829,8 +2287,8 @@ packages: dev: true optional: true - /@xn-sakina/rml-linux-arm64-musl@1.0.0: - resolution: {integrity: sha512-BlBkkwlOi4q5iZaHipY0Qm1NTEZyKWr5pFN8F6A6wRh36WlC+CqCI8YBu+gTqe8fCQCrPuUY8JQsMyfbjriDgw==} + /@xn-sakina/rml-linux-arm64-musl@2.1.1: + resolution: {integrity: sha512-sYY5m7fK1VhLodt4IDB+XSTmvu2g0D5VbT30RpBhXlL3CI37fgLyNvO+NSn9J6b4xrGqzdkIv677JfkhM9hHGw==} engines: {node: '>=14'} cpu: [arm64] os: [linux] @@ -1838,8 +2296,8 @@ packages: dev: true optional: true - /@xn-sakina/rml-linux-x64-gnu@1.0.0: - resolution: {integrity: sha512-QVEekUY487ZZ1GrSZGvFR3jB7yz5qRHtfkgFNEAp16OfLcFMrUCqZ9wnA9d+u9ZcgbfV1f5JFYL1HsXMIhftDw==} + /@xn-sakina/rml-linux-x64-gnu@2.1.1: + resolution: {integrity: sha512-n9Q6DOUgc6U05YqgnwKmpMdrKk3K4JtUpB6Wee3kyxrQr1FKT6E5FXqzzO2q62AxXqWsc1WVNE6IWldURUI2Bg==} engines: {node: '>=14'} cpu: [x64] os: [linux] @@ -1847,8 +2305,8 @@ packages: dev: true optional: true - /@xn-sakina/rml-linux-x64-musl@1.0.0: - resolution: {integrity: sha512-KsgTUcPIxgowNzLQ5lKMO7T/Zzu6O3FerHBjgM5kO32avrqx0sa0Bz7IaNidh5PqPtdGg1tSekF/gQRXMBkRQQ==} + /@xn-sakina/rml-linux-x64-musl@2.1.1: + resolution: {integrity: sha512-4qq3jw6jqrL0L1A3Q1zIIl1392uamXycb6gws+RsWnNnaogVHa/QD47w9xTsVRVYqEfsroV+84OOvNSpaoBrQQ==} engines: {node: '>=14'} cpu: [x64] os: [linux] @@ -1856,8 +2314,12 @@ packages: dev: true optional: true - /@xn-sakina/rml-win32-arm64-msvc@1.0.0: - resolution: {integrity: sha512-+6iFbbTAA0hziCxM0xRf2Fwt63W1RuQpJxkLms3Hjxt1OLA9ENOBkXAyUtYGo0tKfgGVteEe2fb3mESNGU5y3g==} + /@xn-sakina/rml-wasm@2.1.1: + resolution: {integrity: sha512-m2jV3ZOOD2iAcQao9y2BssS9vLBrx4Rh6a2SkEHyP17KytVYecHo+ewmgp7FQcn3YXvmtK1tun4zRyW146n/Bw==} + dev: true + + /@xn-sakina/rml-win32-arm64-msvc@2.1.1: + resolution: {integrity: sha512-QnsttcVOMvetJ0xZOsUSZ38hpAbydDGl4MwY4yGvKK0/6XbirKEq/bn3Zl9ABLX3elLaE/pghGSlxB9fsk70Qw==} engines: {node: '>=14'} cpu: [arm64] os: [win32] @@ -1865,8 +2327,8 @@ packages: dev: true optional: true - /@xn-sakina/rml-win32-x64-msvc@1.0.0: - resolution: {integrity: sha512-eoTtJn1Nm4xxLmCV7//ioDaICAuteZ0097ed26qiSaO7OTaDVqCPBlxZokkBG6nwF935s/gXo1KzSPKoIL7idQ==} + /@xn-sakina/rml-win32-x64-msvc@2.1.1: + resolution: {integrity: sha512-AnNynVvyfp3mBUA0fQFqBth13pFcRjOhCDieF73UYYH3xDc/mowtjDO+kUWW9EtZH94CPDkT1Ei9WWESruOg6w==} engines: {node: '>=14'} cpu: [x64] os: [win32] @@ -1886,12 +2348,12 @@ packages: resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==} dev: false - /acorn-jsx@5.3.2(acorn@8.10.0): + /acorn-jsx@5.3.2(acorn@8.11.2): resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==} peerDependencies: acorn: ^6.0.0 || ^7.0.0 || ^8.0.0 dependencies: - acorn: 8.10.0 + acorn: 8.11.2 dev: true /acorn-walk@8.2.0: @@ -1899,8 +2361,8 @@ packages: engines: {node: '>=0.4.0'} dev: true - /acorn@8.10.0: - resolution: {integrity: sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==} + /acorn@8.11.2: + resolution: {integrity: sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==} engines: {node: '>=0.4.0'} hasBin: true dev: true @@ -2047,8 +2509,8 @@ packages: resolution: {integrity: sha512-c5AMf34bKdvPhQ7tBGhqkgKNUzMr4WUs+WDtC2ZUGOUncbxKMTvqxYctiseW3+L4bA8ec+GcZ6/A/FW4m8ukng==} dev: true - /array-includes@3.1.6: - resolution: {integrity: sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==} + /array-includes@3.1.7: + resolution: {integrity: sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==} engines: {node: '>= 0.4'} dependencies: call-bind: 1.0.2 @@ -2079,8 +2541,8 @@ packages: get-intrinsic: 1.2.1 dev: true - /array.prototype.flat@1.3.1: - resolution: {integrity: sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==} + /array.prototype.flat@1.3.2: + resolution: {integrity: sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==} engines: {node: '>= 0.4'} dependencies: call-bind: 1.0.2 @@ -2089,8 +2551,8 @@ packages: es-shim-unscopables: 1.0.0 dev: true - /array.prototype.flatmap@1.3.1: - resolution: {integrity: sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==} + /array.prototype.flatmap@1.3.2: + resolution: {integrity: sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==} engines: {node: '>= 0.4'} dependencies: call-bind: 1.0.2 @@ -2148,7 +2610,7 @@ packages: hasBin: true dev: true - /autoprefixer@10.4.15(postcss@8.4.29): + /autoprefixer@10.4.15(postcss@8.4.31): resolution: {integrity: sha512-KCuPB8ZCIqFdA4HwKXsvz7j6gvSDNhDP7WnUjBleRkKjPdvCmHFuQ77ocavI8FT6NdvlBnE2UFr2H4Mycn8Vew==} engines: {node: ^10 || ^12 || >=14} hasBin: true @@ -2156,11 +2618,11 @@ packages: postcss: ^8.1.0 dependencies: browserslist: 4.21.10 - caniuse-lite: 1.0.30001524 - fraction.js: 4.3.1 + caniuse-lite: 1.0.30001534 + fraction.js: 4.3.4 normalize-range: 0.1.2 picocolors: 1.0.0 - postcss: 8.4.29 + postcss: 8.4.31 postcss-value-parser: 4.2.0 dev: true @@ -2281,8 +2743,8 @@ packages: engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true dependencies: - caniuse-lite: 1.0.30001524 - electron-to-chromium: 1.4.505 + caniuse-lite: 1.0.30001534 + electron-to-chromium: 1.4.522 node-releases: 2.0.13 update-browserslist-db: 1.0.11(browserslist@4.21.10) dev: true @@ -2361,8 +2823,8 @@ packages: engines: {node: '>=10'} dev: true - /caniuse-lite@1.0.30001524: - resolution: {integrity: sha512-Jj917pJtYg9HSJBF95HVX3Cdr89JUyLT4IZ8SvM5aDRni95swKgYi3TgYLH5hnGfPE/U1dg6IfZ50UsIlLkwSA==} + /caniuse-lite@1.0.30001534: + resolution: {integrity: sha512-vlPVrhsCS7XaSh2VvWluIQEzVhefrUQcEsQWSS5A5V+dM07uv1qHeQzAOTGIMy9i3e9bH15+muvI/UHojVgS/Q==} dev: true /canvas@2.11.2: @@ -2553,8 +3015,8 @@ packages: delayed-stream: 1.0.0 dev: false - /commander@11.0.0: - resolution: {integrity: sha512-9HMlXtt/BNoYr8ooyjjNRdIilOTkVJXB+GhxMTtOKwk0R4j4lS4NpjuqmRxroBfnfTSHQIHQB7wryHhXarNjmQ==} + /commander@11.1.0: + resolution: {integrity: sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==} engines: {node: '>=16'} /commander@7.2.0: @@ -2605,8 +3067,8 @@ packages: split2: 3.2.2 dev: true - /convert-source-map@1.9.0: - resolution: {integrity: sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==} + /convert-source-map@2.0.0: + resolution: {integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==} dev: true /cookies@0.8.0: @@ -2630,7 +3092,7 @@ packages: vary: 1.1.2 dev: true - /cosmiconfig-typescript-loader@4.4.0(@types/node@20.4.7)(cosmiconfig@8.2.0)(ts-node@10.9.1)(typescript@5.0.2): + /cosmiconfig-typescript-loader@4.4.0(@types/node@20.4.7)(cosmiconfig@8.2.0)(ts-node@10.9.1)(typescript@5.2.2): resolution: {integrity: sha512-BabizFdC3wBHhbI4kJh0VkQP9GkBfoHPydD0COMce1nJ1kJAB3F2TmJ/I7diULBKtmEWSwEbuN/KDtgnmUUVmw==} engines: {node: '>=v14.21.3'} peerDependencies: @@ -2641,8 +3103,8 @@ packages: dependencies: '@types/node': 20.4.7 cosmiconfig: 8.2.0 - ts-node: 10.9.1(@types/node@20.4.7)(typescript@5.0.2) - typescript: 5.0.2 + ts-node: 10.9.1(@types/node@20.4.7)(typescript@5.2.2) + typescript: 5.2.2 dev: true /cosmiconfig@7.1.0: @@ -2794,11 +3256,11 @@ packages: resolution: {integrity: sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==} engines: {node: '>=0.11'} dependencies: - '@babel/runtime': 7.22.15 + '@babel/runtime': 7.23.2 dev: false - /dayjs@1.11.9: - resolution: {integrity: sha512-QvzAURSbQ0pKdIye2txOzNaHmxtUBXerpY0FJsFXUMKbIZeFm5ht1LS/jFsrncjnmtv8HsG0W2g6c0zUjZWmpA==} + /dayjs@1.11.10: + resolution: {integrity: sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==} dev: false /de-indent@1.0.2: @@ -2949,7 +3411,7 @@ packages: dependencies: '@babel/parser': 7.22.5 '@babel/traverse': 7.22.5 - '@vue/compiler-sfc': 3.3.4 + '@vue/compiler-sfc': 3.3.8 callsite: 1.0.0 camelcase: 6.3.0 cosmiconfig: 7.1.0 @@ -2966,9 +3428,9 @@ packages: please-upgrade-node: 3.2.0 readdirp: 3.6.0 require-package-name: 2.0.1 - resolve: 1.22.4 + resolve: 1.22.5 resolve-from: 5.0.0 - sass: 1.54.3 + sass: 1.69.5 semver: 7.5.4 yargs: 16.2.0 transitivePeerDependencies: @@ -3138,8 +3600,8 @@ packages: jake: 10.8.7 dev: true - /electron-to-chromium@1.4.505: - resolution: {integrity: sha512-0A50eL5BCCKdxig2SsCXhpuztnB9PfUgRMojj5tMvt8O54lbwz3t6wNgnpiTRosw5QjlJB7ixhVyeg8daLQwSQ==} + /electron-to-chromium@1.4.522: + resolution: {integrity: sha512-KGKjcafTpOxda0kqwQ72M0tDmX6RsGhUJTy0Hr7slt0+CgHh9Oex8JdjY9Og68dUkTLUlBOJC0A5W5Mw3QSGCg==} dev: true /emoji-regex@8.0.0: @@ -3246,34 +3708,64 @@ packages: is-symbol: 1.0.4 dev: true - /esbuild@0.18.20: - resolution: {integrity: sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==} + /esbuild@0.19.5: + resolution: {integrity: sha512-bUxalY7b1g8vNhQKdB24QDmHeY4V4tw/s6Ak5z+jJX9laP5MoQseTOMemAr0gxssjNcH0MCViG8ONI2kksvfFQ==} engines: {node: '>=12'} hasBin: true requiresBuild: true optionalDependencies: - '@esbuild/android-arm': 0.18.20 - '@esbuild/android-arm64': 0.18.20 - '@esbuild/android-x64': 0.18.20 - '@esbuild/darwin-arm64': 0.18.20 - '@esbuild/darwin-x64': 0.18.20 - '@esbuild/freebsd-arm64': 0.18.20 - '@esbuild/freebsd-x64': 0.18.20 - '@esbuild/linux-arm': 0.18.20 - '@esbuild/linux-arm64': 0.18.20 - '@esbuild/linux-ia32': 0.18.20 - '@esbuild/linux-loong64': 0.18.20 - '@esbuild/linux-mips64el': 0.18.20 - '@esbuild/linux-ppc64': 0.18.20 - '@esbuild/linux-riscv64': 0.18.20 - '@esbuild/linux-s390x': 0.18.20 - '@esbuild/linux-x64': 0.18.20 - '@esbuild/netbsd-x64': 0.18.20 - '@esbuild/openbsd-x64': 0.18.20 - '@esbuild/sunos-x64': 0.18.20 - '@esbuild/win32-arm64': 0.18.20 - '@esbuild/win32-ia32': 0.18.20 - '@esbuild/win32-x64': 0.18.20 + '@esbuild/android-arm': 0.19.5 + '@esbuild/android-arm64': 0.19.5 + '@esbuild/android-x64': 0.19.5 + '@esbuild/darwin-arm64': 0.19.5 + '@esbuild/darwin-x64': 0.19.5 + '@esbuild/freebsd-arm64': 0.19.5 + '@esbuild/freebsd-x64': 0.19.5 + '@esbuild/linux-arm': 0.19.5 + '@esbuild/linux-arm64': 0.19.5 + '@esbuild/linux-ia32': 0.19.5 + '@esbuild/linux-loong64': 0.19.5 + '@esbuild/linux-mips64el': 0.19.5 + '@esbuild/linux-ppc64': 0.19.5 + '@esbuild/linux-riscv64': 0.19.5 + '@esbuild/linux-s390x': 0.19.5 + '@esbuild/linux-x64': 0.19.5 + '@esbuild/netbsd-x64': 0.19.5 + '@esbuild/openbsd-x64': 0.19.5 + '@esbuild/sunos-x64': 0.19.5 + '@esbuild/win32-arm64': 0.19.5 + '@esbuild/win32-ia32': 0.19.5 + '@esbuild/win32-x64': 0.19.5 + dev: true + + /esbuild@0.19.7: + resolution: {integrity: sha512-6brbTZVqxhqgbpqBR5MzErImcpA0SQdoKOkcWK/U30HtQxnokIpG3TX2r0IJqbFUzqLjhU/zC1S5ndgakObVCQ==} + engines: {node: '>=12'} + hasBin: true + requiresBuild: true + optionalDependencies: + '@esbuild/android-arm': 0.19.7 + '@esbuild/android-arm64': 0.19.7 + '@esbuild/android-x64': 0.19.7 + '@esbuild/darwin-arm64': 0.19.7 + '@esbuild/darwin-x64': 0.19.7 + '@esbuild/freebsd-arm64': 0.19.7 + '@esbuild/freebsd-x64': 0.19.7 + '@esbuild/linux-arm': 0.19.7 + '@esbuild/linux-arm64': 0.19.7 + '@esbuild/linux-ia32': 0.19.7 + '@esbuild/linux-loong64': 0.19.7 + '@esbuild/linux-mips64el': 0.19.7 + '@esbuild/linux-ppc64': 0.19.7 + '@esbuild/linux-riscv64': 0.19.7 + '@esbuild/linux-s390x': 0.19.7 + '@esbuild/linux-x64': 0.19.7 + '@esbuild/netbsd-x64': 0.19.7 + '@esbuild/openbsd-x64': 0.19.7 + '@esbuild/sunos-x64': 0.19.7 + '@esbuild/win32-arm64': 0.19.7 + '@esbuild/win32-ia32': 0.19.7 + '@esbuild/win32-x64': 0.19.7 dev: true /escalade@3.1.1: @@ -3308,62 +3800,72 @@ packages: source-map: 0.6.1 dev: true - /eslint-config-prettier@8.10.0(eslint@8.48.0): + /eslint-config-prettier@8.10.0(eslint@8.52.0): resolution: {integrity: sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==} hasBin: true peerDependencies: eslint: '>=7.0.0' dependencies: - eslint: 8.48.0 + eslint: 8.52.0 dev: true - /eslint-config-standard-with-typescript@23.0.0(@typescript-eslint/eslint-plugin@5.62.0)(eslint-plugin-import@2.28.1)(eslint-plugin-n@15.7.0)(eslint-plugin-promise@6.1.1)(eslint@8.48.0)(typescript@5.0.2): - resolution: {integrity: sha512-iaaWifImn37Z1OXbNW1es7KI+S7D408F9ys0bpaQf2temeBWlvb0Nc5qHkOgYaRb5QxTZT32GGeN1gtswASOXA==} + /eslint-config-prettier@9.0.0(eslint@8.52.0): + resolution: {integrity: sha512-IcJsTkJae2S35pRsRAwoCE+925rJJStOdkKnLVgtE+tEpqU0EVVM7OqrwxqgptKdX29NUwC82I5pXsGFIgSevw==} + hasBin: true peerDependencies: - '@typescript-eslint/eslint-plugin': ^5.0.0 + eslint: '>=7.0.0' + dependencies: + eslint: 8.52.0 + dev: true + + /eslint-config-standard-with-typescript@39.0.0(@typescript-eslint/eslint-plugin@6.5.0)(eslint-plugin-import@2.29.0)(eslint-plugin-n@16.2.0)(eslint-plugin-promise@6.1.1)(eslint@8.52.0)(typescript@5.2.2): + resolution: {integrity: sha512-CiV2LS4NUeeRmDTDf1ocUMpMxitSyW0g+Y/N7ecElwGj188GahbcQgqfBNyVsIXQxHlZVBlOjkbg3oUI0R3KBg==} + peerDependencies: + '@typescript-eslint/eslint-plugin': ^6.4.0 eslint: ^8.0.1 eslint-plugin-import: ^2.25.2 - eslint-plugin-n: ^15.0.0 + eslint-plugin-n: '^15.0.0 || ^16.0.0 ' eslint-plugin-promise: ^6.0.0 typescript: '*' dependencies: - '@typescript-eslint/eslint-plugin': 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.48.0)(typescript@5.0.2) - '@typescript-eslint/parser': 5.62.0(eslint@8.48.0)(typescript@5.0.2) - eslint: 8.48.0 - eslint-config-standard: 17.0.0(eslint-plugin-import@2.28.1)(eslint-plugin-n@15.7.0)(eslint-plugin-promise@6.1.1)(eslint@8.48.0) - eslint-plugin-import: 2.28.1(@typescript-eslint/parser@5.62.0)(eslint@8.48.0) - eslint-plugin-n: 15.7.0(eslint@8.48.0) - eslint-plugin-promise: 6.1.1(eslint@8.48.0) - typescript: 5.0.2 + '@typescript-eslint/eslint-plugin': 6.5.0(@typescript-eslint/parser@6.5.0)(eslint@8.52.0)(typescript@5.2.2) + '@typescript-eslint/parser': 6.5.0(eslint@8.52.0)(typescript@5.2.2) + eslint: 8.52.0 + eslint-config-standard: 17.1.0(eslint-plugin-import@2.29.0)(eslint-plugin-n@16.2.0)(eslint-plugin-promise@6.1.1)(eslint@8.52.0) + eslint-plugin-import: 2.29.0(@typescript-eslint/parser@6.5.0)(eslint@8.52.0) + eslint-plugin-n: 16.2.0(eslint@8.52.0) + eslint-plugin-promise: 6.1.1(eslint@8.52.0) + typescript: 5.2.2 transitivePeerDependencies: - supports-color dev: true - /eslint-config-standard@17.0.0(eslint-plugin-import@2.28.1)(eslint-plugin-n@15.7.0)(eslint-plugin-promise@6.1.1)(eslint@8.48.0): - resolution: {integrity: sha512-/2ks1GKyqSOkH7JFvXJicu0iMpoojkwB+f5Du/1SC0PtBL+s8v30k9njRZ21pm2drKYm2342jFnGWzttxPmZVg==} + /eslint-config-standard@17.1.0(eslint-plugin-import@2.29.0)(eslint-plugin-n@16.2.0)(eslint-plugin-promise@6.1.1)(eslint@8.52.0): + resolution: {integrity: sha512-IwHwmaBNtDK4zDHQukFDW5u/aTb8+meQWZvNFWkiGmbWjD6bqyuSSBxxXKkCftCUzc1zwCH2m/baCNDLGmuO5Q==} + engines: {node: '>=12.0.0'} peerDependencies: eslint: ^8.0.1 eslint-plugin-import: ^2.25.2 - eslint-plugin-n: ^15.0.0 + eslint-plugin-n: '^15.0.0 || ^16.0.0 ' eslint-plugin-promise: ^6.0.0 dependencies: - eslint: 8.48.0 - eslint-plugin-import: 2.28.1(@typescript-eslint/parser@5.62.0)(eslint@8.48.0) - eslint-plugin-n: 15.7.0(eslint@8.48.0) - eslint-plugin-promise: 6.1.1(eslint@8.48.0) + eslint: 8.52.0 + eslint-plugin-import: 2.29.0(@typescript-eslint/parser@6.5.0)(eslint@8.52.0) + eslint-plugin-n: 16.2.0(eslint@8.52.0) + eslint-plugin-promise: 6.1.1(eslint@8.52.0) dev: true /eslint-import-resolver-node@0.3.9: resolution: {integrity: sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==} dependencies: debug: 3.2.7 - is-core-module: 2.13.0 - resolve: 1.22.4 + is-core-module: 2.13.1 + resolve: 1.22.5 transitivePeerDependencies: - supports-color dev: true - /eslint-module-utils@2.8.0(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-node@0.3.9)(eslint@8.48.0): + /eslint-module-utils@2.8.0(@typescript-eslint/parser@6.5.0)(eslint-import-resolver-node@0.3.9)(eslint@8.52.0): resolution: {integrity: sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==} engines: {node: '>=4'} peerDependencies: @@ -3384,27 +3886,27 @@ packages: eslint-import-resolver-webpack: optional: true dependencies: - '@typescript-eslint/parser': 5.62.0(eslint@8.48.0)(typescript@5.0.2) + '@typescript-eslint/parser': 6.5.0(eslint@8.52.0)(typescript@5.2.2) debug: 3.2.7 - eslint: 8.48.0 + eslint: 8.52.0 eslint-import-resolver-node: 0.3.9 transitivePeerDependencies: - supports-color dev: true - /eslint-plugin-es@4.1.0(eslint@8.48.0): - resolution: {integrity: sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ==} - engines: {node: '>=8.10.0'} + /eslint-plugin-es-x@7.3.0(eslint@8.52.0): + resolution: {integrity: sha512-W9zIs+k00I/I13+Bdkl/zG1MEO07G97XjUSQuH117w620SJ6bHtLUmoMvkGA2oYnI/gNdr+G7BONLyYnFaLLEQ==} + engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: - eslint: '>=4.19.1' + eslint: '>=8' dependencies: - eslint: 8.48.0 - eslint-utils: 2.1.0 - regexpp: 3.2.0 + '@eslint-community/eslint-utils': 4.4.0(eslint@8.52.0) + '@eslint-community/regexpp': 4.10.0 + eslint: 8.52.0 dev: true - /eslint-plugin-import@2.28.1(@typescript-eslint/parser@5.62.0)(eslint@8.48.0): - resolution: {integrity: sha512-9I9hFlITvOV55alzoKBI+K9q74kv0iKMeY6av5+umsNwayt59fz692daGyjR+oStBQgx6nwR9rXldDev3Clw+A==} + /eslint-plugin-import@2.29.0(@typescript-eslint/parser@6.5.0)(eslint@8.52.0): + resolution: {integrity: sha512-QPOO5NO6Odv5lpoTkddtutccQjysJuFxoPS7fAHO+9m9udNHvTCPSAMW9zGAYj8lAIdr40I8yPCdUYrncXtrwg==} engines: {node: '>=4'} peerDependencies: '@typescript-eslint/parser': '*' @@ -3413,18 +3915,18 @@ packages: '@typescript-eslint/parser': optional: true dependencies: - '@typescript-eslint/parser': 5.62.0(eslint@8.48.0)(typescript@5.0.2) - array-includes: 3.1.6 + '@typescript-eslint/parser': 6.5.0(eslint@8.52.0)(typescript@5.2.2) + array-includes: 3.1.7 array.prototype.findlastindex: 1.2.3 - array.prototype.flat: 1.3.1 - array.prototype.flatmap: 1.3.1 + array.prototype.flat: 1.3.2 + array.prototype.flatmap: 1.3.2 debug: 3.2.7 doctrine: 2.1.0 - eslint: 8.48.0 + eslint: 8.52.0 eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.8.0(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-node@0.3.9)(eslint@8.48.0) - has: 1.0.3 - is-core-module: 2.13.0 + eslint-module-utils: 2.8.0(@typescript-eslint/parser@6.5.0)(eslint-import-resolver-node@0.3.9)(eslint@8.52.0) + hasown: 2.0.0 + is-core-module: 2.13.1 is-glob: 4.0.3 minimatch: 3.1.2 object.fromentries: 2.0.7 @@ -3438,62 +3940,88 @@ packages: - supports-color dev: true - /eslint-plugin-n@15.7.0(eslint@8.48.0): - resolution: {integrity: sha512-jDex9s7D/Qial8AGVIHq4W7NswpUD5DPDL2RH8Lzd9EloWUuvUkHfv4FRLMipH5q2UtyurorBkPeNi1wVWNh3Q==} - engines: {node: '>=12.22.0'} + /eslint-plugin-n@16.2.0(eslint@8.52.0): + resolution: {integrity: sha512-AQER2jEyQOt1LG6JkGJCCIFotzmlcCZFur2wdKrp1JX2cNotC7Ae0BcD/4lLv3lUAArM9uNS8z/fsvXTd0L71g==} + engines: {node: '>=16.0.0'} peerDependencies: eslint: '>=7.0.0' dependencies: + '@eslint-community/eslint-utils': 4.4.0(eslint@8.52.0) builtins: 5.0.1 - eslint: 8.48.0 - eslint-plugin-es: 4.1.0(eslint@8.48.0) - eslint-utils: 3.0.0(eslint@8.48.0) + eslint: 8.52.0 + eslint-plugin-es-x: 7.3.0(eslint@8.52.0) + get-tsconfig: 4.7.2 ignore: 5.2.4 is-core-module: 2.13.0 minimatch: 3.1.2 - resolve: 1.22.4 + resolve: 1.22.5 semver: 7.5.4 dev: true - /eslint-plugin-prettier@4.2.1(eslint-config-prettier@8.10.0)(eslint@8.48.0)(prettier@2.8.8): - resolution: {integrity: sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==} - engines: {node: '>=12.0.0'} + /eslint-plugin-prettier@5.0.1(eslint-config-prettier@8.10.0)(eslint@8.52.0)(prettier@3.0.3): + resolution: {integrity: sha512-m3u5RnR56asrwV/lDC4GHorlW75DsFfmUcjfCYylTUs85dBRnB7VM6xG8eCMJdeDRnppzmxZVf1GEPJvl1JmNg==} + engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: - eslint: '>=7.28.0' + '@types/eslint': '>=8.0.0' + eslint: '>=8.0.0' eslint-config-prettier: '*' - prettier: '>=2.0.0' + prettier: '>=3.0.0' peerDependenciesMeta: + '@types/eslint': + optional: true eslint-config-prettier: optional: true dependencies: - eslint: 8.48.0 - eslint-config-prettier: 8.10.0(eslint@8.48.0) - prettier: 2.8.8 + eslint: 8.52.0 + eslint-config-prettier: 8.10.0(eslint@8.52.0) + prettier: 3.0.3 prettier-linter-helpers: 1.0.0 + synckit: 0.8.5 dev: true - /eslint-plugin-promise@6.1.1(eslint@8.48.0): + /eslint-plugin-prettier@5.0.1(eslint-config-prettier@9.0.0)(eslint@8.52.0)(prettier@3.0.3): + resolution: {integrity: sha512-m3u5RnR56asrwV/lDC4GHorlW75DsFfmUcjfCYylTUs85dBRnB7VM6xG8eCMJdeDRnppzmxZVf1GEPJvl1JmNg==} + engines: {node: ^14.18.0 || >=16.0.0} + peerDependencies: + '@types/eslint': '>=8.0.0' + eslint: '>=8.0.0' + eslint-config-prettier: '*' + prettier: '>=3.0.0' + peerDependenciesMeta: + '@types/eslint': + optional: true + eslint-config-prettier: + optional: true + dependencies: + eslint: 8.52.0 + eslint-config-prettier: 9.0.0(eslint@8.52.0) + prettier: 3.0.3 + prettier-linter-helpers: 1.0.0 + synckit: 0.8.5 + dev: true + + /eslint-plugin-promise@6.1.1(eslint@8.52.0): resolution: {integrity: sha512-tjqWDwVZQo7UIPMeDReOpUgHCmCiH+ePnVT+5zVapL0uuHnegBUs2smM13CzOs2Xb5+MHMRFTs9v24yjba4Oig==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^7.0.0 || ^8.0.0 dependencies: - eslint: 8.48.0 + eslint: 8.52.0 dev: true - /eslint-plugin-vue@9.17.0(eslint@8.48.0): - resolution: {integrity: sha512-r7Bp79pxQk9I5XDP0k2dpUC7Ots3OSWgvGZNu3BxmKK6Zg7NgVtcOB6OCna5Kb9oQwJPl5hq183WD0SY5tZtIQ==} + /eslint-plugin-vue@9.18.1(eslint@8.52.0): + resolution: {integrity: sha512-7hZFlrEgg9NIzuVik2I9xSnJA5RsmOfueYgsUGUokEDLJ1LHtxO0Pl4duje1BriZ/jDWb+44tcIlC3yi0tdlZg==} engines: {node: ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.2.0 || ^7.0.0 || ^8.0.0 dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@8.48.0) - eslint: 8.48.0 + '@eslint-community/eslint-utils': 4.4.0(eslint@8.52.0) + eslint: 8.52.0 natural-compare: 1.4.0 nth-check: 2.1.1 postcss-selector-parser: 6.0.13 semver: 7.5.4 - vue-eslint-parser: 9.3.1(eslint@8.48.0) + vue-eslint-parser: 9.3.1(eslint@8.52.0) xml-name-validator: 4.0.0 transitivePeerDependencies: - supports-color @@ -3515,28 +4043,6 @@ packages: estraverse: 5.3.0 dev: true - /eslint-utils@2.1.0: - resolution: {integrity: sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==} - engines: {node: '>=6'} - dependencies: - eslint-visitor-keys: 1.3.0 - dev: true - - /eslint-utils@3.0.0(eslint@8.48.0): - resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==} - engines: {node: ^10.0.0 || ^12.0.0 || >= 14.0.0} - peerDependencies: - eslint: '>=5' - dependencies: - eslint: 8.48.0 - eslint-visitor-keys: 2.1.0 - dev: true - - /eslint-visitor-keys@1.3.0: - resolution: {integrity: sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==} - engines: {node: '>=4'} - dev: true - /eslint-visitor-keys@2.1.0: resolution: {integrity: sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==} engines: {node: '>=10'} @@ -3547,18 +4053,19 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /eslint@8.48.0: - resolution: {integrity: sha512-sb6DLeIuRXxeM1YljSe1KEx9/YYeZFQWcV8Rq9HfigmdDEugjLEVEa1ozDjL6YDjBpQHPJxJzze+alxi4T3OLg==} + /eslint@8.52.0: + resolution: {integrity: sha512-zh/JHnaixqHZsolRB/w9/02akBk9EPrOs9JwcTP2ek7yL5bVvXuRariiaAjjoJ5DvuwQ1WAE/HsMz+w17YgBCg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} hasBin: true dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@8.48.0) - '@eslint-community/regexpp': 4.8.0 + '@eslint-community/eslint-utils': 4.4.0(eslint@8.52.0) + '@eslint-community/regexpp': 4.10.0 '@eslint/eslintrc': 2.1.2 - '@eslint/js': 8.48.0 - '@humanwhocodes/config-array': 0.11.11 + '@eslint/js': 8.52.0 + '@humanwhocodes/config-array': 0.11.13 '@humanwhocodes/module-importer': 1.0.1 '@nodelib/fs.walk': 1.2.8 + '@ungap/structured-clone': 1.2.0 ajv: 6.12.6 chalk: 4.1.2 cross-spawn: 7.0.3 @@ -3574,7 +4081,7 @@ packages: file-entry-cache: 6.0.1 find-up: 5.0.0 glob-parent: 6.0.2 - globals: 13.21.0 + globals: 13.23.0 graphemer: 1.4.0 ignore: 5.2.4 imurmurhash: 0.1.4 @@ -3597,8 +4104,8 @@ packages: resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: - acorn: 8.10.0 - acorn-jsx: 5.3.2(acorn@8.10.0) + acorn: 8.11.2 + acorn-jsx: 5.3.2(acorn@8.11.2) eslint-visitor-keys: 3.4.3 dev: true @@ -3683,6 +4190,21 @@ packages: strip-final-newline: 3.0.0 dev: true + /execa@8.0.1: + resolution: {integrity: sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==} + engines: {node: '>=16.17'} + dependencies: + cross-spawn: 7.0.3 + get-stream: 8.0.1 + human-signals: 5.0.0 + is-stream: 3.0.0 + merge-stream: 2.0.0 + npm-run-path: 5.1.0 + onetime: 6.0.0 + signal-exit: 4.1.0 + strip-final-newline: 3.0.0 + dev: true + /expand-brackets@2.1.4: resolution: {integrity: sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==} engines: {node: '>=0.10.0'} @@ -3773,7 +4295,7 @@ packages: resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==} engines: {node: ^10.12.0 || >=12.0.0} dependencies: - flat-cache: 3.1.0 + flat-cache: 3.1.1 dev: true /filelist@1.0.4: @@ -3829,17 +4351,17 @@ packages: resolve-dir: 1.0.1 dev: true - /flat-cache@3.1.0: - resolution: {integrity: sha512-OHx4Qwrrt0E4jEIcI5/Xb+f+QmJYNj2rrK8wiIdQOIrB9WrrJL8cjZvXdXuBTkkEwEqLycb5BeZDV1o2i9bTew==} + /flat-cache@3.1.1: + resolution: {integrity: sha512-/qM2b3LUIaIgviBQovTLvijfyOQXPtSRnRK26ksj2J7rzPIecePUIpJsZ4T02Qg+xiAEKIs5K8dsHEd+VaKa/Q==} engines: {node: '>=12.0.0'} dependencies: - flatted: 3.2.7 - keyv: 4.5.3 + flatted: 3.2.9 + keyv: 4.5.4 rimraf: 3.0.2 dev: true - /flatted@3.2.7: - resolution: {integrity: sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==} + /flatted@3.2.9: + resolution: {integrity: sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==} dev: true /follow-redirects@1.15.2: @@ -3886,8 +4408,8 @@ packages: engines: {node: '>=0.8'} dev: false - /fraction.js@4.3.1: - resolution: {integrity: sha512-nx0cki48JBA6ThPeUpeKCNpdhEl/9bRS+dAEYnRUod+Z1jhFfC3K/mBLorZZntqHM+GTH3/dkkpfoT3QITYe7g==} + /fraction.js@4.3.4: + resolution: {integrity: sha512-pwiTgt0Q7t+GHZA4yaLjObx4vXmmdcS0iSJ19o8d/goUGgItX9UZWKWNnLHehxviD8wU2IWRsnR8cD5+yOJP2Q==} dev: true /fragment-cache@0.2.1: @@ -3936,6 +4458,10 @@ packages: /function-bind@1.1.1: resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==} + /function-bind@1.1.2: + resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==} + dev: true + /function.prototype.name@1.1.6: resolution: {integrity: sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==} engines: {node: '>= 0.4'} @@ -3988,6 +4514,11 @@ packages: engines: {node: '>=10'} dev: true + /get-stream@8.0.1: + resolution: {integrity: sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==} + engines: {node: '>=16'} + dev: true + /get-symbol-description@1.0.0: resolution: {integrity: sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==} engines: {node: '>= 0.4'} @@ -3996,6 +4527,12 @@ packages: get-intrinsic: 1.2.1 dev: true + /get-tsconfig@4.7.2: + resolution: {integrity: sha512-wuMsz4leaj5hbGgg4IvDU0bqJagpftG5l5cXIAvo8uZrqn0NJqwtfupTN00VnkQJPcIRrxYrm1Ue24btpCha2A==} + dependencies: + resolve-pkg-maps: 1.0.0 + dev: true + /get-value@2.0.6: resolution: {integrity: sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==} engines: {node: '>=0.10.0'} @@ -4069,8 +4606,8 @@ packages: engines: {node: '>=4'} dev: true - /globals@13.21.0: - resolution: {integrity: sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==} + /globals@13.23.0: + resolution: {integrity: sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==} engines: {node: '>=8'} dependencies: type-fest: 0.20.2 @@ -4208,6 +4745,13 @@ packages: dependencies: function-bind: 1.1.1 + /hasown@2.0.0: + resolution: {integrity: sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==} + engines: {node: '>= 0.4'} + dependencies: + function-bind: 1.1.2 + dev: true + /he@1.2.0: resolution: {integrity: sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==} hasBin: true @@ -4293,6 +4837,11 @@ packages: engines: {node: '>=14.18.0'} dev: true + /human-signals@5.0.0: + resolution: {integrity: sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==} + engines: {node: '>=16.17.0'} + dev: true + /husky@8.0.3: resolution: {integrity: sha512-+dQSyqPh4x1hlO1swXBiNb2HzTDN1I2IGLQx1GrBuiqFJfoMrnZWwVmatvSiO+Iz8fBUnf+lekwNo4c2LlXItg==} engines: {node: '>=14'} @@ -4361,6 +4910,12 @@ packages: resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==} dev: true + /interactjs@1.10.21: + resolution: {integrity: sha512-85GdTHci8W7gFzSPfV26x69LA3Gnl64NbVYDTfw0Jo4rVvH4WAGBNjM5xV2UJwMvusmJLo2XkJDK5k7IsU87bA==} + dependencies: + '@interactjs/types': 1.10.21 + dev: false + /internal-slot@1.0.5: resolution: {integrity: sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==} engines: {node: '>= 0.4'} @@ -4432,6 +4987,12 @@ packages: has: 1.0.3 dev: true + /is-core-module@2.13.1: + resolution: {integrity: sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==} + dependencies: + hasown: 2.0.0 + dev: true + /is-data-descriptor@0.1.4: resolution: {integrity: sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==} engines: {node: '>=0.10.0'} @@ -4749,7 +5310,7 @@ packages: resolution: {integrity: sha512-9xZPKVYp9DxnM3sd1yAsh/d59iIaswDkai8oTxbursfKYbg/ibjX0IzFt35+VZ8iEW453TVTXztnRvYUQlAfUQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: - acorn: 8.10.0 + acorn: 8.11.2 eslint-visitor-keys: 3.4.3 espree: 9.6.1 semver: 7.5.4 @@ -4779,8 +5340,8 @@ packages: tsscmp: 1.0.6 dev: true - /keyv@4.5.3: - resolution: {integrity: sha512-QCiSav9WaX1PgETJ+SpNnx2PRRapJ/oRSXM4VO5OGYGSjrxbKPVFVhB3l2OCbLCk329N8qyAtsJjSjvVBWzEug==} + /keyv@4.5.4: + resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==} dependencies: json-buffer: 3.0.1 dev: true @@ -4826,34 +5387,28 @@ packages: resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==} dev: true - /lint-staged@13.3.0: - resolution: {integrity: sha512-mPRtrYnipYYv1FEE134ufbWpeggNTo+O/UPzngoaKzbzHAthvR55am+8GfHTnqNRQVRRrYQLGW9ZyUoD7DsBHQ==} - engines: {node: ^16.14.0 || >=18.0.0} + /lint-staged@15.1.0: + resolution: {integrity: sha512-ZPKXWHVlL7uwVpy8OZ7YQjYDAuO5X4kMh0XgZvPNxLcCCngd0PO5jKQyy3+s4TL2EnHoIXIzP1422f/l3nZKMw==} + engines: {node: '>=18.12.0'} hasBin: true dependencies: chalk: 5.3.0 - commander: 11.0.0 + commander: 11.1.0 debug: 4.3.4 - execa: 7.2.0 + execa: 8.0.1 lilconfig: 2.1.0 - listr2: 6.6.1 + listr2: 7.0.2 micromatch: 4.0.5 pidtree: 0.6.0 string-argv: 0.3.2 - yaml: 2.3.1 + yaml: 2.3.4 transitivePeerDependencies: - - enquirer - supports-color dev: true - /listr2@6.6.1: - resolution: {integrity: sha512-+rAXGHh0fkEWdXBmX+L6mmfmXmXvDGEKzkjxO+8mP3+nI/r/CWznVBvsibXdxda9Zz0OW2e2ikphN3OwCT/jSg==} + /listr2@7.0.2: + resolution: {integrity: sha512-rJysbR9GKIalhTbVL2tYbF2hVyDnrf7pFUZBwjPaMIdadYHmeT+EVi/Bu3qd7ETQPahTotg2WRCatXwRBW554g==} engines: {node: '>=16.0.0'} - peerDependencies: - enquirer: '>= 2.3.0 < 3' - peerDependenciesMeta: - enquirer: - optional: true dependencies: cli-truncate: 3.1.0 colorette: 2.0.20 @@ -4967,13 +5522,6 @@ packages: dependencies: yallist: 4.0.0 - /magic-string@0.30.3: - resolution: {integrity: sha512-B7xGbll2fG/VjP+SWg4sX3JynwIU0mjoTc6MPpKNuIvftk6u6vqhDnk1R80b8C2GBR6ywqy+1DcKBrevBg+bmw==} - engines: {node: '>=12'} - dependencies: - '@jridgewell/sourcemap-codec': 1.4.15 - dev: true - /magic-string@0.30.5: resolution: {integrity: sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==} engines: {node: '>=12'} @@ -5195,7 +5743,7 @@ packages: /mlly@1.4.1: resolution: {integrity: sha512-SCDs78Q2o09jiZiE2WziwVBEqXQ02XkGdUy45cbJf+BpYRIjArXRJ1Wbowxkb+NaM9DWvS3UC9GiO/6eqvQ/pg==} dependencies: - acorn: 8.10.0 + acorn: 8.11.2 pathe: 1.1.1 pkg-types: 1.0.3 ufo: 1.3.0 @@ -5205,7 +5753,7 @@ packages: resolution: {integrity: sha512-eQsKcWzIaZzEZ07NuEyO4Nw65g0hdWAyurVol1IPl1gahRwY+svqzfgfey8U8dahLwG44d6/RwEzuK52rSa/JQ==} hasBin: true dependencies: - commander: 11.0.0 + commander: 11.1.0 dev: false /mrmime@1.0.1: @@ -5239,16 +5787,16 @@ packages: minimatch: 3.1.2 dev: true - /naive-ui@2.35.0(vue@3.3.8): + /naive-ui@2.35.0(vue@3.3.10): resolution: {integrity: sha512-PdnLpOip1LQaKs5+rXLZoPDPQkTq26TnHWeABvUA2eOQjtHxE4+TQvj0Jq/W8clM2On/7jptoGmenLt48G3Bhg==} peerDependencies: vue: ^3.0.0 dependencies: '@css-render/plugin-bem': 0.15.12(css-render@0.15.12) - '@css-render/vue3-ssr': 0.15.12(vue@3.3.8) + '@css-render/vue3-ssr': 0.15.12(vue@3.3.10) '@types/katex': 0.16.2 '@types/lodash': 4.14.199 - '@types/lodash-es': 4.17.9 + '@types/lodash-es': 4.17.11 async-validator: 4.2.5 css-render: 0.15.12 date-fns: 2.30.0 @@ -5259,22 +5807,16 @@ packages: lodash-es: 4.17.21 seemly: 0.3.6 treemate: 0.3.11 - vdirs: 0.1.8(vue@3.3.8) - vooks: 0.2.12(vue@3.3.8) - vue: 3.3.8(typescript@5.0.2) - vueuc: 0.4.51(vue@3.3.8) + vdirs: 0.1.8(vue@3.3.10) + vooks: 0.2.12(vue@3.3.10) + vue: 3.3.10(typescript@5.2.2) + vueuc: 0.4.51(vue@3.3.10) dev: false /nan@2.17.0: resolution: {integrity: sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==} dev: false - /nanoid@3.3.6: - resolution: {integrity: sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==} - engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} - hasBin: true - dev: true - /nanoid@3.3.7: resolution: {integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==} engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} @@ -5342,7 +5884,7 @@ packages: resolution: {integrity: sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==} dependencies: hosted-git-info: 2.8.9 - resolve: 1.22.4 + resolve: 1.22.5 semver: 5.7.2 validate-npm-package-license: 3.0.4 dev: true @@ -5651,10 +6193,10 @@ packages: peerDependencies: pinia: ^2.0.0 dependencies: - pinia: 2.1.6(typescript@5.0.2)(vue@3.3.8) + pinia: 2.1.6(typescript@5.2.2)(vue@3.3.10) dev: false - /pinia@2.1.6(typescript@5.0.2)(vue@3.3.8): + /pinia@2.1.6(typescript@5.2.2)(vue@3.3.10): resolution: {integrity: sha512-bIU6QuE5qZviMmct5XwCesXelb5VavdOWKWaB17ggk++NUwQWWbP5YnsONTk3b752QkW9sACiR81rorpeOMSvQ==} peerDependencies: '@vue/composition-api': ^1.4.0 @@ -5666,10 +6208,10 @@ packages: typescript: optional: true dependencies: - '@vue/devtools-api': 6.5.0 - typescript: 5.0.2 - vue: 3.3.8(typescript@5.0.2) - vue-demi: 0.14.5(vue@3.3.8) + '@vue/devtools-api': 6.5.1 + typescript: 5.2.2 + vue: 3.3.10(typescript@5.2.2) + vue-demi: 0.14.6(vue@3.3.10) dev: false /pkg-types@1.0.3: @@ -5727,17 +6269,17 @@ packages: supports-color: 3.2.3 dev: true - /postcss@8.4.29: - resolution: {integrity: sha512-cbI+jaqIeu/VGqXEarWkRCCffhjgXc0qjBtXpqJhTBohMUjUQnbBr0xqX3vEKudc4iviTewcJo5ajcec5+wdJw==} + /postcss@8.4.31: + resolution: {integrity: sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==} engines: {node: ^10 || ^12 || >=14} dependencies: - nanoid: 3.3.6 + nanoid: 3.3.7 picocolors: 1.0.0 source-map-js: 1.0.2 dev: true - /postcss@8.4.31: - resolution: {integrity: sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==} + /postcss@8.4.32: + resolution: {integrity: sha512-D/kj5JNu6oo2EIy+XL/26JEDTlIbB8hw85G8StOE6L74RQAVVP5rej6wxCNqyMbR4RkPfqvezVbPw81Ngd6Kcw==} engines: {node: ^10 || ^12 || >=14} dependencies: nanoid: 3.3.7 @@ -5791,9 +6333,9 @@ packages: fast-diff: 1.3.0 dev: true - /prettier@2.8.8: - resolution: {integrity: sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==} - engines: {node: '>=10.13.0'} + /prettier@3.0.3: + resolution: {integrity: sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==} + engines: {node: '>=14'} hasBin: true dev: true @@ -5805,8 +6347,8 @@ packages: resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==} dev: false - /punycode@2.3.0: - resolution: {integrity: sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==} + /punycode@2.3.1: + resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==} engines: {node: '>=6'} dev: true @@ -5915,11 +6457,6 @@ packages: functions-have-names: 1.2.3 dev: true - /regexpp@3.2.0: - resolution: {integrity: sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==} - engines: {node: '>=8'} - dev: true - /repeat-element@1.1.4: resolution: {integrity: sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==} engines: {node: '>=0.10.0'} @@ -5969,13 +6506,17 @@ packages: global-dirs: 0.1.1 dev: true + /resolve-pkg-maps@1.0.0: + resolution: {integrity: sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==} + dev: true + /resolve-url@0.2.1: resolution: {integrity: sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==} deprecated: https://github.com/lydell/resolve-url#deprecated dev: true - /resolve@1.22.4: - resolution: {integrity: sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==} + /resolve@1.22.5: + resolution: {integrity: sha512-qWhv7PF1V95QPvRoUGHxOtnAlEvlXBylMZcjUR9pAumMmveFtcHJRXGIr+TkjfNJVQypqv2qcDiiars2y1PsSg==} hasBin: true dependencies: is-core-module: 2.13.0 @@ -6035,27 +6576,40 @@ packages: fsevents: 2.3.3 dev: true - /rollup@3.28.1: - resolution: {integrity: sha512-R9OMQmIHJm9znrU3m3cpE8uhN0fGdXiawME7aZIpQqvpS/85+Vt1Hq1/yVIcYfOmaQiHjvXkQAoJukvLpau6Yw==} - engines: {node: '>=14.18.0', npm: '>=8.0.0'} + /rollup@4.5.2: + resolution: {integrity: sha512-CRK1uoROBfkcqrZKyaFcqCcZWNsvJ6yVYZkqTlRocZhO2s5yER6Z3f/QaYtO8RGyloPnmhwgzuPQpNGeK210xQ==} + engines: {node: '>=18.0.0', npm: '>=8.0.0'} hasBin: true optionalDependencies: + '@rollup/rollup-android-arm-eabi': 4.5.2 + '@rollup/rollup-android-arm64': 4.5.2 + '@rollup/rollup-darwin-arm64': 4.5.2 + '@rollup/rollup-darwin-x64': 4.5.2 + '@rollup/rollup-linux-arm-gnueabihf': 4.5.2 + '@rollup/rollup-linux-arm64-gnu': 4.5.2 + '@rollup/rollup-linux-arm64-musl': 4.5.2 + '@rollup/rollup-linux-x64-gnu': 4.5.2 + '@rollup/rollup-linux-x64-musl': 4.5.2 + '@rollup/rollup-win32-arm64-msvc': 4.5.2 + '@rollup/rollup-win32-ia32-msvc': 4.5.2 + '@rollup/rollup-win32-x64-msvc': 4.5.2 fsevents: 2.3.3 dev: true - /rs-module-lexer@1.0.0: - resolution: {integrity: sha512-usVF0keIjjwfv+kWmT4zFkLOEH5Mk9vQRN+tp0hDfD0FTumX6uJK4PcV6uBs8fcEvrtr7d9oyta3kphR/hOZKw==} + /rs-module-lexer@2.1.1: + resolution: {integrity: sha512-6F5a6PS3PJ/qZ0o+FKFcqABFBVsaMIOEMA4yBFyAwJnCpQ6a8CIk+ln3pRPrl0N2k6HgAupzXpQq4NuTVg5haQ==} engines: {node: '>=14'} + requiresBuild: true optionalDependencies: - '@xn-sakina/rml-darwin-arm64': 1.0.0 - '@xn-sakina/rml-darwin-x64': 1.0.0 - '@xn-sakina/rml-linux-arm-gnueabihf': 1.0.0 - '@xn-sakina/rml-linux-arm64-gnu': 1.0.0 - '@xn-sakina/rml-linux-arm64-musl': 1.0.0 - '@xn-sakina/rml-linux-x64-gnu': 1.0.0 - '@xn-sakina/rml-linux-x64-musl': 1.0.0 - '@xn-sakina/rml-win32-arm64-msvc': 1.0.0 - '@xn-sakina/rml-win32-x64-msvc': 1.0.0 + '@xn-sakina/rml-darwin-arm64': 2.1.1 + '@xn-sakina/rml-darwin-x64': 2.1.1 + '@xn-sakina/rml-linux-arm-gnueabihf': 2.1.1 + '@xn-sakina/rml-linux-arm64-gnu': 2.1.1 + '@xn-sakina/rml-linux-arm64-musl': 2.1.1 + '@xn-sakina/rml-linux-x64-gnu': 2.1.1 + '@xn-sakina/rml-linux-x64-musl': 2.1.1 + '@xn-sakina/rml-win32-arm64-msvc': 2.1.1 + '@xn-sakina/rml-win32-x64-msvc': 2.1.1 dev: true /run-applescript@5.0.0: @@ -6102,9 +6656,9 @@ packages: resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==} dev: true - /sass@1.54.3: - resolution: {integrity: sha512-fLodey5Qd41Pxp/Tk7Al97sViYwF/TazRc5t6E65O7JOk4XF8pzwIW7CvCxYVOfJFFI/1x5+elDyBIixrp+zrw==} - engines: {node: '>=12.0.0'} + /sass@1.69.5: + resolution: {integrity: sha512-qg2+UCJibLr2LCVOt3OlPhr/dqVHWOa9XtZf2OjbLs/T4VPSJ00udtgJxH3neXZm+QqX8B+3cU7RaLqp1iVfcQ==} + engines: {node: '>=14.0.0'} hasBin: true dependencies: chokidar: 3.5.3 @@ -6188,6 +6742,11 @@ packages: /signal-exit@3.0.7: resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==} + /signal-exit@4.1.0: + resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==} + engines: {node: '>=14'} + dev: true + /simple-concat@1.0.1: resolution: {integrity: sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==} dev: false @@ -6204,7 +6763,7 @@ packages: resolution: {integrity: sha512-O9jm9BsID1P+0HOi81VpXPoDxYP374pkOLzACAoyUQ/3OUVndNpsz6wMnY2z+yOxzbllCKZrM+9QrWsv4THnyA==} engines: {node: '>= 10'} dependencies: - '@polka/url': 1.0.0-next.21 + '@polka/url': 1.0.0-next.23 mrmime: 1.0.1 totalist: 3.0.1 dev: true @@ -6282,6 +6841,7 @@ packages: /source-map@0.6.1: resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==} engines: {node: '>=0.10.0'} + dev: true /source-map@0.7.4: resolution: {integrity: sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==} @@ -6467,7 +7027,7 @@ packages: /strip-literal@1.3.0: resolution: {integrity: sha512-PugKzOsyXpArk0yWmUwqOZecSO0GH0bPoctLcqNDH9J04pVW3lflYE0ujElBGTloevcxF5MofAOZ7C5l2b+wLg==} dependencies: - acorn: 8.10.0 + acorn: 8.11.2 dev: true /supports-color@2.0.0: @@ -6578,6 +7138,14 @@ packages: picocolors: 1.0.0 dev: true + /synckit@0.8.5: + resolution: {integrity: sha512-L1dapNV6vu2s/4Sputv8xGsCdAVlb5nRDMFU/E27D44l5U6cw1g0dGd45uLc+OXjNMmF4ntiMdCimzcjFKQI8Q==} + engines: {node: ^14.18.0 || >=16.0.0} + dependencies: + '@pkgr/utils': 2.4.2 + tslib: 2.6.2 + dev: true + /tar@6.1.15: resolution: {integrity: sha512-/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A==} engines: {node: '>=10'} @@ -6686,7 +7254,16 @@ packages: engines: {node: '>=8'} dev: true - /ts-node@10.9.1(@types/node@20.4.7)(typescript@5.0.2): + /ts-api-utils@1.0.3(typescript@5.2.2): + resolution: {integrity: sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==} + engines: {node: '>=16.13.0'} + peerDependencies: + typescript: '>=4.2.0' + dependencies: + typescript: 5.2.2 + dev: true + + /ts-node@10.9.1(@types/node@20.4.7)(typescript@5.2.2): resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==} hasBin: true peerDependencies: @@ -6706,13 +7283,13 @@ packages: '@tsconfig/node14': 1.0.3 '@tsconfig/node16': 1.0.4 '@types/node': 20.4.7 - acorn: 8.10.0 + acorn: 8.11.2 acorn-walk: 8.2.0 arg: 4.1.3 create-require: 1.1.1 diff: 4.0.2 make-error: 1.3.6 - typescript: 5.0.2 + typescript: 5.2.2 v8-compile-cache-lib: 3.0.1 yn: 3.1.1 dev: true @@ -6743,14 +7320,14 @@ packages: engines: {node: '>=0.6.x'} dev: true - /tsutils@3.21.0(typescript@5.0.2): + /tsutils@3.21.0(typescript@5.2.2): resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==} engines: {node: '>= 6'} peerDependencies: typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta' dependencies: tslib: 1.14.1 - typescript: 5.0.2 + typescript: 5.2.2 dev: true /type-check@0.4.0: @@ -6831,9 +7408,9 @@ packages: is-typed-array: 1.1.12 dev: true - /typescript@5.0.2: - resolution: {integrity: sha512-wVORMBGO/FAs/++blGNeAVdbNKtIh1rbBL2EyQ1+J9lClJ93KiiKe8PmFIVdXhHcyv44SL9oglmfeSsndo0jRw==} - engines: {node: '>=12.20'} + /typescript@5.2.2: + resolution: {integrity: sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==} + engines: {node: '>=14.17'} hasBin: true /ufo@1.3.0: @@ -6861,7 +7438,7 @@ packages: escape-string-regexp: 5.0.0 fast-glob: 3.3.1 local-pkg: 0.4.3 - magic-string: 0.30.3 + magic-string: 0.30.5 mlly: 1.4.1 pathe: 1.1.1 pkg-types: 1.0.3 @@ -6892,8 +7469,8 @@ packages: engines: {node: '>= 0.8'} dev: true - /unplugin-auto-import@0.15.3(@vueuse/core@9.13.0): - resolution: {integrity: sha512-RLT8SqbPn4bT7yBshZId0uPSofKWnwr66RyDaxWaFb/+f7OTDOWAsVNz+hOQLBWSjvbekr2xZY9ccS8TDHJbCQ==} + /unplugin-auto-import@0.16.6(@vueuse/core@10.6.1): + resolution: {integrity: sha512-M+YIITkx3C/Hg38hp8HmswP5mShUUyJOzpifv7RTlAbeFlO2Tyw0pwrogSSxnipHDPTtI8VHFBpkYkNKzYSuyA==} engines: {node: '>=14'} peerDependencies: '@nuxt/kit': ^3.2.2 @@ -6906,9 +7483,10 @@ packages: dependencies: '@antfu/utils': 0.7.6 '@rollup/pluginutils': 5.0.4 - '@vueuse/core': 9.13.0(vue@3.3.8) + '@vueuse/core': 10.6.1(vue@3.3.10) + fast-glob: 3.3.1 local-pkg: 0.4.3 - magic-string: 0.30.3 + magic-string: 0.30.5 minimatch: 9.0.3 unimport: 3.2.0 unplugin: 1.4.0 @@ -6916,8 +7494,8 @@ packages: - rollup dev: true - /unplugin-vue-components@0.25.1(vue@3.3.8): - resolution: {integrity: sha512-kzS2ZHVMaGU2XEO2keYQcMjNZkanDSGDdY96uQT9EPe+wqSZwwgbFfKVJ5ti0+8rGAcKHColwKUvctBhq2LJ3A==} + /unplugin-vue-components@0.25.2(vue@3.3.10): + resolution: {integrity: sha512-OVmLFqILH6w+eM8fyt/d/eoJT9A6WO51NZLf1vC5c1FZ4rmq2bbGxTy8WP2Jm7xwFdukaIdv819+UI7RClPyCA==} engines: {node: '>=14'} peerDependencies: '@babel/parser': ^7.15.8 @@ -6935,11 +7513,11 @@ packages: debug: 4.3.4 fast-glob: 3.3.1 local-pkg: 0.4.3 - magic-string: 0.30.3 + magic-string: 0.30.5 minimatch: 9.0.3 - resolve: 1.22.4 + resolve: 1.22.5 unplugin: 1.4.0 - vue: 3.3.8(typescript@5.0.2) + vue: 3.3.10(typescript@5.2.2) transitivePeerDependencies: - rollup - supports-color @@ -6948,7 +7526,7 @@ packages: /unplugin@1.4.0: resolution: {integrity: sha512-5x4eIEL6WgbzqGtF9UV8VEC/ehKptPXDS6L2b0mv4FRMkJxRtjaJfOWDd6a8+kYbqsjklix7yWP0N3SUepjXcg==} dependencies: - acorn: 8.10.0 + acorn: 8.11.2 chokidar: 3.5.3 webpack-sources: 3.2.3 webpack-virtual-modules: 0.5.0 @@ -6981,7 +7559,7 @@ packages: /uri-js@4.4.1: resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==} dependencies: - punycode: 2.3.0 + punycode: 2.3.1 dev: true /urix@0.1.0: @@ -7019,29 +7597,29 @@ packages: engines: {node: '>= 0.8'} dev: true - /vdirs@0.1.8(vue@3.3.8): + /vdirs@0.1.8(vue@3.3.10): resolution: {integrity: sha512-H9V1zGRLQZg9b+GdMk8MXDN2Lva0zx72MPahDKc30v+DtwKjfyOSXWRIX4t2mhDubM1H09gPhWeth/BJWPHGUw==} peerDependencies: vue: ^3.0.11 dependencies: evtd: 0.2.4 - vue: 3.3.8(typescript@5.0.2) + vue: 3.3.10(typescript@5.2.2) dev: false - /vite-plugin-cdn2@0.12.4: - resolution: {integrity: sha512-qaWjAHS8IA/TN3VzQgLdlxsLbCEFdMHJ+0AUmoCJw3VaU6/ZGoUdGTjmmDEQ8j74qHiI58BMvH2rvhRpWWC/1Q==} + /vite-plugin-cdn2@0.15.2: + resolution: {integrity: sha512-aco0DQqeep+u+CGohn5k3U6TIjytLagbVr29SHd1r6LqcsC1ye+viW/65XyigrPLs7DfCk93yFhV0qOuepl/1g==} dependencies: - '@babel/core': 7.22.11 - '@nolyfill/es-aggregate-error': 1.0.21 + '@babel/core': 7.23.2 '@rollup/pluginutils': 5.0.4 + '@xn-sakina/rml-wasm': 2.1.1 debug: 4.3.4 - rs-module-lexer: 1.0.0 + rs-module-lexer: 2.1.1 transitivePeerDependencies: - rollup - supports-color dev: true - /vite-plugin-compression@0.5.1(vite@4.4.9): + /vite-plugin-compression@0.5.1(vite@5.0.4): resolution: {integrity: sha512-5QJKBDc+gNYVqL/skgFAP81Yuzo9R+EAf19d+EtsMF/i8kFUpNi3J/H01QD3Oo8zBQn+NzoCIFkpPLynoOzaJg==} peerDependencies: vite: '>=2.0.0' @@ -7049,18 +7627,21 @@ packages: chalk: 4.1.2 debug: 4.3.4 fs-extra: 10.1.0 - vite: 4.4.9(@types/node@20.4.7)(sass@1.54.3) + vite: 5.0.4(@types/node@20.4.7)(sass@1.69.5) transitivePeerDependencies: - supports-color dev: true - /vite-plugin-ejs@1.6.4: - resolution: {integrity: sha512-23p1RS4PiA0veXY5/gHZ60pl3pPvd8NEqdBsDgxNK8nM1rjFFDcVb0paNmuipzCgNP/Y0f/Id22M7Il4kvZ2jA==} + /vite-plugin-ejs@1.7.0(vite@5.0.4): + resolution: {integrity: sha512-JNP3zQDC4mSbfoJ3G73s5mmZITD8NGjUmLkq4swxyahy/W0xuokK9U9IJGXw7KCggq6UucT6hJ0p+tQrNtqTZw==} + peerDependencies: + vite: '>=5.0.0' dependencies: ejs: 3.1.9 + vite: 5.0.4(@types/node@20.4.7)(sass@1.69.5) dev: true - /vite-plugin-eslint@1.8.1(eslint@8.48.0)(vite@4.4.9): + /vite-plugin-eslint@1.8.1(eslint@8.52.0)(vite@5.0.4): resolution: {integrity: sha512-PqdMf3Y2fLO9FsNPmMX+//2BF5SF8nEWspZdgl4kSt7UvHDRHVVfHvxsD7ULYzZrJDGRxR81Nq7TOFgwMnUang==} peerDependencies: eslint: '>=7' @@ -7068,29 +7649,29 @@ packages: dependencies: '@rollup/pluginutils': 4.2.1 '@types/eslint': 8.44.2 - eslint: 8.48.0 + eslint: 8.52.0 rollup: 2.79.1 - vite: 4.4.9(@types/node@20.4.7)(sass@1.54.3) + vite: 5.0.4(@types/node@20.4.7)(sass@1.69.5) dev: true - /vite-plugin-imp@2.4.0(vite@4.4.9): + /vite-plugin-imp@2.4.0(vite@5.0.4): resolution: {integrity: sha512-L/6/nvOw+MyNh4UxAlCZHsmKd5MitmHamqqAWB15sbUgVIEz/OQ8jpKr6kkQU0eA/AIe8fkCVbQBlP81ajrqWg==} peerDependencies: vite: '>= 2.0.0-beta.5' dependencies: - '@babel/core': 7.22.11 - '@babel/generator': 7.22.10 - '@babel/parser': 7.22.13 - '@babel/traverse': 7.22.11 + '@babel/core': 7.23.2 + '@babel/generator': 7.22.15 + '@babel/parser': 7.23.3 + '@babel/traverse': 7.22.19 chalk: 4.1.2 param-case: 3.0.4 pascal-case: 3.1.2 - vite: 4.4.9(@types/node@20.4.7)(sass@1.54.3) + vite: 5.0.4(@types/node@20.4.7)(sass@1.69.5) transitivePeerDependencies: - supports-color dev: true - /vite-plugin-inspect@0.7.38(vite@4.4.9): + /vite-plugin-inspect@0.7.38(vite@5.0.4): resolution: {integrity: sha512-+p6pJVtBOLGv+RBrcKAFUdx+euizg0bjL35HhPyM0MjtKlqoC5V9xkCmO9Ctc8JrTyXqODbHqiLWJKumu5zJ7g==} engines: {node: '>=14'} peerDependencies: @@ -7108,25 +7689,25 @@ packages: open: 9.1.0 picocolors: 1.0.0 sirv: 2.0.3 - vite: 4.4.9(@types/node@20.4.7)(sass@1.54.3) + vite: 5.0.4(@types/node@20.4.7)(sass@1.69.5) transitivePeerDependencies: - rollup - supports-color dev: true - /vite-plugin-mock-dev-server@1.3.0(vite@4.4.9): - resolution: {integrity: sha512-sbbBMTLAQkxls3bOu/pntGqnlBYcS0wY/L5d6c8h1ru/n1uQOASYHi9ZvX+AI4dKFueCXRtmmzYxjO0LC0kc3Q==} + /vite-plugin-mock-dev-server@1.3.4(vite@5.0.4): + resolution: {integrity: sha512-50biXarRPdKYxR/q9an4vHMh2cbwFlEWHfLJdXg6gpS63CMMrCo9XQWYIkdytZNSEs/5AwykGB5Xo0ORMMttgQ==} engines: {node: ^14.18.0 || >=16} peerDependencies: vite: '>=3.0.0' dependencies: - '@pengzhanbo/utils': 1.0.8 + '@pengzhanbo/utils': 1.0.9 chokidar: 3.5.3 co-body: 6.1.0 cookies: 0.8.0 cors: 2.8.5 debug: 4.3.4 - esbuild: 0.18.20 + esbuild: 0.19.5 fast-glob: 3.3.1 formidable: 2.1.1 http-status: 1.6.2 @@ -7135,7 +7716,7 @@ packages: mime-types: 2.1.35 path-to-regexp: 6.2.1 picocolors: 1.0.0 - vite: 4.4.9(@types/node@20.4.7)(sass@1.54.3) + vite: 5.0.4(@types/node@20.4.7)(sass@1.69.5) ws: 8.13.0 transitivePeerDependencies: - bufferutil @@ -7143,7 +7724,7 @@ packages: - utf-8-validate dev: true - /vite-plugin-svg-icons@2.0.1(vite@4.4.9): + /vite-plugin-svg-icons@2.0.1(vite@5.0.4): resolution: {integrity: sha512-6ktD+DhV6Rz3VtedYvBKKVA2eXF+sAQVaKkKLDSqGUfnhqXl3bj5PPkVTl3VexfTuZy66PmINi8Q6eFnVfRUmA==} peerDependencies: vite: '>=2.0.0' @@ -7156,7 +7737,7 @@ packages: pathe: 0.2.0 svg-baker: 1.7.0 svgo: 2.8.0 - vite: 4.4.9(@types/node@20.4.7)(sass@1.54.3) + vite: 5.0.4(@types/node@20.4.7)(sass@1.69.5) transitivePeerDependencies: - supports-color dev: true @@ -7164,16 +7745,16 @@ packages: /vite-svg-loader@4.0.0: resolution: {integrity: sha512-0MMf1yzzSYlV4MGePsLVAOqXsbF5IVxbn4EEzqRnWxTQl8BJg/cfwIzfQNmNQxZp5XXwd4kyRKF1LytuHZTnqA==} dependencies: - '@vue/compiler-sfc': 3.3.4 + '@vue/compiler-sfc': 3.3.8 svgo: 3.0.2 dev: true - /vite@4.4.9(@types/node@20.4.7)(sass@1.54.3): - resolution: {integrity: sha512-2mbUn2LlUmNASWwSCNSJ/EG2HuSRTnVNaydp6vMCm5VIqJsjMfbIWtbH2kDuwUVW5mMUKKZvGPX/rqeqVvv1XA==} - engines: {node: ^14.18.0 || >=16.0.0} + /vite@5.0.4(@types/node@20.4.7)(sass@1.69.5): + resolution: {integrity: sha512-RzAr8LSvM8lmhB4tQ5OPcBhpjOZRZjuxv9zO5UcxeoY2bd3kP3Ticd40Qma9/BqZ8JS96Ll/jeBX9u+LJZrhVg==} + engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: - '@types/node': '>= 14' + '@types/node': ^18.0.0 || >=20.0.0 less: '*' lightningcss: ^1.21.0 sass: '*' @@ -7197,25 +7778,25 @@ packages: optional: true dependencies: '@types/node': 20.4.7 - esbuild: 0.18.20 - postcss: 8.4.29 - rollup: 3.28.1 - sass: 1.54.3 + esbuild: 0.19.7 + postcss: 8.4.31 + rollup: 4.5.2 + sass: 1.69.5 optionalDependencies: fsevents: 2.3.3 dev: true - /vooks@0.2.12(vue@3.3.8): + /vooks@0.2.12(vue@3.3.10): resolution: {integrity: sha512-iox0I3RZzxtKlcgYaStQYKEzWWGAduMmq+jS7OrNdQo1FgGfPMubGL3uGHOU9n97NIvfFDBGnpSvkWyb/NSn/Q==} peerDependencies: vue: ^3.0.0 dependencies: evtd: 0.2.4 - vue: 3.3.8(typescript@5.0.2) + vue: 3.3.10(typescript@5.2.2) dev: false - /vue-demi@0.14.5(vue@3.3.8): - resolution: {integrity: sha512-o9NUVpl/YlsGJ7t+xuqJKx8EBGf1quRhCiT6D/J0pfwmk9zUwYkC7yrF4SZCe6fETvSM3UNL2edcbYrSyc4QHA==} + /vue-demi@0.14.6(vue@3.3.10): + resolution: {integrity: sha512-8QA7wrYSHKaYgUxDA5ZC24w+eHm3sYCbp0EzcDwKqN3p6HqtTCGR/GVsPyZW92unff4UlcSh++lmqDWN3ZIq4w==} engines: {node: '>=12'} hasBin: true requiresBuild: true @@ -7226,16 +7807,16 @@ packages: '@vue/composition-api': optional: true dependencies: - vue: 3.3.8(typescript@5.0.2) + vue: 3.3.10(typescript@5.2.2) - /vue-eslint-parser@9.3.1(eslint@8.48.0): + /vue-eslint-parser@9.3.1(eslint@8.52.0): resolution: {integrity: sha512-Clr85iD2XFZ3lJ52/ppmUDG/spxQu6+MAeHXjjyI4I1NUYZ9xmenQp4N0oaHJhrA8OOxltCVxMRfANGa70vU0g==} engines: {node: ^14.17.0 || >=16.0.0} peerDependencies: eslint: '>=6.0.0' dependencies: debug: 4.3.4 - eslint: 8.48.0 + eslint: 8.52.0 eslint-scope: 7.2.2 eslint-visitor-keys: 3.4.3 espree: 9.6.1 @@ -7246,7 +7827,7 @@ packages: - supports-color dev: true - /vue-hooks-plus@1.8.5(vue@3.3.8): + /vue-hooks-plus@1.8.5(vue@3.3.10): resolution: {integrity: sha512-cIatTWz6QQcoSCDn7jadQ3zMr799FmNiHyb59yUvR7Ws5KDJ/KdIMHHx/b0XDKzbGhQ61kcJ78zJKAKhOV0pWw==} peerDependencies: vue: ^3.2.25 @@ -7258,27 +7839,26 @@ packages: qs: 6.11.2 query-string: 7.1.3 screenfull: 5.2.0 - vue: 3.3.8(typescript@5.0.2) + vue: 3.3.10(typescript@5.2.2) - /vue-i18n@9.2.2(vue@3.3.8): - resolution: {integrity: sha512-yswpwtj89rTBhegUAv9Mu37LNznyu3NpyLQmozF3i1hYOhwpG8RjcjIFIIfnu+2MDZJGSZPXaKWvnQA71Yv9TQ==} - engines: {node: '>= 14'} + /vue-i18n@9.7.1(vue@3.3.10): + resolution: {integrity: sha512-A6DzWqJQMdzBj+392+g3zIgGV0FnFC7o/V+txs5yIALANEZzY6ZV8hM2wvZR3nTbQI7dntAmzBHMeoEteJO0kQ==} + engines: {node: '>= 16'} peerDependencies: vue: ^3.0.0 dependencies: - '@intlify/core-base': 9.2.2 - '@intlify/shared': 9.2.2 - '@intlify/vue-devtools': 9.2.2 - '@vue/devtools-api': 6.5.0 - vue: 3.3.8(typescript@5.0.2) + '@intlify/core-base': 9.7.1 + '@intlify/shared': 9.7.1 + '@vue/devtools-api': 6.5.1 + vue: 3.3.10(typescript@5.2.2) - /vue-router@4.2.4(vue@3.3.8): + /vue-router@4.2.4(vue@3.3.10): resolution: {integrity: sha512-9PISkmaCO02OzPVOMq2w82ilty6+xJmQrarYZDkjZBfl4RvYAlt4PKnEX21oW4KTtWfa9OuO/b3qk1Od3AEdCQ==} peerDependencies: vue: ^3.2.0 dependencies: - '@vue/devtools-api': 6.5.0 - vue: 3.3.8(typescript@5.0.2) + '@vue/devtools-api': 6.5.1 + vue: 3.3.10(typescript@5.2.2) dev: false /vue-template-compiler@2.7.14: @@ -7288,46 +7868,46 @@ packages: he: 1.2.0 dev: true - /vue-tsc@1.8.8(typescript@5.0.2): + /vue-tsc@1.8.8(typescript@5.2.2): resolution: {integrity: sha512-bSydNFQsF7AMvwWsRXD7cBIXaNs/KSjvzWLymq/UtKE36697sboX4EccSHFVxvgdBlI1frYPc/VMKJNB7DFeDQ==} hasBin: true peerDependencies: typescript: '*' dependencies: - '@vue/language-core': 1.8.8(typescript@5.0.2) - '@vue/typescript': 1.8.8(typescript@5.0.2) + '@vue/language-core': 1.8.8(typescript@5.2.2) + '@vue/typescript': 1.8.8(typescript@5.2.2) semver: 7.5.4 - typescript: 5.0.2 + typescript: 5.2.2 dev: true - /vue@3.3.8(typescript@5.0.2): - resolution: {integrity: sha512-5VSX/3DabBikOXMsxzlW8JyfeLKlG9mzqnWgLQLty88vdZL7ZJgrdgBOmrArwxiLtmS+lNNpPcBYqrhE6TQW5w==} + /vue@3.3.10(typescript@5.2.2): + resolution: {integrity: sha512-zg6SIXZdTBwiqCw/1p+m04VyHjLfwtjwz8N57sPaBhEex31ND0RYECVOC1YrRwMRmxFf5T1dabl6SGUbMKKuVw==} peerDependencies: typescript: '*' peerDependenciesMeta: typescript: optional: true dependencies: - '@vue/compiler-dom': 3.3.8 - '@vue/compiler-sfc': 3.3.8 - '@vue/runtime-dom': 3.3.8 - '@vue/server-renderer': 3.3.8(vue@3.3.8) - '@vue/shared': 3.3.8 - typescript: 5.0.2 + '@vue/compiler-dom': 3.3.10 + '@vue/compiler-sfc': 3.3.10 + '@vue/runtime-dom': 3.3.10 + '@vue/server-renderer': 3.3.10(vue@3.3.10) + '@vue/shared': 3.3.10 + typescript: 5.2.2 - /vueuc@0.4.51(vue@3.3.8): + /vueuc@0.4.51(vue@3.3.10): resolution: {integrity: sha512-pLiMChM4f+W8czlIClGvGBYo656lc2Y0/mXFSCydcSmnCR1izlKPGMgiYBGjbY9FDkFG8a2HEVz7t0DNzBWbDw==} peerDependencies: vue: ^3.0.11 dependencies: - '@css-render/vue3-ssr': 0.15.12(vue@3.3.8) + '@css-render/vue3-ssr': 0.15.12(vue@3.3.10) '@juggle/resize-observer': 3.4.0 css-render: 0.15.12 evtd: 0.2.4 seemly: 0.3.6 - vdirs: 0.1.8(vue@3.3.8) - vooks: 0.2.12(vue@3.3.8) - vue: 3.3.8(typescript@5.0.2) + vdirs: 0.1.8(vue@3.3.10) + vooks: 0.2.12(vue@3.3.10) + vue: 3.3.10(typescript@5.2.2) dev: false /webidl-conversions@3.0.1: @@ -7473,7 +8053,7 @@ packages: dependencies: eslint-visitor-keys: 3.4.3 lodash: 4.17.21 - yaml: 2.3.2 + yaml: 2.3.4 dev: true /yaml@1.10.2: @@ -7481,13 +8061,8 @@ packages: engines: {node: '>= 6'} dev: true - /yaml@2.3.1: - resolution: {integrity: sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==} - engines: {node: '>= 14'} - dev: true - - /yaml@2.3.2: - resolution: {integrity: sha512-N/lyzTPaJasoDmfV7YTrYCI0G/3ivm/9wdG0aHuheKowWQwGTsK0Eoiw6utmzAnI6pkJa0DUVygvp3spqqEKXg==} + /yaml@2.3.4: + resolution: {integrity: sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA==} engines: {node: '>= 14'} dev: true diff --git a/src/App.tsx b/src/App.tsx index 0f93d8be..b568cc66 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,9 +1,9 @@ import { RouterView } from 'vue-router' -import AppNaiveGlobalProvider from '@/app-components/provider/AppNaiveGlobalProvider/index' -import AppStyleProvider from '@/app-components/provider/AppStyleProvider/index' -import AppLockScreen from '@/app-components/app/AppLockScreen/index' -import AppWatermarkProvider from '@/app-components/provider/AppWatermarkProvider/index' -import AppGlobalSpin from '@/spin/index' +import AppNaiveGlobalProvider from '@/app-components/provider/AppNaiveGlobalProvider' +import AppStyleProvider from '@/app-components/provider/AppStyleProvider' +import AppLockScreen from '@/app-components/app/AppLockScreen' +import AppWatermarkProvider from '@/app-components/provider/AppWatermarkProvider' +import AppGlobalSpin from '@/spin' export default defineComponent({ name: 'App', diff --git a/src/api/demo/mock/person.ts b/src/api/demo/mock/person.ts index 1ffa9053..d8767b63 100644 --- a/src/api/demo/mock/person.ts +++ b/src/api/demo/mock/person.ts @@ -1,4 +1,4 @@ -import { request } from '@/axios/index' +import { request } from '@/axios' import type { BasicResponse, PaginationResponse } from '@/types/modules/axios' diff --git a/src/api/demo/test.ts b/src/api/demo/test.ts index 1c766b98..0124197a 100644 --- a/src/api/demo/test.ts +++ b/src/api/demo/test.ts @@ -19,7 +19,7 @@ * 3. 如果该方法在 setup 环境中使用，则可以使用 useHookPlusRequest 包裹该方法，即可便捷使用该请求函数。如果请求方法在非 setup 环境中使用，直接使用即可 */ -import { request } from '@/axios/index' +import { request } from '@/axios' import type { BasicResponse } from '@/types/modules/axios' diff --git a/src/app-components/app/AppLockScreen/components/LockScreen/index.tsx b/src/app-components/app/AppLockScreen/components/LockScreen/index.tsx index 4c27a463..d3c1bfdf 100644 --- a/src/app-components/app/AppLockScreen/components/LockScreen/index.tsx +++ b/src/app-components/app/AppLockScreen/components/LockScreen/index.tsx @@ -11,8 +11,8 @@ /** 锁屏界面 */ -import { NInput, NForm, NFormItem, NButton, NSpace } from 'naive-ui' -import AppAvatar from '@/app-components/app/AppAvatar/index' +import { NInput, NForm, NFormItem, NButton } from 'naive-ui' +import AppAvatar from '@/app-components/app/AppAvatar' import useAppLockScreen from '@/app-components/app/AppLockScreen/appLockVar' import { rules, useCondition } from '@/app-components/app/AppLockScreen/shared' @@ -27,7 +27,7 @@ const LockScreen = defineComponent({ const inputInstRef = ref(null) const { setLockAppScreen } = useAppLockScreen() - const { changeSwitcher } = useSettingActions() + const { updateSettingState } = useSettingActions() const state = reactive({ lockCondition: useCondition(), @@ -38,7 +38,7 @@ const LockScreen = defineComponent({ formInstRef.value?.validate((error) => { if (!error) { setLockAppScreen(true) - changeSwitcher(true, 'lockScreenSwitch') + updateSettingState('lockScreenSwitch', true) state.lockCondition = useCondition() } diff --git a/src/app-components/app/AppLockScreen/components/UnlockScreen/index.tsx b/src/app-components/app/AppLockScreen/components/UnlockScreen/index.tsx index 8b8efb0e..cceb6f7a 100644 --- a/src/app-components/app/AppLockScreen/components/UnlockScreen/index.tsx +++ b/src/app-components/app/AppLockScreen/components/UnlockScreen/index.tsx @@ -12,13 +12,13 @@ /** 解锁界面 */ import { NInput, NForm, NFormItem, NButton, NSpace } from 'naive-ui' -import AppAvatar from '@/app-components/app/AppAvatar/index' +import AppAvatar from '@/app-components/app/AppAvatar' import dayjs from 'dayjs' import { useSigningActions, useSettingActions } from '@/store' import { rules, useCondition } from '@/app-components/app/AppLockScreen/shared' import useAppLockScreen from '@/app-components/app/AppLockScreen/appLockVar' -import { useDevice } from '@/hooks/web/index' +import { useDevice } from '@/hooks/web' import type { FormInst, InputInst } from 'naive-ui' @@ -29,7 +29,7 @@ export default defineComponent({ const inputInstRef = ref(null) const { logout } = useSigningActions() - const { changeSwitcher } = useSettingActions() + const { updateSettingState } = useSettingActions() const { setLockAppScreen } = useAppLockScreen() const { isTabletOrSmaller } = useDevice() @@ -64,7 +64,7 @@ export default defineComponent({ onPositiveClick: () => { logout() setTimeout(() => { - changeSwitcher(false, 'lockScreenSwitch') + updateSettingState('lockScreenSwitch', false) }) }, }) @@ -75,7 +75,7 @@ export default defineComponent({ formRef.value?.validate((error) => { if (!error) { setLockAppScreen(false) - changeSwitcher(false, 'lockScreenSwitch') + updateSettingState('lockScreenSwitch', false) state.lockCondition = useCondition() } diff --git a/src/app-components/app/AppLockScreen/index.tsx b/src/app-components/app/AppLockScreen/index.tsx index b8941f6f..d353aa76 100644 --- a/src/app-components/app/AppLockScreen/index.tsx +++ b/src/app-components/app/AppLockScreen/index.tsx @@ -22,34 +22,42 @@ import LockScreen from './components/LockScreen' import UnlockScreen from './components/UnlockScreen' import useAppLockScreen from '@/app-components/app/AppLockScreen/appLockVar' -import { useSettingGetters } from '@/store' +import { useSettingGetters, useSettingActions } from '@/store' const AppLockScreen = defineComponent({ name: 'AppLockScreen', setup() { - const { getLockScreenSwitch } = useSettingGetters() - const { getLockAppScreen } = useAppLockScreen() + const { updateSettingState } = useSettingActions() + const { getLockScreenSwitch } = useSettingGetters() + const lockScreenSwitchRef = computed({ + get: () => getLockScreenSwitch.value, + set: (val) => { + updateSettingState('lockScreenSwitch', val) + }, + }) return { - getLockScreenSwitch, + lockScreenSwitchRef, getLockAppScreen, } }, render() { + const { getLockAppScreen } = this + return (
- {!this.getLockAppScreen() ? : } + {!getLockAppScreen() ? : }
) diff --git a/src/app-components/app/RayLink/index.tsx b/src/app-components/app/RayLink/index.tsx index ca4f1702..0f7f6015 100644 --- a/src/app-components/app/RayLink/index.tsx +++ b/src/app-components/app/RayLink/index.tsx @@ -15,37 +15,37 @@ const RayLink = defineComponent({ key: 'yunhome', src: 'https://yunkuangao.me/', tooltip: '云之家', - icon: 'https://usc1.contabostorage.com/c2e495d7890844d392e8ec0c6e5d77eb:image/avatar.jpeg', + icon: 'https://r2chevereto.yka.moe/avatar.jpeg', }, { key: 'yun-cloud-images', src: 'https://yunkuangao.com/', tooltip: '云图床', - icon: 'https://usc1.contabostorage.com/c2e495d7890844d392e8ec0c6e5d77eb:image/avatar.jpeg', + icon: 'https://r2chevereto.yka.moe/avatar.jpeg', }, { key: 'ray-js-note', src: 'https://note.youdao.com/s/ObWEe2BB', tooltip: 'Ray的前端学习笔记', - icon: 'https://usc1.contabostorage.com/c2e495d7890844d392e8ec0c6e5d77eb:image/longmao.navigator.png', + icon: 'https://r2chevereto.yka.moe/longmao.navigator.png', }, { key: 'ray-js-cover', src: 'https://note.youdao.com/s/IC8xKPdB', tooltip: 'Ray的面试题总结', - icon: 'https://usc1.contabostorage.com/c2e495d7890844d392e8ec0c6e5d77eb:image/longmao.navigator.png', + icon: 'https://r2chevereto.yka.moe/longmao.navigator.png', }, { key: 'ray-template-doc', src: 'https://xiaodaigua-ray.github.io/ray-template-doc/', tooltip: 'Ray Template Doc', - icon: 'https://usc1.contabostorage.com/c2e495d7890844d392e8ec0c6e5d77eb:image/longmao.navigator.png', + icon: 'https://r2chevereto.yka.moe/longmao.navigator.png', }, { key: 'ray-template-doc-out', src: 'https://ray-template.yunkuangao.com/', tooltip: 'Ray Template Doc (国内地址)', - icon: 'https://usc1.contabostorage.com/c2e495d7890844d392e8ec0c6e5d77eb:image/longmao.navigator.png', + icon: 'https://r2chevereto.yka.moe/longmao.navigator.png', }, ] diff --git a/src/app-components/provider/AppWatermarkProvider/index.tsx b/src/app-components/provider/AppWatermarkProvider/index.tsx index cf749c5e..41784da8 100644 --- a/src/app-components/provider/AppWatermarkProvider/index.tsx +++ b/src/app-components/provider/AppWatermarkProvider/index.tsx @@ -15,25 +15,29 @@ * * 该组件启用时，会在全局（包括首页）展示 * 如果你不希望在登录页显示，可以手动将该组件放置于 Layout 中 + * + * 当然你也可以通过 useWatermark hook 自定义控制水印的显示以及内容 */ import { NWatermark } from 'naive-ui' -import { APP_WATERMARK_CONFIG } from '@/app-config/appConfig' import { useSettingGetters } from '@/store' export default defineComponent({ name: 'AppWatermarkProvider', setup() { - const { getWatermarkSwitch } = useSettingGetters() + const { getWatermarkSwitch, getWatermarkConfig } = useSettingGetters() return { getWatermarkSwitch, + getWatermarkConfig, } }, render() { - return this.getWatermarkSwitch ? ( - + const { getWatermarkConfig, getWatermarkSwitch } = this + + return getWatermarkSwitch ? ( + ) : null }, }) diff --git a/src/app-config/appConfig.ts b/src/app-config/appConfig.ts index 4e6bd4f0..aec231b0 100644 --- a/src/app-config/appConfig.ts +++ b/src/app-config/appConfig.ts @@ -46,12 +46,15 @@ export const PRE_LOADING_CONFIG: PreloadingConfig = { /** * - * 配置根页面 - * 该项目所有重定向至首页, 都依赖该配置项 + * 配置根路由信息 + * 模板维护一个根路由 ROOT_ROUTE，所有的重定向操作、回到 Layout Root Path 操作都依赖该 path * - * 如果修改了该项目的首页路由配置, 需要更改该配置项, 以免重定向首页操作出现错误 + * 该变量的值，会传递给 globalRootRoute + * 这么做也是为了能够在兼容老版本的模板，并且也是为了能够动态的维护根路由信息 + * + * 有些时候，如果你希望动态的维护 Root Route 信息，可以使用 useAppRoot 方法 */ -export const ROOT_ROUTE: Readonly = { +export const ROOT_ROUTE: RootRoute = { name: 'Dashboard', path: '/dashboard', } @@ -115,7 +118,7 @@ export const APP_CATCH_KEY = { * 具体配置信息查看官网: https://www.naiveui.com/zh-CN/dark/components/watermark#API */ export const APP_WATERMARK_CONFIG = { - content: 'Tring be better~', + content: 'Trying be better~', fontSize: 16, lineHeight: 16, width: 384, diff --git a/src/app-config/localConfig.ts b/src/app-config/localConfig.ts index 9b90d442..79fa9415 100644 --- a/src/app-config/localConfig.ts +++ b/src/app-config/localConfig.ts @@ -38,12 +38,20 @@ export const LOCAL_OPTIONS: LocalOptions = [ /** * - * 系统默认语言 + * 模板默认语言 * * 配置时应该与 LOCAL_OPTIONS 的 key 一致 */ export const SYSTEM_DEFAULT_LOCAL: TemplateLocale = 'zh-CN' +/** + * + * 模板默认错误回滚语言 + * + * 配置时应该与 LOCAL_OPTIONS 的 key 一致 + */ +export const SYSTEM_FALLBACK_LOCALE: TemplateLocale = 'zh-CN' + /** * * i18n 国际化配置与 dayjs 配置的映射入口 diff --git a/src/app-config/requestConfig.ts b/src/app-config/requestConfig.ts index 608663f8..7e9e1fb5 100644 --- a/src/app-config/requestConfig.ts +++ b/src/app-config/requestConfig.ts @@ -13,7 +13,7 @@ import type { AxiosConfig } from '@/types/modules/appConfig' /** axios 相关配置 */ export const AXIOS_CONFIG: AxiosConfig = { - baseURL: '', // `import.meta.env`, + baseURL: '', // `const { MODE } = getAppEnvironment()`, withCredentials: false, // 是否允许跨域携带 `cookie` timeout: 5 * 1000, headers: { diff --git a/src/components/RChart/index.ts b/src/components/RChart/index.ts new file mode 100644 index 00000000..39355684 --- /dev/null +++ b/src/components/RChart/index.ts @@ -0,0 +1,11 @@ +import RChart from './src' +import chartProps from './src/props' + +import type { ExtractPublicPropTypes } from 'vue' + +import type * as RChartType from './src/type' + +export type ChartProps = ExtractPublicPropTypes +export type { RChartType } + +export { RChart, chartProps } diff --git a/src/components/RChart/helper.ts b/src/components/RChart/src/helper.ts similarity index 97% rename from src/components/RChart/helper.ts rename to src/components/RChart/src/helper.ts index 4f4ee0ea..da5ce678 100644 --- a/src/components/RChart/helper.ts +++ b/src/components/RChart/src/helper.ts @@ -13,7 +13,7 @@ import type { ChartThemeRawArray, ChartThemeRawModules, LoadingOptions, -} from '@/components/RChart/type' +} from '@/components/RChart/src/type' /** * diff --git a/src/components/RChart/index.scss b/src/components/RChart/src/index.scss similarity index 100% rename from src/components/RChart/index.scss rename to src/components/RChart/src/index.scss diff --git a/src/components/RChart/index.tsx b/src/components/RChart/src/index.tsx similarity index 98% rename from src/components/RChart/index.tsx rename to src/components/RChart/src/index.tsx index 6480f912..fb3054da 100644 --- a/src/components/RChart/index.tsx +++ b/src/components/RChart/src/index.tsx @@ -42,12 +42,12 @@ import { NCard } from 'naive-ui' import props from './props' import { throttle } from 'lodash-es' import { completeSize } from '@/utils/element' -import { call } from '@/utils/vue/index' +import { call } from '@/utils/vue' import { setupChartTheme } from './helper' import { APP_THEME } from '@/app-config/designConfig' import { useResizeObserver } from '@vueuse/core' -import RMoreDropdown from '@/components/RMoreDropdown/index' -import { renderNode } from '@use-utils/vue/index' +import { RMoreDropdown } from '@/components' +import { renderNode } from '@use-utils/vue' import { downloadBase64File } from '@use-utils/basic' import { useSettingGetters } from '@/store' diff --git a/src/components/RChart/props.ts b/src/components/RChart/src/props.ts similarity index 99% rename from src/components/RChart/props.ts rename to src/components/RChart/src/props.ts index f5e12aab..a7535180 100644 --- a/src/components/RChart/props.ts +++ b/src/components/RChart/src/props.ts @@ -5,7 +5,7 @@ import type { LoadingOptions, AutoResize, ChartTheme, -} from '@/components/RChart/type' +} from '@/components/RChart/src/type' import type { ECharts, SetOptionOpts } from 'echarts/core' import type { MaybeComputedElementRef, MaybeElement } from '@vueuse/core' import type { diff --git a/src/components/RChart/type.ts b/src/components/RChart/src/type.ts similarity index 95% rename from src/components/RChart/type.ts rename to src/components/RChart/src/type.ts index 71f9aa97..682454b9 100644 --- a/src/components/RChart/type.ts +++ b/src/components/RChart/src/type.ts @@ -9,7 +9,7 @@ * @remark 今天也是元气满满撸代码的一天 */ -import type { ECharts, EChartsCoreOption } from 'echarts/core' +import type { ECharts } from 'echarts/core' import type { CanvasRenderer } from 'echarts/renderers' // `echarts` 渲染器 export interface ChartThemeRawModules { @@ -50,7 +50,7 @@ export type ChartTheme = | string | null -export interface RayChartInst { +export interface RChartInst { /** * * echart 实例 diff --git a/src/components/RCollapseGrid/index.ts b/src/components/RCollapseGrid/index.ts index 3827b893..13401c4a 100644 --- a/src/components/RCollapseGrid/index.ts +++ b/src/components/RCollapseGrid/index.ts @@ -1,5 +1,10 @@ -import RCollapseGrid from './src/index' -import props from './src/props' +import RCollapseGrid from './src' +import collapseGridProps from './src/props' -export default RCollapseGrid -export { props } +import type * as RCollapseGridType from './src/type' +import type { ExtractPublicPropTypes } from 'vue' + +export type CollapseGridProps = ExtractPublicPropTypes +export type { RCollapseGridType } + +export { RCollapseGrid, collapseGridProps } diff --git a/src/components/RCollapseGrid/src/index.tsx b/src/components/RCollapseGrid/src/index.tsx index f0d49819..eec92e09 100644 --- a/src/components/RCollapseGrid/src/index.tsx +++ b/src/components/RCollapseGrid/src/index.tsx @@ -22,9 +22,9 @@ import './index.scss' import { NCard, NGrid, NGridItem, NSpace } from 'naive-ui' -import RIcon from '@/components/RIcon' +import { RIcon } from '@/components' -import { call } from '@/utils/vue/index' +import { call } from '@/utils/vue' import props from './props' export default defineComponent({ diff --git a/src/components/RIcon/index.ts b/src/components/RIcon/index.ts new file mode 100644 index 00000000..c6175272 --- /dev/null +++ b/src/components/RIcon/index.ts @@ -0,0 +1,8 @@ +import RIcon from './src' +import iconProps from './src/props' + +import type { ExtractPublicPropTypes } from 'vue' + +export type IconProps = ExtractPublicPropTypes + +export { RIcon, iconProps } diff --git a/src/components/RIcon/index.scss b/src/components/RIcon/src/index.scss similarity index 100% rename from src/components/RIcon/index.scss rename to src/components/RIcon/src/index.scss diff --git a/src/components/RIcon/index.tsx b/src/components/RIcon/src/index.tsx similarity index 97% rename from src/components/RIcon/index.tsx rename to src/components/RIcon/src/index.tsx index 2695052b..d82b3c61 100644 --- a/src/components/RIcon/index.tsx +++ b/src/components/RIcon/src/index.tsx @@ -11,7 +11,7 @@ import './index.scss' -import { call } from '@/utils/vue/index' +import { call } from '@/utils/vue' import { completeSize } from '@/utils/element' import props from './props' diff --git a/src/components/RIcon/props.ts b/src/components/RIcon/src/props.ts similarity index 100% rename from src/components/RIcon/props.ts rename to src/components/RIcon/src/props.ts diff --git a/src/components/RIframe/index.ts b/src/components/RIframe/index.ts index 69e0e1eb..e9c3a05f 100644 --- a/src/components/RIframe/index.ts +++ b/src/components/RIframe/index.ts @@ -1,8 +1,10 @@ -import RIframe from './src/index' -import props from './src/props' +import RIframe from './src' +import iframeProps from './src/props' -import type { RIframeInst } from './src/type' +import type * as RIframeType from './src/type' +import type { ExtractPublicPropTypes } from 'vue' -export default RIframe -export { props } -export type { RIframeInst } +export type IframeProps = ExtractPublicPropTypes +export type { RIframeType } + +export { RIframe, iframeProps } diff --git a/src/components/RIframe/src/index.tsx b/src/components/RIframe/src/index.tsx index 8f527861..a268ece6 100644 --- a/src/components/RIframe/src/index.tsx +++ b/src/components/RIframe/src/index.tsx @@ -13,9 +13,10 @@ import './index.scss' import { NSpin } from 'naive-ui' -import { completeSize, on, off } from '@use-utils/element' -import { call } from '@/utils/vue/index' +import { completeSize } from '@use-utils/element' +import { call } from '@/utils/vue' import props from './props' +import { useEventListener } from '@vueuse/core' export default defineComponent({ name: 'RIframe', @@ -53,19 +54,13 @@ export default defineComponent({ } } + useEventListener(iframeRef, 'load', iframeLoadSuccess) + useEventListener(iframeRef, 'error', iframeLoadError) + expose({ iframeInst: iframeRef, }) - onMounted(() => { - on(iframeRef.value, 'load', iframeLoadSuccess.bind(this)) - on(iframeRef.value, 'error', iframeLoadError) - }) - onBeforeUnmount(() => { - off(iframeRef.value, 'load', iframeLoadSuccess) - off(iframeRef.value, 'error', iframeLoadError) - }) - return { cssVars, iframeRef, diff --git a/src/components/RModal/index.ts b/src/components/RModal/index.ts new file mode 100644 index 00000000..f8e679bb --- /dev/null +++ b/src/components/RModal/index.ts @@ -0,0 +1,8 @@ +import RModal from './src/Modal' +import modalProps from './src/props' + +import type { ExtractPublicPropTypes } from 'vue' + +export type ModalProps = ExtractPublicPropTypes + +export { RModal, modalProps } diff --git a/src/components/RModal/src/Modal.tsx b/src/components/RModal/src/Modal.tsx new file mode 100644 index 00000000..f5e3053c --- /dev/null +++ b/src/components/RModal/src/Modal.tsx @@ -0,0 +1,104 @@ +/** + * + * @author Ray + * + * @date 2023-11-22 + * + * @workspace ray-template + * + * @remark 今天也是元气满满撸代码的一天 + */ + +import './index.scss' + +import { NModal } from 'naive-ui' + +import props from './props' +import { completeSize } from '@/utils/element' +import { useWindowSize } from '@vueuse/core' +import { uuid } from '@/utils/basic' +import { setupDraggable } from './utils' + +import type interact from 'interactjs' + +export default defineComponent({ + name: 'RModal', + props, + setup(props) { + const { height } = useWindowSize() + const cssVars = computed(() => ({ + '--r-modal-width': completeSize(props.width ?? 600), + '--r-modal-card-width': completeSize(props.cardWidth ?? 600), + '--r-modal-dialog-width': completeSize(props.dialogWidth ?? 446), + })) + const uuidEl = uuid() + let intractable: null | ReturnType + + /** + * + * 获取当前是否为 card 风格并且为全屏 + */ + const isFullscreenCardType = () => + props.preset === 'card' && props.fullscreen + + const setupInteract = () => { + const target = document.getElementById(uuidEl) + + if (target) { + setupDraggable(target, props.preset).then((res) => { + intractable = res + }) + } + } + + watch( + () => props.show, + (ndata) => { + if ( + ndata && + props.dad && + (props.preset === 'card' || props.preset === 'dialog') + ) { + nextTick(() => { + setupInteract() + }) + } else { + intractable?.unset() + + intractable = null + } + }, + ) + + return { + cssVars, + height, + isFullscreenCardType, + uuidEl, + } + }, + render() { + const { isFullscreenCardType } = this + const { $props, $slots, $attrs } = this + const { preset, ...$otherProps } = $props + const { cssVars, height, uuidEl } = this + + return ( + + {{ ...$slots }} + + ) + }, +}) diff --git a/src/components/RModal/src/index.scss b/src/components/RModal/src/index.scss new file mode 100644 index 00000000..3f2143ff --- /dev/null +++ b/src/components/RModal/src/index.scss @@ -0,0 +1,18 @@ +.r-modal.n-card.r-modal__preset-card--fullscreen { + width: 100%; + + // 当设置全屏时，启用滚动 + & .n-card__content { + overflow: scroll; + } +} + +.r-modal { + &.n-card { + width: var(--r-modal-card-width); + } + + &.n-dialog { + width: var(--r-modal-dialog-width); + } +} diff --git a/src/components/RModal/src/props.ts b/src/components/RModal/src/props.ts new file mode 100644 index 00000000..0e922828 --- /dev/null +++ b/src/components/RModal/src/props.ts @@ -0,0 +1,69 @@ +/** + * + * @author Ray + * + * @date 2023-11-22 + * + * @workspace ray-template + * + * @remark 今天也是元气满满撸代码的一天 + */ + +import { modalProps } from 'naive-ui' + +const props = { + ...modalProps, + /** + * + * 是否全屏 + * + * @default false + */ + fullscreen: { + type: Boolean, + default: false, + }, + width: { + /** + * + * preset 空时宽度设置 + * + * @default 600 + */ + type: [String, Number], + default: 600, + }, + cardWidth: { + /** + * + * preset 为 card 时宽度设置 + * + * @default 600 + */ + type: [String, Number], + default: 600, + }, + dialogWidth: { + /** + * + * preset 为 dialog 时宽度设置 + * + * @default 446 + */ + type: [String, Number], + default: 446, + }, + dad: { + /** + * + * 是否启用拖拽 + * 当启用拖拽时，可以通过拖拽 header 部分控制模态框 + * + * @default false + */ + type: Boolean, + default: false, + }, +} + +export default props diff --git a/src/components/RModal/src/utils.ts b/src/components/RModal/src/utils.ts new file mode 100644 index 00000000..9fc51871 --- /dev/null +++ b/src/components/RModal/src/utils.ts @@ -0,0 +1,57 @@ +import interact from 'interactjs' + +import type { ModalProps } from 'naive-ui' + +/** + * + * @param bindModal modal 预设元素 + * @param preset 预设类型 + * + * 根据预设模态框设置拖拽效果 + * 但是该效果有且仅有 card, dialog 有效 + * + * 默认添加 30ms 延迟，避免诡异问题 + */ +export const setupDraggable = ( + bindModal: HTMLElement, + preset: ModalProps['preset'], +): Promise> => { + return new Promise((resolve) => { + setTimeout(() => { + const allowFromStr = + preset === 'card' ? '.n-card-header__main' : '.n-dialog__title' + + if (bindModal) { + const dad = interact(bindModal) + .draggable({ + inertia: true, + autoScroll: true, + allowFrom: allowFromStr, + modifiers: [ + interact.modifiers.restrictRect({ + restriction: 'parent', + endOnly: true, + }), + ], + listeners: { + move: (event) => { + const target = event.target + const x = + (parseFloat(target.getAttribute('data-x')) || 0) + event.dx + const y = + (parseFloat(target.getAttribute('data-y')) || 0) + event.dy + + target.style.transform = 'translate(' + x + 'px, ' + y + 'px)' + + target.setAttribute('data-x', x) + target.setAttribute('data-y', y) + }, + }, + }) + .resizable(false) + + resolve(dad) + } + }, 30) + }) +} diff --git a/src/components/RMoreDropdown/index.ts b/src/components/RMoreDropdown/index.ts index d7c8a501..e9dd936a 100644 --- a/src/components/RMoreDropdown/index.ts +++ b/src/components/RMoreDropdown/index.ts @@ -1,5 +1,8 @@ -import RMoreDropdown from './src/index' -import props from './src/props' +import RMoreDropdown from './src' +import moreDropdownProps from './src/props' -export default RMoreDropdown -export { props } +import type { ExtractPublicPropTypes } from 'vue' + +export type MoreDropdownProps = ExtractPublicPropTypes + +export { RMoreDropdown, moreDropdownProps } diff --git a/src/components/RMoreDropdown/src/index.tsx b/src/components/RMoreDropdown/src/index.tsx index 444a8b9c..5f7b972a 100644 --- a/src/components/RMoreDropdown/src/index.tsx +++ b/src/components/RMoreDropdown/src/index.tsx @@ -10,10 +10,10 @@ */ import { NDropdown } from 'naive-ui' -import RIcon from '@/components/RIcon/index' +import { RIcon } from '@/components' import props from './props' -import { renderNode } from '@use-utils/vue/index' +import { renderNode } from '@use-utils/vue' export default defineComponent({ name: 'RMoreDropdown', diff --git a/src/components/RQRCode/index.ts b/src/components/RQRCode/index.ts index 6002f700..8d24f6ae 100644 --- a/src/components/RQRCode/index.ts +++ b/src/components/RQRCode/index.ts @@ -1,9 +1,10 @@ -import RayQRcode from './src/index' +import RQRCode from './src' +import qrcodeProps from './src/props' -export default RayQRcode -export type { - QRCodeStatus, - QRCodeLevel, - QRCodeRenderResponse, - QRCodeInst, -} from './src/type' +import type * as RQRCodeType from './src/type' +import type { ExtractPublicPropTypes } from 'vue' + +export type QRCodeProps = ExtractPublicPropTypes +export type { RQRCodeType } + +export { RQRCode, qrcodeProps } diff --git a/src/components/RQRCode/src/index.tsx b/src/components/RQRCode/src/index.tsx index aae7f18b..4023b6cd 100644 --- a/src/components/RQRCode/src/index.tsx +++ b/src/components/RQRCode/src/index.tsx @@ -12,12 +12,12 @@ import './index.scss' import { NButton, NSpin } from 'naive-ui' -import RIcon from '@/components/RIcon/index' +import { RIcon } from '@/components' import props from './props' import { AwesomeQR } from 'awesome-qr' import { isValueType, downloadAnyFile } from '@/utils/basic' -import { call } from '@/utils/vue/index' +import { call } from '@/utils/vue' import type { QRCodeRenderResponse, diff --git a/src/components/RTable/index.ts b/src/components/RTable/index.ts index 49ec1744..f2dc085a 100644 --- a/src/components/RTable/index.ts +++ b/src/components/RTable/index.ts @@ -1,6 +1,10 @@ import RTable from './src/Table' -import props from './src/props' +import tableProps from './src/props' -export default RTable -export { props } -export type { TableInst } from './src/type' +import type * as RTableType from './src/type' +import type { ExtractPublicPropTypes } from 'vue' + +export type TableProps = ExtractPublicPropTypes +export type { RTableType } + +export { RTable, tableProps } diff --git a/src/components/RTable/src/Table.tsx b/src/components/RTable/src/Table.tsx index 6d619ab2..75f36ea4 100644 --- a/src/components/RTable/src/Table.tsx +++ b/src/components/RTable/src/Table.tsx @@ -18,7 +18,7 @@ import C from './components/C' import Print from './components/Print' import props from './props' -import { call, renderNode } from '@/utils/vue/index' +import { call, renderNode } from '@/utils/vue' import { uuid } from '@/utils/basic' import config from './config' @@ -35,13 +35,23 @@ export default defineComponent({ const rTableInst = ref(null) const wrapperRef = ref(null) - const uuidWrapper = uuid(16) - const uuidTable = uuid(16) + const uuidWrapper = uuid(16) // wrapper id + const uuidTable = uuid(16) // table id + /** + * + * x: 横坐标 + * y: 纵坐标 + * showContextMenu: 是否显示右键菜单 + */ const contextMenuReactive = reactive({ x: 0, y: 0, showContextMenu: false, }) + /** + * + * size: table size，内部私有状态管理 + */ const privateReactive = reactive({ size: props.size, }) @@ -90,10 +100,22 @@ export default defineComponent({ } } + /** + * + * @param size table size + * + * 修改 table size + */ const changeTableSize = (size: ComponentSize) => { privateReactive.size = size } + /** + * + * @param options table columns + * + * 更新 table columns，同时触发 onUpdateColumns 和 onUpdate:columns 事件 + */ const updateTableColumn = (options: CType[]) => { const { onUpdateColumns, 'onUpdate:columns': $onUpdateColumns } = props @@ -105,6 +127,11 @@ export default defineComponent({ } } + /** + * + * 处理自定义的 toolOptions + * 匹配所有符合条件的 toolOptions，然后执行 + */ const renderToolOptions = () => { const { toolOptions } = props @@ -113,6 +140,12 @@ export default defineComponent({ .map((curr) => (typeof curr === 'function' ? curr() : curr)) } + /** + * + * @param p props + * + * 处理 toolOptions，合并渲染所有的 toolOptions + */ const tool = (p: typeof props) => { const renderDefaultToolOptions = () => ( <> @@ -163,7 +196,6 @@ export default defineComponent({ } }, render() { - /* eslint-disable @typescript-eslint/no-explicit-any */ const { tool } = this return ( @@ -208,6 +240,7 @@ export default defineComponent({ }), 'header-extra': () => ( + {/* eslint-disable @typescript-eslint/no-explicit-any */} {tool(this.$props as any)} ), diff --git a/src/components/RTable/src/components/C.tsx b/src/components/RTable/src/components/C.tsx index 0957d318..dd1a3462 100644 --- a/src/components/RTable/src/components/C.tsx +++ b/src/components/RTable/src/components/C.tsx @@ -9,13 +9,21 @@ * @remark 今天也是元气满满撸代码的一天 */ +/** + * + * 自定义表格列的顺序 + * + * 但是该方法有几个缺陷地方: + * 1. 只能代理第一层的数据，也就意味着深层次的子列不支持配置操作，只会跟随根列更新 + * 2. 大量数据的时候，可能会出现性能问题 + */ + import { NPopover, NSpace, NTree } from 'naive-ui' -import RIcon from '@/components/RIcon/index' +import { RIcon } from '@/components' import config from '../config' import props from '../props' -import { h } from 'vue' -import { call } from '@/utils/vue/index' +import { call } from '@/utils/vue' import type { TreeOption, TreeDropInfo } from 'naive-ui' import type { C } from '../type' @@ -24,11 +32,9 @@ import type { MaybeArray } from '@/types/modules/utils' type FixedClick = (type: 'left' | 'right', option: C, index: number) => void -const renderSwitcherIcon = () => - h(RIcon, { - name: 'draggable', - size: config.tableIconSize, - }) +const renderSwitcherIcon = () => ( + +) const RowIconRender = ({ icon, diff --git a/src/components/RTable/src/components/Fullscreen.tsx b/src/components/RTable/src/components/Fullscreen.tsx index fe6bb31d..3c829cf9 100644 --- a/src/components/RTable/src/components/Fullscreen.tsx +++ b/src/components/RTable/src/components/Fullscreen.tsx @@ -10,7 +10,7 @@ */ import { NPopover } from 'naive-ui' -import RIcon from '@/components/RIcon/index' +import { RIcon } from '@/components' import config from '../config' import { useFullscreen } from 'vue-hooks-plus' diff --git a/src/components/RTable/src/components/Print.tsx b/src/components/RTable/src/components/Print.tsx index b2e5d71a..c7d0f5a0 100644 --- a/src/components/RTable/src/components/Print.tsx +++ b/src/components/RTable/src/components/Print.tsx @@ -10,16 +10,16 @@ */ import { NPopover } from 'naive-ui' -import RIcon from '@/components/RIcon/index' +import { RIcon } from '@/components' import config from '../config' import props from '../props' -import print from 'print-js' +import { print } from '@/utils/basic' import type { TableProvider } from '../type' export default defineComponent({ - name: 'PrintTable', + name: 'TablePrint', props, setup(props) { const { uuidTable } = inject( @@ -39,7 +39,7 @@ export default defineComponent({ : '表格', }) - print(options) + print(document.getElementById(uuidTable), options) } return { diff --git a/src/components/RTable/src/components/Size.tsx b/src/components/RTable/src/components/Size.tsx index c05891c7..76688ccd 100644 --- a/src/components/RTable/src/components/Size.tsx +++ b/src/components/RTable/src/components/Size.tsx @@ -9,10 +9,10 @@ * @remark 今天也是元气满满撸代码的一天 */ -import { NPopover, NCard, NPopselect } from 'naive-ui' -import RIcon from '@/components/RIcon/index' +import { NPopover, NPopselect } from 'naive-ui' +import { RIcon } from '@/components' -import { call } from '@/utils/vue/index' +import { call } from '@/utils/vue' import props from '../props' import config from '../config' diff --git a/src/components/RTransitionComponent/index.ts b/src/components/RTransitionComponent/index.ts new file mode 100644 index 00000000..cbcdcffa --- /dev/null +++ b/src/components/RTransitionComponent/index.ts @@ -0,0 +1,12 @@ +import RTransitionComponent from './src/index.vue' +import transitionComponentProps from './src/props' + +import type * as RTransitionComponentType from './src/type' +import type { ExtractPublicPropTypes } from 'vue' + +export type TransitionComponentProps = ExtractPublicPropTypes< + typeof transitionComponentProps +> +export type { RTransitionComponentType } + +export { RTransitionComponent, transitionComponentProps } diff --git a/src/components/RTransitionComponent/index.vue b/src/components/RTransitionComponent/src/index.vue similarity index 90% rename from src/components/RTransitionComponent/index.vue rename to src/components/RTransitionComponent/src/index.vue index 1d85f681..9f1c9b30 100644 --- a/src/components/RTransitionComponent/index.vue +++ b/src/components/RTransitionComponent/src/index.vue @@ -25,6 +25,7 @@ + */ +export const useElementFullscreen = ( + target: BasicTarget, + options?: UseElementFullscreenOptions, +) => { + const { beforeEnter, beforeExit, backgroundColor, zIndex } = options ?? {} + const cacheStyle: Partial = {} // 缓存一些需要被覆盖的样式，例如: transition + let isSetup = false + + const updateStyle = () => { + const element = unrefElement(target) as HTMLElement | null + + if (!element) { + return + } + + const { left, top } = element.getBoundingClientRect() + const cssContent = ` + [${ID_TAG}] { + position: fixed; + width: 100% !important; + height: ${height.value}px !important; + transform: translate(-${left}px, -${top}px) !important; + transition: all 0.3s var(--r-bezier); + z-index: ${ + isValueType(zIndex, 'Null') || + isValueType(zIndex, 'Undefined') + ? currentZIndex + : zIndex + } !important; + background-color: ${backgroundColor ?? null}; + } + ` + + styleElement.innerHTML = cssContent + + // 避免重复添加 style 标签 + if (!isAppend) { + document.head.appendChild(styleElement) + } + } + + const enter = () => { + const element = unrefElement(target) as HTMLElement | null + + beforeEnter?.() + + if (element) { + if (!element.getAttribute(ID_TAG)) { + element.setAttribute(ID_TAG, ID_TAG) + } + + if (!isSetup) { + isSetup = true + currentZIndex += 1 + } + + if (!isAppend) { + updateStyle() + + isAppend = true + } + + cacheStyle.transition = element.style.transition + element.style.transition = 'all 0.3s var(--r-bezier)' + } + } + + const exit = () => { + beforeExit?.() + + const element = unrefElement(target) + + if (element) { + element.removeAttribute(ID_TAG) + } + } + + const toggleFullscreen = () => { + const element = unrefElement(target) + + if (element) { + if (element.getAttribute(ID_TAG)) { + exit() + } else { + enter() + } + } + } + + const stopWatch = watch(() => height.value, updateStyle) + + effectDispose(() => { + const element = unrefElement(target) as HTMLElement | null + + if (element) { + element.style.transition = cacheStyle.transition ?? '' + + element.removeAttribute(ID_TAG) + } + + stopWatch() + }) + + return { + enter, + exit, + toggleFullscreen, + } +} diff --git a/src/hooks/web/useI18n.ts b/src/hooks/web/useI18n.ts index 4e567115..31adab74 100644 --- a/src/hooks/web/useI18n.ts +++ b/src/hooks/web/useI18n.ts @@ -9,7 +9,7 @@ * @remark 今天也是元气满满撸代码的一天 */ -import { i18n } from '@/locales/index' +import { i18n } from '@/locales' import type { WritableComputedRef } from 'vue' @@ -63,3 +63,5 @@ export const useI18n = (namespace?: string) => { * 该插件识别 t 方法包裹 path 进行提示文案内容 */ export const t = (key: string) => key + +export type UseI18nReturnType = ReturnType diff --git a/src/hooks/web/useVueRouter.ts b/src/hooks/web/useVueRouter.ts index 5f8465c4..be7b29d1 100644 --- a/src/hooks/web/useVueRouter.ts +++ b/src/hooks/web/useVueRouter.ts @@ -9,7 +9,7 @@ * @remark 今天也是元气满满撸代码的一天 */ -import { router } from '@/router/index' +import { router } from '@/router' /** * @@ -33,3 +33,5 @@ export const useVueRouter = () => { throw new Error('router is not defined') } } + +export type UseVueRouterReturnType = ReturnType diff --git a/src/hooks/web/useWebFullscreen.ts b/src/hooks/web/useWebFullscreen.ts deleted file mode 100644 index 40b31de2..00000000 --- a/src/hooks/web/useWebFullscreen.ts +++ /dev/null @@ -1,14 +0,0 @@ -/** - * - * @author Ray - * - * @date 2023-11-16 - * - * @workspace ray-template - * - * @remark 今天也是元气满满撸代码的一天 - */ - -export function useWebFullscreen() { - // -} diff --git a/src/layout/components/Menu/components/SiderBarLogo/index.tsx b/src/layout/components/Menu/components/SiderBarLogo/index.tsx index 3e20b52e..48d541a4 100644 --- a/src/layout/components/Menu/components/SiderBarLogo/index.tsx +++ b/src/layout/components/Menu/components/SiderBarLogo/index.tsx @@ -12,7 +12,7 @@ import './index.scss' import { NEllipsis, NPopover } from 'naive-ui' -import RIcon from '@/components/RIcon/index' +import { RIcon } from '@/components' export default defineComponent({ name: 'SiderBarLogo', diff --git a/src/layout/components/Menu/index.tsx b/src/layout/components/Menu/index.tsx index a3125eaa..71449cda 100644 --- a/src/layout/components/Menu/index.tsx +++ b/src/layout/components/Menu/index.tsx @@ -12,11 +12,11 @@ import './index.scss' import { NMenu, NLayoutSider, NDrawer } from 'naive-ui' -import SiderBarLogo from './components/SiderBarLogo/index' +import SiderBarLogo from './components/SiderBarLogo' import { APP_MENU_CONFIG } from '@/app-config/appConfig' -import { useDevice } from '@/hooks/web/index' -import { getVariableToRefs, setVariable } from '@/global-variable/index' +import { useDevice } from '@/hooks/web' +import { getVariableToRefs, setVariable } from '@/global-variable' import { useMenuGetters, useMenuActions } from '@/store' import type { MenuInst } from 'naive-ui' diff --git a/src/layout/components/MenuTag/index.scss b/src/layout/components/MenuTag/index.scss index 53a88982..a22a1366 100644 --- a/src/layout/components/MenuTag/index.scss +++ b/src/layout/components/MenuTag/index.scss @@ -41,6 +41,46 @@ $menuTagWrapperWidth: 76px; } } +// 激活标签页关闭按钮样式 +.menu-tag { + .menu-tag__btn { + padding: 7px 10px; + + .menu-tag__btn-icon--hidden { + display: none !important; + } + + .menu-tag__btn-icon { + display: inline; + margin-left: 0; + width: 0; + height: 0; + transition: all 0.3s var(--r-bezier); + overflow: hidden; + opacity: 0; + + & .ray-icon { + transform: translate(-1px, 0px); + } + } + + &:hover { + .menu-tag__btn-icon { + width: 14px; + height: 14px; + margin-left: 5px; + font-size: 12px; + background-color: rgba(0, 0, 0, 0.12); + border-radius: 50%; + padding: 1px; + transition: all 0.3s var(--r-bezier); + opacity: 1; + } + } + } +} + +// 设置 dropdown animate svg 尺寸 .menu-tag__dropdown { & .menu-tag__icon { width: 18px; diff --git a/src/layout/components/MenuTag/index.tsx b/src/layout/components/MenuTag/index.tsx index 73aa24d3..3f929c0d 100644 --- a/src/layout/components/MenuTag/index.tsx +++ b/src/layout/components/MenuTag/index.tsx @@ -31,23 +31,27 @@ import './index.scss' -import { NScrollbar, NTag, NSpace, NLayoutHeader, NDropdown } from 'naive-ui' -import RIcon from '@/components/RIcon/index' -import RMoreDropdown from '@/components/RMoreDropdown/index' +import { + NScrollbar, + NSpace, + NLayoutHeader, + NDropdown, + NButton, + NIcon, +} from 'naive-ui' +import { RIcon, RMoreDropdown } from '@/components' -// import Reload from '@/icons/reload.svg?component' import CloseRight from '@/icons/close_right.svg?component' import CloseLeft from '@/icons/close_left.svg?component' import { useMenuGetters, useMenuActions } from '@/store' import { uuid } from '@/utils/basic' import { hasClass } from '@/utils/element' -import { ROOT_ROUTE } from '@/app-config/appConfig' import { queryElements } from '@use-utils/element' -import { renderNode } from '@/utils/vue/index' -import { useMainPage } from '@/hooks/template/index' -import { useMenuTag } from '@/hooks/template/index' +import { useMaximize, useSpinning } from '@/hooks/template' +import { useSiderBar } from '@/hooks/template' import { throttle } from 'lodash-es' +import { useAppRoot } from '@/hooks/template' import type { ScrollbarInst } from 'naive-ui' import type { MenuTagOptions, AppMenuOption } from '@/types/modules/app' @@ -59,15 +63,16 @@ export default defineComponent({ const { getMenuKey, getMenuTagOptions } = useMenuGetters() const { changeMenuModelValue } = useMenuActions() - const { path } = ROOT_ROUTE - const { reload, maximize } = useMainPage() + const { getRootPath } = useAppRoot() + const { maximize } = useMaximize() + const { reload } = useSpinning() const { close, closeAll: $closeAll, closeRight: $closeRight, closeLeft: $closeLeft, closeOther: $closeOther, - } = useMenuTag() + } = useSiderBar() const canDisabledOptions = [ 'closeAll', @@ -95,16 +100,16 @@ export default defineComponent({ type: 'divider', key: 'd1', }, - { - label: '关闭右侧标签页', - key: 'closeRight', - icon: () => , - }, { label: '关闭左侧标签页', key: 'closeLeft', icon: () => , }, + { + label: '关闭右侧标签页', + key: 'closeRight', + icon: () => , + }, { type: 'divider', key: 'd1', @@ -124,7 +129,7 @@ export default defineComponent({ const uuidScrollBar = uuid(16) // scroll bar uuid const actionMap = { closeCurrentPage: () => { - getMenuKey.value !== path && close(currentContextmenuIndex) + getMenuKey.value !== getRootPath.value && close(currentContextmenuIndex) }, reloadCurrentPage: () => { reload() @@ -180,7 +185,7 @@ export default defineComponent({ const handleTagClick = (option: AppMenuOption) => { actionState.actionDropdownShow = false - changeMenuModelValue(option.key as string, option) + changeMenuModelValue(option.key, option) } /** @@ -194,9 +199,11 @@ export default defineComponent({ const scrollContentElement = Array.from( scroll.childNodes, ) as HTMLElement[] - const findElement = scrollContentElement.find((el) => - hasClass(el, 'n-scrollbar-container'), - ) + const findElement = scrollContentElement.find((el) => { + const has = hasClass(el, 'n-scrollbar-container') + + return has.value + }) return findElement } @@ -262,20 +269,12 @@ export default defineComponent({ */ const setDisabledAccordionToIndex = () => { const length = getMenuTagOptions.value.length - 1 + const { closeable } = + getMenuTagOptions.value[currentContextmenuIndex] ?? + ({} as MenuTagOptions) // 是否需要禁用关闭当前标签页 - if (getMenuKey.value === path) { - setMoreOptionsDisabled('closeCurrentPage', true) - } else { - const isRoot = moreOptions.value[currentContextmenuIndex] - - // 避免 isRoot 为 undefined - if (isRoot?.key === 'closeCurrentPage') { - setMoreOptionsDisabled('closeCurrentPage', true) - } else { - setMoreOptionsDisabled('closeCurrentPage', false) - } - } + setMoreOptionsDisabled('closeCurrentPage', !closeable ?? false) // 是否需要禁用关闭右侧标签页 if (currentContextmenuIndex === length) { @@ -310,7 +309,10 @@ export default defineComponent({ /** 仅有 getMenuTagOptions 长度大于 1 并且非 root path 时, 才激活关闭按钮 */ const menuTagMouseenter = (option: MenuTagOptions) => { - if (getMenuTagOptions.value.length > 1 && option.key !== path) { + if ( + getMenuTagOptions.value.length > 1 && + option.key !== getRootPath.value + ) { option.closeable = true } } @@ -351,7 +353,10 @@ export default defineComponent({ const [menuTag] = tags nextTick().then(() => { - menuTag.scrollIntoView?.(true) + scrollRef.value?.scrollTo({ + left: menuTag.offsetLeft, + behavior: 'smooth', + }) }) } }) @@ -360,21 +365,19 @@ export default defineComponent({ /** 如果有且只有一个标签页时, 禁止全部关闭操作 */ watch( () => getMenuTagOptions.value, - (newData, oldData) => { + (ndata, odata) => { // 当 menuTagOptions 长度为 1时，禁用所有 canDisabledOptions 匹配的项 moreOptions.value.forEach((curr) => { if (canDisabledOptions.includes(curr.key)) { - newData.length > 1 - ? (curr.disabled = false) - : (curr.disabled = true) + ndata.length > 1 ? (curr.disabled = false) : (curr.disabled = true) } }) // 更新当前激活标签定位 - if (oldData?.length) { - if (newData.length > oldData?.length) { + if (odata?.length) { + if (ndata.length > odata?.length) { updateScrollBarPosition() - } else if (newData.length === oldData?.length) { + } else if (ndata.length === odata?.length) { positionMenuTag() } } @@ -418,11 +421,12 @@ export default defineComponent({ height: 28, }, maximize, + getRootPath, } }, render() { - const { iconConfig } = this - const { maximize } = this + const { iconConfig, getRootPath, uuidScrollBar } = this + const { maximize, closeCurrentMenuTag, scrollX, $t } = this return ( @@ -460,7 +464,7 @@ export default defineComponent({ xScrollable ref="scrollRef" {...{ - id: this.uuidScrollBar, + id: uuidScrollBar, }} > {this.getMenuTagOptions.map((curr, idx) => ( - - {renderNode(curr.breadcrumbLabel)} - + {{ + default: () => ( + <> + + {{ + default: () => { + const { + breadcrumbLabel, + meta: { i18nKey }, + } = curr + + return i18nKey ? $t(i18nKey) : breadcrumbLabel + }, + }} + + {(curr.closeable || + this.getMenuTagOptions.length === 1) && + curr.key !== getRootPath ? ( + + + + ) : ( + // 默认使用一个空 NIcon 占位，避免不能正确的触发动画 + + )} + + ), + }} + ))} @@ -504,7 +548,7 @@ export default defineComponent({ width={iconConfig.width} height={iconConfig.height} customClassName="menu-tag__right-arrow" - onClick={this.scrollX.bind(this, 'right')} + onClick={scrollX.bind(this, 'right')} /> 标签, 避免 Runtime directive used on component... 警告 */ +import './index.scss' + import { NDropdown, NBreadcrumb, NBreadcrumbItem } from 'naive-ui' +import { TransitionGroup } from 'vue' import { useMenuGetters, useMenuActions } from '@/store' -import { useDevice } from '@/hooks/web/index' +import { useDevice } from '@/hooks/web' import type { DropdownOption } from 'naive-ui' import type { AppMenuOption } from '@/types/modules/app' @@ -61,36 +64,41 @@ export default defineComponent({ } }, render() { - const { isTabletOrSmaller } = this + const { isTabletOrSmaller, getBreadcrumbOptions } = this + const { dropdownSelect, breadcrumbItemClick } = this return isTabletOrSmaller ? ( -
+
) : ( - {this.getBreadcrumbOptions.map((curr) => ( - - 1 ? curr.children : [] - } - onSelect={this.dropdownSelect.bind(this)} + + {getBreadcrumbOptions.map((curr) => ( + - {{ - default: () => ( - - {curr.label && typeof curr.label === 'function' - ? curr.label() - : curr.breadcrumbLabel} - - ), - }} - - - ))} + 1 + ? curr.children + : [] + } + onSelect={dropdownSelect.bind(this)} + > + {{ + default: () => ( + + {curr.label && typeof curr.label === 'function' + ? curr.label() + : curr.breadcrumbLabel} + + ), + }} + + + ))} + ) }, diff --git a/src/layout/components/SiderBar/components/GlobalSearch/index.tsx b/src/layout/components/SiderBar/components/GlobalSearch/index.tsx index 33e73244..30c6ba75 100644 --- a/src/layout/components/SiderBar/components/GlobalSearch/index.tsx +++ b/src/layout/components/SiderBar/components/GlobalSearch/index.tsx @@ -21,13 +21,14 @@ import './index.scss' import { NInput, NModal, NResult, NScrollbar, NSpace } from 'naive-ui' -import RIcon from '@/components/RIcon/index' +import { RIcon } from '@/components' -import { on, off, queryElements, addClass, removeClass } from '@/utils/element' +import { queryElements, addClass, removeClass } from '@/utils/element' import { debounce } from 'lodash-es' import { useMenuGetters, useMenuActions } from '@/store' import { validMenuItemShow } from '@/router/helper/routerCopilot' -import { useDevice } from '@/hooks/web/index' +import { useDevice } from '@/hooks/web' +import { useEventListener } from '@vueuse/core' import type { AppRouteMeta } from '@/router/type' import type { AppMenuOption } from '@/types/modules/app' @@ -275,17 +276,9 @@ export default defineComponent({ } }) - onMounted(() => { - on(window, 'keydown', (e: Event) => { - registerArouseKeyboard(e as KeyboardEvent) - registerChangeSearchElementIndex(e as KeyboardEvent) - }) - }) - onBeforeUnmount(() => { - off(window, 'keydown', (e: Event) => { - registerArouseKeyboard(e as KeyboardEvent) - registerChangeSearchElementIndex(e as KeyboardEvent) - }) + useEventListener(window, 'keydown', (e: KeyboardEvent) => { + registerArouseKeyboard(e) + registerChangeSearchElementIndex(e) }) return { diff --git a/src/layout/components/SiderBar/components/SettingDrawer/components/ThemeSwitch/index.tsx b/src/layout/components/SiderBar/components/SettingDrawer/components/ThemeSwitch/index.tsx index b5c0ac0c..8cc20e87 100644 --- a/src/layout/components/SiderBar/components/SettingDrawer/components/ThemeSwitch/index.tsx +++ b/src/layout/components/SiderBar/components/SettingDrawer/components/ThemeSwitch/index.tsx @@ -10,18 +10,19 @@ */ import { NSpace, NSwitch, NTooltip } from 'naive-ui' -import RIcon from '@/components/RIcon' +import { RIcon } from '@/components' -import { useSettingGetters, useSettingActions } from '@/store' +import { useSettingGetters } from '@/store' +import { useTheme } from '@/hooks/template' export default defineComponent({ name: 'ThemeSwitch', setup() { - const { changeSwitcher } = useSettingActions() + const { changeDarkTheme, changeLightTheme } = useTheme() const { getAppTheme } = useSettingGetters() const modelAppThemeRef = ref(getAppTheme.value) - const handleRailStyle = ({ checked }: { checked: boolean }) => { + const railStyle = ({ checked }: { checked: boolean }) => { return checked ? { backgroundColor: '#000000', @@ -32,14 +33,15 @@ export default defineComponent({ } return { - changeSwitcher, + changeDarkTheme, + changeLightTheme, getAppTheme, - handleRailStyle, + railStyle, modelAppThemeRef, } }, render() { - const { $t } = this + const { $t, changeDarkTheme, changeLightTheme, railStyle } = this return ( @@ -48,28 +50,14 @@ export default defineComponent({ trigger: () => ( - this.changeSwitcher(bool, 'appTheme') + bool ? changeDarkTheme() : changeLightTheme() } > {{ - 'checked-icon': () => - h( - RIcon, - { - name: 'dark', - }, - {}, - ), - 'unchecked-icon': () => - h( - RIcon, - { - name: 'light', - }, - {}, - ), + 'checked-icon': () => , + 'unchecked-icon': () => , checked: () => '亮', unchecked: () => '暗', }} diff --git a/src/layout/components/SiderBar/components/SettingDrawer/index.tsx b/src/layout/components/SiderBar/components/SettingDrawer/index.tsx index 3216ec19..11a786d0 100644 --- a/src/layout/components/SiderBar/components/SettingDrawer/index.tsx +++ b/src/layout/components/SiderBar/components/SettingDrawer/index.tsx @@ -21,7 +21,7 @@ import { NDescriptionsItem, NSelect, } from 'naive-ui' -import ThemeSwitch from '@/layout/components/SiderBar/components/SettingDrawer/components/ThemeSwitch/index' +import ThemeSwitch from '@/layout/components/SiderBar/components/SettingDrawer/components/ThemeSwitch' import { APP_THEME } from '@/app-config/designConfig' import { useSettingGetters, useSettingActions } from '@/store' @@ -47,8 +47,7 @@ const SettingDrawer = defineComponent({ }, emits: ['update:show'], setup(props, { emit }) { - const { changePrimaryColor, changeSwitcher, updateContentTransition } = - useSettingActions() + const { changePrimaryColor, updateSettingState } = useSettingActions() const { getAppTheme, getPrimaryColorOverride, @@ -84,20 +83,22 @@ const SettingDrawer = defineComponent({ value: 'opacity', }, ] + const modelSwitchReactive = reactive({ + getMenuTagSwitch: getMenuTagSwitch.value, + getBreadcrumbSwitch: getBreadcrumbSwitch.value, + getCopyrightSwitch: getCopyrightSwitch.value, + getContentTransition: getContentTransition.value, + getWatermarkSwitch: getWatermarkSwitch.value, + }) return { modelShow, changePrimaryColor, getAppTheme, getPrimaryColorOverride, - getMenuTagSwitch, - changeSwitcher, - getBreadcrumbSwitch, - getCopyrightSwitch, contentTransitionOptions, - getContentTransition, - updateContentTransition, - getWatermarkSwitch, + updateSettingState, + modelSwitchReactive, } }, render() { @@ -127,10 +128,10 @@ const SettingDrawer = defineComponent({ {$t('headerSettingOptions.ContentTransition')} { - this.updateContentTransition(value) + this.updateSettingState('contentTransition', value) }} /> @@ -139,33 +140,33 @@ const SettingDrawer = defineComponent({ - this.changeSwitcher(bool, 'menuTagSwitch') + this.updateSettingState('menuTagSwitch', bool) } /> - this.changeSwitcher(bool, 'breadcrumbSwitch') + this.updateSettingState('breadcrumbSwitch', bool) } /> - this.changeSwitcher(bool, 'watermarkSwitch') + this.updateSettingState('watermarkSwitch', bool) } /> - this.changeSwitcher(bool, 'copyrightSwitch') + this.updateSettingState('copyrightSwitch', bool) } /> diff --git a/src/layout/components/SiderBar/components/TooltipIcon/index.tsx b/src/layout/components/SiderBar/components/TooltipIcon/index.tsx index ac11fcd0..19993bf6 100644 --- a/src/layout/components/SiderBar/components/TooltipIcon/index.tsx +++ b/src/layout/components/SiderBar/components/TooltipIcon/index.tsx @@ -12,7 +12,7 @@ import './index.scss' import { NTooltip } from 'naive-ui' -import RIcon from '@/components/RIcon/index' +import { RIcon } from '@/components' import { tooltipProps } from 'naive-ui' diff --git a/src/layout/components/SiderBar/index.tsx b/src/layout/components/SiderBar/index.tsx index 664f5564..9df8723e 100644 --- a/src/layout/components/SiderBar/index.tsx +++ b/src/layout/components/SiderBar/index.tsx @@ -20,12 +20,12 @@ import './index.scss' import { NLayoutHeader, NSpace, NDropdown } from 'naive-ui' -import RIcon from '@/components/RIcon/index' -import TooltipIcon from '@/layout/components/SiderBar/components/TooltipIcon/index' -import SettingDrawer from './components/SettingDrawer/index' -import Breadcrumb from './components/Breadcrumb/index' -import GlobalSearch from './components/GlobalSearch/index' -import AppAvatar from '@/app-components/app/AppAvatar/index' +import { RIcon } from '@/components' +import TooltipIcon from '@/layout/components/SiderBar/components/TooltipIcon' +import SettingDrawer from './components/SettingDrawer' +import Breadcrumb from './components/Breadcrumb' +import GlobalSearch from './components/GlobalSearch' +import AppAvatar from '@/app-components/app/AppAvatar' import { LOCAL_OPTIONS } from '@/app-config/localConfig' import { @@ -34,11 +34,11 @@ import { createLeftIconOptions, createRightIconOptions, } from './shared' -import { useDevice } from '@/hooks/web/index' -import { getVariableToRefs, setVariable } from '@/global-variable/index' +import { useDevice } from '@/hooks/web' +import { getVariableToRefs, setVariable } from '@/global-variable' import { useFullscreen } from 'vue-hooks-plus' -import { useI18n } from '@/hooks/web/index' -import { useMainPage } from '@/hooks/template/index' +import { useI18n } from '@/hooks/web' +import { useSpinning } from '@/hooks/template' import { useSettingGetters, useSettingActions } from '@/store' import type { IconEventMapOptions, IconEventMap } from './type' @@ -46,9 +46,9 @@ import type { IconEventMapOptions, IconEventMap } from './type' export default defineComponent({ name: 'AppSiderBar', setup() { - const { updateLocale, changeSwitcher } = useSettingActions() + const { updateLocale, updateSettingState } = useSettingActions() const { t } = useI18n() - const { reload } = useMainPage() + const { reload } = useSpinning() const [isFullscreen, { toggleFullscreen, isEnabled }] = useFullscreen( document.getElementsByTagName('html')[0], @@ -107,7 +107,7 @@ export default defineComponent({ globalSearchShown.value = true }, lock: () => { - changeSwitcher(true, 'lockScreenSwitch') + updateSettingState('lockScreenSwitch', true) }, menu: () => { setVariable('globalDrawerValue', !globalDrawerValue.value) diff --git a/src/layout/components/SiderBar/shared.ts b/src/layout/components/SiderBar/shared.ts index 557de5f5..ba9138fa 100644 --- a/src/layout/components/SiderBar/shared.ts +++ b/src/layout/components/SiderBar/shared.ts @@ -1,4 +1,4 @@ -import { useI18n } from '@/hooks/web/index' +import { useI18n } from '@/hooks/web' import { useSigningActions, useSettingActions } from '@/store' import type { IconOptionsFC, IconOptions } from './type' @@ -54,9 +54,9 @@ const avatarDropdownActionMap = { * 锁定屏幕 */ lockScreen: () => { - const { changeSwitcher } = useSettingActions() + const { updateSettingState } = useSettingActions() - changeSwitcher(true, 'lockScreenSwitch') + updateSettingState('lockScreenSwitch', true) }, } diff --git a/src/layout/default/ContentWrapper/index.tsx b/src/layout/default/ContentWrapper/index.tsx index 348c1aa2..f63c2317 100644 --- a/src/layout/default/ContentWrapper/index.tsx +++ b/src/layout/default/ContentWrapper/index.tsx @@ -18,13 +18,12 @@ import './index.scss' import { NSpin } from 'naive-ui' -import RTransitionComponent from '@/components/RTransitionComponent/index.vue' -import AppRequestCancelerProvider from '@/app-components/provider/AppRequestCancelerProvider/index' -import RIcon from '@/components/RIcon/index' +import { RTransitionComponent, RIcon } from '@/components' +import AppRequestCancelerProvider from '@/app-components/provider/AppRequestCancelerProvider' -import { getVariableToRefs } from '@/global-variable/index' +import { getVariableToRefs } from '@/global-variable' import { useSettingGetters } from '@/store' -import { useMainPage } from '@/hooks/template/index' +import { useMaximize } from '@/hooks/template' import type { GlobalThemeOverrides } from 'naive-ui' @@ -33,6 +32,7 @@ export default defineComponent({ setup() { const router = useRouter() + const { maximize } = useMaximize() const { getContentTransition } = useSettingGetters() const spinning = ref(false) const themeOverridesSpin: GlobalThemeOverrides['Spin'] = { @@ -40,7 +40,7 @@ export default defineComponent({ } const globalMainLayoutLoad = getVariableToRefs('globalMainLayoutLoad') const layoutContentMaximize = getVariableToRefs('layoutContentMaximize') - const { maximize } = useMainPage() + const layoutContentSpinning = getVariableToRefs('layoutContentSpinning') const setupLayoutContentSpin = () => { router.beforeEach(() => { @@ -61,15 +61,20 @@ export default defineComponent({ getContentTransition, layoutContentMaximize, maximize, + layoutContentSpinning, } }, render() { - const { globalMainLayoutLoad, layoutContentMaximize } = this + const { + globalMainLayoutLoad, + layoutContentMaximize, + layoutContentSpinning, + } = this const { maximize } = this return ( { const locale = getAppDefaultLanguage() const messages = await getAppLocalMessages(LOCAL_OPTIONS) @@ -45,12 +49,18 @@ const createI18nOptions = async () => { sync: true, missingWarn: false, silentFallbackWarn: true, + fallbackLocale: SYSTEM_FALLBACK_LOCALE, }) return i18nInstance } -/** 注册 i18n */ +/** + * + * @param app vue app instance + * + * 注册 i18n，并且缓存实例 + */ export const setupI18n = async (app: App) => { const i18nInstance = await createI18nOptions() diff --git a/src/locales/lang/en-US/menu.json b/src/locales/lang/en-US/menu.json index 8497168d..f51d657f 100644 --- a/src/locales/lang/en-US/menu.json +++ b/src/locales/lang/en-US/menu.json @@ -21,5 +21,7 @@ "Mock": "Mock", "QRCode": "QRCode", "SvgIcon": "SVG Icon", - "TemplateHooks": "Template Api" + "TemplateHooks": "Template Api", + "Modal": "Modal", + "ContextMenu": "Right Click Menu" } diff --git a/src/locales/lang/zh-CN/menu.json b/src/locales/lang/zh-CN/menu.json index 56828747..e759374b 100644 --- a/src/locales/lang/zh-CN/menu.json +++ b/src/locales/lang/zh-CN/menu.json @@ -21,5 +21,7 @@ "Mock": "Mock 数据", "QRCode": "二维码", "SvgIcon": "SVG 图标", - "TemplateHooks": "模板内置 Api" + "TemplateHooks": "模板内置 Api", + "Modal": "模态框", + "ContextMenu": "右键菜单" } diff --git a/src/main.ts b/src/main.ts index 01f5090a..ab0eed16 100644 --- a/src/main.ts +++ b/src/main.ts @@ -4,11 +4,11 @@ import '@/styles/base.scss' import 'virtual:svg-icons-register' // vite-plugin-svg-icons 脚本，启用 svg 雪碧图 -import { setupRouter } from './router/index' -import { setupStore } from './store/index' -import { setupI18n } from './locales/index' -import { setupDayjs } from './dayjs/index' -import { setupDirectives } from './directives/index' +import { setupRouter } from './router' +import { setupStore } from './store' +import { setupI18n } from './locales' +import { setupDayjs } from './dayjs' +import { setupDirectives } from './directives' import type { App as AppType } from 'vue' diff --git a/src/router/README.md b/src/router/README.md index 5076b94c..ea39b1b8 100644 --- a/src/router/README.md +++ b/src/router/README.md @@ -5,8 +5,8 @@ > router modules 包中的路由模块会与菜单一一映射，也就是说，路由模块的配置结构会影响菜单的展示。当你有子菜单需要配置时，你需要使用该组件。 ```ts -import { t } from '@/hooks/web/index' -import { LAYOUT } from '@/router/constant/index' +import { t } from '@/hooks/web' +import { LAYOUT } from '@/router/constant' import type { AppRouteRecordRaw } from '@/router/type' diff --git a/src/router/constant/index.ts b/src/router/constant/index.ts index 25093f6b..226026e9 100644 --- a/src/router/constant/index.ts +++ b/src/router/constant/index.ts @@ -16,4 +16,4 @@ * } * ``` */ -export const LAYOUT = () => import('@/layout/default/ContentWrapper/index') +export const LAYOUT = () => import('@/layout/default/ContentWrapper') diff --git a/src/router/helper/permission.ts b/src/router/helper/permission.ts index ba04f9d0..f56bf05c 100644 --- a/src/router/helper/permission.ts +++ b/src/router/helper/permission.ts @@ -21,11 +21,12 @@ */ import { getStorage } from '@/utils/cache' -import { APP_CATCH_KEY, ROOT_ROUTE } from '@/app-config/appConfig' +import { APP_CATCH_KEY } from '@/app-config/appConfig' import { redirectRouterToDashboard } from '@/router/helper/routerCopilot' import { WHITE_ROUTES } from '@/app-config/routerConfig' import { validRole } from '@/router/helper/routerCopilot' import { isValueType } from '@/utils/basic' +import { useAppRoot } from '@/hooks/template' import type { Router, RouteLocationNormalized } from 'vue-router' import type { AppRouteMeta } from '@/router/type' @@ -33,6 +34,7 @@ import type { AppRouteMeta } from '@/router/type' /** 路由守卫 */ export const permissionRouter = (router: Router) => { const { beforeEach } = router + const { getRootPath } = useAppRoot() const isToLogin = ( to: RouteLocationNormalized, @@ -44,7 +46,7 @@ export const permissionRouter = (router: Router) => { const catchRoutePath = getStorage( 'menuKey', 'sessionStorage', - ROOT_ROUTE.path, + getRootPath.value, ) const { meta, name } = to diff --git a/src/router/helper/routerCopilot.ts b/src/router/helper/routerCopilot.ts index 24d94a6a..54fb836b 100644 --- a/src/router/helper/routerCopilot.ts +++ b/src/router/helper/routerCopilot.ts @@ -11,11 +11,11 @@ import { permissionRouter } from './permission' import { SETUP_ROUTER_ACTION, SUPER_ADMIN } from '@/app-config/routerConfig' -import { useVueRouter } from '@/hooks/web/index' -import { ROOT_ROUTE } from '@/app-config/appConfig' +import { useVueRouter } from '@/hooks/web' import { setStorage } from '@/utils/cache' import { getAppEnvironment } from '@/utils/basic' import { useSigningGetters } from '@/store' +import { useAppRoot } from '@/hooks/template' import type { Router } from 'vue-router' import type { AppRouteMeta } from '@/router/type' @@ -132,9 +132,9 @@ export const redirectRouterToDashboard = (isReplace = true) => { const { router } = useVueRouter() const { push, replace } = router - const { path } = ROOT_ROUTE + const { getRootPath } = useAppRoot() - setStorage('menuKey', path) + setStorage('menuKey', getRootPath.value) - isReplace ? replace(path) : push(path) + isReplace ? replace(getRootPath.value) : push(getRootPath.value) } diff --git a/src/router/index.ts b/src/router/index.ts index 2aeadfe9..346b6cca 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -1,7 +1,7 @@ import { createRouter, createWebHashHistory } from 'vue-router' import { scrollViewToTop } from '@/router/helper/setupHelper' import { vueRouterRegister } from '@/router/helper/routerCopilot' -import { useVueRouter } from '@/hooks/web/index' +import { useVueRouter } from '@/hooks/web' import constantRoutes from './routes' @@ -35,7 +35,7 @@ export const setupRouter = async (app: App) => { router = await createVueRouter() vueRouterRegister(router) - useVueRouter() - app.use(router) + // 等待 router 挂载后，初始化 useRouter 方法 + useVueRouter() } diff --git a/src/router/modules/dashboard.ts b/src/router/modules/dashboard.ts index 16f77709..7103fa80 100644 --- a/src/router/modules/dashboard.ts +++ b/src/router/modules/dashboard.ts @@ -1,5 +1,5 @@ -import { t } from '@/hooks/web/index' -import { LAYOUT } from '@/router/constant/index' +import { t } from '@/hooks/web' +import { LAYOUT } from '@/router/constant' import type { AppRouteRecordRaw } from '@/router/type' diff --git a/src/router/modules/demo/axios.ts b/src/router/modules/demo/axios.ts index f92a6ae8..ebe40e1b 100644 --- a/src/router/modules/demo/axios.ts +++ b/src/router/modules/demo/axios.ts @@ -1,5 +1,5 @@ -import { t } from '@/hooks/web/index' -import { LAYOUT } from '@/router/constant/index' +import { t } from '@/hooks/web' +import { LAYOUT } from '@/router/constant' import type { AppRouteRecordRaw } from '@/router/type' diff --git a/src/router/modules/demo/context-menu.ts b/src/router/modules/demo/context-menu.ts new file mode 100644 index 00000000..b687c791 --- /dev/null +++ b/src/router/modules/demo/context-menu.ts @@ -0,0 +1,16 @@ +import { t } from '@/hooks/web' + +import type { AppRouteRecordRaw } from '@/router/type' + +const contextMenu: AppRouteRecordRaw = { + path: '/context-menu', + name: 'ContextMenuDemo', + component: () => import('@/views/demo/context-menu/index'), + meta: { + i18nKey: t('menu.ContextMenu'), + icon: 'other', + order: 2, + }, +} + +export default contextMenu diff --git a/src/router/modules/demo/directive.ts b/src/router/modules/demo/directive.ts index 6051a4bc..0352f01b 100644 --- a/src/router/modules/demo/directive.ts +++ b/src/router/modules/demo/directive.ts @@ -1,5 +1,5 @@ -import { t } from '@/hooks/web/index' -import { LAYOUT } from '@/router/constant/index' +import { t } from '@/hooks/web' +import { LAYOUT } from '@/router/constant' import type { AppRouteRecordRaw } from '@/router/type' diff --git a/src/router/modules/demo/doc.ts b/src/router/modules/demo/doc.ts index d3ed1421..d92664df 100644 --- a/src/router/modules/demo/doc.ts +++ b/src/router/modules/demo/doc.ts @@ -1,5 +1,5 @@ -import { t } from '@/hooks/web/index' -import { LAYOUT } from '@/router/constant/index' +import { t } from '@/hooks/web' +import { LAYOUT } from '@/router/constant' import type { AppRouteRecordRaw } from '@/router/type' diff --git a/src/router/modules/demo/echart.ts b/src/router/modules/demo/echart.ts index d9f85fb8..77ce47f1 100644 --- a/src/router/modules/demo/echart.ts +++ b/src/router/modules/demo/echart.ts @@ -1,5 +1,5 @@ -import { t } from '@/hooks/web/index' -import { LAYOUT } from '@/router/constant/index' +import { t } from '@/hooks/web' +import { LAYOUT } from '@/router/constant' import type { AppRouteRecordRaw } from '@/router/type' diff --git a/src/router/modules/demo/iframe.ts b/src/router/modules/demo/iframe.ts index 0e517b97..21e47086 100644 --- a/src/router/modules/demo/iframe.ts +++ b/src/router/modules/demo/iframe.ts @@ -1,4 +1,4 @@ -import { t } from '@/hooks/web/index' +import { t } from '@/hooks/web' import type { AppRouteRecordRaw } from '@/router/type' diff --git a/src/router/modules/demo/mock.ts b/src/router/modules/demo/mock.ts index 187ca628..aa1fc7e2 100644 --- a/src/router/modules/demo/mock.ts +++ b/src/router/modules/demo/mock.ts @@ -1,5 +1,5 @@ -import { t } from '@/hooks/web/index' -import { LAYOUT } from '@/router/constant/index' +import { t } from '@/hooks/web' +import { LAYOUT } from '@/router/constant' import type { AppRouteRecordRaw } from '@/router/type' diff --git a/src/router/modules/demo/modal.ts b/src/router/modules/demo/modal.ts new file mode 100644 index 00000000..d6f5bc8e --- /dev/null +++ b/src/router/modules/demo/modal.ts @@ -0,0 +1,17 @@ +import { t } from '@/hooks/web' +import { LAYOUT } from '@/router/constant' + +import type { AppRouteRecordRaw } from '@/router/type' + +const mockDemo: AppRouteRecordRaw = { + path: '/modal-demo', + name: 'ModalDemo', + component: () => import('@/views/demo/modal-demo/index'), + meta: { + i18nKey: t('menu.Modal'), + icon: 'other', + order: 3, + }, +} + +export default mockDemo diff --git a/src/router/modules/demo/multi-menu.ts b/src/router/modules/demo/multi-menu.ts index 490ad4f1..28f5002d 100644 --- a/src/router/modules/demo/multi-menu.ts +++ b/src/router/modules/demo/multi-menu.ts @@ -1,5 +1,5 @@ -import { t } from '@/hooks/web/index' -import { LAYOUT } from '@/router/constant/index' +import { t } from '@/hooks/web' +import { LAYOUT } from '@/router/constant' import type { AppRouteRecordRaw } from '@/router/type' diff --git a/src/router/modules/demo/precision.ts b/src/router/modules/demo/precision.ts index abc5dfc9..077a6c63 100644 --- a/src/router/modules/demo/precision.ts +++ b/src/router/modules/demo/precision.ts @@ -1,5 +1,5 @@ -import { t } from '@/hooks/web/index' -import { LAYOUT } from '@/router/constant/index' +import { t } from '@/hooks/web' +import { LAYOUT } from '@/router/constant' import type { AppRouteRecordRaw } from '@/router/type' diff --git a/src/router/modules/demo/qrcode.ts b/src/router/modules/demo/qrcode.ts index 7f284580..73582aef 100644 --- a/src/router/modules/demo/qrcode.ts +++ b/src/router/modules/demo/qrcode.ts @@ -1,5 +1,5 @@ -import { t } from '@/hooks/web/index' -import { LAYOUT } from '@/router/constant/index' +import { t } from '@/hooks/web' +import { LAYOUT } from '@/router/constant' import type { AppRouteRecordRaw } from '@/router/type' diff --git a/src/router/modules/demo/rely.ts b/src/router/modules/demo/rely.ts index 129468a4..cd652fb8 100644 --- a/src/router/modules/demo/rely.ts +++ b/src/router/modules/demo/rely.ts @@ -1,16 +1,16 @@ -import { t } from '@/hooks/web/index' -import { LAYOUT } from '@/router/constant/index' +import { t } from '@/hooks/web' +import { LAYOUT } from '@/router/constant' import type { AppRouteRecordRaw } from '@/router/type' const rely: AppRouteRecordRaw = { path: '/rely', - name: 'RelyAbout', + name: 'Rely', component: LAYOUT, meta: { i18nKey: t('menu.Rely'), icon: 'rely', - order: 7, + order: 999, }, children: [ { @@ -18,7 +18,7 @@ const rely: AppRouteRecordRaw = { name: 'RelyAbout', component: () => import('@/views/demo/rely/views/rely-about/index'), meta: { - i18nKey: 'RelyAbout', + i18nKey: t('menu.RelyAbout'), }, }, ], diff --git a/src/router/modules/demo/router-demo.ts b/src/router/modules/demo/router-demo.ts index 40298ea3..14a6b4c2 100644 --- a/src/router/modules/demo/router-demo.ts +++ b/src/router/modules/demo/router-demo.ts @@ -1,5 +1,5 @@ -import { t } from '@/hooks/web/index' -import { LAYOUT } from '@/router/constant/index' +import { t } from '@/hooks/web' +import { LAYOUT } from '@/router/constant' import type { AppRouteRecordRaw } from '@/router/type' diff --git a/src/router/modules/demo/scroll-reveal.ts b/src/router/modules/demo/scroll-reveal.ts index 3a235ec7..1c7350a5 100644 --- a/src/router/modules/demo/scroll-reveal.ts +++ b/src/router/modules/demo/scroll-reveal.ts @@ -4,8 +4,8 @@ * 所以暂时隐藏该页面 */ -import { t } from '@/hooks/web/index' -import { LAYOUT } from '@/router/constant/index' +import { t } from '@/hooks/web' +import { LAYOUT } from '@/router/constant' import type { AppRouteRecordRaw } from '@/router/type' diff --git a/src/router/modules/demo/svg-icons.ts b/src/router/modules/demo/svg-icons.ts index 8915f904..f2c27e18 100644 --- a/src/router/modules/demo/svg-icons.ts +++ b/src/router/modules/demo/svg-icons.ts @@ -1,5 +1,5 @@ -import { t } from '@/hooks/web/index' -import { LAYOUT } from '@/router/constant/index' +import { t } from '@/hooks/web' +import { LAYOUT } from '@/router/constant' import type { AppRouteRecordRaw } from '@/router/type' diff --git a/src/router/modules/demo/table.ts b/src/router/modules/demo/table.ts index 6a40a2cb..e034ea48 100644 --- a/src/router/modules/demo/table.ts +++ b/src/router/modules/demo/table.ts @@ -1,5 +1,5 @@ -import { t } from '@/hooks/web/index' -import { LAYOUT } from '@/router/constant/index' +import { t } from '@/hooks/web' +import { LAYOUT } from '@/router/constant' import type { AppRouteRecordRaw } from '@/router/type' diff --git a/src/router/modules/demo/template-hooks.ts b/src/router/modules/demo/template-hooks.ts index 8e6a7adb..c19cbb64 100644 --- a/src/router/modules/demo/template-hooks.ts +++ b/src/router/modules/demo/template-hooks.ts @@ -1,5 +1,5 @@ -import { t } from '@/hooks/web/index' -import { LAYOUT } from '@/router/constant/index' +import { t } from '@/hooks/web' +import { LAYOUT } from '@/router/constant' import type { AppRouteRecordRaw } from '@/router/type' diff --git a/src/router/modules/error404.ts b/src/router/modules/error404.ts index 9f3da514..9d22bde5 100644 --- a/src/router/modules/error404.ts +++ b/src/router/modules/error404.ts @@ -1,5 +1,5 @@ -import { t } from '@/hooks/web/index' -import { LAYOUT } from '@/router/constant/index' +import { t } from '@/hooks/web' +import { LAYOUT } from '@/router/constant' import type { AppRouteRecordRaw } from '@/router/type' diff --git a/src/router/routes.ts b/src/router/routes.ts index cf9640dd..406fec65 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -1,27 +1,31 @@ -import Layout from '@/layout/index' +import Layout from '@/layout' import { appExpandRoutes } from './appRouteModules' -import { ROOT_ROUTE } from '@/app-config/appConfig' +import { useAppRoot } from '@/hooks/template' -export default async () => [ - /** - * - * 首页（一般为 Login 页面） - * 整个模板默认导航地址 - */ - { - path: '/', - name: 'login', - component: () => import('@/views/login/index'), - }, - /** - * - * App Layout 核心页面（一般为登陆后展示的页面） - */ - { - path: '/', - name: 'layout', - redirect: ROOT_ROUTE.path, - component: Layout, - children: appExpandRoutes, - }, -] +export default async () => { + const { getRootPath } = useAppRoot() + + return [ + /** + * + * 首页（一般为 Login 页面） + * 整个模板默认导航地址 + */ + { + path: '/', + name: 'login', + component: () => import('@/views/login/index'), + }, + /** + * + * App Layout 核心页面（一般为登陆后展示的页面） + */ + { + path: '/', + name: 'layout', + redirect: getRootPath.value, + component: Layout, + children: appExpandRoutes, + }, + ] +} diff --git a/src/spin/index.tsx b/src/spin/index.tsx index 6480ab24..7763bf5e 100644 --- a/src/spin/index.tsx +++ b/src/spin/index.tsx @@ -16,7 +16,7 @@ * 基于 Naive UI Spin 组件 * * 使用方法 - * 1. import { setVariable } from '@/hooks/variable/index' + * 1. import { setVariable } from '@/hooks/variable' * 2. setVariable('globalSpinning', true) | setVariable('globalSpinning', false) * * 仅需按照上述步骤实现全屏加载动画 @@ -29,7 +29,7 @@ import { NSpin } from 'naive-ui' import { spinProps } from 'naive-ui' -import { getVariableToRefs } from '@/global-variable/index' +import { getVariableToRefs } from '@/global-variable' const GlobalSpin = defineComponent({ name: 'GlobalSpin', diff --git a/src/store/README.md b/src/store/README.md index 7e09e462..374794cd 100644 --- a/src/store/README.md +++ b/src/store/README.md @@ -63,7 +63,7 @@ export const useMenuActions = () => { - 最后在 index.ts 中暴露 ```ts -export { useDemoGetters, useMenuActions } from './modules/demo/index' +export { useDemoGetters, useMenuActions } from './modules/demo' ``` - 使用 diff --git a/src/store/hooks/useMenuStore.ts b/src/store/hooks/useMenuStore.ts index 08d52426..d782431c 100644 --- a/src/store/hooks/useMenuStore.ts +++ b/src/store/hooks/useMenuStore.ts @@ -10,7 +10,7 @@ */ import { piniaMenuStore } from '../modules/menu' -import { ROOT_ROUTE } from '@/app-config/appConfig' +import { useAppRoot } from '@/hooks/template' export const useMenuGetters = () => { const variable = piniaMenuStore() @@ -35,16 +35,16 @@ export const useMenuGetters = () => { * @remark 获取菜单标签列表 */ const getMenuTagOptions = computed(() => { - const { path } = ROOT_ROUTE + const { getRootPath } = useAppRoot() return variable.menuTagOptions.map((curr, _idx, currentArray) => { - if (curr.key === getMenuKey.value && curr.key !== path) { + if (curr.key === getMenuKey.value && curr.key !== getRootPath.value) { curr.closeable = true } else { curr.closeable = false } - if (curr.key === path) { + if (curr.key === getRootPath.value) { curr.closeable = false } diff --git a/src/store/hooks/useSettingStore.ts b/src/store/hooks/useSettingStore.ts index edfccc84..cfe2c8f9 100644 --- a/src/store/hooks/useSettingStore.ts +++ b/src/store/hooks/useSettingStore.ts @@ -65,6 +65,12 @@ export const useSettingGetters = () => { */ const getWatermarkSwitch = computed(() => variable.watermarkSwitch) + /** + * + * @remark 获取水印配置 + */ + const getWatermarkConfig = computed(() => variable.watermarkConfig) + return { getDrawerPlacement, getPrimaryColorOverride, @@ -76,21 +82,17 @@ export const useSettingGetters = () => { getCopyrightSwitch, getContentTransition, getWatermarkSwitch, + getWatermarkConfig, } } export const useSettingActions = () => { - const { - updateLocale, - changePrimaryColor, - changeSwitcher, - updateContentTransition, - } = piniaSettingStore() + const { updateLocale, changePrimaryColor, updateSettingState } = + piniaSettingStore() return { updateLocale, changePrimaryColor, - changeSwitcher, - updateContentTransition, + updateSettingState, } } diff --git a/src/store/index.ts b/src/store/index.ts index 06ffa54e..fcf7eed3 100644 --- a/src/store/index.ts +++ b/src/store/index.ts @@ -10,31 +10,30 @@ */ /** + * + * 模板约定不直接操作 store 实例，所有操作都应在 hooks 中二次封装的 getters, actions * * 持久化存储 pinia 数据 * 但是不能正常持久化 function 属性 * * 官网地址: https://prazdevs.github.io/pinia-plugin-persistedstate/zh/guide/ */ + import piniaPluginPersistedstate from 'pinia-plugin-persistedstate' -// 导出仓库实例，不建议直接使用 store -export { piniaSettingStore } from './modules/setting/index' // import { piniaSettingStore } from '@/store' 即可使用 -export { piniaMenuStore } from './modules/menu/index' -export { piniaSigningStore } from './modules/signing/index' -export { piniaKeepAliveStore } from './modules/keep-alive/index' - -// 导出 getters, actions -export { useMenuGetters, useMenuActions } from './hooks/useMenuStore' -export { useSettingGetters, useSettingActions } from './hooks/useSettingStore' -export { useSigningGetters, useSigningActions } from './hooks/useSigningStore' -export { - useKeepAliveGetters, - useKeepAliveActions, -} from './hooks/useKeepAliveStore' - import type { App } from 'vue' +// 该仓库导出，更多是为了 hooks 包中，在模板中尽量不直接操作 store 仓库 +export * from './modules/setting' +export * from './modules/menu' +export * from './modules/signing' +export * from './modules/keep-alive' +// 导出 getters, actions +export * from './hooks/useMenuStore' +export * from './hooks/useSettingStore' +export * from './hooks/useSigningStore' +export * from './hooks/useKeepAliveStore' + /** * * 设置并且注册 pinia diff --git a/src/store/modules/menu/helper.ts b/src/store/modules/menu/helper.ts index ce3ddc90..ebff5166 100644 --- a/src/store/modules/menu/helper.ts +++ b/src/store/modules/menu/helper.ts @@ -11,10 +11,11 @@ /** 本方法感谢 的支持 */ -import { APP_MENU_CONFIG, ROOT_ROUTE } from '@/app-config/appConfig' -import RIcon from '@/components/RIcon/index' +import { APP_MENU_CONFIG } from '@/app-config/appConfig' +import { RIcon } from '@/components' import { isValueType } from '@/utils/basic' import { getStorage } from '@/utils/cache' +import { useAppRoot } from '@/hooks/template' import type { AppMenuOption, @@ -171,13 +172,13 @@ export const hasMenuIcon = (option: AppMenuOption) => { return () => icon } -/** 获取缓存的 menu key, 如果未获取到则使用 ROOT_ROUTE path 当作默认激活路由菜单 */ +/** 获取缓存的 menu key, 如果未获取到则使用 getRootPath 当作默认激活路由菜单 */ export const getCatchMenuKey = () => { - const { path: rootPath } = ROOT_ROUTE + const { getRootPath } = useAppRoot() const cacheMenuKey = getStorage( 'menuKey', 'sessionStorage', - rootPath, + getRootPath.value, ) return cacheMenuKey diff --git a/src/store/modules/menu/index.ts b/src/store/modules/menu/index.ts index 6ef8e418..91392e46 100644 --- a/src/store/modules/menu/index.ts +++ b/src/store/modules/menu/index.ts @@ -33,19 +33,16 @@ import { hasMenuIcon, getCatchMenuKey, } from './helper' -import { useI18n } from '@/hooks/web/index' +import { useI18n } from '@/hooks/web' import { getAppRawRoutes } from '@/router/appRouteModules' -import { useVueRouter } from '@/hooks/web/index' +import { useVueRouter } from '@/hooks/web' import { throttle } from 'lodash-es' import { useKeepAliveActions } from '@/store' -import type { AppRouteMeta, AppRouteRecordRaw } from '@/router/type' -import type { - AppMenuOption, - MenuTagOptions, - AppMenuKey, -} from '@/types/modules/app' +import type { AppRouteRecordRaw } from '@/router/type' +import type { AppMenuOption, MenuTagOptions } from '@/types/modules/app' import type { MenuState } from '@/store/modules/menu/type' +import type { LocationQuery } from 'vue-router' export const piniaMenuStore = defineStore( 'menu', @@ -148,6 +145,7 @@ export const piniaMenuStore = defineStore( const changeMenuModelValue = ( key: string | number, option: AppMenuOption, + query?: LocationQuery, ) => { const { meta, path } = option @@ -167,10 +165,16 @@ export const piniaMenuStore = defineStore( .map((curr) => curr.key) .join('/') - router.push(_path) + router.push({ + path: _path, + query, + }) } else { /** 根路由直接跳转 */ - router.push(path) + router.push({ + path, + query, + }) } /** 检查是否为根路由 */ @@ -205,14 +209,18 @@ export const piniaMenuStore = defineStore( * @remark 监听路由地址变化更新菜单状态 * @remark 递归查找匹配项 */ - const updateMenuKeyWhenRouteUpdate = async (path: string) => { - // 获取 `/` 出现次数(如果为 1 则表示该路径为根路由路径) - const count = (path.match(new RegExp('/', 'g')) || []).length - let combinePath = path + const updateMenuKeyWhenRouteUpdate = async ( + path: string, + query: LocationQuery, + ) => { + const [routePath] = path.split('?') + const count = (routePath.match(new RegExp('/', 'g')) || []).length // 如果获取长度为 1，则视为根路由 + + let combinePath = routePath if (count > 1) { // 如果不是跟路径则取出最后一项字符 - const splitPath = path.split('/').filter((curr) => curr) + const splitPath = routePath.split('/').filter((curr) => curr) combinePath = splitPath[splitPath.length - 1] } @@ -221,10 +229,12 @@ export const piniaMenuStore = defineStore( for (const curr of options) { if (curr.children?.length) { findMenuOption(pathKey, curr.children) + + continue } if (pathKey === curr.key && !curr?.children?.length) { - changeMenuModelValue(pathKey, curr) + changeMenuModelValue(pathKey, curr, query) break } @@ -335,22 +345,24 @@ export const piniaMenuStore = defineStore( * 该方法仅执行一次 */ const setupPiniaMenuStore = async () => { - if (isSetupAppMenuLock.value) { - await setupAppMenu() + if (!isSetupAppMenuLock.value) { + return } + await setupAppMenu() + isSetupAppMenuLock.value = false } /** 监听路由变化并且更新路由菜单与菜单标签 */ watch( () => route.fullPath, - async (newData) => { - const reg = /^([^?]+)/ - const match = newData.match(reg)?.[1] - + async (ndata, odata) => { await setupPiniaMenuStore() - await updateMenuKeyWhenRouteUpdate(match || '') + + if (ndata !== odata) { + await updateMenuKeyWhenRouteUpdate(ndata, route.query) + } }, { immediate: true, diff --git a/src/store/modules/setting/index.ts b/src/store/modules/setting/index.ts index 10047864..6c4304ce 100644 --- a/src/store/modules/setting/index.ts +++ b/src/store/modules/setting/index.ts @@ -2,13 +2,15 @@ import { getAppDefaultLanguage } from '@/locales/helper' import { setStorage } from '@use-utils/cache' import { set } from 'lodash-es' import { colorToRgba } from '@/utils/element' -import { useI18n } from '@/hooks/web/index' +import { useI18n } from '@/hooks/web' import { APP_THEME } from '@/app-config/designConfig' -import { useDayjs } from '@/hooks/web/index' +import { useDayjs } from '@/hooks/web' +import { APP_WATERMARK_CONFIG } from '@/app-config/appConfig' +import { cloneDeep } from 'lodash-es' -import type { ConditionalPick } from '@/types/modules/helper' import type { SettingState } from '@/store/modules/setting/type' -import type { LocalKey } from '@/hooks/web/index' +import type { LocalKey } from '@/hooks/web' +import type { AnyFC } from '@/types/modules/utils' export const piniaSettingStore = defineStore( 'setting', @@ -36,13 +38,9 @@ export const piniaSettingStore = defineStore( copyrightSwitch: true, // 底部区域开关 contentTransition: 'scale', // 切换过渡效果 watermarkSwitch: false, // 水印开关, + watermarkConfig: cloneDeep(APP_WATERMARK_CONFIG), }) - /** 更新过渡效果 */ - const updateContentTransition = (value: string) => { - settingState.contentTransition = value - } - /** 修改当前语言 */ const updateLocale = (key: string) => { locale(key) @@ -73,29 +71,38 @@ export const piniaSettingStore = defineStore( /** * - * @param bool 开关当前值 - * @param key `settingState` 对应开关属性值 + * @param key settingState 的 key + * @param value settingState 的 value + * @param cb 回调函数 * - * @remark 仅适用于值为 `boolean` 的切换 + * 更新 settingState 的值，如果 key 不存在与 settingState 中，则不会更新 + * 但是不论是否更新成功，都会执行回调函数 + * + * @example + * updateSettingState('drawerPlacement', 'left') + * updateSettingState('appTheme', true) */ - const changeSwitcher = ( - bool: boolean, - key: keyof ConditionalPick, + const updateSettingState = < + T extends keyof SettingState, + V extends typeof settingState, + C extends AnyFC, + >( + key: T, + value: V[T], + cb?: C, ) => { - if ( - Object.hasOwn(settingState, key) && - typeof settingState[key] === 'boolean' - ) { - settingState[key] = bool + if (Object.hasOwn(settingState, key)) { + settingState[key] = value } + + cb?.() } return { ...toRefs(settingState), updateLocale, changePrimaryColor, - changeSwitcher, - updateContentTransition, + updateSettingState, } }, { diff --git a/src/store/modules/setting/type.ts b/src/store/modules/setting/type.ts index 9b3585db..f1279540 100644 --- a/src/store/modules/setting/type.ts +++ b/src/store/modules/setting/type.ts @@ -1,5 +1,6 @@ import type { GlobalThemeOverrides } from 'naive-ui' import type { Placement } from '@/types/modules/component' +import type { APP_WATERMARK_CONFIG } from '@/app-config/appConfig' export interface SettingState { drawerPlacement: Placement @@ -12,4 +13,5 @@ export interface SettingState { watermarkSwitch: boolean copyrightSwitch: boolean contentTransition: string + watermarkConfig: typeof APP_WATERMARK_CONFIG } diff --git a/src/store/modules/signing/index.ts b/src/store/modules/signing/index.ts index 1d19b4cb..458c6e0b 100644 --- a/src/store/modules/signing/index.ts +++ b/src/store/modules/signing/index.ts @@ -53,8 +53,7 @@ export const piniaSigningStore = defineStore( state.signingCallback = { role: 'admin', name: SigningForm.name, - avatar: - 'https://usc1.contabostorage.com/c2e495d7890844d392e8ec0c6e5d77eb:image/longmao.navigator.png', + avatar: 'https://r2chevereto.yka.moe/longmao.navigator.png', } resolve({ diff --git a/src/types/global.d.ts b/src/types/global.d.ts index 2ff174ea..3c76157e 100644 --- a/src/types/global.d.ts +++ b/src/types/global.d.ts @@ -12,6 +12,8 @@ export declare global { [propName: string]: any } + declare const __DEV__: boolean + declare const __APP_CFG__: AppConfig declare interface Window { diff --git a/src/types/modules/helper.ts b/src/types/modules/helper.ts index 0eab87ae..74ad5452 100644 --- a/src/types/modules/helper.ts +++ b/src/types/modules/helper.ts @@ -1,15 +1,70 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ + +/** + * + * 从目标类型中挑选出符合条件的属性名 + * + * @example + * ConditionalKeys<{ a: string, b: number }, string> // 'a' + */ export type ConditionalKeys = NonNullable< { [Key in keyof Base]: Base[Key] extends Condition ? Key : never }[keyof Base] > +/** + * + * 从目标类型中挑选出符合条件的属性 + * + * @example + * ConditionalPick<{ a: string, b: number }, string> // { a: string } + */ export type ConditionalPick = Pick< Base, ConditionalKeys > +/** + * + * 声明一个任意类型的对象 + * + * @example + * const A: Recordable = { a: 1, b: [] } + */ export type Recordable = Record +/** + * + * 获取目标类型的所有属性名 + * + * @example + * Keys<{ a: string, b: number }> // 'a' | 'b' + */ export type ValueOf = T[keyof T] + +/** + * + * 将目标所有属性变为可修改 + * + * @example + * Mutable<{ readonly a: string }> // { a: string } + */ +export type Mutable = { + -readonly [P in keyof T]: T[P] +} + +/** + * + * 递归将目标所有属性变为可修改 + * + * @example + * DeepMutable<{ readonly a: { readonly b: { readonly c: string } } }> // { a: { b: { c: string } } } + */ +export type DeepMutable = { + -readonly [P in keyof T]: T[P] extends ReadonlyArray + ? Array> + : T[P] extends object + ? DeepMutable + : T[P] +} diff --git a/src/types/modules/utils.ts b/src/types/modules/utils.ts index c5ca8504..28af968e 100644 --- a/src/types/modules/utils.ts +++ b/src/types/modules/utils.ts @@ -1,6 +1,5 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import type CryptoJS from 'crypto-js' -import type { BasicTarget } from './vue' export type StorageLike = 'sessionStorage' | 'localStorage' @@ -10,10 +9,6 @@ export type RemoveStorageKey = | 'all-sessionStorage' | 'all-localStorage' -export type EventListenerOrEventListenerObject = - | EventListener - | EventListenerObject - export type ValidateValueType = | 'BigUint64Array' | 'BigInt64Array' @@ -93,7 +88,3 @@ export type ElementSelector = string | `attr:${string}` export type MaybeArray = T | T[] export type DownloadAnyFileDataType = Blob | File | string | ArrayBuffer - -export type EventListenerTarget = BasicTarget< - HTMLElement | Element | Window | Document -> diff --git a/src/utils/basic.ts b/src/utils/basic.ts index b3233fb1..1ea97b7e 100644 --- a/src/utils/basic.ts +++ b/src/utils/basic.ts @@ -1,12 +1,28 @@ +import printJs from 'print-js' +import { unrefElement } from '@/utils/vue' +import { watchEffectWithTarget } from '@/utils/vue' + import type { ValidateValueType, DownloadAnyFileDataType, BasicTypes, } from '@/types/modules/utils' +import type { BasicTarget, TargetValue } from '@/types/modules/vue' /** * - * @returns 获取当前项目环境 + * 获取当前项目环境 + * + * 如果你只是想单纯的判断是否为开发环境，可以直接使用: __DEV__ + * + * @example + * 是否为开发环境: __DEV__ + * + * @example + * const { BASE_URL } = getAppEnvironment() 获取 BASE_URL + * const { MODE } = getAppEnvironment() 获取 MODE，当前环境 + * const { SSR } = getAppEnvironment() 是否启用 SSR + * const { your config } = getAppEnvironment() 获取你自定义的配置项 */ export const getAppEnvironment = () => { const env = import.meta.env @@ -18,7 +34,10 @@ export const getAppEnvironment = () => { * * @param data 二进制流数据 * - * @returns format binary to base64 of the image + * 将 base64 格式文件转换为图片 + * + * @example + * arrayBufferToBase64Image('base64') => Image */ export const arrayBufferToBase64Image = (data: ArrayBuffer): string | null => { if (!data || data.byteLength) { @@ -42,7 +61,10 @@ export const arrayBufferToBase64Image = (data: ArrayBuffer): string | null => { * @param base64 base64 * @param fileName file name * - * @remark 下载 base64 文件 + * 该方法仅能下载 base64 文件，如果有其他的文件类型需要下载，请看 downloadAnyFile 方法 + * + * @example + * downloadBase64File('base64', 'file name') */ export const downloadBase64File = (base64: string, fileName: string) => { const link = document.createElement('a') @@ -61,6 +83,10 @@ export const downloadBase64File = (base64: string, fileName: string) => { * * @param value 目标值 * @param type 类型 + * + * @example + * isValueType('123', 'String') => true + * isValueType({}, 'Object') => true */ export const isValueType = ( value: unknown, @@ -73,9 +99,11 @@ export const isValueType = ( /** * - * @param length `uuid` 长度 - * @param radix `uuid` 基数 - * @returns `uuid` + * @param length uuid 长度 + * @param radix uuid 基数 + * + * @example + * uuid(8) => 'B8tGcl0FCKJkpO0V' */ export const uuid = (length = 16, radix = 62) => { // 定义可用的字符集，即 0-9, A-Z, a-z @@ -109,7 +137,11 @@ export const uuid = (length = 16, radix = 62) => { * @param data base64, Blob, ArrayBuffer type * @param fileName file name * - * @remark 支持下载任意类型的文件，包括 base64, Blob, ArrayBuffer + * 支持下载任意类型的文件，包括 base64, Blob, ArrayBuffer + * + * @example + * downloadAnyFile('base64', 'file name') + * downloadAnyFile('Blob', 'file name') */ export const downloadAnyFile = ( data: DownloadAnyFileDataType, @@ -167,3 +199,60 @@ export const downloadAnyFile = ( } }) } + +/** + * + * @param target Ref Dom、Dom、Dom id + * @param options print 配置项 + * + * 基于 print-js 封装，允许 Ref 注册 Dom 直接调用打印 + * + * @example + * print(refDom, { printJs.Configuration }) + * print(Dom id, { printJs.Configuration }) + * print(Dom, { printJs.Configuration }) + */ +export function print>( + target: T, + options?: printJs.Configuration, +) { + const element = computed(() => unrefElement(target)) + const { printable, ...args } = options ?? {} + + const $print = (element: TargetValue) => { + printJs({ + ...args, + printable: element, + }) + } + + const watcher = watch(element, (ndata) => $print(ndata), { + immediate: true, + }) + + watchEffectWithTarget(watcher) +} + +/** + * + * @param targetObject 对象 + * @param targetKeys 待删除的 key + * + * 删除对象中的指定 key + * + * @example + * omit({ a: 1, b: 2, c: 3 }, 'a') => { b: 2, c: 3 } + * omit({ a: 1, b: 2, c: 3 }, ['a', 'b']) => { c: 3 } + */ +export const omit = , K extends keyof T>( + targetObject: T, + targetKeys: K | K[], +): Omit => { + const keys = Array.isArray(targetKeys) ? targetKeys : [targetKeys] + + keys.forEach((key) => { + delete targetObject[key] + }) + + return targetObject +} diff --git a/src/utils/element.ts b/src/utils/element.ts index 30ddfd03..8576a377 100644 --- a/src/utils/element.ts +++ b/src/utils/element.ts @@ -1,74 +1,25 @@ import { isValueType } from '@/utils/basic' import { APP_REGEX } from '@/app-config/regexConfig' -import { unrefElement } from '@/utils/vue/index' -import { watchEffectWithTarget } from '@/utils/vue/index' +import { unrefElement } from '@/utils/vue' +import { watchEffectWithTarget } from '@/utils/vue' +import { useCurrentElement } from '@vueuse/core' import type { - EventListenerOrEventListenerObject, PartialCSSStyleDeclaration, ElementSelector, } from '@/types/modules/utils' -import type { EventListenerTarget } from '@/types/modules/utils' -import type { BasicTarget } from '@/types/modules/vue' - -/** - * - * @param target Target element dom - * @param event 绑定事件类型 - * @param handler 事件触发方法 - * @param useCapture 是否冒泡 - * - * @remark 给元素绑定某个事件柄方法 - */ -export const on = ( - target: EventListenerTarget, - event: string, - handler: EventListenerOrEventListenerObject, - useCapture: boolean | AddEventListenerOptions = false, -) => { - const targetElement = computed(() => unrefElement(target, window)) - - const update = () => { - if (targetElement.value && event && handler) { - targetElement.value.addEventListener(event, handler, useCapture) - } - } - - watchEffectWithTarget(update) -} - -/** - * - * @param target Target element dom - * @param event 卸载事件类型 - * @param handler 所需卸载方法 - * @param useCapture 是否冒泡 - * - * @remark 卸载元素上某个事件柄方法 - */ -export const off = ( - target: EventListenerTarget, - event: string, - handler: EventListenerOrEventListenerObject, - useCapture: boolean | AddEventListenerOptions = false, -) => { - const targetElement = computed(() => unrefElement(target, window)) - - const update = () => { - if (targetElement.value && event && handler) { - targetElement.value.removeEventListener(event, handler, useCapture) - } - } - - watchEffectWithTarget(update) -} +import type { BasicTarget, TargetValue } from '@/types/modules/vue' /** * * @param target Target element dom * @param className 所需添加className，可: 'xxx xxx' | 'xxx' 格式添加(参考向元素绑定 css 语法) * - * @remark 添加元素className(可: 'xxx xxx' | 'xxx'格式添加) + * 添加元素className(可: 'xxx xxx' | 'xxx'格式添加) + * + * @example + * targetDom 当前 class: a-class b-class + * addClass(targetDom, 'c-class') => a-class b-class c-class */ export const addClass = ( target: BasicTarget, @@ -76,19 +27,25 @@ export const addClass = ( ) => { const targetElement = computed(() => unrefElement(target)) - const update = () => { - if (targetElement.value) { + const update = ( + element: TargetValue, + ) => { + if (element) { const classes = className.trim().split(' ') classes.forEach((item) => { if (item) { - targetElement.value!.classList.add(item) + element.classList.add(item) } }) } } - watchEffectWithTarget(update) + const watcher = watch(targetElement, (ndata) => update(ndata), { + immediate: true, + }) + + watchEffectWithTarget(watcher) } /** @@ -96,8 +53,12 @@ export const addClass = ( * @param target Target element dom * @param className 所需删除className，可: 'xxx xxx' | 'xxx' 格式删除(参考向元素绑定 css 语法) * - * @remark 删除元素className(可: 'xxx xxx' | 'xxx'格式删除) - * @remark 如果输入值为 removeAllClass 则会删除该元素所有 class name + * 删除元素className(可: 'xxx xxx' | 'xxx'格式删除) + * 如果输入值为 removeAllClass 则会删除该元素所有 class name + * + * @example + * targetDom 当前 class: a-class b-class + * removeClass(targetDom, 'a-class') => b-class */ export const removeClass = ( target: BasicTarget, @@ -105,10 +66,12 @@ export const removeClass = ( ) => { const targetElement = computed(() => unrefElement(target)) - const update = () => { - if (targetElement.value) { + const update = ( + element: TargetValue, + ) => { + if (element) { if (className === 'removeAllClass') { - const classList = targetElement.value.classList + const classList = element.classList classList.forEach((curr) => classList.remove(curr)) } else { @@ -116,14 +79,18 @@ export const removeClass = ( classes.forEach((item) => { if (item) { - targetElement.value!.classList.remove(item) + element.classList.remove(item) } }) } } } - watchEffectWithTarget(update) + const watcher = watch(targetElement, (ndata) => update(ndata), { + immediate: true, + }) + + watchEffectWithTarget(watcher) } /** @@ -131,25 +98,37 @@ export const removeClass = ( * @param target Target element dom * @param className 查询元素是否含有此className，可: 'xxx xxx' | 'xxx' 格式查询(参考向元素绑定 css 语法) * - * @returns 返回boolean + * 元素是否含有某个className(可: 'xxx xxx' | 'xxx' 格式查询) * - * @remark 元素是否含有某个className(可: 'xxx xxx' | 'xxx' 格式查询) + * @example + * hasClass(targetDom, 'matchClassName') => Ref | Ref */ -export const hasClass = (target: BasicTarget, className: string) => { - const targetElement = unrefElement(target) +export const hasClass = (target: BasicTarget, className: string) => { + const targetElement = computed(() => unrefElement(target)) + const hasClassRef = ref(false) - if (!targetElement) { - return false + const update = >(element: E) => { + if (!element) { + hasClassRef.value = false + } else { + const elementClassName = element.className + + const classes = className + .trim() + .split(' ') + .filter((item: string) => item !== '') + + hasClassRef.value = elementClassName.includes(classes.join(' ')) + } } - const elementClassName = targetElement.className + const watcher = watch(targetElement, (ndata) => update(ndata), { + immediate: true, + }) - const classes = className - .trim() - .split(' ') - .filter((item: string) => item !== '') + watchEffectWithTarget(watcher) - return elementClassName.includes(classes.join(' ')) + return hasClassRef } /** @@ -157,7 +136,6 @@ export const hasClass = (target: BasicTarget, className: string) => { * @param target Target element dom * @param styles 所需绑定样式(如果为字符串, 则必须以分号结尾每个行内样式描述) * - * * @example * style of string * ``` @@ -180,14 +158,13 @@ export const addStyle = ( styles: PartialCSSStyleDeclaration | string, ) => { const targetElement = computed(() => unrefElement(target)) - - if (!targetElement.value) { - return - } - let styleObj: PartialCSSStyleDeclaration - const update = () => { + const update = (element: TargetValue) => { + if (!element) { + return + } + if (isValueType(styles, 'String')) { styleObj = styles.split(';').reduce((pre, curr) => { const [key, value] = curr.split(':').map((s) => s.trim()) @@ -205,13 +182,17 @@ export const addStyle = ( Object.keys(styleObj).forEach((key) => { const value = styleObj[key] - if (key in targetElement.value!.style) { - targetElement.value!.style[key] = value + if (key in element!.style) { + element!.style[key] = value } }) } - watchEffectWithTarget(update) + const watcher = watch(targetElement, (ndata) => update(ndata), { + immediate: true, + }) + + watchEffectWithTarget(watcher) } /** @@ -220,6 +201,7 @@ export const addStyle = ( * @param styles 所需卸载样式 * * 当你发现不能正常的移除某些样式的时候，应该考虑是否是样式表兼容问题 + * * @example * removeStyle(['zIndex', 'z-index']) */ @@ -229,26 +211,36 @@ export const removeStyle = ( ) => { const targetElement = computed(() => unrefElement(target)) - if (!targetElement.value) { - return - } + const update = (element: TargetValue) => { + if (!element) { + return + } - const update = () => { styles.forEach((curr) => { - targetElement.value!.style.removeProperty(curr) + element.style.removeProperty(curr) }) } - watchEffectWithTarget(update) + const watcher = watch(targetElement, (ndata) => update(ndata), { + immediate: true, + }) + + watchEffectWithTarget(watcher) } /** * * @param color 颜色格式 * @param alpha 透明度 - * @returns 转换后的 rgba 颜色值 * - * @remark 将任意颜色值转为 rgba + * 将任意颜色值转为 rgba，如果本身为 rgba, rgb 或者其它非法颜色值则直接返回 + * + * @example + * colorToRgba('#123632', 0.8) => rgba(18, 54, 50, 0.8) + * colorToRgba('rgb(18, 54, 50)', 0.8) => rgb(18, 54, 50) + * colorToRgba('#ee4f12', 0.3) => rgba(238, 79, 18, 0.3) + * colorToRgba('rgba(238, 79, 18, 0.3)', 0.3) => rgba(238, 79, 18, 0.3) + * colorToRgba('not a color', 0.3) => not a color */ export const colorToRgba = (color: string, alpha = 1) => { const hexPattern = /^#([0-9a-f]{3}|[0-9a-f]{6}|[0-9a-f]{8})$/i @@ -268,11 +260,11 @@ export const colorToRgba = (color: string, alpha = 1) => { result = 'rgb(' + rgb.join(', ') + ')' } else if (rgbPattern.test(color)) { - result = color + return color } else if (rgbaPattern.test(color)) { - result = color + return color } else { - result = color + return color } if (result && !result.startsWith('rgba')) { diff --git a/src/utils/precision.ts b/src/utils/precision.ts index 4c7f7dfa..f069b753 100644 --- a/src/utils/precision.ts +++ b/src/utils/precision.ts @@ -21,7 +21,6 @@ * - pattern default: `!#`(!: 货币符号代替, #: 货币金额代替) * - negativePattern default: `!#`(!: 货币符号代替, #: 货币金额代替) * - format default: `null`(默认格式化方法替代, 看文档) - * - fromCents default: `false` * - fromCents default: `false`(尊重精度选项) * - errorOnInvalid default: `false`(传入 null undefined 直接抛出错误) * - increment default: `null`(四舍五入增量值) @@ -30,6 +29,7 @@ import currency from 'currency.js' import { cloneDeep } from 'lodash-es' +import { isValueType } from '@/utils/basic' import type { Options } from 'currency.js' import type { AnyFC } from '@/types/modules/utils' @@ -38,6 +38,29 @@ export type CurrencyArguments = string | number | currency export type OriginalValueType = 'string' | 'number' +// currency.js 默认配置 +const defaultOptions: Partial = { + precision: 8, + decimal: '.', +} +// currency.js 原型属性集合 +const currencyPrototypeKeys = [ + 's', + 'intValue', + 'p', + 'value', + 'toJSON', + 'add', + 'cents', + 'distribute', + 'divide', + 'dollars', + 'format', + 'multiply', + 'subtract', + 'toString', +] + /** * * @param valueOptions 待计算参数列表 @@ -56,7 +79,7 @@ const basic = ( } if (valueOptions.length === 1) { - return currency(valueOptions[0]) + return currency(valueOptions[0], defaultOptions) } const result = valueOptions.reduce((pre, curr, idx, arr) => { @@ -68,6 +91,31 @@ const basic = ( return result } +/** + * + * @param value 待判断值 + * + * 检查一个对象是否为 currency.js 的对象 + * 当该对象含有 s, intValue, p, value... 属性时, 则认为该对象为 currency.js 的对象 + * + * @example + * isCurrency(1.23) => false + * isCurrency('1.23') => false + * isCurrency({ s: 1, intValue: 1, p: 1, value: 1 }) => false + * isCurrency(currency(1)) => true + */ +export const isCurrency = (value: unknown) => { + if (typeof value === 'string' || typeof value === 'number') { + return false + } + + if (isValueType(value, 'Object')) { + return currencyPrototypeKeys.every((key) => Reflect.has(value, key)) + } + + return false +} + /** * * 格式化一个数据值, 并且返回其原始值 @@ -80,9 +128,10 @@ export const format = ( options?: Options, type: OriginalValueType = 'number', ) => { - return type === 'number' - ? currency(value, options).value - : currency(value, options).toString() + const assignOptions = Object.assign({}, defaultOptions, options) + const v = currency(value, assignOptions) + + return type === 'number' ? v.value : v.toString() } /** @@ -94,8 +143,12 @@ export const format = ( * format(add(0.2, 0.33)) => 0.53 */ export const add = (...args: CurrencyArguments[]) => { + if (args.length === 1) { + return currency(args[0], defaultOptions).add(0) + } + return basic(args, 0, (pre, curr) => { - return currency(pre).add(curr) + return currency(pre, defaultOptions).add(curr) }) } @@ -108,10 +161,14 @@ export const add = (...args: CurrencyArguments[]) => { * format(subtract(0.2, 0.33)) => -0.13 */ export const subtract = (...args: CurrencyArguments[]) => { + if (args.length === 1) { + return currency(args[0], defaultOptions).subtract(0) + } + if (args.length === 2) { const [one, two] = args - return currency(one).subtract(two) + return currency(one, defaultOptions).subtract(two) } const cloneDeepArgs = cloneDeep(args) @@ -122,7 +179,7 @@ export const subtract = (...args: CurrencyArguments[]) => { } return basic(cloneDeepArgs, dividend, (pre, curr) => { - return currency(pre).subtract(curr) + return currency(pre, defaultOptions).subtract(curr) }) } @@ -135,8 +192,12 @@ export const subtract = (...args: CurrencyArguments[]) => { * format(multiply(0.2, 0.33)) => 0.07 */ export const multiply = (...args: CurrencyArguments[]) => { + if (args.length === 1) { + return currency(args[0], defaultOptions).multiply(1) + } + return basic(args, 1, (pre, curr) => { - return currency(pre).multiply(curr) + return currency(pre, defaultOptions).multiply(curr) }) } @@ -149,21 +210,21 @@ export const multiply = (...args: CurrencyArguments[]) => { * format(divide(0.2, 0.33)) => 0.61 */ export const divide = (...args: CurrencyArguments[]) => { + if (args.length === 1) { + return currency(args[0], defaultOptions).divide(1) + } + if (args.length === 2) { const [one, two] = args - return currency(one).divide(two) + return currency(one, defaultOptions).divide(two) } const cloneDeepArgs = cloneDeep(args) const dividend = cloneDeepArgs.shift() as CurrencyArguments - if (!cloneDeepArgs.length) { - return dividend - } - return basic(cloneDeepArgs, dividend, (pre, curr) => { - return currency(pre).divide(curr) + return currency(pre, defaultOptions).divide(curr) }) } @@ -176,11 +237,7 @@ export const divide = (...args: CurrencyArguments[]) => { * distribute(0, 1) => [0] * distribute(0, 3) => [0, 0, 0] */ -export const distribute = ( - value: CurrencyArguments, - length: number, - options?: Options, -) => { +export const distribute = (value: CurrencyArguments, length: number) => { if (length <= 1) { return [value ? value : 0] } else { @@ -189,10 +246,10 @@ export const distribute = ( } } - const result = currency(value, options) + const result = currency(value, defaultOptions) .distribute(length) .map((curr) => { - return format(curr, options) + return format(curr) }) return result diff --git a/src/utils/vue/index.ts b/src/utils/vue/index.ts index c47074de..c7239326 100644 --- a/src/utils/vue/index.ts +++ b/src/utils/vue/index.ts @@ -1,5 +1,7 @@ -export { call } from './call' -export { unrefElement } from './unrefElement' -export { renderNode } from './renderNode' -export { effectDispose } from './effectDispose' -export { watchEffectWithTarget } from './watchEffectWithTarget' +import { call } from './call' +import { unrefElement } from './unrefElement' +import { renderNode } from './renderNode' +import { effectDispose } from './effectDispose' +import { watchEffectWithTarget } from './watchEffectWithTarget' + +export { call, unrefElement, renderNode, effectDispose, watchEffectWithTarget } diff --git a/src/utils/vue/renderNode.ts b/src/utils/vue/renderNode.ts index cf67e5b7..ee7339bb 100644 --- a/src/utils/vue/renderNode.ts +++ b/src/utils/vue/renderNode.ts @@ -33,6 +33,18 @@ export interface RenderNodeOptions { export type RenderNodeReturn = ReturnType +/** + * + * @param vnode 将 jsx element, slot, h, string 等渲染为 vnode + * @param options 配置项 + * + * 可以将常见的类型转换为 vnode + * + * @example + * renderNode('hello world') => () => 'hello world' + * renderNode(
hello world
) => () =>
hello world
+ * renderNode(() =>
hello world
) => () =>
hello world
+ */ export function renderNode( vnode: RenderVNodeType, options?: RenderNodeOptions, diff --git a/src/utils/vue/unrefElement.ts b/src/utils/vue/unrefElement.ts index 45a74839..66ce95fb 100644 --- a/src/utils/vue/unrefElement.ts +++ b/src/utils/vue/unrefElement.ts @@ -12,12 +12,28 @@ import type { BasicTarget, TargetType, TargetValue } from '@/types/modules/vue' import type { ComponentPublicInstance } from 'vue' -export function unrefElement( +/** + * + * @param target 获取 ref dom, vue instance 的 dom + * @param defaultTarget 默认值 + * + * @example + * + * + * const refDom = ref(null) + * const computedDom = computed(() => refDom.value) + * + * unrefElement(refDom) => div + * unrefElement(computedDom) => div + */ +function unrefElement( target: BasicTarget, - defaultTarget?: T, + defaultElement?: T, ) { if (!target) { - return defaultTarget + return defaultElement } let targetElement: TargetValue @@ -33,3 +49,5 @@ export function unrefElement( return targetElement } + +export { unrefElement } diff --git a/src/utils/vue/watchEffectWithTarget.ts b/src/utils/vue/watchEffectWithTarget.ts index e5cd89ae..e85f48b2 100644 --- a/src/utils/vue/watchEffectWithTarget.ts +++ b/src/utils/vue/watchEffectWithTarget.ts @@ -21,6 +21,12 @@ import type { AnyFC } from '@/types/modules/utils' * * 该方法使用 watchEffect 实现副作用函数的执行 * 并且能够在 effect 作用域卸载时，自动停止监听 + * + * @example + * const ref = ref(0) + * const watcher = watch(()=> ref.value, (newVal, oldVal) => {}) + * + * watchEffectWithTarget(watcher) */ export function watchEffectWithTarget( fc: T, diff --git a/src/views/dashboard/index.tsx b/src/views/dashboard/index.tsx index 4f0ec8cb..7bb95331 100644 --- a/src/views/dashboard/index.tsx +++ b/src/views/dashboard/index.tsx @@ -10,8 +10,8 @@ import { NP, NH6, } from 'naive-ui' -import RIcon from '@/components/RIcon/index' -import RayLink from '@/app-components/app/RayLink/index' +import { RIcon } from '@/components' +import RayLink from '@/app-components/app/RayLink' const Dashboard = defineComponent({ name: 'RDashboard', @@ -90,15 +90,7 @@ const Dashboard = defineComponent({ {{ - header: () => - h( - RIcon, - { - name: 'ray', - size: '64', - }, - {}, - ), + header: () => , default: () => '当你看见这个页面后, 就说明项目已经启动成功了~', }} diff --git a/src/views/demo/axios/index.tsx b/src/views/demo/axios/index.tsx index 1061b02c..34d6f017 100644 --- a/src/views/demo/axios/index.tsx +++ b/src/views/demo/axios/index.tsx @@ -2,7 +2,7 @@ import './index.scss' import { NCard, NLayout, NSpace, NInput, NButton } from 'naive-ui' import { getWeather, getTypicode } from '@/api/demo/test' -import { useRequest, useHookPlusRequest } from '@/axios/index' +import { useRequest, useHookPlusRequest } from '@/axios' const Axios = defineComponent({ name: 'RAxios', diff --git a/src/views/demo/context-menu/index.tsx b/src/views/demo/context-menu/index.tsx new file mode 100644 index 00000000..c29a212e --- /dev/null +++ b/src/views/demo/context-menu/index.tsx @@ -0,0 +1,78 @@ +/** + * + * @author Ray + * + * @date 2023-12-01 + * + * @workspace ray-template + * + * @remark 今天也是元气满满撸代码的一天 + */ + +import { NSpace, NCard, NDropdown } from 'naive-ui' + +import { useContextmenuCoordinate } from '@/hooks/components' + +export default defineComponent({ + name: 'ContextMenuDemo', + setup() { + const demoOneRef = ref() + const demoOneShow = ref(false) + const options = ref([ + { + label: '杰·盖茨比', + key: 'jay gatsby', + }, + { + label: '黛西·布坎南', + key: 'daisy buchanan', + }, + { + type: 'divider', + key: 'd1', + }, + { + label: '尼克·卡拉威', + key: 'nick carraway', + }, + ]) + + const { x, y, show } = useContextmenuCoordinate(demoOneRef) + + return { + demoOneRef, + demoOneShow, + x, + y, + show, + options, + } + }, + render() { + const { x, y, show } = this + + return ( + + + +

默认点击元素外部会关闭菜单。

+
+ 右击 +
+ + + + + ) + }, +}) diff --git a/src/views/demo/doc/index.tsx b/src/views/demo/doc/index.tsx index 8a591d1a..97781a88 100644 --- a/src/views/demo/doc/index.tsx +++ b/src/views/demo/doc/index.tsx @@ -9,7 +9,7 @@ * @remark 今天也是元气满满撸代码的一天 */ -import RayIframe from '@/components/RIframe/index' +import { RIframe } from '@/components' const RTemplateDoc = defineComponent({ name: 'RTemplateDoc', @@ -18,12 +18,12 @@ const RTemplateDoc = defineComponent({ }, render() { return ( - + > ) }, }) diff --git a/src/views/demo/echart/index.tsx b/src/views/demo/echart/index.tsx index 62820a7e..2fe1170c 100644 --- a/src/views/demo/echart/index.tsx +++ b/src/views/demo/echart/index.tsx @@ -1,14 +1,14 @@ import './index.scss' import { NCard, NSwitch, NSpace, NH2, NButton } from 'naive-ui' -import RChart from '@/components/RChart/index' +import { RChart } from '@/components' -import type { RayChartInst } from '@/components/RChart/type' +import type { RChartType } from '@/components' const Echart = defineComponent({ name: 'REchart', setup() { - const baseChartRef = ref() + const baseChartRef = ref() const chartLoading = ref(false) const chartAria = ref(false) const state = reactive({ diff --git a/src/views/demo/iframe/index.tsx b/src/views/demo/iframe/index.tsx index 08e6c4de..674b67e3 100644 --- a/src/views/demo/iframe/index.tsx +++ b/src/views/demo/iframe/index.tsx @@ -11,14 +11,14 @@ /** * - * RayIframe 组件使用示例 + * RIframe 组件使用示例 * * 具体使用参考 props 代码注释 * 做了简单的一个组件封装, 希望有用 */ import { NCard, NSpace } from 'naive-ui' -import RayIframe from '@/components/RIframe/index' +import { RIframe } from '@/components' const IframeDemo = defineComponent({ name: 'IframeDemo', @@ -29,14 +29,14 @@ const IframeDemo = defineComponent({ return ( - - + * + * @date 2023-11-24 + * + * @workspace ray-template + * + * @remark 今天也是元气满满撸代码的一天 + */ + +import { RModal } from '@/components' +import { NButton, NCard, NSpace } from 'naive-ui' + +export default defineComponent({ + name: 'ModalDemo', + setup() { + const state = reactive({ + modal1: false, + modal2: false, + modal3: false, + }) + + return { + ...toRefs(state), + } + }, + render() { + return ( + + + 我是全屏模态框，并且会自动启用滚动条。 + + +

我可以被拖拽

+ + +

我可以被拖拽

+ + + (this.modal2 = true)}>卡片模态框 + (this.modal3 = true)}>对话框模态框 + + + +

+ 全屏模态框需要同时设置：fullscreen 为 true，并且 preset 为 card + 时才会生效。 +

+ (this.modal1 = true)}>打开 + + + +

+ width（--r-modal-width）: 当 preset 不为 dialog 或者 card + 的时候，你可能用得上。 +

+

+ dialogWidth（--r-modal-dialog-width）: 当 preset 为 + dialog，你可能用得上。 +

+

+ cardWidth（--r-modal-card-width）: 当 preset 为 card，你可能用得上。 +

+

+ 所有的宽度配置属性都会注入一个对应的 `css variable`，有时候会用上。 +

+ + + ) + }, +}) diff --git a/src/views/demo/precision/index.tsx b/src/views/demo/precision/index.tsx index 250a1cc5..30ae6955 100644 --- a/src/views/demo/precision/index.tsx +++ b/src/views/demo/precision/index.tsx @@ -39,7 +39,7 @@ const CalculatePrecision = defineComponent({ divideOptions: divide, } - const copilotFunc = (value: string[], path: string) => { + const copilotFunc = (value: string[], path: keyof typeof actionMap) => { const action = actionMap[path] const result = action(...value) @@ -66,13 +66,14 @@ const CalculatePrecision = defineComponent({ return (

- 计算方法，默认都保留两位小数与四舍五入，可以根据 format 方法自行转换 + 计算方法，默认都保留八位小数与四舍五入，可以根据 format 方法自行转换

示例方法都基于 currency.js 封装，利用其精度处理能力封装了常用的一些计算方法，解决精度问题。如果需要其他的方法请阅读官方文档 https://currency.js.org/#subtract

+ {{ diff --git a/src/views/demo/qrcode/index.tsx b/src/views/demo/qrcode/index.tsx index 38470e1c..dc454bc7 100644 --- a/src/views/demo/qrcode/index.tsx +++ b/src/views/demo/qrcode/index.tsx @@ -10,18 +10,18 @@ */ import { NSpace, NCard, NButton } from 'naive-ui' -import RayQRcode from '@/components/RQRCode/index' +import { RQRCode } from '@/components' import LOGO from '@/assets/images/ray.svg' -import type { QRCodeStatus, QRCodeInst } from '@/components/RQRCode/index' +import type { RQRCodeType } from '@/components' -const RQRCode = defineComponent({ - name: 'RQRCode', +export default defineComponent({ + name: 'RQRCodeDemo', setup() { const qrcodeText = ref('ray template yes') - const qrcodeStatus = ref() - const rayQRCodeRef = ref() + const qrcodeStatus = ref() + const rayQRCodeRef = ref() return { qrcodeText, @@ -41,9 +41,9 @@ const RQRCode = defineComponent({ - - - + + - - - + + 你好 {this.$route.query.name} + 我是平层路由详情页面

1. 可以点击面包屑或者菜单返回到主页面

diff --git a/src/views/demo/router-demo/router-demo-home/index.tsx b/src/views/demo/router-demo/router-demo-home/index.tsx index 8c743912..0b1a72f5 100644 --- a/src/views/demo/router-demo/router-demo-home/index.tsx +++ b/src/views/demo/router-demo/router-demo-home/index.tsx @@ -9,8 +9,8 @@ * @remark 今天也是元气满满撸代码的一天 */ -import { NSpace, NDataTable, NButton } from 'naive-ui' -import RTable from '@/components/RTable/index' +import { NSpace, NButton } from 'naive-ui' +import { RTable } from '@/components' import type { DataTableColumns } from 'naive-ui' @@ -52,6 +52,9 @@ const RouterDemoHome = defineComponent({ onClick={() => { router.push({ path: '/router-demo/router-demo-detail', + query: { + name: row.name, + }, }) }} > diff --git a/src/views/demo/svg-icons/index.tsx b/src/views/demo/svg-icons/index.tsx index be070e8e..5a039bc8 100644 --- a/src/views/demo/svg-icons/index.tsx +++ b/src/views/demo/svg-icons/index.tsx @@ -12,7 +12,7 @@ import './index.scss' import { NSpace, NCard, NPopover } from 'naive-ui' -import RIcon from '@/components/RIcon/index' +import { RIcon } from '@/components' const PreviewSVGIcons = defineComponent({ name: 'PreviewSVGIcons', diff --git a/src/views/demo/table/index.tsx b/src/views/demo/table/index.tsx index cc30f7c2..45bf4dd8 100644 --- a/src/views/demo/table/index.tsx +++ b/src/views/demo/table/index.tsx @@ -21,13 +21,10 @@ import { NPopover, NCard, } from 'naive-ui' -import RCollapseGrid from '@/components/RCollapseGrid/index' -import RTable from '@/components/RTable/index' -import RIcon from '@/components/RIcon/index' -import RMoreDropdown from '@/components/RMoreDropdown/index' +import { RCollapseGrid, RTable, RIcon, RMoreDropdown } from '@/components' import type { DataTableColumns } from 'naive-ui' -import type { TableInst } from '@/components/RTable/index' +import type { RTableType } from '@/components' type RowData = { key: number @@ -58,18 +55,10 @@ const TableView = defineComponent({ key: 'tags', render: (row: RowData) => { const tags = row.tags.map((tagKey) => { - return h( - NTag, - { - style: { - marginRight: '6px', - }, - type: 'info', - bordered: false, - }, - { - default: () => tagKey, - }, + return ( + + {tagKey} + ) }) @@ -141,7 +130,7 @@ const TableView = defineComponent({ key: 'edit', }, { - label: () => h('span', { style: { color: 'red' } }, '删除'), + label: () => 删除, key: 'delete', }, ] diff --git a/src/views/demo/template-hooks/index.tsx b/src/views/demo/template-hooks/index.tsx index 1d0e72db..384d75ea 100644 --- a/src/views/demo/template-hooks/index.tsx +++ b/src/views/demo/template-hooks/index.tsx @@ -9,19 +9,36 @@ * @remark 今天也是元气满满撸代码的一天 */ -import { NSpace, NCard, NButton } from 'naive-ui' +import { NSpace, NCard, NButton, NInput } from 'naive-ui' -import { useAppMenu, useMainPage } from '@/hooks/template/index' -import { getVariableToRefs } from '@/global-variable/index' +import { + useAppNavigation, + useMaximize, + useSpinning, + useWatermark, + useTheme, +} from '@/hooks/template' +import { getVariableToRefs } from '@/global-variable' +import { useSettingGetters } from '@/store' export default defineComponent({ name: 'TemplateHooks', setup() { const currentMenuOption = ref('') const maximizeRef = getVariableToRefs('layoutContentMaximize') + const watermark = ref(useSettingGetters().getWatermarkConfig.value.content) - const { navigationTo } = useAppMenu() - const { reload, maximize } = useMainPage() + const { navigationTo } = useAppNavigation() + const { maximize, isLayoutContentMaximized } = useMaximize() + const { reload, openSpin, closeSpin } = useSpinning() + const { + showWatermark, + hiddenWatermark, + setWatermarkContent, + toggleWatermark, + } = useWatermark() + const { changeDarkTheme, changeLightTheme, toggleTheme, getAppTheme } = + useTheme() return { navigationTo, @@ -29,10 +46,37 @@ export default defineComponent({ currentMenuOption, maximize, maximizeRef, + openSpin, + closeSpin, + showWatermark, + hiddenWatermark, + setWatermarkContent, + watermark, + toggleWatermark, + changeDarkTheme, + changeLightTheme, + toggleTheme, + getAppTheme, + isLayoutContentMaximized, } }, render() { - const { navigationTo, reload, maximize } = this + const { + navigationTo, + reload, + maximize, + openSpin, + closeSpin, + showWatermark, + hiddenWatermark, + setWatermarkContent, + toggleWatermark, + changeDarkTheme, + changeLightTheme, + toggleTheme, + getAppTheme, + isLayoutContentMaximized, + } = this return ( @@ -42,38 +86,78 @@ export default defineComponent({ 方法。这里不做过多的赘述，可以查看文档具体描述。 - + + +

getAppTheme 获取当前主题色: {getAppTheme().themeLabel}

+ + changeDarkTheme()}>切换暗黑主题 + changeLightTheme()}>切换明亮主题 + toggleTheme()}>切换主题 + + + + + + { + setWatermarkContent(val) + }} + /> + + showWatermark()}>显示水印 + hiddenWatermark()}>隐藏水印 + toggleWatermark()}>切换水印 + + + +

- navigationTo - 参数为正整数时，会更具当前的菜单顺序进行自动导航匹配。但是此方法仅能导航一级菜单。并且如果导航菜单非根菜单项，会自动递归导航至一子菜单。 + 手动刷新内容区域，会使得当前路由页面内容强制重新加载（会执行完整的 + vue 生命周期）。默认 800ms 延迟。


- navigationTo(14)}>跳转至多级菜单 - - - -

- 手动刷新内容区域，会使得当前路由页面内容强制重新加载（会执行完整的 - vue 生命周期）。默认 800ms 延迟。 -

-
+ { reload() }} > - 刷新 + 刷新（强制刷新） - - { - maximize(!this.maximizeRef) + openSpin() + + setTimeout(() => { + closeSpin() + }, 800) }} > - 最大化内容区域 + 触发加载动画（不强制刷新） - + + + +

+ isLayoutContentMaximized 检测当前内容区域是否最大化: + {isLayoutContentMaximized ? '最大化' : '正常尺寸'} +

+ { + maximize(!this.maximizeRef) + }} + > + 最大化内容区域 + + + +

+ navigationTo + 参数为正整数时，会更具当前的菜单顺序进行自动导航匹配。但是此方法仅能导航一级菜单。并且如果导航菜单非根菜单项，会自动递归导航至一子菜单。 +

+
+ navigationTo(16)}>跳转至多级菜单 ) diff --git a/src/views/login/components/QRCodeSigning/index.tsx b/src/views/login/components/QRCodeSigning/index.tsx index d5334fb7..08c7ed06 100644 --- a/src/views/login/components/QRCodeSigning/index.tsx +++ b/src/views/login/components/QRCodeSigning/index.tsx @@ -11,7 +11,7 @@ import './index.scss' -import RayQRcode from '@/components/RQRCode/index' +import { RQRCode } from '@/components' import LOGO from '@/assets/images/ray.svg' @@ -36,7 +36,7 @@ const QRCodeSigning = defineComponent({ render() { return (
- +
) }, diff --git a/src/views/login/components/SSOSigning/index.tsx b/src/views/login/components/SSOSigning/index.tsx index c3c35418..fe18b5fd 100644 --- a/src/views/login/components/SSOSigning/index.tsx +++ b/src/views/login/components/SSOSigning/index.tsx @@ -19,7 +19,7 @@ import './index.scss' import { NSpace, NPopover } from 'naive-ui' -import RIcon from '@/components/RIcon/index' +import { RIcon } from '@/components' interface SSOSigningOptions { icon: string diff --git a/src/views/login/components/Signing/index.tsx b/src/views/login/components/Signing/index.tsx index de951738..0b1f914a 100644 --- a/src/views/login/components/Signing/index.tsx +++ b/src/views/login/components/Signing/index.tsx @@ -1,11 +1,11 @@ import { NForm, NFormItem, NInput, NButton } from 'naive-ui' import { setStorage } from '@/utils/cache' -import { useI18n } from '@/hooks/web/index' -import { APP_CATCH_KEY, ROOT_ROUTE } from '@/app-config/appConfig' -import { useVueRouter } from '@/hooks/web/index' -import { setVariable, getVariableToRefs } from '@/global-variable/index' -import { useSigningActions, useSigningGetters } from '@/store' +import { useI18n } from '@/hooks/web' +import { APP_CATCH_KEY } from '@/app-config/appConfig' +import { setVariable, getVariableToRefs } from '@/global-variable' +import { useSigningActions } from '@/store' +import { useAppRoot } from '@/hooks/template' import type { FormInst } from 'naive-ui' @@ -16,7 +16,7 @@ export default defineComponent({ const { t } = useI18n() const { signing } = useSigningActions() - const { path } = ROOT_ROUTE + const { getRootPath } = useAppRoot() const globalSpinning = getVariableToRefs('globalSpinning') const useSigningForm = () => ({ @@ -24,7 +24,7 @@ export default defineComponent({ pwd: '123456', }) - const { router } = useVueRouter() + const router = useRouter() const signingForm = ref(useSigningForm()) const rules = { @@ -57,7 +57,7 @@ export default defineComponent({ setStorage(APP_CATCH_KEY.token, 'tokenValue') setStorage(APP_CATCH_KEY.signing, res.data) - router.push(path) + router.push(getRootPath.value) }, 2 * 1000) } }) diff --git a/src/views/login/index.tsx b/src/views/login/index.tsx index 6ce76bb7..3e85ef63 100644 --- a/src/views/login/index.tsx +++ b/src/views/login/index.tsx @@ -11,13 +11,13 @@ import { NGrid, NGridItem, } from 'naive-ui' -import Signing from './components/Signing/index' -import Register from './components/Register/index' -import QRCodeSigning from './components/QRCodeSigning/index' -import SSOSigning from './components/SSOSigning/index' -import RIcon from '@/components/RIcon' -import RayLink from '@/app-components/app/RayLink/index' -import ThemeSwitch from '@/layout/components/SiderBar/components/SettingDrawer/components/ThemeSwitch/index' +import Signing from './components/Signing' +import Register from './components/Register' +import QRCodeSigning from './components/QRCodeSigning' +import SSOSigning from './components/SSOSigning' +import { RIcon } from '@/components' +import RayLink from '@/app-components/app/RayLink' +import ThemeSwitch from '@/layout/components/SiderBar/components/SettingDrawer/components/ThemeSwitch' import { LOCAL_OPTIONS } from '@/app-config/localConfig' import { useWindowSize } from '@vueuse/core' @@ -80,6 +80,7 @@ const Login = defineComponent({ this.updateLocale(key)} + trigger="click" > { @@ -31,13 +31,35 @@ export default defineConfig(async ({ mode }) => { base: base || '/', define: { __APP_CFG__: JSON.stringify(__APP_CFG__), + __DEV__: mode === 'development', }, resolve: { alias: alias, }, plugins: vitePlugins(mode), optimizeDeps: { - include: ['vue', 'vue-router', 'pinia', 'vue-i18n', '@vueuse/core'], + include: [ + 'vue', + 'vue-router', + 'pinia', + 'vue-i18n', + 'naive-ui', + '@vueuse/core', + 'vue-demi', + 'dayjs', + 'echarts', + 'xlsx', + 'axios', + 'print-js', + 'clipboard', + 'lodash-es', + 'vue-hooks-plus', + 'interactjs', + 'awesome-qr', + 'pinia-plugin-persistedstate', + 'currency.js', + 'mockjs', + ], }, esbuild: { pure: ['console.log'], @@ -47,9 +69,21 @@ export default defineConfig(async ({ mode }) => { rollupOptions: { output: { manualChunks: (id) => { - if (id.includes('node_modules')) { - const index = id.includes('pnpm') ? 1 : 0 + const isUtils = () => id.includes('src/utils/') + const isHooks = () => + id.includes('src/hooks/template') || id.includes('src/hooks/web') + const isNodeModules = () => id.includes('node_modules') + const index = id.includes('pnpm') ? 1 : 0 + if (isUtils()) { + return 'utils' + } + + if (isHooks()) { + return 'hooks' + } + + if (isNodeModules()) { return id .toString() .split('node_modules/')[1] diff --git a/vite.pliugin.config.ts b/vite.plugin.config.ts similarity index 85% rename from vite.pliugin.config.ts rename to vite.plugin.config.ts index 559c7dcf..7eac1d0c 100644 --- a/vite.pliugin.config.ts +++ b/vite.plugin.config.ts @@ -33,7 +33,50 @@ import config from './cfg' import type { PluginOption } from 'vite' -export default function (mode: string): PluginOption[] { +// 仅适用于报告模式（report） +function onlyReportOptions(mode: string) { + return [ + visualizer({ + gzipSize: true, // 搜集 `gzip` 压缩包 + brotliSize: true, // 搜集 `brotli` 压缩包 + emitFile: false, // 生成文件在根目录下 + filename: 'visualizer.html', + open: mode === 'report' ? true : false, // 以默认服务器代理打开文件 + }), + ] +} + +// 仅适用于构建模式（任何构建模式：preview、build、report...） +function onlyBuildOptions(mode: string) { + return [ + viteCDNPlugin({ + // modules 顺序 vue, vue-demi 必须保持当前顺序加载，否则会出现加载错误问题 + modules: [ + 'vue', + 'vue-demi', + 'pinia', + 'naive-ui', + 'vue-router', + 'vue-i18n', + 'dayjs', + 'echarts', + 'xlsx', + 'axios', + 'print-js', + 'clipboard', + 'lodash-es', + ], + }), + ] +} + +// 仅适用于开发模式 +function onlyDevOptions(mode: string) { + return [] +} + +// 基础插件配置 +function baseOptions(mode: string) { const { title, appPrimaryColor, preloadingConfig } = config return [ @@ -111,23 +154,6 @@ export default function (mode: string): PluginOption[] { }, ], }), - { - include: [ - 'src/**/*.ts', - 'src/**/*.tsx', - 'src/**/*.vue', - 'src/*.ts', - 'src/*.tsx', - 'src/*.vue', - ], - }, - visualizer({ - gzipSize: true, // 搜集 `gzip` 压缩包 - brotliSize: true, // 搜集 `brotli` 压缩包 - emitFile: false, // 生成文件在根目录下 - filename: 'visualizer.html', - open: mode === 'report' ? true : false, // 以默认服务器代理打开文件 - }), viteEjsPlugin({ preloadingConfig, appPrimaryColor, @@ -154,22 +180,13 @@ export default function (mode: string): PluginOption[] { inject: 'body-last', customDomId: '__svg__icons__dom__', }), - viteCDNPlugin({ - modules: [ - 'vue', - 'vue-demi', - 'pinia', - 'naive-ui', - 'vue-router', - 'vue-i18n', - 'dayjs', - 'echarts', - 'xlsx', - 'axios', - 'print-js', - 'clipboard', - 'lodash-es', - ], - }), ] } + +export default function (mode: string): PluginOption[] { + const plugins = + mode === 'development' ? onlyDevOptions(mode) : onlyBuildOptions(mode) + const reportPlugins = mode === 'report' ? onlyReportOptions(mode) : [] + + return [...baseOptions(mode), ...plugins, ...reportPlugins] +}