Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin

apps/backend-mock/nitro.config.ts

@@ -1,5 +1,6 @@
 import errorHandler from './error';
 
+process.env.COMPATIBILITY_DATE = new Date().toISOString();
 export default defineNitroConfig({
   devErrorHandler: errorHandler,
   errorHandler: '~/error',

apps/web-antd/src/adapter/vxe-table.ts

@@ -17,6 +17,10 @@ setupVbenVxeTable({
         align: 'center',
         border: false,
         minHeight: 180,
+        formConfig: {
+          // 全局禁用vxe-table的表单配置，使用formOptions
+          enabled: false,
+        },
         proxyConfig: {
           autoLoad: true,
           response: {

apps/web-ele/src/adapter/vxe-table.ts

@@ -16,6 +16,10 @@ setupVbenVxeTable({
           resizable: true,
         },
         minHeight: 180,
+        formConfig: {
+          // 全局禁用vxe-table的表单配置，使用formOptions
+          enabled: false,
+        },
         proxyConfig: {
           autoLoad: true,
           response: {

apps/web-naive/src/adapter/vxe-table.ts

@@ -16,6 +16,10 @@ setupVbenVxeTable({
           resizable: true,
         },
         minHeight: 180,
+        formConfig: {
+          // 全局禁用vxe-table的表单配置，使用formOptions
+          enabled: false,
+        },
         proxyConfig: {
           autoLoad: true,
           response: {

internal/tailwind-config/build.config.ts

@@ -4,7 +4,6 @@ export default defineBuildConfig({
   clean: true,
   declaration: true,
   entries: ['src/index', './src/postcss.config'],
-  externals: ['@vben/node-utils'],
   rollup: {
     emitCJS: true,
   },

internal/tailwind-config/package.json

@@ -12,7 +12,7 @@
   "license": "MIT",
   "type": "module",
   "scripts": {
-    "stub": "pnpm unbuild --stub"
+    "stub": "pnpm unbuild"
   },
   "files": [
     "dist"
@@ -48,6 +48,7 @@
   "dependencies": {
     "@iconify/json": "catalog:",
     "@iconify/tailwind": "catalog:",
+    "@manypkg/get-packages": "catalog:",
     "@tailwindcss/nesting": "catalog:",
     "@tailwindcss/typography": "catalog:",
     "autoprefixer": "catalog:",
@@ -60,7 +61,6 @@
     "tailwindcss-animate": "catalog:"
   },
   "devDependencies": {
-    "@types/postcss-import": "catalog:",
+    "@types/postcss-import": "catalog:"
-    "@vben/node-utils": "workspace:*"
   }
 }

internal/tailwind-config/src/index.ts

@@ -2,9 +2,8 @@ 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';
 
@@ -12,7 +11,7 @@ import { enterAnimationPlugin } from './plugins/entry';
 
 // import defaultTheme from 'tailwindcss/defaultTheme';
 
-const { packages } = getPackagesSync();
+const { packages } = getPackagesSync(process.cwd());
 
 const tailwindPackages: string[] = [];
 

internal/vite-config/package.json

@@ -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:"
   },

internal/vite-config/src/config/common.ts

@@ -3,7 +3,7 @@ import type { UserConfig } from 'vite';
 async function getCommonConfig(): Promise<UserConfig> {
   return {
     build: {
-      chunkSizeWarningLimit: 1000,
+      chunkSizeWarningLimit: 2000,
       reportCompressedSize: false,
       sourcemap: false,
     },

internal/vite-config/src/config/library.ts

@@ -19,7 +19,6 @@ function defineLibraryConfig(userConfigPromise?: DefineLibraryOptions) {
 
     const plugins = await loadLibraryPlugins({
       dts: false,
-      injectLibCss: true,
       injectMetadata: true,
       isBuild,
       mode,

internal/vite-config/src/plugins/index.ts

@@ -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';
 
@@ -225,7 +224,7 @@ 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,
@@ -233,10 +232,6 @@ async function loadLibraryPlugins(
       condition: isBuild && !!dts,
       plugins: () => [viteDtsPlugin({ logLevel: 'error' })],
     },
-    {
-      condition: injectLibCss,
-      plugins: () => [viteLibInjectCss()],
-    },
   ]);
 }
 

internal/vite-config/src/typing.ts

@@ -130,9 +130,6 @@ interface ApplicationPluginOptions extends CommonPluginOptions {
 interface LibraryPluginOptions extends CommonPluginOptions {
   /** 开启 dts 输出 */
   dts?: boolean | PluginOptions;
-
-  /** 是否注入lib css */
-  injectLibCss?: boolean;
 }
 
 type ApplicationOptions = ApplicationPluginOptions;

packages/@core/base/design/package.json

@@ -28,7 +28,7 @@
     ".": {
       "types": "./src/index.ts",
       "development": "./src/index.ts",
-      "default": "./dist/index.mjs"
+      "default": "./dist/style.css"
     }
   },
   "publishConfig": {

playground/src/adapter/vxe-table.ts

@@ -15,6 +15,11 @@ setupVbenVxeTable({
         columnConfig: {
           resizable: true,
         },
+
+        formConfig: {
+          // 全局禁用vxe-table的表单配置，使用formOptions
+          enabled: false,
+        },
         minHeight: 180,
         proxyConfig: {
           autoLoad: true,

pnpm-workspace.yaml

@@ -154,7 +154,7 @@ catalog:
   theme-colors: ^0.1.0
   turbo: ^2.2.3
   typescript: ^5.6.3
-  unbuild: ^2.0.0
+  unbuild: ^3.0.0-rc.11
   unplugin-element-plus: ^0.8.0
   vee-validate: ^4.14.6
   vite: ^5.4.10
@@ -162,7 +162,6 @@ catalog:
   vite-plugin-dts: 4.2.1
   vite-plugin-html: ^3.2.2
   vite-plugin-lazy-import: ^1.0.7
-  vite-plugin-lib-inject-css: ^2.1.1
   vite-plugin-pwa: ^0.20.5
   vite-plugin-vue-devtools: ^7.6.2
   vitepress: ^1.4.3

scripts/deploy/Dockerfile

@@ -14,7 +14,7 @@ WORKDIR /app
 COPY . /app
 
 RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile
-RUN pnpm run build
+RUN pnpm run build --filter=\!./docs
 
 RUN echo "Builder Success 🎉"
 

scripts/turbo-run/src/run.ts

@@ -46,7 +46,6 @@ export async function run(options: RunOptions) {
     process.exit(1);
   }
 
-  process.env.VITE_CJS_IGNORE_WARNING = '1';
   execaCommand(`pnpm --filter=${selectPkg} run ${command}`, {
     stdio: 'inherit',
   });

turbo.json

@@ -16,7 +16,12 @@
   "tasks": {
     "build": {
       "dependsOn": ["^build"],
-      "outputs": ["dist/**", "dist.zip"]
+      "outputs": [
+        "dist/**",
+        "dist.zip",
+        ".vitepress/dist.zip",
+        ".vitepress/dist/**"
+      ]
     },
     "preview": {
       "dependsOn": ["^build"],