Skip to content

Commit

Permalink
fix: fix pnpm-lock confix
Browse files Browse the repository at this point in the history
  • Loading branch information
ArthurDarkstone committed Nov 4, 2024
2 parents 23a97d3 + 44440d0 commit eede2d7
Show file tree
Hide file tree
Showing 72 changed files with 1,985 additions and 2,209 deletions.
1 change: 1 addition & 0 deletions apps/backend-mock/nitro.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import errorHandler from './error';

process.env.COMPATIBILITY_DATE = new Date().toISOString();
export default defineNitroConfig({
devErrorHandler: errorHandler,
errorHandler: '~/error',
Expand Down
2 changes: 1 addition & 1 deletion apps/web-antd/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vben/web-antd",
"version": "5.4.3",
"version": "5.4.4",
"homepage": "https://vben.pro",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {
Expand Down
4 changes: 4 additions & 0 deletions apps/web-antd/src/adapter/vxe-table.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ setupVbenVxeTable({
resizable: true,
},
minHeight: 180,
formConfig: {
// 全局禁用vxe-table的表单配置,使用formOptions
enabled: false,
},
proxyConfig: {
autoLoad: true,
response: {
Expand Down
2 changes: 1 addition & 1 deletion apps/web-ele/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vben/web-ele",
"version": "5.4.3",
"version": "5.4.4",
"homepage": "https://vben.pro",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {
Expand Down
4 changes: 4 additions & 0 deletions apps/web-ele/src/adapter/vxe-table.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ setupVbenVxeTable({
resizable: true,
},
minHeight: 180,
formConfig: {
// 全局禁用vxe-table的表单配置,使用formOptions
enabled: false,
},
proxyConfig: {
autoLoad: true,
response: {
Expand Down
2 changes: 1 addition & 1 deletion apps/web-naive/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vben/web-naive",
"version": "5.4.3",
"version": "5.4.4",
"homepage": "https://vben.pro",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {
Expand Down
4 changes: 4 additions & 0 deletions apps/web-naive/src/adapter/vxe-table.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ setupVbenVxeTable({
resizable: true,
},
minHeight: 180,
formConfig: {
// 全局禁用vxe-table的表单配置,使用formOptions
enabled: false,
},
proxyConfig: {
autoLoad: true,
response: {
Expand Down
2 changes: 1 addition & 1 deletion docs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vben/docs",
"version": "5.4.3",
"version": "5.4.4",
"private": true,
"scripts": {
"build": "vitepress build",
Expand Down
14 changes: 8 additions & 6 deletions docs/src/components/common-ui/vben-modal.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,12 +110,14 @@ const [Modal, modalApi] = useVbenModal({

以下事件,只有在 `useVbenModal({onCancel:()=>{}})` 中传入才会生效。

| 事件名 | 描述 | 类型 |
| --- | --- | --- |
| onBeforeClose | 关闭前触发,返回 `false`则禁止关闭 | `()=>boolean` |
| onCancel | 点击取消按钮触发 | `()=>void` |
| onConfirm | 点击确认按钮触发 | `()=>void` |
| onOpenChange | 关闭或者打开弹窗时触发 | `(isOpen:boolean)=>void` |
| 事件名 | 描述 | 类型 | 版本号 |
| --- | --- | --- | --- |
| onBeforeClose | 关闭前触发,返回 `false`则禁止关闭 | `()=>boolean` | |
| onCancel | 点击取消按钮触发 | `()=>void` | |
| onClosed | 关闭动画播放完毕时触发 | `()=>void` | >5.4.3 |
| onConfirm | 点击确认按钮触发 | `()=>void` | |
| onOpenChange | 关闭或者打开弹窗时触发 | `(isOpen:boolean)=>void` | |
| onOpened | 打开动画播放完毕时触发 | `()=>void` | >5.4.3 |

### Slots

Expand Down
6 changes: 6 additions & 0 deletions docs/src/en/guide/essentials/development.md
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,12 @@ To run the `docs` application:
pnpm dev:docs
```

## Public Static Resources

If you need to use public static resources in the project, such as images, static HTML, etc., and you want to directly import them in the development process through `src="/xxx.png"`.

You need to put the resource in the corresponding project's `public/static` directory. The import path for the resource should be `src="/static/xxx.png"`.

## DevTools

The project has a built-in [Vue DevTools](https://github.com/vuejs/devtools-next) plugin, which can be used during development. It is disabled by default, but can be enabled in the `.env.development` file. After enabling it, restart the project:
Expand Down
2 changes: 1 addition & 1 deletion docs/src/en/guide/introduction/quick-start.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ outline: deep

Before starting the project, ensure that your environment meets the following requirements:

- [Node.js](https://nodejs.org/en) version 20 or above. It is recommended to use [fnm](https://github.com/Schniz/fnm) or [nvm](https://github.com/nvm-sh/nvm) for version management.
- [Node.js](https://nodejs.org/en) version 20.15.0 or above. It is recommended to use [fnm](https://github.com/Schniz/fnm), [nvm](https://github.com/nvm-sh/nvm), or directly use [pnpm](https://pnpm.io/cli/env) for version management.
- [Git](https://git-scm.com/) any version.

To verify if your environment meets the above requirements, you can check the versions using the following commands:
Expand Down
6 changes: 6 additions & 0 deletions docs/src/guide/essentials/development.md
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,12 @@ pnpm dev:ele
pnpm dev:docs
```

## 公共静态资源

项目中需要使用到的公共静态资源,如:图片、静态HTML等,需要在开发中通过 `src="/xxx.png"` 直接引入的。

需要将资源放在对应项目的 `public/static` 目录下。引入的路径为:`src="/static/xxx.png"`

## DevTools

项目内置了 [Vue DevTools](https://github.com/vuejs/devtools-next) 插件,可以在开发过程中使用。默认关闭,可在`.env.development` 内开启,并重新运行项目即可:
Expand Down
2 changes: 1 addition & 1 deletion docs/src/guide/in-depth/loading.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

## 原理

`vite-plugin-inject-app-loading` 插件实现,插件会在每个应用的注入一个全局的 `loading html`
`vite-plugin-inject-app-loading` 插件实现,插件会在每个应用都注入一个全局的 `loading html`

## 关闭

Expand Down
2 changes: 1 addition & 1 deletion docs/src/guide/introduction/quick-start.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ outline: deep

在启动项目前,你需要确保你的环境满足以下要求:

- [Node.js](https://nodejs.org/en) 20.15.0 及以上版本,推荐使用 [fnm](https://github.com/Schniz/fnm) 或者 [nvm](https://github.com/nvm-sh/nvm) 进行版本管理。
- [Node.js](https://nodejs.org/en) 20.15.0 及以上版本,推荐使用 [fnm](https://github.com/Schniz/fnm) [nvm](https://github.com/nvm-sh/nvm) 或者直接使用[pnpm](https://pnpm.io/cli/env) 进行版本管理。
- [Git](https://git-scm.com/) 任意版本。

验证你的环境是否满足以上要求,你可以通过以下命令查看版本:
Expand Down
2 changes: 1 addition & 1 deletion internal/lint-configs/commitlint-config/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vben/commitlint-config",
"version": "5.4.3",
"version": "5.4.4",
"private": true,
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
Expand Down
2 changes: 1 addition & 1 deletion internal/lint-configs/stylelint-config/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vben/stylelint-config",
"version": "5.4.3",
"version": "5.4.4",
"private": true,
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
Expand Down
2 changes: 1 addition & 1 deletion internal/node-utils/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vben/node-utils",
"version": "5.4.3",
"version": "5.4.4",
"private": true,
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
Expand Down
1 change: 0 additions & 1 deletion internal/tailwind-config/build.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ export default defineBuildConfig({
clean: true,
declaration: true,
entries: ['src/index', './src/postcss.config'],
externals: ['@vben/node-utils'],
rollup: {
emitCJS: true,
},
Expand Down
8 changes: 4 additions & 4 deletions internal/tailwind-config/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vben/tailwind-config",
"version": "5.4.3",
"version": "5.4.4",
"private": true,
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
Expand All @@ -12,7 +12,7 @@
"license": "MIT",
"type": "module",
"scripts": {
"stub": "pnpm unbuild --stub"
"stub": "pnpm unbuild"
},
"files": [
"dist"
Expand Down Expand Up @@ -48,6 +48,7 @@
"dependencies": {
"@iconify/json": "catalog:",
"@iconify/tailwind": "catalog:",
"@manypkg/get-packages": "catalog:",
"@tailwindcss/nesting": "catalog:",
"@tailwindcss/typography": "catalog:",
"autoprefixer": "catalog:",
Expand All @@ -60,7 +61,6 @@
"tailwindcss-animate": "catalog:"
},
"devDependencies": {
"@types/postcss-import": "catalog:",
"@vben/node-utils": "workspace:*"
"@types/postcss-import": "catalog:"
}
}
5 changes: 2 additions & 3 deletions internal/tailwind-config/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,16 @@ import type { Config } from 'tailwindcss';

import path from 'node:path';

import { getPackagesSync } from '@vben/node-utils';

import { addDynamicIconSelectors } from '@iconify/tailwind';
import { getPackagesSync } from '@manypkg/get-packages';
import typographyPlugin from '@tailwindcss/typography';
import animate from 'tailwindcss-animate';

import { enterAnimationPlugin } from './plugins/entry';

// import defaultTheme from 'tailwindcss/defaultTheme';

const { packages } = getPackagesSync();
const { packages } = getPackagesSync(process.cwd());

const tailwindPackages: string[] = [];

Expand Down
2 changes: 1 addition & 1 deletion internal/tsconfig/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vben/tsconfig",
"version": "5.4.3",
"version": "5.4.4",
"private": true,
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
Expand Down
3 changes: 1 addition & 2 deletions internal/vite-config/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vben/vite-config",
"version": "5.4.3",
"version": "5.4.4",
"private": true,
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
Expand Down Expand Up @@ -35,7 +35,6 @@
"html-minifier-terser": "catalog:",
"nitropack": "catalog:",
"resolve.exports": "catalog:",
"vite-plugin-lib-inject-css": "catalog:",
"vite-plugin-pwa": "catalog:",
"vite-plugin-vue-devtools": "catalog:"
},
Expand Down
2 changes: 1 addition & 1 deletion internal/vite-config/src/config/common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type { UserConfig } from 'vite';
async function getCommonConfig(): Promise<UserConfig> {
return {
build: {
chunkSizeWarningLimit: 1000,
chunkSizeWarningLimit: 2000,
reportCompressedSize: false,
sourcemap: false,
},
Expand Down
1 change: 0 additions & 1 deletion internal/vite-config/src/config/library.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ function defineLibraryConfig(userConfigPromise?: DefineLibraryOptions) {

const plugins = await loadLibraryPlugins({
dts: false,
injectLibCss: true,
injectMetadata: true,
isBuild,
mode,
Expand Down
7 changes: 1 addition & 6 deletions internal/vite-config/src/plugins/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import { visualizer as viteVisualizerPlugin } from 'rollup-plugin-visualizer';
import viteCompressPlugin from 'vite-plugin-compression';
import viteDtsPlugin from 'vite-plugin-dts';
import { createHtmlPlugin as viteHtmlPlugin } from 'vite-plugin-html';
import { libInjectCss as viteLibInjectCss } from 'vite-plugin-lib-inject-css';
import { VitePWA } from 'vite-plugin-pwa';
import viteVueDevTools from 'vite-plugin-vue-devtools';

Expand Down Expand Up @@ -225,18 +224,14 @@ async function loadLibraryPlugins(
): Promise<PluginOption[]> {
// 单独取,否则commonOptions拿不到
const isBuild = options.isBuild;
const { dts, injectLibCss, ...commonOptions } = options;
const { dts, ...commonOptions } = options;
const commonPlugins = await loadCommonPlugins(commonOptions);
return await loadConditionPlugins([
...commonPlugins,
{
condition: isBuild && !!dts,
plugins: () => [viteDtsPlugin({ logLevel: 'error' })],
},
{
condition: injectLibCss,
plugins: () => [viteLibInjectCss()],
},
]);
}

Expand Down
3 changes: 0 additions & 3 deletions internal/vite-config/src/typing.ts
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,6 @@ interface ApplicationPluginOptions extends CommonPluginOptions {
interface LibraryPluginOptions extends CommonPluginOptions {
/** 开启 dts 输出 */
dts?: boolean | PluginOptions;

/** 是否注入lib css */
injectLibCss?: boolean;
}

type ApplicationOptions = ApplicationPluginOptions;
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vben-admin-monorepo",
"version": "5.4.3",
"version": "5.4.4",
"private": true,
"keywords": [
"monorepo",
Expand Down Expand Up @@ -107,6 +107,7 @@
}
},
"overrides": {
"@ast-grep/napi": "catalog:",
"@ctrl/tinycolor": "catalog:",
"clsx": "catalog:",
"pinia": "catalog:",
Expand Down
4 changes: 2 additions & 2 deletions packages/@core/base/design/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vben-core/design",
"version": "5.4.3",
"version": "5.4.4",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {
Expand Down Expand Up @@ -28,7 +28,7 @@
".": {
"types": "./src/index.ts",
"development": "./src/index.ts",
"default": "./dist/index.mjs"
"default": "./dist/style.css"
}
},
"publishConfig": {
Expand Down
2 changes: 1 addition & 1 deletion packages/@core/base/icons/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vben-core/icons",
"version": "5.4.3",
"version": "5.4.4",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {
Expand Down
4 changes: 3 additions & 1 deletion packages/@core/base/shared/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vben-core/shared",
"version": "5.4.3",
"version": "5.4.4",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {
Expand Down Expand Up @@ -81,10 +81,12 @@
"dependencies": {
"@ctrl/tinycolor": "catalog:",
"@tanstack/vue-store": "catalog:",
"@types/lodash.get": "catalog:",
"@vue/shared": "catalog:",
"clsx": "catalog:",
"defu": "catalog:",
"lodash.clonedeep": "catalog:",
"lodash.get": "catalog:",
"nprogress": "catalog:",
"tailwind-merge": "catalog:",
"theme-colors": "catalog:"
Expand Down
2 changes: 1 addition & 1 deletion packages/@core/base/typings/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vben-core/typings",
"version": "5.4.3",
"version": "5.4.4",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion packages/@core/composables/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vben-core/composables",
"version": "5.4.3",
"version": "5.4.4",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion packages/@core/preferences/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vben-core/preferences",
"version": "5.4.3",
"version": "5.4.4",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {
Expand Down
Loading

0 comments on commit eede2d7

Please sign in to comment.