Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin
This commit is contained in:
commit
cff04b7101
@ -1,5 +1,6 @@
|
|||||||
import errorHandler from './error';
|
import errorHandler from './error';
|
||||||
|
|
||||||
|
process.env.COMPATIBILITY_DATE = new Date().toISOString();
|
||||||
export default defineNitroConfig({
|
export default defineNitroConfig({
|
||||||
devErrorHandler: errorHandler,
|
devErrorHandler: errorHandler,
|
||||||
errorHandler: '~/error',
|
errorHandler: '~/error',
|
||||||
|
@ -17,6 +17,10 @@ setupVbenVxeTable({
|
|||||||
align: 'center',
|
align: 'center',
|
||||||
border: false,
|
border: false,
|
||||||
minHeight: 180,
|
minHeight: 180,
|
||||||
|
formConfig: {
|
||||||
|
// 全局禁用vxe-table的表单配置,使用formOptions
|
||||||
|
enabled: false,
|
||||||
|
},
|
||||||
proxyConfig: {
|
proxyConfig: {
|
||||||
autoLoad: true,
|
autoLoad: true,
|
||||||
response: {
|
response: {
|
||||||
|
@ -16,6 +16,10 @@ setupVbenVxeTable({
|
|||||||
resizable: true,
|
resizable: true,
|
||||||
},
|
},
|
||||||
minHeight: 180,
|
minHeight: 180,
|
||||||
|
formConfig: {
|
||||||
|
// 全局禁用vxe-table的表单配置,使用formOptions
|
||||||
|
enabled: false,
|
||||||
|
},
|
||||||
proxyConfig: {
|
proxyConfig: {
|
||||||
autoLoad: true,
|
autoLoad: true,
|
||||||
response: {
|
response: {
|
||||||
|
@ -16,6 +16,10 @@ setupVbenVxeTable({
|
|||||||
resizable: true,
|
resizable: true,
|
||||||
},
|
},
|
||||||
minHeight: 180,
|
minHeight: 180,
|
||||||
|
formConfig: {
|
||||||
|
// 全局禁用vxe-table的表单配置,使用formOptions
|
||||||
|
enabled: false,
|
||||||
|
},
|
||||||
proxyConfig: {
|
proxyConfig: {
|
||||||
autoLoad: true,
|
autoLoad: true,
|
||||||
response: {
|
response: {
|
||||||
|
@ -4,7 +4,6 @@ export default defineBuildConfig({
|
|||||||
clean: true,
|
clean: true,
|
||||||
declaration: true,
|
declaration: true,
|
||||||
entries: ['src/index', './src/postcss.config'],
|
entries: ['src/index', './src/postcss.config'],
|
||||||
externals: ['@vben/node-utils'],
|
|
||||||
rollup: {
|
rollup: {
|
||||||
emitCJS: true,
|
emitCJS: true,
|
||||||
},
|
},
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"stub": "pnpm unbuild --stub"
|
"stub": "pnpm unbuild"
|
||||||
},
|
},
|
||||||
"files": [
|
"files": [
|
||||||
"dist"
|
"dist"
|
||||||
@ -48,6 +48,7 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@iconify/json": "catalog:",
|
"@iconify/json": "catalog:",
|
||||||
"@iconify/tailwind": "catalog:",
|
"@iconify/tailwind": "catalog:",
|
||||||
|
"@manypkg/get-packages": "catalog:",
|
||||||
"@tailwindcss/nesting": "catalog:",
|
"@tailwindcss/nesting": "catalog:",
|
||||||
"@tailwindcss/typography": "catalog:",
|
"@tailwindcss/typography": "catalog:",
|
||||||
"autoprefixer": "catalog:",
|
"autoprefixer": "catalog:",
|
||||||
@ -60,7 +61,6 @@
|
|||||||
"tailwindcss-animate": "catalog:"
|
"tailwindcss-animate": "catalog:"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/postcss-import": "catalog:",
|
"@types/postcss-import": "catalog:"
|
||||||
"@vben/node-utils": "workspace:*"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2,9 +2,8 @@ import type { Config } from 'tailwindcss';
|
|||||||
|
|
||||||
import path from 'node:path';
|
import path from 'node:path';
|
||||||
|
|
||||||
import { getPackagesSync } from '@vben/node-utils';
|
|
||||||
|
|
||||||
import { addDynamicIconSelectors } from '@iconify/tailwind';
|
import { addDynamicIconSelectors } from '@iconify/tailwind';
|
||||||
|
import { getPackagesSync } from '@manypkg/get-packages';
|
||||||
import typographyPlugin from '@tailwindcss/typography';
|
import typographyPlugin from '@tailwindcss/typography';
|
||||||
import animate from 'tailwindcss-animate';
|
import animate from 'tailwindcss-animate';
|
||||||
|
|
||||||
@ -12,7 +11,7 @@ import { enterAnimationPlugin } from './plugins/entry';
|
|||||||
|
|
||||||
// import defaultTheme from 'tailwindcss/defaultTheme';
|
// import defaultTheme from 'tailwindcss/defaultTheme';
|
||||||
|
|
||||||
const { packages } = getPackagesSync();
|
const { packages } = getPackagesSync(process.cwd());
|
||||||
|
|
||||||
const tailwindPackages: string[] = [];
|
const tailwindPackages: string[] = [];
|
||||||
|
|
||||||
|
@ -35,7 +35,6 @@
|
|||||||
"html-minifier-terser": "catalog:",
|
"html-minifier-terser": "catalog:",
|
||||||
"nitropack": "catalog:",
|
"nitropack": "catalog:",
|
||||||
"resolve.exports": "catalog:",
|
"resolve.exports": "catalog:",
|
||||||
"vite-plugin-lib-inject-css": "catalog:",
|
|
||||||
"vite-plugin-pwa": "catalog:",
|
"vite-plugin-pwa": "catalog:",
|
||||||
"vite-plugin-vue-devtools": "catalog:"
|
"vite-plugin-vue-devtools": "catalog:"
|
||||||
},
|
},
|
||||||
|
@ -3,7 +3,7 @@ import type { UserConfig } from 'vite';
|
|||||||
async function getCommonConfig(): Promise<UserConfig> {
|
async function getCommonConfig(): Promise<UserConfig> {
|
||||||
return {
|
return {
|
||||||
build: {
|
build: {
|
||||||
chunkSizeWarningLimit: 1000,
|
chunkSizeWarningLimit: 2000,
|
||||||
reportCompressedSize: false,
|
reportCompressedSize: false,
|
||||||
sourcemap: false,
|
sourcemap: false,
|
||||||
},
|
},
|
||||||
|
@ -19,7 +19,6 @@ function defineLibraryConfig(userConfigPromise?: DefineLibraryOptions) {
|
|||||||
|
|
||||||
const plugins = await loadLibraryPlugins({
|
const plugins = await loadLibraryPlugins({
|
||||||
dts: false,
|
dts: false,
|
||||||
injectLibCss: true,
|
|
||||||
injectMetadata: true,
|
injectMetadata: true,
|
||||||
isBuild,
|
isBuild,
|
||||||
mode,
|
mode,
|
||||||
|
@ -14,7 +14,6 @@ import { visualizer as viteVisualizerPlugin } from 'rollup-plugin-visualizer';
|
|||||||
import viteCompressPlugin from 'vite-plugin-compression';
|
import viteCompressPlugin from 'vite-plugin-compression';
|
||||||
import viteDtsPlugin from 'vite-plugin-dts';
|
import viteDtsPlugin from 'vite-plugin-dts';
|
||||||
import { createHtmlPlugin as viteHtmlPlugin } from 'vite-plugin-html';
|
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 { VitePWA } from 'vite-plugin-pwa';
|
||||||
import viteVueDevTools from 'vite-plugin-vue-devtools';
|
import viteVueDevTools from 'vite-plugin-vue-devtools';
|
||||||
|
|
||||||
@ -225,7 +224,7 @@ async function loadLibraryPlugins(
|
|||||||
): Promise<PluginOption[]> {
|
): Promise<PluginOption[]> {
|
||||||
// 单独取,否则commonOptions拿不到
|
// 单独取,否则commonOptions拿不到
|
||||||
const isBuild = options.isBuild;
|
const isBuild = options.isBuild;
|
||||||
const { dts, injectLibCss, ...commonOptions } = options;
|
const { dts, ...commonOptions } = options;
|
||||||
const commonPlugins = await loadCommonPlugins(commonOptions);
|
const commonPlugins = await loadCommonPlugins(commonOptions);
|
||||||
return await loadConditionPlugins([
|
return await loadConditionPlugins([
|
||||||
...commonPlugins,
|
...commonPlugins,
|
||||||
@ -233,10 +232,6 @@ async function loadLibraryPlugins(
|
|||||||
condition: isBuild && !!dts,
|
condition: isBuild && !!dts,
|
||||||
plugins: () => [viteDtsPlugin({ logLevel: 'error' })],
|
plugins: () => [viteDtsPlugin({ logLevel: 'error' })],
|
||||||
},
|
},
|
||||||
{
|
|
||||||
condition: injectLibCss,
|
|
||||||
plugins: () => [viteLibInjectCss()],
|
|
||||||
},
|
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -130,9 +130,6 @@ interface ApplicationPluginOptions extends CommonPluginOptions {
|
|||||||
interface LibraryPluginOptions extends CommonPluginOptions {
|
interface LibraryPluginOptions extends CommonPluginOptions {
|
||||||
/** 开启 dts 输出 */
|
/** 开启 dts 输出 */
|
||||||
dts?: boolean | PluginOptions;
|
dts?: boolean | PluginOptions;
|
||||||
|
|
||||||
/** 是否注入lib css */
|
|
||||||
injectLibCss?: boolean;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type ApplicationOptions = ApplicationPluginOptions;
|
type ApplicationOptions = ApplicationPluginOptions;
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
".": {
|
".": {
|
||||||
"types": "./src/index.ts",
|
"types": "./src/index.ts",
|
||||||
"development": "./src/index.ts",
|
"development": "./src/index.ts",
|
||||||
"default": "./dist/index.mjs"
|
"default": "./dist/style.css"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"publishConfig": {
|
"publishConfig": {
|
||||||
|
@ -15,6 +15,11 @@ setupVbenVxeTable({
|
|||||||
columnConfig: {
|
columnConfig: {
|
||||||
resizable: true,
|
resizable: true,
|
||||||
},
|
},
|
||||||
|
|
||||||
|
formConfig: {
|
||||||
|
// 全局禁用vxe-table的表单配置,使用formOptions
|
||||||
|
enabled: false,
|
||||||
|
},
|
||||||
minHeight: 180,
|
minHeight: 180,
|
||||||
proxyConfig: {
|
proxyConfig: {
|
||||||
autoLoad: true,
|
autoLoad: true,
|
||||||
|
@ -154,7 +154,7 @@ catalog:
|
|||||||
theme-colors: ^0.1.0
|
theme-colors: ^0.1.0
|
||||||
turbo: ^2.2.3
|
turbo: ^2.2.3
|
||||||
typescript: ^5.6.3
|
typescript: ^5.6.3
|
||||||
unbuild: ^2.0.0
|
unbuild: ^3.0.0-rc.11
|
||||||
unplugin-element-plus: ^0.8.0
|
unplugin-element-plus: ^0.8.0
|
||||||
vee-validate: ^4.14.6
|
vee-validate: ^4.14.6
|
||||||
vite: ^5.4.10
|
vite: ^5.4.10
|
||||||
@ -162,7 +162,6 @@ catalog:
|
|||||||
vite-plugin-dts: 4.2.1
|
vite-plugin-dts: 4.2.1
|
||||||
vite-plugin-html: ^3.2.2
|
vite-plugin-html: ^3.2.2
|
||||||
vite-plugin-lazy-import: ^1.0.7
|
vite-plugin-lazy-import: ^1.0.7
|
||||||
vite-plugin-lib-inject-css: ^2.1.1
|
|
||||||
vite-plugin-pwa: ^0.20.5
|
vite-plugin-pwa: ^0.20.5
|
||||||
vite-plugin-vue-devtools: ^7.6.2
|
vite-plugin-vue-devtools: ^7.6.2
|
||||||
vitepress: ^1.4.3
|
vitepress: ^1.4.3
|
||||||
|
@ -14,7 +14,7 @@ WORKDIR /app
|
|||||||
COPY . /app
|
COPY . /app
|
||||||
|
|
||||||
RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile
|
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 🎉"
|
RUN echo "Builder Success 🎉"
|
||||||
|
|
||||||
|
@ -46,7 +46,6 @@ export async function run(options: RunOptions) {
|
|||||||
process.exit(1);
|
process.exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
process.env.VITE_CJS_IGNORE_WARNING = '1';
|
|
||||||
execaCommand(`pnpm --filter=${selectPkg} run ${command}`, {
|
execaCommand(`pnpm --filter=${selectPkg} run ${command}`, {
|
||||||
stdio: 'inherit',
|
stdio: 'inherit',
|
||||||
});
|
});
|
||||||
|
@ -16,7 +16,12 @@
|
|||||||
"tasks": {
|
"tasks": {
|
||||||
"build": {
|
"build": {
|
||||||
"dependsOn": ["^build"],
|
"dependsOn": ["^build"],
|
||||||
"outputs": ["dist/**", "dist.zip"]
|
"outputs": [
|
||||||
|
"dist/**",
|
||||||
|
"dist.zip",
|
||||||
|
".vitepress/dist.zip",
|
||||||
|
".vitepress/dist/**"
|
||||||
|
]
|
||||||
},
|
},
|
||||||
"preview": {
|
"preview": {
|
||||||
"dependsOn": ["^build"],
|
"dependsOn": ["^build"],
|
||||||
|
Loading…
Reference in New Issue
Block a user