Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"tailwindCSS.experimental.configFile": "packages/@core/base/design/src/css/global.css",
"tailwindCSS.experimental.configFile": "internal/tailwind-config/src/theme.css",
"tailwindCSS.lint.suggestCanonicalClasses": "ignore",
// workbench
"workbench.list.smoothScrolling": true,
Expand Down
1 change: 1 addition & 0 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"devDependencies": {
"@nolebase/vitepress-plugin-git-changelog": "catalog:",
"@tailwindcss/vite": "catalog:",
"@vben/tailwind-config": "workspace:*",
"@vben/vite-config": "workspace:*",
"@vite-pwa/vitepress": "catalog:",
"vitepress": "catalog:",
Expand Down
6 changes: 3 additions & 3 deletions docs/src/en/guide/project/tailwindcss.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

The project no longer maintains Tailwind through `tailwind.config.*` files. Theme definitions and scan scope are now managed through CSS and the shared Vite configuration.

- Theme entry: `packages/@core/base/design/src/css/global.css`
- Theme entry: `internal/tailwind-config/src/theme.css`
- Vite integration: `internal/vite-config`

In `global.css`, you will see the Tailwind CSS v4 directives currently used by the project, such as:
Expand All @@ -21,7 +21,7 @@ In `global.css`, you will see the Tailwind CSS v4 directives currently used by t

The project does not decide whether Tailwind CSS is enabled based on whether a package contains `tailwind.config.mjs`.

Apps and packages share `@vben/vite-config`, which integrates `@tailwindcss/vite`. The Tailwind scan scope is managed centrally in `packages/@core/base/design/src/css/global.css`.
Apps and packages share `@vben/vite-config`, which integrates `@tailwindcss/vite`. The Tailwind scan scope is managed centrally in `@vben/tailwind-config`, backed by `internal/tailwind-config/src/theme.css`.

::: tip Notes on using Tailwind CSS in packages

Expand All @@ -35,4 +35,4 @@ The project applies a shared handling layer for `@apply` inside Vue single-file

- `internal/vite-config/src/plugins/tailwind-reference.ts`

When component styles use `@apply`, the required `@reference` is injected automatically in most cases.
When component styles use `@apply`, `@reference "@vben/tailwind-config/theme"` is injected automatically in most cases.
6 changes: 3 additions & 3 deletions docs/src/guide/project/tailwindcss.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

项目当前不再通过 `tailwind.config.*` 文件维护 Tailwind 配置,主题与扫描范围都统一放在 CSS 与共享 Vite 配置中。

- 主题入口:`packages/@core/base/design/src/css/global.css`
- 主题入口:`internal/tailwind-config/src/theme.css`
- Vite 集成:`internal/vite-config`

在 `global.css` 中你会看到当前项目使用的 Tailwind CSS v4 指令,例如:
Expand All @@ -21,7 +21,7 @@

当前项目不会根据某个包下是否存在 `tailwind.config.mjs` 来决定是否启用 Tailwind CSS。

应用和包统一复用 `@vben/vite-config`,并由该配置接入 `@tailwindcss/vite`。Tailwind 的扫描范围则统一在 `packages/@core/base/design/src/css/global.css` 中维护。
应用和包统一复用 `@vben/vite-config`,并由该配置接入 `@tailwindcss/vite`。Tailwind 的扫描范围则统一在 `@vben/tailwind-config` 对应的 `internal/tailwind-config/src/theme.css` 中维护。

::: tip 包使用 Tailwind CSS 的说明

Expand All @@ -35,4 +35,4 @@

- `internal/vite-config/src/plugins/tailwind-reference.ts`

当组件样式中使用 `@apply` 时,会自动注入对应的 `@reference`,一般不需要手动补充。
当组件样式中使用 `@apply` 时,会自动注入 `@reference "@vben/tailwind-config/theme"`,一般不需要手动补充。
1 change: 1 addition & 0 deletions internal/lint-configs/eslint-config/src/configs/node.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ export async function node(): Promise<Linter.Config[]> {
{
allowModules: [
'tsdown',
'unplugin-vue',
'@vben/vite-config',
'vitest',
'vite',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const selectors = [
];

const settings = {
entryPoint: 'packages/@core/base/design/src/css/global.css',
entryPoint: 'internal/tailwind-config/src/theme.css',
selectors,
};

Expand Down
38 changes: 38 additions & 0 deletions internal/tailwind-config/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"name": "@vben/tailwind-config",
"version": "5.7.0",
"private": true,
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {
"type": "git",
"url": "git+https://github.com/vbenjs/vue-vben-admin.git",
"directory": "internal/tailwind-config"
},
"license": "MIT",
"type": "module",
"files": [
"src"
],
"sideEffects": [
"**/*.css"
],
"main": "./src/index.ts",
"module": "./src/index.ts",
"types": "./src/index.ts",
"exports": {
".": {
"types": "./src/index.ts",
"default": "./src/index.ts"
},
"./theme": {
"default": "./src/theme.css"
}
},
"dependencies": {
"@iconify/tailwind4": "catalog:",
"@tailwindcss/typography": "catalog:",
"tailwindcss": "catalog:",
"tw-animate-css": "catalog:"
}
}
1 change: 1 addition & 0 deletions internal/tailwind-config/src/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import './theme.css';
Loading
Loading