From 67d611770e18070965b6bb4790bda1bcbcbd8161 Mon Sep 17 00:00:00 2001 From: zhangxiang Date: Mon, 27 Oct 2025 20:27:53 +0800 Subject: [PATCH 1/3] feat: remove tailwindPlugin and add doc --- .../guides/basic-features/css/tailwindcss.mdx | 120 +++++++++-------- .../guides/basic-features/css/tailwindcss.mdx | 122 +++++++++--------- .../rsbuild-tailwindcss-v2/modern.config.ts | 6 + .../rsbuild-tailwindcss-v2/package.json | 18 +++ .../rsbuild-tailwindcss-v2/postcss.config.cjs | 5 + .../rsbuild-tailwindcss-v2/src/App.jsx | 82 ++++++++++++ .../rsbuild-tailwindcss-v2/src/app.css | 3 + .../tailwind.config.cjs | 44 +++++++ .../babel-plugin-macros.config.cjs | 7 + .../rsbuild-tailwindcss-v3/modern.config.ts | 20 +++ .../rsbuild-tailwindcss-v3/package.json | 23 ++++ .../rsbuild-tailwindcss-v3/postcss.config.cjs | 5 + .../rsbuild-tailwindcss-v3/src/App.jsx | 86 ++++++++++++ .../rsbuild-tailwindcss-v3/src/Macro.jsx | 10 ++ .../rsbuild-tailwindcss-v3/src/app.css | 3 + .../rsbuild-tailwindcss-v3/tailwind.config.js | 46 +++++++ .../rsbuild-tailwindcss-v4/modern.config.ts | 5 + .../rsbuild-tailwindcss-v4/package.json | 22 ++++ .../rsbuild-tailwindcss-v4/postcss.config.mjs | 5 + .../rsbuild-tailwindcss-v4/src/App.jsx | 79 ++++++++++++ .../rsbuild-tailwindcss-v4/src/index.css | 26 ++++ .../rsbuild-tailwindcss-v4/tailwind.config.js | 16 +++ .../fixtures/tailwindcss-v3/modern.config.ts | 14 ++ .../fixtures/tailwindcss-v3/package.json | 11 +- .../fixtures/tailwindcss-v3/src/App.jsx | 84 +++++++++++- .../fixtures/tailwindcss-v3/src/Macro.jsx | 10 ++ .../tailwindcss-v3/tailwind.config.ts | 46 +++++++ 27 files changed, 786 insertions(+), 132 deletions(-) create mode 100644 tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v2/modern.config.ts create mode 100644 tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v2/package.json create mode 100644 tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v2/postcss.config.cjs create mode 100644 tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v2/src/App.jsx create mode 100644 tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v2/src/app.css create mode 100644 tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v2/tailwind.config.cjs create mode 100644 tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/babel-plugin-macros.config.cjs create mode 100644 tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/modern.config.ts create mode 100644 tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/package.json create mode 100644 tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/postcss.config.cjs create mode 100644 tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/src/App.jsx create mode 100644 tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/src/Macro.jsx create mode 100644 tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/src/app.css create mode 100644 tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/tailwind.config.js create mode 100644 tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v4/modern.config.ts create mode 100644 tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v4/package.json create mode 100644 tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v4/postcss.config.mjs create mode 100644 tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v4/src/App.jsx create mode 100644 tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v4/src/index.css create mode 100644 tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v4/tailwind.config.js create mode 100644 tests/integration/tailwindcss/fixtures/tailwindcss-v3/src/Macro.jsx create mode 100644 tests/integration/tailwindcss/fixtures/tailwindcss-v3/tailwind.config.ts diff --git a/packages/document/main-doc/docs/en/guides/basic-features/css/tailwindcss.mdx b/packages/document/main-doc/docs/en/guides/basic-features/css/tailwindcss.mdx index d89a75e349e9..56972d41eae7 100644 --- a/packages/document/main-doc/docs/en/guides/basic-features/css/tailwindcss.mdx +++ b/packages/document/main-doc/docs/en/guides/basic-features/css/tailwindcss.mdx @@ -2,86 +2,91 @@ [Tailwind CSS](https://tailwindcss.com/) is a CSS framework and design system based on Utility Class, which can quickly add common styles to components, and support flexible extension of theme styles. -To use [Tailwind CSS](https://tailwindcss.com/) in Modern.js, you can follow the steps below: +## Using Tailwind CSS in Modern.js -1. Run `pnpm run new` in the root directory of your project and make the following selections: +To use [Tailwind CSS](https://tailwindcss.com/) in Modern.js, you only need to configure it according to the Rsbuild steps. Rsbuild supports Tailwind CSS versions v3 and v4: -```text -? Please select the operation you want: Enable features -? Please select the feature name: Enable Tailwind CSS -``` +- [Tailwind CSS v3](https://rsbuild.rs/zh/guide/styling/tailwindcss-v3#tailwind-css-v3) +- [Tailwind CSS v4](https://rsbuild.rs/zh/guide/styling/tailwindcss) -After successful initialization, you will see that the `package.json` has added dependencies for `tailwindcss` and `@modern-js/plugin-tailwindcss`. +## Tailwind Plugin Migration -2. Register the Tailwind plugin in `modern.config.ts`: +### Migration Background -```ts title="modern.config.ts" -import { tailwindcssPlugin } from '@modern-js/plugin-tailwindcss'; +As Modern.js evolves, to provide a more unified build experience and stronger configuration flexibility, we have adjusted the way Tailwind CSS is supported. Modern.js V3 recommends integrating Tailwind CSS natively through Rsbuild, no longer relying on the `@modern-js/plugin-tailwindcss` plugin, thereby fully leveraging Rsbuild’s more flexible configuration capabilities and better build experience. -export default defineConfig({ - plugins: [..., tailwindcssPlugin()], -}); -``` +### Migration Steps -3. Create a `index.css` file and add the following code: +Taking Tailwind CSS V3 as an example, the migration steps are as follows: -```css title="index.css" -@tailwind base; -@tailwind components; -@tailwind utilities; -``` +#### 1. Remove the Old Plugin + +- Remove the `@modern-js/plugin-tailwindcss` dependency +- Remove the import and usage of the `@modern-js/plugin-tailwindcss` plugin in the `modern.config.ts` file -:::info -Depending on your needs, you can selectively import the CSS styles provided by Tailwind CSS. Please refer to the [`@tailwind` documentation](https://tailwindcss.com/docs/functions-and-directives#tailwind) for detailed usage of the `@tailwind` directive. -::: +#### 2. Configure PostCSS -4. Import the `index.css` file, for example, add the following code in the root component `src/App.jsx`: +Create or update the `postcss.config.cjs` file. -```js -import './index.css'; +```js title="postcss.config.cjs" +module.exports = { + plugins: { + tailwindcss: {}, + }, +}; ``` -5. Now you can use the Utility Classes provided by Tailwind CSS in your components: +#### 3. Tailwind CSS Configuration Migration -```tsx -const Hello = () => ( -
-

hello world

-
-); -``` +- **Single Configuration Case**: -## Configuring Tailwind CSS + - If configured only in `tailwind.config.{ts,js}`, no additional action is needed + - If configured only in `modern.config.ts`, migrate the Tailwind-related configuration to `tailwind.config.{ts,js}` -In Modern.js, you have two ways to configure Tailwind CSS: +- **Dual Configuration Case**: If configurations exist in both `tailwind.config.{ts,js}` and `modern.config.ts`, merge the configurations and migrate the merged result to `tailwind.config.{ts,js}` -1. Using the `tailwind.config.{ts,js}` file, which follows the official usage of Tailwind CSS. Please refer to ["Tailwind CSS - Configuration"](https://tailwindcss.com/docs/configuration) for more details. +- **Special Directory Handling**: If your project contains storybook or config/html directories, supplement `./storybook/**/*` or `./config/html/**/*.{html,ejs,hbs}` in the `content` field of `tailwind.config.{ts,js}` -```ts title="tailwind.config.ts" -import type { Config } from 'tailwindcss'; +#### 4. CSS Style Import -export default { - content: ['./src/**/*.{js,jsx,ts,tsx}'], -} as Config; +- Change to use the @tailwind directive + +```css +/* Old way */ +@import 'tailwindcss/base.css'; +@import 'tailwindcss/components.css'; +@import 'tailwindcss/utilities.css'; + +/* New way */ +@tailwind base; +@tailwind components; +@tailwind utilities; ``` -:::tip -Please upgrade Modern.js to version >= MAJOR_VERSION.33.0 to support automatic reading of `tailwind.config.{ts,js}` files. -::: +#### 5. Twin.macro Integration + +If your project uses twin.macro, perform the following steps; otherwise, ignore: -2. Using the [tools.tailwindcss](/configure/app/tools/tailwindcss.html) configuration option. This is the old way of configuring Tailwind CSS, and we recommend using the `tailwind.config.{ts,js}` file for configuration. +- Manually install dependencies: `pnpm add twin.macro styled-components -D` +- Add the `babel-plugin-macros.config.cjs` configuration file: -```ts title="modern.config.ts" -export default { - tools: { - tailwindcss: { - content: ['./src/**/*.{js,jsx,ts,tsx}'], - }, +```js title="babel-plugin-macros.config.cjs" +module.exports = { + twin: { + preset: 'styled-components', + config: './tailwind.config.js', }, }; ``` -If you are using both the `tailwind.config.{ts,js}` file and `tools.tailwindcss` option, the configuration defined in `tools.tailwindcss` will take precedence and override the content defined in `tailwind.config.{ts,js}`. +#### Tailwind CSS V2 Migration + +If your project still uses Tailwind CSS v2, we recommend upgrading to v3 to support JIT and other features. For differences between Tailwind CSS v2 and v3, please refer to the following articles: + +- [Tailwind CSS v3.0](https://tailwindcss.com/blog/tailwindcss-v3) +- [Upgrade Guide](https://v3.tailwindcss.com/docs/upgrade-guide) + +The migration for Tailwind CSS v2 also follows the above steps, but note that the original plugin automatically adapts to the differences between Tailwind v2 (purge configuration) and v3 (content configuration). After removal, you need to use the `purge` option to specify the CSS classes to retain. ## Tailwind CSS Autocomplete @@ -92,15 +97,6 @@ You can follow the steps below to enable the autocomplete feature: 1. Install the [Tailwind CSS IntelliSense](https://github.com/tailwindlabs/tailwindcss-intellisense) extension in VS Code. 2. If the root directory of your project does not have a `tailwind.config.{ts,js}` file, you need to create one and write the Tailwind CSS configuration for your current project. Otherwise, the IDE plugin will not work correctly. -## Tailwind CSS Version - -Modern.js supports both Tailwind CSS v2 and v3 versions, and the framework will recognize the version of the `tailwindcss` dependency in the project `package.json` file and enable the corresponding configuration. By default, we will install Tailwind CSS v3 version for you. - -If your project is still using Tailwind CSS v2, we recommend that you upgrade to v3 to support JIT and other capabilities. For the differences between Tailwind CSS v2 and v3 versions, please refer to the following articles: - -- [Tailwind CSS v3.0](https://tailwindcss.com/blog/tailwindcss-v3) -- [Upgrade Guide](https://tailwindcss.com/docs/upgrade-guide) - ## Browser Compatibility Tailwind CSS v2 and v3 do not support the IE 11 browser, please refer to: diff --git a/packages/document/main-doc/docs/zh/guides/basic-features/css/tailwindcss.mdx b/packages/document/main-doc/docs/zh/guides/basic-features/css/tailwindcss.mdx index 84bd8fb55aa9..df6c63f302da 100644 --- a/packages/document/main-doc/docs/zh/guides/basic-features/css/tailwindcss.mdx +++ b/packages/document/main-doc/docs/zh/guides/basic-features/css/tailwindcss.mdx @@ -2,88 +2,93 @@ [Tailwind CSS](https://tailwindcss.com/) 是一个以 Utility Class 为基础的 CSS 框架和设计系统，可以快速地为组件添加常用样式，同时支持主题样式的灵活扩展。 -在 Modern.js 中使用 [Tailwind CSS](https://tailwindcss.com/)，你只需要按照以下步骤操作： +## 在 Modern.js 中使用 Tailwind CSS -1. 在项目根目录下执行 `pnpm run new`，按照如下进行选择： +在 Modern.js 中使用 [Tailwind CSS](https://tailwindcss.com/)，你只需要按照 Rsbuild 操作步骤进行配置，Rsbuild 支持 Tailwind CSS v3 和 v4 版本： -```text -? 请选择你想要的操作 启用可选功能 -? 请选择功能名称 启用 「Tailwind CSS」 支持 -``` +- [Tailwind CSS v3](https://rsbuild.rs/zh/guide/styling/tailwindcss-v3#tailwind-css-v3) +- [Tailwind CSS v4](https://rsbuild.rs/zh/guide/styling/tailwindcss) -成功开启后，你会看到 `package.json` 中新增了 `tailwindcss` 和 `@modern-js/plugin-tailwindcss` 依赖。 +## Tailwind 插件迁移 -2. 在 `modern.config.ts` 中注册 Tailwind 插件: +### 迁移背景 -```ts title="modern.config.ts" -import { tailwindcssPlugin } from '@modern-js/plugin-tailwindcss'; +随着 Modern.js 不断演进，为了提供更统一的构建体验和更强的配置灵活性，我们对 Tailwind CSS 的支持方式进行了调整。Modern.js V3 推荐通过 Rsbuild 原生方式接入 Tailwind CSS，不再依赖 `@modern-js/plugin-tailwindcss` 插件，从而充分利用 Rsbuild 提供的更灵活的配置能力和更优的构建体验。 -export default defineConfig({ - plugins: [..., tailwindcssPlugin()], -}); -``` +### 迁移步骤 -3. 创建 `index.css` 文件，添加以下代码： +以 Tailwind CSS V3 版本为例，提供迁移步骤如下： -```css title="index.css" -@tailwind base; -@tailwind components; -@tailwind utilities; -``` +#### 1. 移除旧插件 + +- 移除 `@modern-js/plugin-tailwindcss` 依赖 +- 移除 `modern.config.ts` 文件中 `@modern-js/plugin-tailwindcss` 插件的导入和使用 -:::info -根据需求不同，你可以选择性地导入 Tailwind CSS 提供的 CSS 样式。请参考 [`@tailwind` 文档](https://tailwindcss.com/docs/functions-and-directives#tailwind) 来了解 `@tailwind` 指令的详细用法。 -::: +#### 2. 配置 PostCSS -4. 引用 `index.css` 文件，比如在入口的根组件 `src/App.jsx` 添加如下代码： +创建或更新 `postcss.config.cjs` 文件。 -```js -import './index.css'; +```js title="postcss.config.cjs" +module.exports = { + plugins: { + tailwindcss: {}, + }, +}; ``` -5. 然后即可在各个组件中使用 Tailwind CSS 提供的 Utility Class 了： +#### 3. Tailwind CSS 配置迁移 -```tsx -const Hello = () => ( -
-

hello world

-
-); -``` +- **单一配置情况**： -### 配置 Tailwind CSS + - 若仅在 `tailwind.config.{ts,js}` 中配置，则无需额外处理 + - 若仅在 `modern.config.ts` 中配置，需将 Tailwind 相关配置移植到 `tailwind.config.{ts,js}` 中 -在 Modern.js 中，你有两种方式来配置 Tailwind CSS： +- **双重配置情况**：若在 `tailwind.config.{ts,js}` 与 `modern.config.ts` 中都有配置，需要合并两者的配置内容，并将合并后的配置移植到 `tailwind.config.{ts,js}` -1. 使用 `tailwind.config.{ts,js}` 文件，该用法与 Tailwind CSS 的官方用法一致，请参考 ["Tailwind CSS - Configuration"](https://tailwindcss.com/docs/configuration) 来了解更多用法。 +- **特殊目录处理**：若项目中存在 storybook 或 config/html 目录，需在 `tailwind.config.{ts,js}` 的 `content` 中补充 `./storybook/**/*` 或 `./config/html/**/*.{html,ejs,hbs}` -```ts title="tailwind.config.ts" -import type { Config } from 'tailwindcss'; +#### 4. CSS 样式引入 -export default { - content: ['./src/**/*.{js,jsx,ts,tsx}'], -} as Config; +- 变更为 @tailwind 指令方式 + +```css +/* 旧方式 */ +@import 'tailwindcss/base.css'; +@import 'tailwindcss/components.css'; +@import 'tailwindcss/utilities.css'; + +/* 新方式 */ +@tailwind base; +@tailwind components; +@tailwind utilities; ``` -:::tip -请升级 Modern.js 到 >= MAJOR_VERSION.33.0 版本，以支持自动读取 `tailwind.config.{ts,js}` 文件。 -::: +#### 5. Twin.macro 集成 + +若项目中有使用 twin.macro 需执行如下操作，未使用则忽略： -2. 使用 [tools.tailwindcss](/configure/app/tools/tailwindcss.html) 配置项，这是旧版本的用法，我们更推荐使用 `tailwind.config.{ts,js}` 文件进行配置。 +- 手动安装依赖：`pnpm add twin.macro styled-components -D` +- 新增 `babel-plugin-macros.config.cjs` 配置文件： -```ts title="modern.config.ts" -export default { - tools: { - tailwindcss: { - content: ['./src/**/*.{js,jsx,ts,tsx}'], - }, +```js title="babel-plugin-macros.config.cjs" +module.exports = { + twin: { + preset: 'styled-components', + config: './tailwind.config.js', }, }; ``` -如果你同时使用了 `tailwind.config.{ts,js}` 文件和 `tools.tailwindcss` 选项，那么 `tools.tailwindcss` 定义的配置会优先生效，并覆盖 `tailwind.config.{ts,js}` 中定义的内容。 +#### Tailwind CSS V2 版本迁移 + +如果你的项目仍使用 Tailwind CSS v2，我们推荐你升级到 v3 以支持 JIT 等能力。关于 Tailwind CSS v2 与 v3 版本之间的差异，请参考以下文章： + +- [Tailwind CSS v3.0](https://tailwindcss.com/blog/tailwindcss-v3) +- [Upgrade Guide](https://v3.tailwindcss.com/docs/upgrade-guide) + +Tailwind CSS v2 迁移同样参考上述步骤，但需要注意的是，原插件自动适配 Tailwind v2（purge 配置）与 v3（content 配置）的差异。移除后，需使用 `purge` 配置项来指定需要保留的 CSS 类名。 -### Tailwind CSS 自动补全 +## Tailwind CSS 自动补全 Tailwind CSS 官方提供了 [Tailwind CSS IntelliSense](https://github.com/tailwindlabs/tailwindcss-intellisense) 插件，用于在 VS Code 中自动补全 Tailwind CSS 的 class names、CSS functions 和 directives。 @@ -92,15 +97,6 @@ Tailwind CSS 官方提供了 [Tailwind CSS IntelliSense](https://github.com/tail 1. 在 VS Code 中安装 [Tailwind CSS IntelliSense](https://github.com/tailwindlabs/tailwindcss-intellisense) 插件。 2. 如果项目的根目录没有 `tailwind.config.{ts,js}` 文件，那么你需要创建该文件，并写入当前项目的 Tailwind CSS 配置，否则 IDE 插件将无法正确生效。 -## Tailwind CSS 版本 - -Modern.js 同时支持 Tailwind CSS v2 和 v3 版本，框架会识别项目 `package.json` 中的 `tailwindcss` 依赖版本，并启用相应的配置。默认情况下，我们会为你安装 Tailwind CSS v3 版本。 - -如果你的项目仍在使用 Tailwind CSS v2，我们推荐你升级到 v3 以支持 JIT 等能力。关于 Tailwind CSS v2 与 v3 版本之间的差异，请参考以下文章： - -- [Tailwind CSS v3.0](https://tailwindcss.com/blog/tailwindcss-v3) -- [Upgrade Guide](https://tailwindcss.com/docs/upgrade-guide) - ## 浏览器兼容性 Tailwind CSS v2 和 v3 均不支持 IE 11 浏览器，相关背景请参考： diff --git a/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v2/modern.config.ts b/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v2/modern.config.ts new file mode 100644 index 000000000000..951186c44a8e --- /dev/null +++ b/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v2/modern.config.ts @@ -0,0 +1,6 @@ +// import { tailwindcssPlugin } from '@modern-js/plugin-tailwindcss'; +import { applyBaseConfig } from '../../../../utils/applyBaseConfig'; + +export default applyBaseConfig({ + plugins: [], +}); diff --git a/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v2/package.json b/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v2/package.json new file mode 100644 index 000000000000..2318c45259f2 --- /dev/null +++ b/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v2/package.json @@ -0,0 +1,18 @@ +{ + "private": true, + "name": "integration-rsbuild-tailwindcss-v2", + "version": "2.66.0", + "scripts": { + "dev": "modern dev", + "build": "modern build", + "serve": "modern serve", + "new": "modern new" + }, + "dependencies": { + "@modern-js/app-tools": "workspace:*", + "@modern-js/runtime": "workspace:*", + "react": "^19.2.0", + "react-dom": "^19.2.0", + "tailwindcss": "^2" + } +} diff --git a/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v2/postcss.config.cjs b/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v2/postcss.config.cjs new file mode 100644 index 000000000000..ee5f90b30902 --- /dev/null +++ b/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v2/postcss.config.cjs @@ -0,0 +1,5 @@ +module.exports = { + plugins: { + tailwindcss: {}, + }, +}; diff --git a/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v2/src/App.jsx b/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v2/src/App.jsx new file mode 100644 index 000000000000..8aa33099ea58 --- /dev/null +++ b/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v2/src/App.jsx @@ -0,0 +1,82 @@ +import './app.css'; +import 'tailwindcss/base.css'; +import 'tailwindcss/components.css'; +import 'tailwindcss/utilities.css'; +import { useEffect, useState } from 'react'; + +const App = () => { + const [isDarkMode, setIsDarkMode] = useState(false); + + const toggleDarkMode = () => { + setIsDarkMode(!isDarkMode); + }; + + useEffect(() => { + if (isDarkMode) { + document.documentElement.classList.add('dark'); + } else { + document.documentElement.classList.remove('dark'); + } + }, [isDarkMode]); + + return ( +
+
+ +
+ +
+
+
+
+ + bg-primary + +
+
+
+ + bg-secondary + +
+
+
+ +
+
+
+
+
+ text +
+
+ shadow text +
+
+
+
+
+ +
+
+
+
+
+ +
+
+
+
+
+
+ ); +}; + +export default App; diff --git a/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v2/src/app.css b/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v2/src/app.css new file mode 100644 index 000000000000..b5c61c956711 --- /dev/null +++ b/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v2/src/app.css @@ -0,0 +1,3 @@ +@tailwind base; +@tailwind components; +@tailwind utilities; diff --git a/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v2/tailwind.config.cjs b/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v2/tailwind.config.cjs new file mode 100644 index 000000000000..0a13fb34974c --- /dev/null +++ b/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v2/tailwind.config.cjs @@ -0,0 +1,44 @@ +const plugin = require('tailwindcss/plugin'); + +module.exports = { + purge: ['./src/**/*.{js,jsx,ts,tsx}'], + darkMode: 'class', + + theme: { + extend: { + colors: { + primary: 'blue', + secondary: 'yellow', + + dark: { + primary: 'sky', + secondary: 'light-yellow', + }, + }, + }, + }, + + plugins: [ + plugin(function ({ addUtilities }) { + addUtilities({ + '.content-auto': { + 'content-visibility': 'auto', + }, + '.text-shadow': { + 'text-shadow': '0 2px 4px rgba(0,0,0,0.1)', + }, + }); + }), + + plugin(function ({ addComponents }) { + addComponents({ + '.btn': { + padding: '0.5rem 1rem', + borderRadius: '0.375rem', + fontWeight: '500', + transition: 'all 0.2s', + }, + }); + }), + ], +}; diff --git a/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/babel-plugin-macros.config.cjs b/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/babel-plugin-macros.config.cjs new file mode 100644 index 000000000000..43f6da6ee8cd --- /dev/null +++ b/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/babel-plugin-macros.config.cjs @@ -0,0 +1,7 @@ +// twin.macro 配置文件 +module.exports = { + twin: { + preset: 'styled-components', + config: './tailwind.config.js', + }, +}; diff --git a/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/modern.config.ts b/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/modern.config.ts new file mode 100644 index 000000000000..156bbb5278f0 --- /dev/null +++ b/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/modern.config.ts @@ -0,0 +1,20 @@ +import { applyBaseConfig } from '../../../../utils/applyBaseConfig'; + +export default applyBaseConfig({ + plugins: [], + tools: { + babel: { + plugins: [ + [ + 'babel-plugin-macros', + { + twin: { + preset: 'styled-components', + config: './tailwind.config.js', + }, + }, + ], + ], + }, + }, +}); diff --git a/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/package.json b/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/package.json new file mode 100644 index 000000000000..8cabc104160e --- /dev/null +++ b/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/package.json @@ -0,0 +1,23 @@ +{ + "private": true, + "name": "integration-rsbuild-tailwindcss-v3", + "version": "2.66.0", + "scripts": { + "dev": "modern dev", + "build": "modern build", + "serve": "modern serve", + "new": "modern new" + }, + "dependencies": { + "@modern-js/app-tools": "workspace:*", + "@modern-js/runtime": "workspace:*", + "react": "^19.2.0", + "react-dom": "^19.2.0", + "twin.macro": "^3.4.0", + "tailwindcss": "^3.3.3", + "styled-components": "^5.3.1" + }, + "devDependencies": { + "babel-plugin-macros": "3.1.0" + } +} diff --git a/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/postcss.config.cjs b/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/postcss.config.cjs new file mode 100644 index 000000000000..ee5f90b30902 --- /dev/null +++ b/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/postcss.config.cjs @@ -0,0 +1,5 @@ +module.exports = { + plugins: { + tailwindcss: {}, + }, +}; diff --git a/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/src/App.jsx b/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/src/App.jsx new file mode 100644 index 000000000000..2dc9033e6724 --- /dev/null +++ b/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/src/App.jsx @@ -0,0 +1,86 @@ +import './app.css'; +import 'tailwindcss/base.css'; +import 'tailwindcss/components.css'; +import 'tailwindcss/utilities.css'; +import { useEffect, useState } from 'react'; +import Macro from './Macro'; + +const App = () => { + const [isDarkMode, setIsDarkMode] = useState(false); + + const toggleDarkMode = () => { + setIsDarkMode(!isDarkMode); + }; + + useEffect(() => { + if (isDarkMode) { + document.documentElement.classList.add('dark'); + } else { + document.documentElement.classList.remove('dark'); + } + }, [isDarkMode]); + + return ( +
+
+ +
+ +
+
+
+
+ + bg-primary + +
+
+
+ + bg-secondary + +
+
+
+ +
+
+
+
+
+ text +
+
+ shadow text +
+
+
+
+
+ +
+
+
+
+
+ +
+
+
+
+
+
+ +
+
+ ); +}; + +export default App; diff --git a/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/src/Macro.jsx b/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/src/Macro.jsx new file mode 100644 index 000000000000..342d219a8514 --- /dev/null +++ b/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/src/Macro.jsx @@ -0,0 +1,10 @@ +import React from 'react'; +import tw from 'twin.macro'; + +const ConfigTest = () => { + const DirectColorDiv = tw.div`w-[200px] h-[50px] bg-yellow-300`; + + return tw; +}; + +export default ConfigTest; diff --git a/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/src/app.css b/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/src/app.css new file mode 100644 index 000000000000..b5c61c956711 --- /dev/null +++ b/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/src/app.css @@ -0,0 +1,3 @@ +@tailwind base; +@tailwind components; +@tailwind utilities; diff --git a/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/tailwind.config.js b/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/tailwind.config.js new file mode 100644 index 000000000000..d38fbac9f0e5 --- /dev/null +++ b/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/tailwind.config.js @@ -0,0 +1,46 @@ +import plugin from 'tailwindcss/plugin'; + +/** @type {import('tailwindcss').Config} */ +export default { + content: ['./src/**/*.{js,jsx,ts,tsx}'], + + darkMode: 'class', + + theme: { + extend: { + colors: { + primary: 'blue', + secondary: 'yellow', + + dark: { + primary: 'sky', + secondary: 'light-yellow', + }, + }, + }, + }, + + plugins: [ + plugin(function ({ addUtilities }) { + addUtilities({ + '.content-auto': { + 'content-visibility': 'auto', + }, + '.text-shadow': { + 'text-shadow': '0 2px 4px rgba(0,0,0,0.1)', + }, + }); + }), + + plugin(function ({ addComponents }) { + addComponents({ + '.btn': { + padding: '0.5rem 1rem', + borderRadius: '0.375rem', + fontWeight: '500', + transition: 'all 0.2s', + }, + }); + }), + ], +}; diff --git a/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v4/modern.config.ts b/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v4/modern.config.ts new file mode 100644 index 000000000000..82977832a553 --- /dev/null +++ b/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v4/modern.config.ts @@ -0,0 +1,5 @@ +import { applyBaseConfig } from '../../../../utils/applyBaseConfig'; + +export default applyBaseConfig({ + plugins: [], +}); diff --git a/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v4/package.json b/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v4/package.json new file mode 100644 index 000000000000..bbece78992e9 --- /dev/null +++ b/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v4/package.json @@ -0,0 +1,22 @@ +{ + "private": true, + "type": "module", + "name": "integration-rsbuild-tailwindcss-v4", + "version": "2.66.0", + "scripts": { + "dev": "modern dev", + "build": "modern build", + "serve": "modern serve", + "new": "modern new" + }, + "dependencies": { + "@modern-js/app-tools": "workspace:*", + "@modern-js/plugin-tailwindcss": "workspace:*", + "@modern-js/runtime": "workspace:*", + "postcss": "^8.5.6", + "react": "^19.2.0", + "react-dom": "^19.2.0", + "@tailwindcss/postcss": "^4.1.14", + "tailwindcss": "^4" + } +} diff --git a/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v4/postcss.config.mjs b/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v4/postcss.config.mjs new file mode 100644 index 000000000000..fb9e9b44a9d6 --- /dev/null +++ b/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v4/postcss.config.mjs @@ -0,0 +1,5 @@ +export default { + plugins: { + '@tailwindcss/postcss': true, + }, +}; diff --git a/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v4/src/App.jsx b/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v4/src/App.jsx new file mode 100644 index 000000000000..e120f28ecdae --- /dev/null +++ b/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v4/src/App.jsx @@ -0,0 +1,79 @@ +import { useEffect, useState } from 'react'; +import './index.css'; + +const App = () => { + const [isDarkMode, setIsDarkMode] = useState(false); + + const toggleDarkMode = () => { + setIsDarkMode(!isDarkMode); + }; + + useEffect(() => { + if (isDarkMode) { + document.documentElement.classList.add('dark'); + } else { + document.documentElement.classList.remove('dark'); + } + }, [isDarkMode]); + + return ( +
+
+ +
+ +
+
+
+
+ + bg-primary + +
+
+
+ + bg-secondary + +
+
+
+ +
+
+
+
+
+ text +
+
+ shadow text +
+
+
+
+
+ +
+
+
+
+
+ +
+
+
+
+
+
+ ); +}; + +export default App; diff --git a/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v4/src/index.css b/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v4/src/index.css new file mode 100644 index 000000000000..d3c6f14d8113 --- /dev/null +++ b/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v4/src/index.css @@ -0,0 +1,26 @@ +@import 'tailwindcss'; + +@config '../tailwind.config.js'; + +@theme { + --btn-padding: 0.5rem 1rem; + --btn-radius: 0.375rem; + --btn-font-weight: 500; + --btn-transition: all 0.2s; + --shadow-color: rgba(0, 0, 0, 0.1); +} + +.text-shadow { + text-shadow: 0 2px 4px var(--shadow-color); +} + +.content-auto { + content-visibility: auto; +} + +.btn { + padding: var(--btn-padding); + border-radius: var(--btn-radius); + font-weight: var(--btn-font-weight); + transition: var(--btn-transition); +} diff --git a/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v4/tailwind.config.js b/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v4/tailwind.config.js new file mode 100644 index 000000000000..d9a29de0fb98 --- /dev/null +++ b/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v4/tailwind.config.js @@ -0,0 +1,16 @@ +export default { + darkMode: 'class', + + theme: { + extend: { + colors: { + primary: 'blue', + secondary: 'yellow', + dark: { + primary: 'sky', + secondary: 'light-yellow', + }, + }, + }, + }, +}; diff --git a/tests/integration/tailwindcss/fixtures/tailwindcss-v3/modern.config.ts b/tests/integration/tailwindcss/fixtures/tailwindcss-v3/modern.config.ts index e0ae69718a39..8898f4d923f0 100644 --- a/tests/integration/tailwindcss/fixtures/tailwindcss-v3/modern.config.ts +++ b/tests/integration/tailwindcss/fixtures/tailwindcss-v3/modern.config.ts @@ -3,4 +3,18 @@ import { applyBaseConfig } from '../../../../utils/applyBaseConfig'; export default applyBaseConfig({ plugins: [tailwindcssPlugin()], + tools: { + tailwindcss: { + theme: { + extend: { + colors: { + primary: 'green', + dark: { + primary: 'emerald', + }, + }, + }, + }, + }, + }, }); diff --git a/tests/integration/tailwindcss/fixtures/tailwindcss-v3/package.json b/tests/integration/tailwindcss/fixtures/tailwindcss-v3/package.json index ab6221166104..8911b423ca7d 100644 --- a/tests/integration/tailwindcss/fixtures/tailwindcss-v3/package.json +++ b/tests/integration/tailwindcss/fixtures/tailwindcss-v3/package.json @@ -2,13 +2,20 @@ "private": true, "name": "integration-tailwindcss-v3", "version": "2.66.0", + "scripts": { + "dev": "modern dev", + "build": "modern build", + "serve": "modern serve", + "new": "modern new" + }, "dependencies": { "@modern-js/app-tools": "workspace:*", "@modern-js/plugin-tailwindcss": "workspace:*", "@modern-js/runtime": "workspace:*", - "postcss": "^8.5.6", "react": "^19.2.0", "react-dom": "^19.2.0", - "tailwindcss": "^3.3.3" + "twin.macro": "^3.4.1", + "tailwindcss": "^3.3.3", + "styled-components": "^5.3.1" } } diff --git a/tests/integration/tailwindcss/fixtures/tailwindcss-v3/src/App.jsx b/tests/integration/tailwindcss/fixtures/tailwindcss-v3/src/App.jsx index b6439563757e..eef569c71e2d 100644 --- a/tests/integration/tailwindcss/fixtures/tailwindcss-v3/src/App.jsx +++ b/tests/integration/tailwindcss/fixtures/tailwindcss-v3/src/App.jsx @@ -1,11 +1,85 @@ import 'tailwindcss/base.css'; import 'tailwindcss/components.css'; import 'tailwindcss/utilities.css'; +import { useEffect, useState } from 'react'; +import Macro from './Macro'; -const App = () => ( -
-

hello world

-
-); +const App = () => { + const [isDarkMode, setIsDarkMode] = useState(false); + + const toggleDarkMode = () => { + setIsDarkMode(!isDarkMode); + }; + + useEffect(() => { + if (isDarkMode) { + document.documentElement.classList.add('dark'); + } else { + document.documentElement.classList.remove('dark'); + } + }, [isDarkMode]); + + return ( +
+
+ +
+ +
+
+
+
+ + bg-primary + +
+
+
+ + bg-secondary + +
+
+
+ +
+
+
+
+
+ text +
+
+ shadow text +
+
+
+
+
+ +
+
+
+
+
+ +
+
+
+
+
+
+ +
+
+ ); +}; export default App; diff --git a/tests/integration/tailwindcss/fixtures/tailwindcss-v3/src/Macro.jsx b/tests/integration/tailwindcss/fixtures/tailwindcss-v3/src/Macro.jsx new file mode 100644 index 000000000000..342d219a8514 --- /dev/null +++ b/tests/integration/tailwindcss/fixtures/tailwindcss-v3/src/Macro.jsx @@ -0,0 +1,10 @@ +import React from 'react'; +import tw from 'twin.macro'; + +const ConfigTest = () => { + const DirectColorDiv = tw.div`w-[200px] h-[50px] bg-yellow-300`; + + return tw; +}; + +export default ConfigTest; diff --git a/tests/integration/tailwindcss/fixtures/tailwindcss-v3/tailwind.config.ts b/tests/integration/tailwindcss/fixtures/tailwindcss-v3/tailwind.config.ts new file mode 100644 index 000000000000..103803c82cc1 --- /dev/null +++ b/tests/integration/tailwindcss/fixtures/tailwindcss-v3/tailwind.config.ts @@ -0,0 +1,46 @@ +import type { Config } from 'tailwindcss'; +import plugin from 'tailwindcss/plugin'; + +export default { + content: ['./src/**/*.{js,jsx,ts,tsx}'], + + darkMode: 'class', + + theme: { + extend: { + colors: { + primary: 'blue', + secondary: 'yellow', + + dark: { + primary: 'sky', + secondary: 'light-yellow', + }, + }, + }, + }, + + plugins: [ + plugin(function ({ addUtilities }) { + addUtilities({ + '.content-auto': { + 'content-visibility': 'auto', + }, + '.text-shadow': { + 'text-shadow': '0 2px 4px rgba(0,0,0,0.1)', + }, + }); + }), + + plugin(function ({ addComponents }) { + addComponents({ + '.btn': { + padding: '0.5rem 1rem', + borderRadius: '0.375rem', + fontWeight: '500', + transition: 'all 0.2s', + }, + }); + }), + ], +} as Config; From 6cfef4e794739c129f4539c167fc1add824ddeee Mon Sep 17 00:00:00 2001 From: zhangxiang Date: Mon, 27 Oct 2025 21:12:52 +0800 Subject: [PATCH 2/3] feat: remove tailwindPlugin and add doc --- packages/cli/plugin-tailwind/.npmignore | 31 - packages/cli/plugin-tailwind/CHANGELOG.md | 2836 ----------------- packages/cli/plugin-tailwind/LICENSE | 21 - packages/cli/plugin-tailwind/README.md | 26 - packages/cli/plugin-tailwind/jest.config.js | 7 - packages/cli/plugin-tailwind/modern.config.js | 5 - packages/cli/plugin-tailwind/package.json | 93 - packages/cli/plugin-tailwind/src/cli.ts | 104 - packages/cli/plugin-tailwind/src/config.ts | 78 - packages/cli/plugin-tailwind/src/index.ts | 4 - packages/cli/plugin-tailwind/src/macro.ts | 30 - packages/cli/plugin-tailwind/src/types.ts | 5 - packages/cli/plugin-tailwind/src/utils.ts | 18 - .../tests/fixtures/twin-macro/package.json | 5 - .../cli/plugin-tailwind/tests/index.test.ts | 7 - .../cli/plugin-tailwind/tests/macro.test.ts | 52 - .../cli/plugin-tailwind/tests/tsconfig.json | 14 - packages/cli/plugin-tailwind/tsconfig.json | 11 - .../docs/en/plugin/official/cli-plugins.mdx | 1 - .../docs/en/tutorials/first-app/c03-css.mdx | 54 +- .../en/tutorials/first-app/c08-entries.mdx | 4 +- .../docs/zh/plugin/official/cli-plugins.mdx | 1 - .../docs/zh/tutorials/first-app/c03-css.mdx | 59 +- .../zh/tutorials/first-app/c08-entries.mdx | 3 +- .../generator-common/src/locale/en.ts | 1 - .../generator-common/src/locale/zh.ts | 1 - .../src/newAction/common/index.ts | 3 - .../src/newAction/mwa/index.ts | 6 - .../tailwindcss-generator/.npmignore | 31 - .../tailwindcss-generator/CHANGELOG.md | 979 ------ .../generators/tailwindcss-generator/LICENSE | 21 - .../tailwindcss-generator/README.md | 26 - .../tailwindcss-generator/jest.config.js | 7 - .../tailwindcss-generator/modern.config.js | 5 - .../tailwindcss-generator/package.json | 53 - .../tailwindcss-generator/src/index.ts | 85 - .../templates/ts-template/tailwind.config.ts | 5 - .../tailwindcss-generator/tsconfig.json | 10 - packages/generator/new-action/src/mwa.ts | 1 - scripts/check-dependencies.js | 1 - .../rsbuild-tailwindcss-v2/modern.config.ts | 6 - .../rsbuild-tailwindcss-v2/package.json | 18 - .../rsbuild-tailwindcss-v2/src/App.jsx | 82 - .../rsbuild-tailwindcss-v3/modern.config.ts | 20 - .../rsbuild-tailwindcss-v3/package.json | 23 - .../rsbuild-tailwindcss-v3/src/App.jsx | 86 - .../rsbuild-tailwindcss-v3/src/Macro.jsx | 10 - .../fixtures/tailwindcss-v2/modern.config.ts | 3 +- .../fixtures/tailwindcss-v2/package.json | 9 +- .../postcss.config.cjs | 0 .../fixtures/tailwindcss-v2/src/App.jsx | 81 +- .../src/app.css | 0 .../tailwind.config.cjs | 0 .../modern.config.ts | 6 - .../package.json | 14 - .../postcss.config.ts | 5 - .../src/App.jsx | 11 - .../tailwind.config.js | 7 - .../tailwindcss-v3-js-config/modern.config.ts | 6 - .../tailwindcss-v3-js-config/package.json | 14 - .../tailwindcss-v3-js-config/src/App.jsx | 11 - .../tailwind.config.js | 7 - .../modern.config.ts | 15 - .../tailwindcss-v3-merge-config/package.json | 14 - .../tailwindcss-v3-merge-config/src/App.jsx | 11 - .../tailwind.config.ts | 7 - .../tailwindcss-v3-ts-config/modern.config.ts | 6 - .../tailwindcss-v3-ts-config/package.json | 14 - .../tailwindcss-v3-ts-config/src/App.jsx | 11 - .../tailwind.config.ts | 7 - .../babel-plugin-macros.config.cjs | 0 .../fixtures/tailwindcss-v3/modern.config.ts | 22 +- .../fixtures/tailwindcss-v3/package.json | 6 +- .../postcss.config.cjs | 0 .../fixtures/tailwindcss-v3/src/App.jsx | 1 + .../src/app.css | 0 .../tailwind.config.js | 0 .../tailwindcss-v3/tailwind.config.ts | 46 - .../modern.config.ts | 0 .../package.json | 3 +- .../postcss.config.mjs | 0 .../src/App.jsx | 0 .../src/index.css | 0 .../tailwind.config.js | 0 .../modern.config.ts | 3 - .../tailwindcss-without-plugin/package.json | 13 - .../postcss.config.js | 5 - .../tailwindcss-without-plugin/src/App.jsx | 11 - .../tailwind.config.js | 8 - .../fixtures/twin.macro-v2/modern.config.ts | 15 - .../fixtures/twin.macro-v2/package.json | 14 - .../fixtures/twin.macro-v2/src/App.jsx | 6 - .../fixtures/twin.macro-v3/modern.config.ts | 15 - .../fixtures/twin.macro-v3/package.json | 16 - .../fixtures/twin.macro-v3/src/App.jsx | 6 - .../tailwindcss/tests/tailwindcss-v2.test.ts | 12 +- .../tailwindcss/tests/tailwindcss-v3.test.ts | 67 +- .../tailwindcss/tests/tailwindcss-v4.test.ts | 18 + .../tests/tailwindcss-without-plugin.test.ts | 17 - .../tailwindcss/tests/twin.macro-v2.test.ts | 17 - .../tailwindcss/tests/twin.macro-v3.test.ts | 16 - 101 files changed, 202 insertions(+), 5343 deletions(-) delete mode 100644 packages/cli/plugin-tailwind/.npmignore delete mode 100644 packages/cli/plugin-tailwind/CHANGELOG.md delete mode 100644 packages/cli/plugin-tailwind/LICENSE delete mode 100644 packages/cli/plugin-tailwind/README.md delete mode 100644 packages/cli/plugin-tailwind/jest.config.js delete mode 100644 packages/cli/plugin-tailwind/modern.config.js delete mode 100644 packages/cli/plugin-tailwind/package.json delete mode 100644 packages/cli/plugin-tailwind/src/cli.ts delete mode 100644 packages/cli/plugin-tailwind/src/config.ts delete mode 100644 packages/cli/plugin-tailwind/src/index.ts delete mode 100644 packages/cli/plugin-tailwind/src/macro.ts delete mode 100644 packages/cli/plugin-tailwind/src/types.ts delete mode 100644 packages/cli/plugin-tailwind/src/utils.ts delete mode 100644 packages/cli/plugin-tailwind/tests/fixtures/twin-macro/package.json delete mode 100644 packages/cli/plugin-tailwind/tests/index.test.ts delete mode 100644 packages/cli/plugin-tailwind/tests/macro.test.ts delete mode 100644 packages/cli/plugin-tailwind/tests/tsconfig.json delete mode 100644 packages/cli/plugin-tailwind/tsconfig.json delete mode 100644 packages/generator/generators/tailwindcss-generator/.npmignore delete mode 100644 packages/generator/generators/tailwindcss-generator/CHANGELOG.md delete mode 100644 packages/generator/generators/tailwindcss-generator/LICENSE delete mode 100644 packages/generator/generators/tailwindcss-generator/README.md delete mode 100644 packages/generator/generators/tailwindcss-generator/jest.config.js delete mode 100644 packages/generator/generators/tailwindcss-generator/modern.config.js delete mode 100644 packages/generator/generators/tailwindcss-generator/package.json delete mode 100644 packages/generator/generators/tailwindcss-generator/src/index.ts delete mode 100644 packages/generator/generators/tailwindcss-generator/templates/ts-template/tailwind.config.ts delete mode 100644 packages/generator/generators/tailwindcss-generator/tsconfig.json delete mode 100644 tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v2/modern.config.ts delete mode 100644 tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v2/package.json delete mode 100644 tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v2/src/App.jsx delete mode 100644 tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/modern.config.ts delete mode 100644 tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/package.json delete mode 100644 tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/src/App.jsx delete mode 100644 tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/src/Macro.jsx rename tests/integration/tailwindcss/fixtures/{rsbuild-tailwindcss-v2 => tailwindcss-v2}/postcss.config.cjs (100%) rename tests/integration/tailwindcss/fixtures/{rsbuild-tailwindcss-v2 => tailwindcss-v2}/src/app.css (100%) rename tests/integration/tailwindcss/fixtures/{rsbuild-tailwindcss-v2 => tailwindcss-v2}/tailwind.config.cjs (100%) delete mode 100644 tests/integration/tailwindcss/fixtures/tailwindcss-v3-js-config-with-postcss-config/modern.config.ts delete mode 100644 tests/integration/tailwindcss/fixtures/tailwindcss-v3-js-config-with-postcss-config/package.json delete mode 100644 tests/integration/tailwindcss/fixtures/tailwindcss-v3-js-config-with-postcss-config/postcss.config.ts delete mode 100644 tests/integration/tailwindcss/fixtures/tailwindcss-v3-js-config-with-postcss-config/src/App.jsx delete mode 100644 tests/integration/tailwindcss/fixtures/tailwindcss-v3-js-config-with-postcss-config/tailwind.config.js delete mode 100644 tests/integration/tailwindcss/fixtures/tailwindcss-v3-js-config/modern.config.ts delete mode 100644 tests/integration/tailwindcss/fixtures/tailwindcss-v3-js-config/package.json delete mode 100644 tests/integration/tailwindcss/fixtures/tailwindcss-v3-js-config/src/App.jsx delete mode 100644 tests/integration/tailwindcss/fixtures/tailwindcss-v3-js-config/tailwind.config.js delete mode 100644 tests/integration/tailwindcss/fixtures/tailwindcss-v3-merge-config/modern.config.ts delete mode 100644 tests/integration/tailwindcss/fixtures/tailwindcss-v3-merge-config/package.json delete mode 100644 tests/integration/tailwindcss/fixtures/tailwindcss-v3-merge-config/src/App.jsx delete mode 100644 tests/integration/tailwindcss/fixtures/tailwindcss-v3-merge-config/tailwind.config.ts delete mode 100644 tests/integration/tailwindcss/fixtures/tailwindcss-v3-ts-config/modern.config.ts delete mode 100644 tests/integration/tailwindcss/fixtures/tailwindcss-v3-ts-config/package.json delete mode 100644 tests/integration/tailwindcss/fixtures/tailwindcss-v3-ts-config/src/App.jsx delete mode 100644 tests/integration/tailwindcss/fixtures/tailwindcss-v3-ts-config/tailwind.config.ts rename tests/integration/tailwindcss/fixtures/{rsbuild-tailwindcss-v3 => tailwindcss-v3}/babel-plugin-macros.config.cjs (100%) rename tests/integration/tailwindcss/fixtures/{rsbuild-tailwindcss-v3 => tailwindcss-v3}/postcss.config.cjs (100%) rename tests/integration/tailwindcss/fixtures/{rsbuild-tailwindcss-v3 => tailwindcss-v3}/src/app.css (100%) rename tests/integration/tailwindcss/fixtures/{rsbuild-tailwindcss-v3 => tailwindcss-v3}/tailwind.config.js (100%) delete mode 100644 tests/integration/tailwindcss/fixtures/tailwindcss-v3/tailwind.config.ts rename tests/integration/tailwindcss/fixtures/{rsbuild-tailwindcss-v4 => tailwindcss-v4}/modern.config.ts (100%) rename tests/integration/tailwindcss/fixtures/{rsbuild-tailwindcss-v4 => tailwindcss-v4}/package.json (81%) rename tests/integration/tailwindcss/fixtures/{rsbuild-tailwindcss-v4 => tailwindcss-v4}/postcss.config.mjs (100%) rename tests/integration/tailwindcss/fixtures/{rsbuild-tailwindcss-v4 => tailwindcss-v4}/src/App.jsx (100%) rename tests/integration/tailwindcss/fixtures/{rsbuild-tailwindcss-v4 => tailwindcss-v4}/src/index.css (100%) rename tests/integration/tailwindcss/fixtures/{rsbuild-tailwindcss-v4 => tailwindcss-v4}/tailwind.config.js (100%) delete mode 100644 tests/integration/tailwindcss/fixtures/tailwindcss-without-plugin/modern.config.ts delete mode 100644 tests/integration/tailwindcss/fixtures/tailwindcss-without-plugin/package.json delete mode 100644 tests/integration/tailwindcss/fixtures/tailwindcss-without-plugin/postcss.config.js delete mode 100644 tests/integration/tailwindcss/fixtures/tailwindcss-without-plugin/src/App.jsx delete mode 100644 tests/integration/tailwindcss/fixtures/tailwindcss-without-plugin/tailwind.config.js delete mode 100644 tests/integration/tailwindcss/fixtures/twin.macro-v2/modern.config.ts delete mode 100644 tests/integration/tailwindcss/fixtures/twin.macro-v2/package.json delete mode 100644 tests/integration/tailwindcss/fixtures/twin.macro-v2/src/App.jsx delete mode 100644 tests/integration/tailwindcss/fixtures/twin.macro-v3/modern.config.ts delete mode 100644 tests/integration/tailwindcss/fixtures/twin.macro-v3/package.json delete mode 100644 tests/integration/tailwindcss/fixtures/twin.macro-v3/src/App.jsx create mode 100644 tests/integration/tailwindcss/tests/tailwindcss-v4.test.ts delete mode 100644 tests/integration/tailwindcss/tests/tailwindcss-without-plugin.test.ts delete mode 100644 tests/integration/tailwindcss/tests/twin.macro-v2.test.ts delete mode 100644 tests/integration/tailwindcss/tests/twin.macro-v3.test.ts diff --git a/packages/cli/plugin-tailwind/.npmignore b/packages/cli/plugin-tailwind/.npmignore deleted file mode 100644 index 353fddf17262..000000000000 --- a/packages/cli/plugin-tailwind/.npmignore +++ /dev/null @@ -1,31 +0,0 @@ -.DS_Store - -.pnp -.pnp.js -.env.local -.env.*.local -*.log* - -node_modules/ -*.tsbuildinfo -.eslintcache - -coverage/ -output/ -output_resource/ -tests/ - -.vscode/**/* -!.vscode/settings.json -!.vscode/extensions.json -.idea/ - -src/ - -modern.config.* -jest.config.js -.eslintrc.js -.eslintrc -tsconfig.json -CHANGELOG.md - diff --git a/packages/cli/plugin-tailwind/CHANGELOG.md b/packages/cli/plugin-tailwind/CHANGELOG.md deleted file mode 100644 index 798fac82a6e1..000000000000 --- a/packages/cli/plugin-tailwind/CHANGELOG.md +++ /dev/null @@ -1,2836 +0,0 @@ -# @modern-js/plugin-tailwindcss - -## 2.68.1 - -### Patch Changes - -- Updated dependencies [0d98723] -- Updated dependencies [0d98723] - - @modern-js/runtime@2.68.1 - - @modern-js/node-bundle-require@2.68.1 - - @modern-js/runtime-utils@2.68.1 - - @modern-js/utils@2.68.1 - -## 2.68.0 - -### Patch Changes - -- Updated dependencies [292d91c] -- Updated dependencies [4cc0a22] - - @modern-js/node-bundle-require@2.68.0 - - @modern-js/runtime@2.68.0 - - @modern-js/runtime-utils@2.68.0 - - @modern-js/utils@2.68.0 - -## 2.67.11 - -### Patch Changes - -- @modern-js/runtime@2.67.11 -- @modern-js/node-bundle-require@2.67.11 -- @modern-js/runtime-utils@2.67.11 -- @modern-js/utils@2.67.11 - -## 2.67.10 - -### Patch Changes - -- @modern-js/runtime@2.67.10 -- @modern-js/node-bundle-require@2.67.10 -- @modern-js/runtime-utils@2.67.10 -- @modern-js/utils@2.67.10 - -## 2.67.9 - -### Patch Changes - -- @modern-js/runtime@2.67.9 -- @modern-js/node-bundle-require@2.67.9 -- @modern-js/runtime-utils@2.67.9 -- @modern-js/utils@2.67.9 - -## 2.67.8 - -### Patch Changes - -- Updated dependencies [23c8201] - - @modern-js/utils@2.67.8 - - @modern-js/runtime@2.67.8 - - @modern-js/node-bundle-require@2.67.8 - - @modern-js/runtime-utils@2.67.8 - -## 2.67.7 - -### Patch Changes - -- @modern-js/runtime@2.67.7 -- @modern-js/node-bundle-require@2.67.7 -- @modern-js/runtime-utils@2.67.7 -- @modern-js/utils@2.67.7 - -## 2.67.6 - -### Patch Changes - -- @modern-js/runtime@2.67.6 -- @modern-js/runtime-utils@2.67.6 -- @modern-js/utils@2.67.6 -- @modern-js/node-bundle-require@2.67.6 - -## 2.67.5 - -### Patch Changes - -- Updated dependencies [342b4d4] - - @modern-js/runtime@2.67.5 - - @modern-js/node-bundle-require@2.67.5 - - @modern-js/runtime-utils@2.67.5 - - @modern-js/utils@2.67.5 - -## 2.67.4 - -### Patch Changes - -- Updated dependencies [35e9786] -- Updated dependencies [3a66335] -- Updated dependencies [03cf233] -- Updated dependencies [446939a] -- Updated dependencies [446939a] -- Updated dependencies [b00922e] -- Updated dependencies [446939a] -- Updated dependencies [b60d21c] - - @modern-js/runtime@2.67.4 - - @modern-js/runtime-utils@2.67.4 - - @modern-js/node-bundle-require@2.67.4 - - @modern-js/utils@2.67.4 - -## 2.67.3 - -### Patch Changes - -- @modern-js/runtime@2.67.3 -- @modern-js/runtime-utils@2.67.3 -- @modern-js/utils@2.67.3 -- @modern-js/node-bundle-require@2.67.3 - -## 2.67.2 - -### Patch Changes - -- Updated dependencies [8f97aae] - - @modern-js/runtime-utils@2.67.2 - - @modern-js/runtime@2.67.2 - - @modern-js/node-bundle-require@2.67.2 - - @modern-js/utils@2.67.2 - -## 2.67.1 - -### Patch Changes - -- Updated dependencies [1d96265] - - @modern-js/runtime@2.67.1 - - @modern-js/utils@2.67.1 - - @modern-js/runtime-utils@2.67.1 - - @modern-js/node-bundle-require@2.67.1 - -## 2.67.0 - -### Patch Changes - -- Updated dependencies [fe46fdc] -- Updated dependencies [fb9fc66] - - @modern-js/runtime@2.67.0 - - @modern-js/node-bundle-require@2.67.0 - - @modern-js/runtime-utils@2.67.0 - - @modern-js/utils@2.67.0 - -## 2.66.0 - -### Patch Changes - -- @modern-js/runtime@2.66.0 -- @modern-js/node-bundle-require@2.66.0 -- @modern-js/runtime-utils@2.66.0 -- @modern-js/utils@2.66.0 - -## 2.65.5 - -### Patch Changes - -- Updated dependencies [90a3c1c] -- Updated dependencies [58a1afd] - - @modern-js/runtime-utils@2.65.5 - - @modern-js/runtime@2.65.5 - - @modern-js/node-bundle-require@2.65.5 - - @modern-js/utils@2.65.5 - -## 2.65.4 - -### Patch Changes - -- Updated dependencies [7bce153] -- Updated dependencies [0d47cb8] -- Updated dependencies [f1cd095] - - @modern-js/runtime@2.65.4 - - @modern-js/utils@2.65.4 - - @modern-js/runtime-utils@2.65.4 - - @modern-js/node-bundle-require@2.65.4 - -## 2.65.3 - -### Patch Changes - -- Updated dependencies [dc78fc0] -- Updated dependencies [b337977] -- Updated dependencies [437638f] -- Updated dependencies [087ae7c] - - @modern-js/runtime@2.65.3 - - @modern-js/runtime-utils@2.65.3 - - @modern-js/utils@2.65.3 - - @modern-js/node-bundle-require@2.65.3 - -## 2.65.2 - -### Patch Changes - -- Updated dependencies [793be44] -- Updated dependencies [1fe923c] -- Updated dependencies [8837b85] -- Updated dependencies [1f83d96] - - @modern-js/runtime@2.65.2 - - @modern-js/runtime-utils@2.65.2 - - @modern-js/utils@2.65.2 - - @modern-js/node-bundle-require@2.65.2 - -## 2.65.1 - -### Patch Changes - -- @modern-js/runtime@2.65.1 -- @modern-js/node-bundle-require@2.65.1 -- @modern-js/runtime-utils@2.65.1 -- @modern-js/utils@2.65.1 - -## 2.65.0 - -### Patch Changes - -- @modern-js/runtime@2.65.0 -- @modern-js/node-bundle-require@2.65.0 -- @modern-js/runtime-utils@2.65.0 -- @modern-js/utils@2.65.0 - -## 2.64.3 - -### Patch Changes - -- Updated dependencies [5044904] - - @modern-js/runtime@2.64.3 - - @modern-js/node-bundle-require@2.64.3 - - @modern-js/runtime-utils@2.64.3 - - @modern-js/utils@2.64.3 - -## 2.64.2 - -### Patch Changes - -- Updated dependencies [02ca983] - - @modern-js/runtime@2.64.2 - - @modern-js/runtime-utils@2.64.2 - - @modern-js/utils@2.64.2 - - @modern-js/node-bundle-require@2.64.2 - -## 2.64.1 - -### Patch Changes - -- 5a9394d: feat: add warning for twin.macro v2 usage - - feat: twin.macro v2 使用添加警告信息 - -- Updated dependencies [f83fd60] - - @modern-js/runtime@2.64.1 - - @modern-js/node-bundle-require@2.64.1 - - @modern-js/runtime-utils@2.64.1 - - @modern-js/utils@2.64.1 - -## 2.64.0 - -### Patch Changes - -- Updated dependencies [48c11bf] -- Updated dependencies [9e6f86e] - - @modern-js/runtime@2.64.0 - - @modern-js/node-bundle-require@2.64.0 - - @modern-js/runtime-utils@2.64.0 - - @modern-js/utils@2.64.0 - -## 2.63.7 - -### Patch Changes - -- Updated dependencies [f5af01d] -- Updated dependencies [41849f6] -- Updated dependencies [09a91c2] - - @modern-js/runtime@2.63.7 - - @modern-js/node-bundle-require@2.63.7 - - @modern-js/runtime-utils@2.63.7 - - @modern-js/utils@2.63.7 - -## 2.63.6 - -### Patch Changes - -- Updated dependencies [c3e73b4] - - @modern-js/runtime@2.63.6 - - @modern-js/node-bundle-require@2.63.6 - - @modern-js/runtime-utils@2.63.6 - - @modern-js/utils@2.63.6 - -## 2.63.5 - -### Patch Changes - -- @modern-js/runtime@2.63.5 -- @modern-js/node-bundle-require@2.63.5 -- @modern-js/runtime-utils@2.63.5 -- @modern-js/utils@2.63.5 - -## 2.63.4 - -### Patch Changes - -- Updated dependencies [0526b6a] -- Updated dependencies [8df497d] - - @modern-js/runtime@2.63.4 - - @modern-js/node-bundle-require@2.63.4 - - @modern-js/runtime-utils@2.63.4 - - @modern-js/utils@2.63.4 - -## 2.63.3 - -### Patch Changes - -- @modern-js/runtime@2.63.3 -- @modern-js/node-bundle-require@2.63.3 -- @modern-js/runtime-utils@2.63.3 -- @modern-js/utils@2.63.3 - -## 2.63.2 - -### Patch Changes - -- Updated dependencies [5fc95f7] -- Updated dependencies [524d6af] -- Updated dependencies [53e3ae0] - - @modern-js/utils@2.63.2 - - @modern-js/runtime@2.63.2 - - @modern-js/node-bundle-require@2.63.2 - - @modern-js/runtime-utils@2.63.2 - -## 2.63.1 - -### Patch Changes - -- Updated dependencies [8ffaedb] - - @modern-js/runtime@2.63.1 - - @modern-js/node-bundle-require@2.63.1 - - @modern-js/runtime-utils@2.63.1 - - @modern-js/utils@2.63.1 - -## 2.63.0 - -### Patch Changes - -- Updated dependencies [192f82e] - - @modern-js/runtime@2.63.0 - - @modern-js/node-bundle-require@2.63.0 - - @modern-js/runtime-utils@2.63.0 - - @modern-js/utils@2.63.0 - -## 2.62.1 - -### Patch Changes - -- Updated dependencies [86213ae] - - @modern-js/runtime-utils@2.62.1 - - @modern-js/runtime@2.62.1 - - @modern-js/node-bundle-require@2.62.1 - - @modern-js/utils@2.62.1 - -## 2.62.0 - -### Patch Changes - -- Updated dependencies [99469d6] -- Updated dependencies [ed32577] - - @modern-js/runtime@2.62.0 - - @modern-js/node-bundle-require@2.62.0 - - @modern-js/runtime-utils@2.62.0 - - @modern-js/utils@2.62.0 - -## 2.61.0 - -### Patch Changes - -- b6acb98: perf(plugin-tailwind): reduce tailwindcss `hash()` overhead -- Updated dependencies [45230e2] -- Updated dependencies [d8d5679] -- Updated dependencies [4b8b957] - - @modern-js/utils@2.61.0 - - @modern-js/runtime@2.61.0 - - @modern-js/node-bundle-require@2.61.0 - - @modern-js/runtime-utils@2.61.0 - -## 2.60.6 - -### Patch Changes - -- Updated dependencies [2492002] -- Updated dependencies [c4894e6] - - @modern-js/runtime@2.60.6 - - @modern-js/runtime-utils@2.60.6 - - @modern-js/node-bundle-require@2.60.6 - - @modern-js/utils@2.60.6 - -## 2.60.5 - -### Patch Changes - -- Updated dependencies [03625a8] - - @modern-js/runtime@2.60.5 - - @modern-js/node-bundle-require@2.60.5 - - @modern-js/runtime-utils@2.60.5 - - @modern-js/utils@2.60.5 - -## 2.60.4 - -### Patch Changes - -- Updated dependencies [c87813e] -- Updated dependencies [df1bed5] - - @modern-js/runtime-utils@2.60.4 - - @modern-js/runtime@2.60.4 - - @modern-js/node-bundle-require@2.60.4 - - @modern-js/utils@2.60.4 - -## 2.60.3 - -### Patch Changes - -- Updated dependencies [303331c] - - @modern-js/utils@2.60.3 - - @modern-js/runtime@2.60.3 - - @modern-js/node-bundle-require@2.60.3 - - @modern-js/runtime-utils@2.60.3 - -## 2.60.2 - -### Patch Changes - -- Updated dependencies [8a709bc] -- Updated dependencies [b36bf9f] -- Updated dependencies [d4e32bf] -- Updated dependencies [0a31d31] - - @modern-js/runtime@2.60.2 - - @modern-js/utils@2.60.2 - - @modern-js/node-bundle-require@2.60.2 - - @modern-js/runtime-utils@2.60.2 - -## 2.60.1 - -### Patch Changes - -- Updated dependencies [4cfe425] -- Updated dependencies [80825c4] -- Updated dependencies [3f968e1] - - @modern-js/runtime@2.60.1 - - @modern-js/node-bundle-require@2.60.1 - - @modern-js/runtime-utils@2.60.1 - - @modern-js/utils@2.60.1 - -## 2.60.0 - -### Patch Changes - -- Updated dependencies [d6e0118] -- Updated dependencies [e27b46a] - - @modern-js/runtime@2.60.0 - - @modern-js/node-bundle-require@2.60.0 - - @modern-js/runtime-utils@2.60.0 - - @modern-js/utils@2.60.0 - -## 2.59.0 - -### Patch Changes - -- Updated dependencies [553924c] -- Updated dependencies [6c084da] - - @modern-js/runtime@2.59.0 - - @modern-js/runtime-utils@2.59.0 - - @modern-js/utils@2.59.0 - - @modern-js/node-bundle-require@2.59.0 - -## 2.58.3 - -### Patch Changes - -- Updated dependencies [6b0a5c4] -- Updated dependencies [59fba90] -- Updated dependencies [f624878] -- Updated dependencies [e0cb246] - - @modern-js/runtime@2.58.3 - - @modern-js/node-bundle-require@2.58.3 - - @modern-js/runtime-utils@2.58.3 - - @modern-js/utils@2.58.3 - -## 2.58.2 - -### Patch Changes - -- Updated dependencies [9bbb0a0] -- Updated dependencies [7715b6d] -- Updated dependencies [44c1bc4] -- Updated dependencies [a1a9373] -- Updated dependencies [81829b0] - - @modern-js/runtime@2.58.2 - - @modern-js/runtime-utils@2.58.2 - - @modern-js/utils@2.58.2 - - @modern-js/node-bundle-require@2.58.2 - -## 2.58.1 - -### Patch Changes - -- Updated dependencies [ec01bad] -- Updated dependencies [2482a6b] -- Updated dependencies [7a88ae9] -- Updated dependencies [c904ee2] -- Updated dependencies [9db73d7] - - @modern-js/runtime@2.58.1 - - @modern-js/runtime-utils@2.58.1 - - @modern-js/utils@2.58.1 - - @modern-js/node-bundle-require@2.58.1 - -## 2.58.0 - -### Patch Changes - -- Updated dependencies [7188385] -- Updated dependencies [cc74dba] - - @modern-js/runtime@2.58.0 - - @modern-js/node-bundle-require@2.58.0 - - @modern-js/runtime-utils@2.58.0 - - @modern-js/utils@2.58.0 - -## 2.57.1 - -### Patch Changes - -- @modern-js/runtime@2.57.1 -- @modern-js/node-bundle-require@2.57.1 -- @modern-js/runtime-utils@2.57.1 -- @modern-js/utils@2.57.1 - -## 2.57.0 - -### Minor Changes - -- dc736ef: feat: refactor runtime plugin hooks - - feat: 重构 runtime 插件钩子函数 - -### Patch Changes - -- dc736ef: feat: Support Runtime Plugin Communication - - feat: 支持 Runtime 插件通信 - -- Updated dependencies [2515b00] -- Updated dependencies [abad541] -- Updated dependencies [223d63b] -- Updated dependencies [a9807e5] -- Updated dependencies [916559a] -- Updated dependencies [db43d8e] -- Updated dependencies [dc736ef] -- Updated dependencies [dc736ef] - - @modern-js/runtime@2.57.0 - - @modern-js/utils@2.57.0 - - @modern-js/runtime-utils@2.57.0 - - @modern-js/node-bundle-require@2.57.0 - -## 2.56.2 - -### Patch Changes - -- Updated dependencies [e9c724c] -- Updated dependencies [9626370] -- Updated dependencies [89e1df0] -- Updated dependencies [c441e14] - - @modern-js/runtime@2.56.2 - - @modern-js/node-bundle-require@2.56.2 - - @modern-js/utils@2.56.2 - -## 2.56.1 - -### Patch Changes - -- Updated dependencies [ad9e984] -- Updated dependencies [137d387] -- Updated dependencies [1696694] - - @modern-js/runtime@2.56.1 - - @modern-js/node-bundle-require@2.56.1 - - @modern-js/utils@2.56.1 - -## 2.56.0 - -### Patch Changes - -- Updated dependencies [ced7039] -- Updated dependencies [6fda6a2] -- Updated dependencies [0f0a31e] -- Updated dependencies [f27eaab] -- Updated dependencies [32d31c3] -- Updated dependencies [9eee52a] -- Updated dependencies [1e85b76] -- Updated dependencies [d36f095] - - @modern-js/runtime@2.56.0 - - @modern-js/utils@2.56.0 - - @modern-js/node-bundle-require@2.56.0 - -## 2.55.0 - -### Minor Changes - -- 1515ea9: feat: refactor runtime brower entry - - feat: 重构客户端入口 - -### Patch Changes - -- 380c4a3: fix: add bff/tailwindcss/swc plugin exported types - fix: 添加 bff/tailwindcss/swc 插件的导出类型 -- Updated dependencies [1430c5d] -- Updated dependencies [bbcf55a] -- Updated dependencies [a38bb04] -- Updated dependencies [1515ea9] -- Updated dependencies [59e46ad] -- Updated dependencies [283ac69] - - @modern-js/runtime@2.55.0 - - @modern-js/utils@2.55.0 - - @modern-js/node-bundle-require@2.55.0 - -## 2.54.6 - -### Patch Changes - -- @modern-js/runtime@2.54.6 -- @modern-js/node-bundle-require@2.54.6 -- @modern-js/utils@2.54.6 - -## 2.54.5 - -### Patch Changes - -- Updated dependencies [5510104] - - @modern-js/runtime@2.54.5 - - @modern-js/node-bundle-require@2.54.5 - - @modern-js/utils@2.54.5 - -## 2.54.4 - -### Patch Changes - -- @modern-js/runtime@2.54.4 -- @modern-js/node-bundle-require@2.54.4 -- @modern-js/utils@2.54.4 - -## 2.54.3 - -### Patch Changes - -- @modern-js/runtime@2.54.3 -- @modern-js/node-bundle-require@2.54.3 -- @modern-js/utils@2.54.3 - -## 2.54.2 - -### Patch Changes - -- Updated dependencies [8c71964] - - @modern-js/runtime@2.54.2 - - @modern-js/node-bundle-require@2.54.2 - - @modern-js/utils@2.54.2 - -## 2.54.1 - -### Patch Changes - -- @modern-js/runtime@2.54.1 -- @modern-js/node-bundle-require@2.54.1 -- @modern-js/utils@2.54.1 - -## 2.54.0 - -### Patch Changes - -- 09798ac: feat: refactor runtime plugin - - feat: 重构 runtime 插件 - -- Updated dependencies [15a090c] -- Updated dependencies [a8d8f0c] -- Updated dependencies [413b27f] -- Updated dependencies [09798ac] -- Updated dependencies [9da873c] - - @modern-js/runtime@2.54.0 - - @modern-js/utils@2.54.0 - - @modern-js/node-bundle-require@2.54.0 - -## 2.53.0 - -### Patch Changes - -- @modern-js/runtime@2.53.0 -- @modern-js/node-bundle-require@2.53.0 -- @modern-js/utils@2.53.0 - -## 2.52.0 - -### Patch Changes - -- Updated dependencies [85ac453] - - @modern-js/runtime@2.52.0 - - @modern-js/node-bundle-require@2.52.0 - - @modern-js/utils@2.52.0 - -## 2.51.0 - -### Patch Changes - -- Updated dependencies [4c09d57] -- Updated dependencies [08d9466] -- Updated dependencies [7834d4b] - - @modern-js/runtime@2.51.0 - - @modern-js/node-bundle-require@2.51.0 - - @modern-js/utils@2.51.0 - -## 2.50.0 - -### Patch Changes - -- Updated dependencies [4a9c0c7] - - @modern-js/runtime@2.50.0 - - @modern-js/node-bundle-require@2.50.0 - - @modern-js/utils@2.50.0 - -## 2.49.4 - -### Patch Changes - -- Updated dependencies [a5fdc8d] - - @modern-js/runtime@2.49.4 - - @modern-js/node-bundle-require@2.49.4 - - @modern-js/utils@2.49.4 - -## 2.49.3 - -### Patch Changes - -- Updated dependencies [644a226] -- Updated dependencies [6d980e4] -- Updated dependencies [b57ca76] - - @modern-js/runtime@2.49.3 - - @modern-js/node-bundle-require@2.49.3 - - @modern-js/utils@2.49.3 - -## 2.49.2 - -### Patch Changes - -- @modern-js/runtime@2.49.2 -- @modern-js/node-bundle-require@2.49.2 -- @modern-js/utils@2.49.2 - -## 2.49.1 - -### Patch Changes - -- Updated dependencies [b45da78] -- Updated dependencies [06bff92] - - @modern-js/runtime@2.49.1 - - @modern-js/node-bundle-require@2.49.1 - - @modern-js/utils@2.49.1 - -## 2.49.0 - -### Patch Changes - -- Updated dependencies [e8c8c5d] - - @modern-js/runtime@2.49.0 - - @modern-js/utils@2.49.0 - - @modern-js/node-bundle-require@2.49.0 - -## 2.48.6 - -### Patch Changes - -- @modern-js/runtime@2.48.6 -- @modern-js/node-bundle-require@2.48.6 -- @modern-js/utils@2.48.6 - -## 2.48.5 - -### Patch Changes - -- Updated dependencies [4ca9f4c] - - @modern-js/utils@2.48.5 - - @modern-js/runtime@2.48.5 - - @modern-js/node-bundle-require@2.48.5 - -## 2.48.4 - -### Patch Changes - -- Updated dependencies [d3e028b] -- Updated dependencies [78b889f] -- Updated dependencies [7d2d433] - - @modern-js/runtime@2.48.4 - - @modern-js/utils@2.48.4 - - @modern-js/node-bundle-require@2.48.4 - -## 2.48.3 - -### Patch Changes - -- @modern-js/runtime@2.48.3 -- @modern-js/node-bundle-require@2.48.3 -- @modern-js/utils@2.48.3 - -## 2.48.2 - -### Patch Changes - -- Updated dependencies [8eccb3b] -- Updated dependencies [08e062f] - - @modern-js/runtime@2.48.2 - - @modern-js/node-bundle-require@2.48.2 - - @modern-js/utils@2.48.2 - -## 2.48.1 - -### Patch Changes - -- Updated dependencies [8942b90] -- Updated dependencies [ce426f7] -- Updated dependencies [74749ae] - - @modern-js/utils@2.48.1 - - @modern-js/runtime@2.48.1 - - @modern-js/node-bundle-require@2.48.1 - -## 2.48.0 - -### Patch Changes - -- Updated dependencies [c323a23] - - @modern-js/utils@2.48.0 - - @modern-js/runtime@2.48.0 - - @modern-js/node-bundle-require@2.48.0 - -## 2.47.1 - -### Patch Changes - -- Updated dependencies [cee9184] - - @modern-js/runtime@2.47.1 - - @modern-js/node-bundle-require@2.47.1 - - @modern-js/utils@2.47.1 - -## 2.47.0 - -### Patch Changes - -- Updated dependencies [2ed7a8c] -- Updated dependencies [a5386ab] -- Updated dependencies [9464c9c] -- Updated dependencies [19ee61f] -- Updated dependencies [2ed7a8c] - - @modern-js/runtime@2.47.0 - - @modern-js/utils@2.47.0 - - @modern-js/node-bundle-require@2.47.0 - -## 2.46.1 - -### Patch Changes - -- @modern-js/runtime@2.46.1 -- @modern-js/node-bundle-require@2.46.1 -- @modern-js/utils@2.46.1 - -## 2.46.0 - -### Patch Changes - -- Updated dependencies [494b290] - - @modern-js/runtime@2.46.0 - - @modern-js/utils@2.46.0 - - @modern-js/node-bundle-require@2.46.0 - -## 2.45.0 - -### Patch Changes - -- Updated dependencies [f50ad3e] -- Updated dependencies [10d8203] - - @modern-js/runtime@2.45.0 - - @modern-js/utils@2.45.0 - - @modern-js/node-bundle-require@2.45.0 - -## 2.44.0 - -### Patch Changes - -- Updated dependencies [e25a5e3] - - @modern-js/runtime@2.44.0 - - @modern-js/utils@2.44.0 - - @modern-js/node-bundle-require@2.44.0 - -## 2.43.0 - -### Patch Changes - -- Updated dependencies [2006851] -- Updated dependencies [563c286] -- Updated dependencies [d959200] -- Updated dependencies [bb75155] -- Updated dependencies [ae22b74] -- Updated dependencies [5e9a6a9] -- Updated dependencies [4b4d08a] - - @modern-js/runtime@2.43.0 - - @modern-js/utils@2.43.0 - - @modern-js/node-bundle-require@2.43.0 - -## 2.42.2 - -### Patch Changes - -- Updated dependencies [e05e496] - - @modern-js/runtime@2.42.2 - - @modern-js/utils@2.42.2 - - @modern-js/node-bundle-require@2.42.2 - -## 2.42.1 - -### Patch Changes - -- @modern-js/runtime@2.42.1 -- @modern-js/node-bundle-require@2.42.1 -- @modern-js/utils@2.42.1 - -## 2.42.0 - -### Patch Changes - -- Updated dependencies [103cf92] -- Updated dependencies [ecc57b6] -- Updated dependencies [d6596cb] -- Updated dependencies [e2c899b] - - @modern-js/runtime@2.42.0 - - @modern-js/node-bundle-require@2.42.0 - - @modern-js/utils@2.42.0 - -## 2.41.0 - -### Patch Changes - -- c4d396a: chore(swc): bump swc and helpers - chore(swc): 升级 swc 以及 helpers -- Updated dependencies [c4d396a] -- Updated dependencies [7640d4d] - - @modern-js/node-bundle-require@2.41.0 - - @modern-js/runtime@2.41.0 - - @modern-js/utils@2.41.0 - -## 2.40.0 - -### Minor Changes - -- 95f15d2: chore: remove ajv schema verification of configuration - chore: 移除 ajv 对项目配置的校验 - -### Patch Changes - -- Updated dependencies [96ede9e] -- Updated dependencies [95f15d2] -- Updated dependencies [dac1564] - - @modern-js/runtime@2.40.0 - - @modern-js/utils@2.40.0 - - @modern-js/node-bundle-require@2.40.0 - -## 2.39.2 - -### Patch Changes - -- @modern-js/runtime@2.39.2 -- @modern-js/node-bundle-require@2.39.2 -- @modern-js/utils@2.39.2 - -## 2.39.1 - -### Patch Changes - -- Updated dependencies [f397649] -- Updated dependencies [d4d942c] -- Updated dependencies [e93fac9] - - @modern-js/runtime@2.39.1 - - @modern-js/node-bundle-require@2.39.1 - - @modern-js/utils@2.39.1 - -## 2.39.0 - -### Patch Changes - -- @modern-js/runtime@2.39.0 -- @modern-js/node-bundle-require@2.39.0 -- @modern-js/utils@2.39.0 - -## 2.38.0 - -### Patch Changes - -- Updated dependencies [3304d33] -- Updated dependencies [ce967bb] -- Updated dependencies [623c6c8] - - @modern-js/runtime@2.38.0 - - @modern-js/node-bundle-require@2.38.0 - - @modern-js/utils@2.38.0 - -## 2.37.2 - -### Patch Changes - -- @modern-js/runtime@2.37.2 -- @modern-js/node-bundle-require@2.37.2 -- @modern-js/utils@2.37.2 - -## 2.37.1 - -### Patch Changes - -- @modern-js/runtime@2.37.1 -- @modern-js/node-bundle-require@2.37.1 -- @modern-js/utils@2.37.1 - -## 2.37.0 - -### Patch Changes - -- Updated dependencies [383b636] -- Updated dependencies [ce0a14e] -- Updated dependencies [708f248] - - @modern-js/utils@2.37.0 - - @modern-js/runtime@2.37.0 - - @modern-js/node-bundle-require@2.37.0 - -## 2.36.0 - -### Patch Changes - -- Updated dependencies [3473bee] -- Updated dependencies [b98f8aa] -- Updated dependencies [eb602d2] -- Updated dependencies [4e3310b] - - @modern-js/utils@2.36.0 - - @modern-js/runtime@2.36.0 - - @modern-js/node-bundle-require@2.36.0 - -## 2.35.1 - -### Patch Changes - -- Updated dependencies [ea3fe18] -- Updated dependencies [9dd3151] -- Updated dependencies [85f877b] -- Updated dependencies [4980480] -- Updated dependencies [7bc7e9c] -- Updated dependencies [6a1d46e] - - @modern-js/utils@2.35.1 - - @modern-js/runtime@2.35.1 - - @modern-js/node-bundle-require@2.35.1 - -## 2.35.0 - -### Patch Changes - -- Updated dependencies [15b834f] -- Updated dependencies [d87a426] - - @modern-js/utils@2.35.0 - - @modern-js/runtime@2.35.0 - - @modern-js/node-bundle-require@2.35.0 - -## 2.34.0 - -### Patch Changes - -- Updated dependencies [a77b82a] -- Updated dependencies [dcdeea5] -- Updated dependencies [eca24a2] -- Updated dependencies [c8b448b] - - @modern-js/utils@2.34.0 - - @modern-js/runtime@2.34.0 - - @modern-js/node-bundle-require@2.34.0 - -## 2.33.1 - -### Patch Changes - -- @modern-js/runtime@2.33.1 -- @modern-js/node-bundle-require@2.33.1 -- @modern-js/utils@2.33.1 - -## 2.33.0 - -### Patch Changes - -- fd2ca58: feat(plugin-tailwind): automatically read tailwind config file - - feat(plugin-tailwind): 自动读取 tailwind config 文件 - -- bc1f8da: feat(builder): support custom logger in dev server - - feat(builder): 支持自定义 logger - -- Updated dependencies [6ea89ab] -- Updated dependencies [ae35c65] -- Updated dependencies [2bcff4f] -- Updated dependencies [fd82137] -- Updated dependencies [bc1f8da] -- Updated dependencies [44da57b] - - @modern-js/runtime@2.33.0 - - @modern-js/utils@2.33.0 - - @modern-js/node-bundle-require@2.33.0 - -## 2.32.1 - -### Patch Changes - -- 5e04e3e: refactor(tailwindcss): allow to use tailwind theme config - - refactor(tailwindcss): 支持使用 tailwind theme 配置 - -- Updated dependencies [90e053a] - - @modern-js/runtime@2.32.1 - - @modern-js/utils@2.32.1 - -## 2.32.0 - -### Patch Changes - -- 6076166: fix: packaging errors found by publint - - fix: 修复 publint 检测到的 packaging 问题 - -- b31e9dd: chore(plugin-tailwindcss): use glob shorthand in the default config - - chore(plugin-tailwindcss): 在默认配置中使用 glob 缩写 - -- Updated dependencies [e5a3fb4] -- Updated dependencies [6076166] -- Updated dependencies [a030aff] -- Updated dependencies [92591c6] -- Updated dependencies [3c91100] -- Updated dependencies [5255eba] - - @modern-js/runtime@2.32.0 - - @modern-js/utils@2.32.0 - -## 2.31.2 - -### Patch Changes - -- Updated dependencies [15d30abdc66] - - @modern-js/utils@2.31.2 - - @modern-js/runtime@2.31.2 - -## 2.31.1 - -### Patch Changes - -- Updated dependencies [99ffd10] - - @modern-js/runtime@2.31.1 - - @modern-js/utils@2.31.1 - -## 2.31.0 - -### Patch Changes - -- 1882366: chore(deps): bump build dependencies - - chore(deps): 升级构建相关依赖 - -- Updated dependencies [4a87c07] -- Updated dependencies [2361ce8] -- Updated dependencies [1882366] -- Updated dependencies [cd39c6f] - - @modern-js/runtime@2.31.0 - - @modern-js/utils@2.31.0 - -## 2.30.0 - -### Patch Changes - -- Updated dependencies [a8a4fd3] -- Updated dependencies [276ace3] -- Updated dependencies [855a61e] -- Updated dependencies [c731bf3] -- Updated dependencies [8219d55] - - @modern-js/runtime@2.30.0 - - @modern-js/utils@2.30.0 - -## 2.29.0 - -### Patch Changes - -- Updated dependencies [e6b5355] -- Updated dependencies [93db783] -- Updated dependencies [600bb0a] -- Updated dependencies [cba7675] -- Updated dependencies [fd3e71c] -- Updated dependencies [9a81e31] -- Updated dependencies [99052ea] -- Updated dependencies [1d71d2e] - - @modern-js/utils@2.29.0 - - @modern-js/runtime@2.29.0 - -## 2.28.0 - -### Patch Changes - -- Updated dependencies [00b58a7] - - @modern-js/utils@2.28.0 - - @modern-js/runtime@2.28.0 - -## 2.27.0 - -### Patch Changes - -- Updated dependencies [21be212] -- Updated dependencies [91d14b8] -- Updated dependencies [8322a51] -- Updated dependencies [fb51b98] -- Updated dependencies [b591092] -- Updated dependencies [6d7104d] - - @modern-js/runtime@2.27.0 - - @modern-js/utils@2.27.0 - -## 2.26.0 - -### Patch Changes - -- Updated dependencies [64a51c4] -- Updated dependencies [1586774] -- Updated dependencies [73c592d] -- Updated dependencies [5c2dbb3] -- Updated dependencies [22acfda] - - @modern-js/runtime@2.26.0 - - @modern-js/utils@2.26.0 - -## 2.25.2 - -### Patch Changes - -- Updated dependencies [63d8247] -- Updated dependencies [6651684] -- Updated dependencies [272646c] -- Updated dependencies [358ed24] -- Updated dependencies [e8a90f3] - - @modern-js/utils@2.25.2 - - @modern-js/runtime@2.25.2 - -## 2.25.1 - -### Patch Changes - -- Updated dependencies [9f78d0c] -- Updated dependencies [85366bc] - - @modern-js/utils@2.25.1 - - @modern-js/runtime@2.25.1 - -## 2.25.0 - -### Patch Changes - -- 4c4c0ad: feat: add named exports for all CLI plugins - - feat: 为各个 CLI 插件添加 named 导出 - -- Updated dependencies [5732c6a] -- Updated dependencies [09521e0] - - @modern-js/utils@2.25.0 - - @modern-js/runtime@2.25.0 - -## 2.24.0 - -### Patch Changes - -- Updated dependencies [c882fbd] -- Updated dependencies [56693a3] -- Updated dependencies [4a82c3b] - - @modern-js/runtime@2.24.0 - - @modern-js/utils@2.24.0 - -## 2.23.1 - -### Patch Changes - -- Updated dependencies [f08bbfc] -- Updated dependencies [a6b313a] -- Updated dependencies [8f2cab0] - - @modern-js/utils@2.23.1 - - @modern-js/runtime@2.23.1 - -## 2.23.0 - -### Patch Changes - -- 7e6fb5f: chore: publishConfig add provenance config - - chore: publishConfig 增加 provenance 配置 - -- c3216b5: chore: split the scheme into the plugin - - chore: 拆分 scheme 到插件内部 - -- Updated dependencies [7e6fb5f] -- Updated dependencies [a7a7ad7] -- Updated dependencies [6dec7c2] -- Updated dependencies [c3216b5] - - @modern-js/runtime@2.23.0 - - @modern-js/utils@2.23.0 - -## 2.22.1 - -### Patch Changes - -- 5522285: fix(tailwind): should not add tools.babel config when not haveTwinMacro - - fix(tailwind): 在没有命中 haveTwinMacro 时，不添加 tools.babel 配置 - -- Updated dependencies [e2848a2] -- Updated dependencies [9b69987] -- Updated dependencies [d4045ed] - - @modern-js/runtime@2.22.1 - - @modern-js/utils@2.22.1 - -## 2.22.0 - -### Patch Changes - -- Updated dependencies [3d48836] -- Updated dependencies [63cdea1] -- Updated dependencies [8f1141c] -- Updated dependencies [5050e8e] -- Updated dependencies [dc45896] -- Updated dependencies [79180c2] -- Updated dependencies [c271c5d] - - @modern-js/runtime@2.22.0 - - @modern-js/utils@2.22.0 - -## 2.21.1 - -### Patch Changes - -- @modern-js/runtime@2.21.1 -- @modern-js/utils@2.21.1 - -## 2.21.0 - -### Patch Changes - -- 26dcf3a: chore: bump typescript to v5 in devDependencies - - chore: 升级 devDependencies 中的 typescript 版本到 v5 - -- Updated dependencies [e81eeaf] -- Updated dependencies [26dcf3a] -- Updated dependencies [0a1aa3b] -- Updated dependencies [056627f] -- Updated dependencies [8b7c6d4] -- Updated dependencies [807f04a] -- Updated dependencies [0fc15ca] -- Updated dependencies [43b4e83] -- Updated dependencies [ad78387] - - @modern-js/runtime@2.21.0 - - @modern-js/utils@2.21.0 - -## 2.20.0 - -### Patch Changes - -- 25e28a9: fix(tailwindcss): avoid unnecessary rebuild when running dev - - fix(tailwindcss): 修复 dev 模式下不必要的重新构建 - -- 6b9d90a: chore: remove @babel/runtime. add @swc/helper and enable `externalHelper` config. - chore: 移除 @babel/runtime 依赖. 增加 @swc/helpers 依赖并且开启 `externalHelpers` 配置 -- Updated dependencies [3c4e0a5] -- Updated dependencies [6b9d90a] - - @modern-js/utils@2.20.0 - - @modern-js/runtime@2.20.0 - -## 2.19.1 - -### Patch Changes - -- @modern-js/runtime@2.19.1 -- @modern-js/utils@2.19.1 - -## 2.19.0 - -### Patch Changes - -- Updated dependencies [1134fe2] -- Updated dependencies [579d3d5] -- Updated dependencies [8a3a2e5] - - @modern-js/utils@2.19.0 - - @modern-js/runtime@2.19.0 - -## 2.18.1 - -### Patch Changes - -- cdc9db1: fix(module-tools, plugin-tailwindcss): fix `style.tailwindcss` config name and merge logic - fix(module-tools, plugin-tailwindcss): 修复 `style.tailwindcss` 错误的配置名和合并逻辑 -- Updated dependencies [8fb93d1] - - @modern-js/runtime@2.18.1 - - @modern-js/utils@2.18.1 - -## 2.18.0 - -### Patch Changes - -- Updated dependencies [7de6599] - - @modern-js/runtime@2.18.0 - - @modern-js/utils@2.18.0 - -## 2.17.1 - -### Patch Changes - -- @modern-js/runtime@2.17.1 -- @modern-js/utils@2.17.1 - -## 2.17.0 - -### Patch Changes - -- Updated dependencies [3810930] - - @modern-js/runtime@2.17.0 - - @modern-js/utils@2.17.0 - -## 2.16.0 - -### Patch Changes - -- acc0a00: fix: upgrade libuild version to support tailwind in watch mode - fix: 更新 libuild 版本以支持 tailwindcss 在 watch 模式下生效 -- 4e876ab: chore: package.json include the monorepo-relative directory - - chore: 在 package.json 中声明 monorepo 的子路径 - -- Updated dependencies [02e9c5d] -- Updated dependencies [5954330] -- Updated dependencies [7596520] -- Updated dependencies [4e876ab] - - @modern-js/runtime@2.16.0 - - @modern-js/utils@2.16.0 - -## 2.15.0 - -### Patch Changes - -- Updated dependencies [09a3e57] - - @modern-js/runtime@2.15.0 - - @modern-js/utils@2.15.0 - -## 2.14.0 - -### Patch Changes - -- Updated dependencies [4779152] -- Updated dependencies [9321bef] -- Updated dependencies [c921f30] -- Updated dependencies [ead58c8] -- Updated dependencies [afe5d35] -- Updated dependencies [4c74ea7] -- Updated dependencies [9b45c58] -- Updated dependencies [76ad173] -- Updated dependencies [394470c] -- Updated dependencies [8b634f9] -- Updated dependencies [1b3afa0] -- Updated dependencies [52d0cb1] -- Updated dependencies [28721cb] -- Updated dependencies [60a81d0] -- Updated dependencies [dacef96] -- Updated dependencies [16399fd] - - @modern-js/utils@2.14.0 - - @modern-js/runtime@2.14.0 - -## 2.13.4 - -### Patch Changes - -- @modern-js/runtime@2.13.4 -- @modern-js/utils@2.13.4 - -## 2.13.3 - -### Patch Changes - -- @modern-js/runtime@2.13.3 -- @modern-js/utils@2.13.3 - -## 2.13.2 - -### Patch Changes - -- @modern-js/runtime@2.13.2 -- @modern-js/utils@2.13.2 - -## 2.13.1 - -### Patch Changes - -- @modern-js/runtime@2.13.1 -- @modern-js/utils@2.13.1 - -## 2.13.0 - -### Patch Changes - -- Updated dependencies [cad9676] -- Updated dependencies [e9b1656] -- Updated dependencies [4d413c4] -- Updated dependencies [4220c0e] - - @modern-js/runtime@2.13.0 - - @modern-js/utils@2.13.0 - -## 2.12.0 - -### Patch Changes - -- Updated dependencies [c2ca6c8] -- Updated dependencies [0b05ec3] -- Updated dependencies [6d86e34] -- Updated dependencies [1aa0cb7] - - @modern-js/utils@2.12.0 - - @modern-js/runtime@2.12.0 - -## 2.11.0 - -### Patch Changes - -- Updated dependencies [cfb058f] -- Updated dependencies [0bd018b] -- Updated dependencies [5d624fd] -- Updated dependencies [e2466a1] -- Updated dependencies [02bb383] -- Updated dependencies [381a3b9] -- Updated dependencies [7a60f10] -- Updated dependencies [274b2e5] -- Updated dependencies [b9e1c54] - - @modern-js/utils@2.11.0 - - @modern-js/runtime@2.11.0 - -## 2.10.0 - -### Patch Changes - -- 0da32d0: chore: upgrade jest and puppeteer - chore: 升级 jest 和 puppeteer 到 latest -- Updated dependencies [0da32d0] -- Updated dependencies [5766414] -- Updated dependencies [fbefa7e] -- Updated dependencies [4d54233] -- Updated dependencies [6db4864] -- Updated dependencies [950e138] - - @modern-js/runtime@2.10.0 - - @modern-js/utils@2.10.0 - -## 2.9.0 - -### Patch Changes - -- Updated dependencies [e8c580125d] -- Updated dependencies [7035d5c22f] -- Updated dependencies [49bb8cd0ef] -- Updated dependencies [755a053579] - - @modern-js/runtime@2.9.0 - - @modern-js/utils@2.9.0 - -## 2.8.0 - -### Patch Changes - -- Updated dependencies [3ef832741b] -- Updated dependencies [9330022f4e] -- Updated dependencies [1104a9f18b] -- Updated dependencies [40747e6fdd] -- Updated dependencies [58a1fc64da] -- Updated dependencies [4cfea8ce49] -- Updated dependencies [1f6ca2c7fb] -- Updated dependencies [9c9ebba6f2] - - @modern-js/runtime@2.8.0 - - @modern-js/utils@2.8.0 - -## 2.7.0 - -### Patch Changes - -- 7fff9020e1: chore: make file naming consistent - - chore: 统一文件命名为小驼峰格式 - -- Updated dependencies [0f15fc597c] -- Updated dependencies [dcad887024] -- Updated dependencies [a4672f7c16] -- Updated dependencies [7fff9020e1] -- Updated dependencies [1eea234fdd] -- Updated dependencies [84bfb439b8] - - @modern-js/utils@2.7.0 - - @modern-js/runtime@2.7.0 - -## 2.6.0 - -### Patch Changes - -- Updated dependencies [671477d] -- Updated dependencies [e1f799e] -- Updated dependencies [7915ab3] -- Updated dependencies [a909ad1] -- Updated dependencies [49fa0b1] -- Updated dependencies [0fe658a] -- Updated dependencies [1906d7b] - - @modern-js/runtime@2.6.0 - - @modern-js/utils@2.6.0 - -## 2.5.0 - -### Patch Changes - -- 89ca6cc: refactor: merge build-config into scripts/build - - refactor: 把 build-config 合并进 scripts/build - -- 30614fa: chore: modify package.json entry fields and build config - chore: 更改 package.json entry 字段以及构建配置 -- Updated dependencies [89ca6cc] -- Updated dependencies [7cb8bb4] -- Updated dependencies [30614fa] -- Updated dependencies [7a25271] -- Updated dependencies [8871bb8] -- Updated dependencies [1b0ce87] -- Updated dependencies [0d75c27] -- Updated dependencies [11c053b] -- Updated dependencies [a0f2ab1] - - @modern-js/runtime@2.5.0 - - @modern-js/utils@2.5.0 - -## 2.4.0 - -### Patch Changes - -- 98a2733: fix(tailwind): fix webpack cache not work when using twin.macro - - fix(tailwind): 修复使用 twin.macro 时 webpack 缓存不生效的问题 - -- Updated dependencies [98a2733] -- Updated dependencies [9e907ec] -- Updated dependencies [8c2db5f] - - @modern-js/utils@2.4.0 - - @modern-js/runtime@2.4.0 - -## 2.3.0 - -### Patch Changes - -- Updated dependencies [fd5a3ed] -- Updated dependencies [6ca1c0b] -- Updated dependencies [89b6739] -- Updated dependencies [b4dd017] - - @modern-js/utils@2.3.0 - - @modern-js/runtime@2.3.0 - -## 2.2.0 - -### Patch Changes - -- cb12ee7: chore: remove some unused deps, bump postcss version - - chore: 移除未使用的依赖, 升级 postcss 版本 - -- Updated dependencies [49eff0c] -- Updated dependencies [f7a1c1f] - - @modern-js/utils@2.2.0 - - @modern-js/runtime@2.2.0 - -## 2.1.0 - -### Patch Changes - -- 6562578: chore: optimize the capitalization of plugin names - - chore: 规范引用插件时的命名格式，统一使用 camelCase 代替 PascalCase - -- Updated dependencies [f3237db] -- Updated dependencies [837620c] -- Updated dependencies [776cc27] -- Updated dependencies [35d3e84] -- Updated dependencies [8a9482c] - - @modern-js/runtime@2.1.0 - - @modern-js/utils@2.1.0 - -## 2.0.2 - -### Patch Changes - -- Updated dependencies [39988b2] - - @modern-js/runtime@2.0.2 - - @modern-js/utils@2.0.2 - -## 2.0.1 - -### Patch Changes - -- @modern-js/runtime@2.0.1 -- @modern-js/utils@2.0.1 - -## 2.0.0 - -### Major Changes - -- dda38c9c3e: chore: v2 - -### Patch Changes - -- Updated dependencies [c9e800d39a] -- Updated dependencies [edd1cfb1af] -- Updated dependencies [6bda14ed71] -- Updated dependencies [dda38c9c3e] -- Updated dependencies [8b8e1bb571] -- Updated dependencies [ffb2ed4] -- Updated dependencies [bbe4c4ab64] - - @modern-js/runtime@2.0.0 - - @modern-js/utils@2.0.0 - -## 2.0.0-beta.7 - -### Major Changes - -- dda38c9c3e: chore: v2 - -### Patch Changes - -- Updated dependencies [c9e800d39a] -- Updated dependencies [edd1cfb1af] -- Updated dependencies [6bda14ed71] -- Updated dependencies [dda38c9c3e] -- Updated dependencies [8b8e1bb571] -- Updated dependencies [bbe4c4ab64] - - @modern-js/runtime@2.0.0-beta.7 - - @modern-js/utils@2.0.0-beta.7 - -## 2.0.0-beta.6 - -### Major Changes - -- dda38c9c3e: chore: v2 - -### Minor Changes - -- 92f0eade39: feat: - - 1. add style config and add new hook - 2. add dts alias logic - 3. add copy logic - 4. add log logic - 5. add skipDeps config - - feat: - - 1. 添加样式配置以及新的 hook - 2. 添加 dts 别名处理 - 3. 添加 copy 逻辑 - 4. 添加日志逻辑 - 5. 添加 skipDeps 配置 - -- 92f0eade39: feat: - - 1. core: 增加 test 函数 - 2. module plugins: 增加 `babel`, `mainField`, `target` 插件 - 3. storybook: 修改部分逻辑并且增加 tspath webpack 插件 - 4. 增加 designSystem 配置 - - feat: - - 1. core: add test method - 2. module plugins: add `babel`, `mainField`, `target` plugin - 3. storybook: change some logic and add tspath webpack plugin - 4. add `designSystem` config - -### Patch Changes - -- d6546ad916: add buildConfig style in module-tools and remove tools - 在 module-tools 里新增 buildConfig style 并删除 tools -- 67472ca1cc: fix: move babel-plugin-marcos to plugin-tailwindcss - - fix: 将 babel-plugin-marcos 依赖移动到 plugin-tailwindcss 中 - -- Updated dependencies [2344eb26ed] -- Updated dependencies [a11fcf8b50] -- Updated dependencies [a93159440e] -- Updated dependencies [e7ce0636d1] -- Updated dependencies [b18fa8f3ed] -- Updated dependencies [7879e8f711] -- Updated dependencies [50d4675e5b] -- Updated dependencies [c9e800d39a] -- Updated dependencies [6604f1b8b3] -- Updated dependencies [6aca875011] -- Updated dependencies [fda836fe8a] -- Updated dependencies [d6bc321747] -- Updated dependencies [3e57f2bd58] -- Updated dependencies [2e6031955e] -- Updated dependencies [c5798d284f] -- Updated dependencies [fbf5eed5aa] -- Updated dependencies [a2509bfbdb] -- Updated dependencies [a7c68832b3] -- Updated dependencies [425e57092d] -- Updated dependencies [e4357f1856] -- Updated dependencies [7b7d12cf8f] -- Updated dependencies [4369648ae2] -- Updated dependencies [7efeed4] -- Updated dependencies [92f0eade39] -- Updated dependencies [df7ee2d] -- Updated dependencies [92c0994468] -- Updated dependencies [2cc2eb35ba] -- Updated dependencies [edd1cfb1af] -- Updated dependencies [cc971eabfc] -- Updated dependencies [5b9049f2e9] -- Updated dependencies [6bda14ed71] -- Updated dependencies [92004d1906] -- Updated dependencies [b8bbe036c7] -- Updated dependencies [40ed5874c6] -- Updated dependencies [60d5378632] -- Updated dependencies [d5a31df781] -- Updated dependencies [dda38c9c3e] -- Updated dependencies [8b8e1bb571] -- Updated dependencies [3bbea92b2a] -- Updated dependencies [21d7521] -- Updated dependencies [9144c21d27] -- Updated dependencies [b710adb843] -- Updated dependencies [18aaf42249] -- Updated dependencies [34702d5d47] -- Updated dependencies [fcace5b5b9] -- Updated dependencies [ea7cf06257] -- Updated dependencies [bbe4c4ab64] -- Updated dependencies [e4558a0bc4] -- Updated dependencies [abf3421a75] -- Updated dependencies [543be9558e] -- Updated dependencies [14b712da84] - - @modern-js/runtime@2.0.0-beta.6 - - @modern-js/utils@2.0.0-beta.6 - -## 2.0.0-beta.4 - -### Major Changes - -- dda38c9c3e: chore: v2 - -### Minor Changes - -- 92f0eade39: feat: - - 1. add style config and add new hook - 2. add dts alias logic - 3. add copy logic - 4. add log logic - 5. add skipDeps config - - feat: - - 1. 添加样式配置以及新的 hook - 2. 添加 dts 别名处理 - 3. 添加 copy 逻辑 - 4. 添加日志逻辑 - 5. 添加 skipDeps 配置 - -- 92f0eade39: feat: - - 1. core: 增加 test 函数 - 2. module plugins: 增加 `babel`, `mainField`, `target` 插件 - 3. storybook: 修改部分逻辑并且增加 tspath webpack 插件 - 4. 增加 designSystem 配置 - - feat: - - 1. core: add test method - 2. module plugins: add `babel`, `mainField`, `target` plugin - 3. storybook: change some logic and add tspath webpack plugin - 4. add `designSystem` config - -### Patch Changes - -- d6546ad916: add buildConfig style in module-tools and remove tools - 在 module-tools 里新增 buildConfig style 并删除 tools -- 67472ca: fix: move babel-plugin-marcos to plugin-tailwindcss - - fix: 将 babel-plugin-marcos 依赖移动到 plugin-tailwindcss 中 - -- Updated dependencies [2344eb26ed] -- Updated dependencies [a11fcf8b50] -- Updated dependencies [a931594] -- Updated dependencies [e7ce063] -- Updated dependencies [b18fa8f3ed] -- Updated dependencies [7879e8f] -- Updated dependencies [50d4675] -- Updated dependencies [c9e800d39a] -- Updated dependencies [6604f1b] -- Updated dependencies [6aca875] -- Updated dependencies [fda836f] -- Updated dependencies [d6bc321] -- Updated dependencies [3e57f2bd58] -- Updated dependencies [2e6031955e] -- Updated dependencies [c5798d2] -- Updated dependencies [fbf5eed5aa] -- Updated dependencies [a2509bfbdb] -- Updated dependencies [a7c6883] -- Updated dependencies [425e57092d] -- Updated dependencies [e4357f1856] -- Updated dependencies [7b7d12c] -- Updated dependencies [4369648ae2] -- Updated dependencies [92f0eade39] -- Updated dependencies [92c0994468] -- Updated dependencies [2cc2eb3] -- Updated dependencies [edd1cfb1af] -- Updated dependencies [cc971eabfc] -- Updated dependencies [5b9049f2e9] -- Updated dependencies [6bda14ed71] -- Updated dependencies [92004d1906] -- Updated dependencies [b8bbe036c7] -- Updated dependencies [40ed5874c6] -- Updated dependencies [60d5378632] -- Updated dependencies [d5a31df781] -- Updated dependencies [dda38c9c3e] -- Updated dependencies [8b8e1bb571] -- Updated dependencies [3bbea92b2a] -- Updated dependencies [9144c21] -- Updated dependencies [b710adb843] -- Updated dependencies [18aaf42249] -- Updated dependencies [34702d5] -- Updated dependencies [fcace5b5b9] -- Updated dependencies [ea7cf06] -- Updated dependencies [bbe4c4a] -- Updated dependencies [e4558a0] -- Updated dependencies [abf3421a75] -- Updated dependencies [543be9558e] -- Updated dependencies [14b712da84] - - @modern-js/runtime@2.0.0-beta.4 - - @modern-js/utils@2.0.0-beta.4 - -## 2.0.0-beta.3 - -### Major Changes - -- dda38c9c3e: chore: v2 - -### Minor Changes - -- 92f0eade39: feat: - - 1. add style config and add new hook - 2. add dts alias logic - 3. add copy logic - 4. add log logic - 5. add skipDeps config - - feat: - - 1. 添加样式配置以及新的 hook - 2. 添加 dts 别名处理 - 3. 添加 copy 逻辑 - 4. 添加日志逻辑 - 5. 添加 skipDeps 配置 - -- 92f0eade39: feat: - - 1. core: 增加 test 函数 - 2. module plugins: 增加 `babel`, `mainField`, `target` 插件 - 3. storybook: 修改部分逻辑并且增加 tspath webpack 插件 - 4. 增加 designSystem 配置 - - feat: - - 1. core: add test method - 2. module plugins: add `babel`, `mainField`, `target` plugin - 3. storybook: change some logic and add tspath webpack plugin - 4. add `designSystem` config - -### Patch Changes - -- d6546ad: add buildConfig style in module-tools-v2 and remove tools - 在 module-tools-v2 里新增 buildConfig style 并删除 tools -- Updated dependencies [2344eb26ed] -- Updated dependencies [a11fcf8b50] -- Updated dependencies [e7ce063] -- Updated dependencies [b18fa8f3ed] -- Updated dependencies [c9e800d39a] -- Updated dependencies [6604f1b] -- Updated dependencies [6aca875] -- Updated dependencies [fda836f] -- Updated dependencies [3e57f2bd58] -- Updated dependencies [2e60319] -- Updated dependencies [fbf5eed5aa] -- Updated dependencies [a2509bfbdb] -- Updated dependencies [425e570] -- Updated dependencies [e4357f1] -- Updated dependencies [4369648ae2] -- Updated dependencies [92f0eade39] -- Updated dependencies [92c0994468] -- Updated dependencies [edd1cfb1af] -- Updated dependencies [cc971eabfc] -- Updated dependencies [5b9049f2e9] -- Updated dependencies [6bda14ed71] -- Updated dependencies [92004d1906] -- Updated dependencies [b8bbe036c7] -- Updated dependencies [40ed5874c6] -- Updated dependencies [60d5378632] -- Updated dependencies [d5a31df781] -- Updated dependencies [dda38c9c3e] -- Updated dependencies [8b8e1bb571] -- Updated dependencies [3bbea92b2a] -- Updated dependencies [b710adb] -- Updated dependencies [18aaf42249] -- Updated dependencies [34702d5] -- Updated dependencies [fcace5b5b9] -- Updated dependencies [ea7cf06] -- Updated dependencies [bbe4c4a] -- Updated dependencies [e4558a0] -- Updated dependencies [abf3421a75] -- Updated dependencies [543be9558e] -- Updated dependencies [14b712da84] - - @modern-js/runtime@2.0.0-beta.3 - - @modern-js/utils@2.0.0-beta.3 - -## 2.0.0-beta.2 - -### Major Changes - -- dda38c9c3e: chore: v2 - -### Minor Changes - -- 92f0ead: feat: - - 1. add style config and add new hook - 2. add dts alias logic - 3. add copy logic - 4. add log logic - 5. add skipDeps config - - feat: - - 1. 添加样式配置以及新的 hook - 2. 添加 dts 别名处理 - 3. 添加 copy 逻辑 - 4. 添加日志逻辑 - 5. 添加 skipDeps 配置 - -- 92f0ead: feat: - - 1. core: 增加 test 函数 - 2. module plugins: 增加 `babel`, `mainField`, `target` 插件 - 3. storybook: 修改部分逻辑并且增加 tspath webpack 插件 - 4. 增加 designSystem 配置 - - feat: - - 1. core: add test method - 2. module plugins: add `babel`, `mainField`, `target` plugin - 3. storybook: change some logic and add tspath webpack plugin - 4. add `designSystem` config - -### Patch Changes - -- Updated dependencies [2344eb2] -- Updated dependencies [a11fcf8] -- Updated dependencies [b18fa8f3ed] -- Updated dependencies [c9e800d39a] -- Updated dependencies [3e57f2b] -- Updated dependencies [fbf5eed] -- Updated dependencies [a2509bfbdb] -- Updated dependencies [e4357f1] -- Updated dependencies [4369648ae2] -- Updated dependencies [92f0ead] -- Updated dependencies [92c0994] -- Updated dependencies [edd1cfb1af] -- Updated dependencies [cc971eabfc] -- Updated dependencies [5b9049f2e9] -- Updated dependencies [6bda14ed71] -- Updated dependencies [92004d1] -- Updated dependencies [b8bbe036c7] -- Updated dependencies [40ed587] -- Updated dependencies [60d5378632] -- Updated dependencies [d5a31df781] -- Updated dependencies [dda38c9c3e] -- Updated dependencies [8b8e1bb571] -- Updated dependencies [3bbea92b2a] -- Updated dependencies [18aaf42] -- Updated dependencies [fcace5b5b9] -- Updated dependencies [abf3421a75] -- Updated dependencies [543be9558e] -- Updated dependencies [14b712da84] - - @modern-js/runtime@2.0.0-beta.2 - - @modern-js/utils@2.0.0-beta.2 - -## 2.0.0-beta.1 - -### Major Changes - -- dda38c9: chore: v2 - -### Minor Changes - -- 92f0ead: feat: - - 1. add style config and add new hook - 2. add dts alias logic - 3. add copy logic - 4. add log logic - 5. add skipDeps config - - feat: - - 1. 添加样式配置以及新的 hook - 2. 添加 dts 别名处理 - 3. 添加 copy 逻辑 - 4. 添加日志逻辑 - 5. 添加 skipDeps 配置 - -- 92f0ead: feat: - - 1. core: 增加 test 函数 - 2. module plugins: 增加 `babel`, `mainField`, `target` 插件 - 3. storybook: 修改部分逻辑并且增加 tspath webpack 插件 - 4. 增加 designSystem 配置 - - feat: - - 1. core: add test method - 2. module plugins: add `babel`, `mainField`, `target` plugin - 3. storybook: change some logic and add tspath webpack plugin - 4. add `designSystem` config - -### Patch Changes - -- Updated dependencies [2344eb2] -- Updated dependencies [a11fcf8] -- Updated dependencies [b18fa8f] -- Updated dependencies [c9e800d39a] -- Updated dependencies [3e57f2b] -- Updated dependencies [fbf5eed] -- Updated dependencies [a2509bfbdb] -- Updated dependencies [4369648ae2] -- Updated dependencies [92f0ead] -- Updated dependencies [92c0994] -- Updated dependencies [edd1cfb1af] -- Updated dependencies [cc971eabfc] -- Updated dependencies [5b9049f] -- Updated dependencies [6bda14ed71] -- Updated dependencies [92004d1] -- Updated dependencies [b8bbe036c7] -- Updated dependencies [40ed587] -- Updated dependencies [60d5378632] -- Updated dependencies [d5a31df781] -- Updated dependencies [dda38c9] -- Updated dependencies [8b8e1bb571] -- Updated dependencies [3bbea92b2a] -- Updated dependencies [18aaf42] -- Updated dependencies [fcace5b5b9] -- Updated dependencies [abf3421] -- Updated dependencies [543be9558e] -- Updated dependencies [14b712d] - - @modern-js/runtime@2.0.0-beta.1 - - @modern-js/utils@2.0.0-beta.1 - -## 2.0.0-beta.0 - -### Major Changes - -- dda38c9: chore: v2 - -### Patch Changes - -- Updated dependencies [b18fa8f] -- Updated dependencies [c9e800d39] -- Updated dependencies [a2509bf] -- Updated dependencies [4369648ae] -- Updated dependencies [edd1cfb1a] -- Updated dependencies [cc971eabf] -- Updated dependencies [5b9049f] -- Updated dependencies [6bda14ed7] -- Updated dependencies [b8bbe036c] -- Updated dependencies [60d5378] -- Updated dependencies [d5a31df78] -- Updated dependencies [dda38c9] -- Updated dependencies [8b8e1bb57] -- Updated dependencies [3bbea92b2] -- Updated dependencies [fcace5b5b] -- Updated dependencies [abf3421] -- Updated dependencies [543be95] -- Updated dependencies [14b712d] - - @modern-js/runtime@2.0.0-beta.0 - - @modern-js/utils@2.0.0-beta.0 - -## 1.21.2 - -### Patch Changes - -- @modern-js/runtime@1.21.2 -- @modern-js/utils@1.21.2 - -## 1.21.1 - -### Patch Changes - -- @modern-js/runtime@1.21.1 -- @modern-js/utils@1.21.1 - -## 1.21.0 - -### Patch Changes - -- Updated dependencies [f51c59a] -- Updated dependencies [4c1f3a4] -- Updated dependencies [4c1f3a4] -- Updated dependencies [c40fc4b] - - @modern-js/runtime@1.21.0 - - @modern-js/utils@1.21.0 - -## 1.20.1 - -### Patch Changes - -- Updated dependencies [49515c5] - - @modern-js/utils@1.20.1 - - @modern-js/runtime@1.20.1 - -## 1.20.0 - -### Patch Changes - -- Updated dependencies [d5d570b] -- Updated dependencies [b57d5ff] -- Updated dependencies [4ddc185] -- Updated dependencies [715df7a] -- Updated dependencies [df8ee7e] -- Updated dependencies [8c05089] - - @modern-js/utils@1.20.0 - - @modern-js/runtime@1.20.0 - -## 1.19.0 - -### Patch Changes - -- @modern-js/runtime@1.19.0 -- @modern-js/utils@1.19.0 - -## 1.18.1 - -### Patch Changes - -- Updated dependencies [9fcfbd4] -- Updated dependencies [6c2c745] - - @modern-js/utils@1.18.1 - - @modern-js/runtime@1.18.1 - -## 1.18.0 - -### Patch Changes - -- Updated dependencies [8280920] -- Updated dependencies [5227370] -- Updated dependencies [7928bae] - - @modern-js/utils@1.18.0 - - @modern-js/runtime@1.18.0 - -## 1.17.0 - -### Patch Changes - -- Updated dependencies [1b9176f] -- Updated dependencies [77d3a38] -- Updated dependencies [151329d] -- Updated dependencies [5af9472] -- Updated dependencies [6b6a534] -- Updated dependencies [77d3a38] -- Updated dependencies [6b43a2b] -- Updated dependencies [492437f] -- Updated dependencies [c3d4a6a] -- Updated dependencies [a7be124] -- Updated dependencies [31547b4] - - @modern-js/utils@1.17.0 - - @modern-js/runtime@1.17.0 - -## 1.16.0 - -### Minor Changes - -- 1100dd58c: chore: support react 18 - - chore: 支持 React 18 - -### Patch Changes - -- Updated dependencies [641592f52] -- Updated dependencies [3904b30a5] -- Updated dependencies [1100dd58c] -- Updated dependencies [a480d6ad0] -- Updated dependencies [e04e6e76a] -- Updated dependencies [81c66e4a4] -- Updated dependencies [2c305b6f5] - - @modern-js/utils@1.16.0 - - @modern-js/runtime@1.16.0 - -## 1.15.0 - -### Patch Changes - -- Updated dependencies [8658a78] -- Updated dependencies [335c97c] -- Updated dependencies [05d4a4f] -- Updated dependencies [ad05af9] -- Updated dependencies [5d53d1c] -- Updated dependencies [37cd159] -- Updated dependencies [a04a11b] - - @modern-js/utils@1.15.0 - - @modern-js/runtime@1.15.0 - -## 1.5.1 - -### Patch Changes - -- 3c874ca16: fix: `@modern-js/plugin-tailwindcss` support `pluginName` params - - fix: `@modern-js/plugin-tailwindcss` 支持 `pluginName` 参数 - -## 1.5.0 - -### Minor Changes - -- 79e83ef: chore: merge `@modern-js/plugin-design-token` to `@modern-js/plugin-tailwindcss` - - chore: 合并 `@modern-js/plugin-design-token` 到 `@modern-js/plugin-tailwindcss` - -- 59c941a: chore(runtime): merge `@modern-js/runtime-core` to `@modern-js/runtime` - - chore(runtime): 合并 `@modern-js/runtime-core` 到 `@modern-js/runtime` - -### Patch Changes - -- Updated dependencies [79e83ef] -- Updated dependencies [e0cd14a] -- Updated dependencies [287ac8b] -- Updated dependencies [22f4dca] -- Updated dependencies [59c941a] -- Updated dependencies [7b9067f] - - @modern-js/utils@1.9.0 - - @modern-js/runtime@1.5.0 - -## 1.4.2 - -### Patch Changes - -- nothing happen, only bump -- Updated dependencies - - @modern-js/utils@1.7.11 - - @modern-js/plugin-design-token@1.0.11 - -## 1.4.1 - -### Patch Changes - -- b82869d: change package.json exports -- Updated dependencies [b82869d] - - @modern-js/utils@1.7.10 - - @modern-js/plugin-design-token@1.0.11 - -## 1.4.0 - -### Minor Changes - -- 3050acc: support twin.macro - -### Patch Changes - -- 546266c: support windows -- Updated dependencies [a90bc96] - - @modern-js/utils@1.7.9 - - @modern-js/plugin-design-token@1.0.11 - -## 1.3.0 - -### Minor Changes - -- 8d0eb81f5: support twin.macro - -## 1.2.11 - -### Patch Changes - -- a1198d509: feat: bump babel 7.18.0 -- Updated dependencies [a1198d509] - - @modern-js/plugin-design-token@1.0.10 - -## 1.2.10 - -### Patch Changes - -- d32f35134: chore: add modern/jest/eslint/ts config files to .npmignore -- Updated dependencies [d32f35134] -- Updated dependencies [6ae4a34ae] -- Updated dependencies [b80229c79] -- Updated dependencies [16ca3151b] -- Updated dependencies [948cc4436] - - @modern-js/plugin-design-token@1.0.7 - - @modern-js/utils@1.7.3 - -## 1.2.9 - -### Patch Changes - -- 69a728375: fix: remove exports.jsnext:source after publish -- 0f86e133b: fix react & react-dom types problem -- Updated dependencies [cd7346b0d] -- Updated dependencies [69a728375] - - @modern-js/utils@1.7.2 - - @modern-js/plugin-design-token@1.0.6 - -## 1.2.8 - -### Patch Changes - -- 04ae5262: chore: bump @modern-js/utils to v1.4.1 in dependencies -- 60f7d8bf: feat: add tests dir to npmignore -- Updated dependencies [b8599d09] -- Updated dependencies [04ae5262] -- Updated dependencies [60f7d8bf] -- Updated dependencies [3bf4f8b0] - - @modern-js/utils@1.5.0 - - @modern-js/plugin-design-token@1.0.4 - -## 1.2.7 - -### Patch Changes - -- 17d0cc46: feat: prebundle lodash to @modern-js/utils/lodash -- Updated dependencies [77ff9754] -- Updated dependencies [d2d1d6b2] -- Updated dependencies [07a4887e] -- Updated dependencies [ea2ae711] -- Updated dependencies [17d0cc46] -- Updated dependencies [d2d1d6b2] - - @modern-js/utils@1.4.0 - - @modern-js/plugin-design-token@1.0.3 - -## 1.2.6 - -### Patch Changes - -- bebb39b6: chore: improve devDependencies and peerDependencies -- 132f7b53: feat: move config declarations to @modern-js/core -- Updated dependencies [bebb39b6] -- Updated dependencies [132f7b53] - - @modern-js/plugin-design-token@1.0.3 - - @modern-js/utils@1.3.7 - -## 1.2.5 - -### Patch Changes - -- b851d628: feat: convert to new plugin -- 61e3f623: feat: convert to new plugin -- Updated dependencies [c2046f37] -- Updated dependencies [10379961] -- Updated dependencies [61e3f623] - - @modern-js/utils@1.3.6 - - @modern-js/plugin-design-token@1.0.2 - -## 1.2.4 - -### Patch Changes - -- 83059b93: fix tailwindcss type reference -- 83059b93: fix tailwindcss generator -- Updated dependencies [969f172f] -- Updated dependencies [4c792f68] -- Updated dependencies [4b5d4bf4] -- Updated dependencies [62f5b8c8] -- Updated dependencies [55e18278] -- Updated dependencies [4499a674] -- Updated dependencies [403f5169] -- Updated dependencies [a7f42f48] - - @modern-js/core@1.4.4 - - @modern-js/utils@1.3.3 - -## 1.2.3 - -### Patch Changes - -- 8f24a514: fix: UserConfig is missing tools.tailwindcss type -- Updated dependencies [deeaa602] -- Updated dependencies [54786e58] - - @modern-js/utils@1.3.2 - - @modern-js/core@1.4.3 - -## 1.2.2 - -### Patch Changes - -- 6891e4c2: add @modern-js/plugin-design-token, support 'source.designSystem.supportStyledComponents' config -- Updated dependencies [6891e4c2] -- Updated dependencies [b376c8d6] -- Updated dependencies [e62c4efd] -- Updated dependencies [e2a8233f] - - @modern-js/plugin-design-token@1.0.1 - - @modern-js/core@1.4.2 - -## 1.2.1 - -### Patch Changes - -- 83166714: change .npmignore -- Updated dependencies [83166714] -- Updated dependencies [c3de9882] -- Updated dependencies [33ff48af] - - @modern-js/core@1.3.2 - - @modern-js/utils@1.2.2 - -## 1.2.0 - -### Minor Changes - -- cfe11628: Make Modern.js self bootstraping - -### Patch Changes - -- Updated dependencies [2da09c69] -- Updated dependencies [fc71e36f] -- Updated dependencies [c3d46ee4] -- Updated dependencies [cfe11628] - - @modern-js/utils@1.2.0 - - @modern-js/core@1.3.0 - -## 1.1.3 - -### Patch Changes - -- ca7dcb32: fix ignore style files in src dir -- Updated dependencies [90eeb72c] -- Updated dependencies [e04914ce] -- Updated dependencies [5a4c557e] -- Updated dependencies [e04914ce] -- Updated dependencies [ca7dcb32] -- Updated dependencies [ecb344dc] - - @modern-js/core@1.2.0 - - @modern-js/utils@1.1.5 - -## 1.1.2 - -### Patch Changes - -- 0fa83663: support more .env files -- Updated dependencies [6f7fe574] -- Updated dependencies [0fa83663] -- Updated dependencies [f594fbc8] - - @modern-js/core@1.1.2 - - @modern-js/utils@1.1.2 - -## 1.1.1 - -### Patch Changes - -- cca52250: fix error config - - change `tools.tailwind` to `tools.tailwindcss` - -- Updated dependencies [687c92c7] -- Updated dependencies [c0fc0700] - - @modern-js/core@1.1.1 - - @modern-js/utils@1.1.1 - -## 1.1.0 - -### Minor Changes - -- 96119db2: Relese v1.1.0 - -### Patch Changes - -- Updated dependencies [96119db2] - - @modern-js/core@1.1.0 - - @modern-js/utils@1.1.0 - -## 1.0.0 - -### Patch Changes - -- 224f7fe: fix server route match -- 30ac27c: feat: add generator package description -- 0fd196e: feat: fix bugs -- 63be0a5: fix: #118 #104 -- Updated dependencies [224f7fe] -- Updated dependencies [30ac27c] -- Updated dependencies [0fd196e] -- Updated dependencies [204c626] -- Updated dependencies [63be0a5] - - @modern-js/core@1.0.0 - - @modern-js/utils@1.0.0 - -## 1.0.0-rc.23 - -### Patch Changes - -- 224f7fe: fix server route match -- 30ac27c: feat: add generator package description -- 0fd196e: feat: fix bugs -- 63be0a5: fix: #118 #104 -- Updated dependencies [224f7fe] -- Updated dependencies [30ac27c] -- Updated dependencies [0fd196e] -- Updated dependencies [204c626] -- Updated dependencies [63be0a5] - - @modern-js/core@1.0.0-rc.23 - - @modern-js/utils@1.0.0-rc.23 - -## 1.0.0-rc.22 - -### Patch Changes - -- 224f7fe: fix server route match -- 30ac27c: feat: add generator package description -- 0fd196e: feat: fix bugs -- 63be0a5: fix: #118 #104 -- Updated dependencies [224f7fe] -- Updated dependencies [30ac27c] -- Updated dependencies [0fd196e] -- Updated dependencies [204c626] -- Updated dependencies [63be0a5] - - @modern-js/core@1.0.0-rc.22 - - @modern-js/utils@1.0.0-rc.22 - -## 1.0.0-rc.21 - -### Patch Changes - -- 224f7fe: fix server route match -- 30ac27c: feat: add generator package description -- 0fd196e: feat: fix bugs -- 63be0a5: fix: #118 #104 -- Updated dependencies [224f7fe] -- Updated dependencies [30ac27c] -- Updated dependencies [0fd196e] -- Updated dependencies [204c626] -- Updated dependencies [63be0a5] - - @modern-js/core@1.0.0-rc.21 - - @modern-js/utils@1.0.0-rc.21 - -## 1.0.0-rc.20 - -### Patch Changes - -- 224f7fe: fix server route match -- 30ac27c: feat: add generator package description -- feat: fix bugs -- 63be0a5: fix: #118 #104 -- Updated dependencies [224f7fe] -- Updated dependencies [30ac27c] -- Updated dependencies [undefined] -- Updated dependencies [204c626] -- Updated dependencies [63be0a5] - - @modern-js/core@1.0.0-rc.20 - - @modern-js/utils@1.0.0-rc.20 - -## 1.0.0-rc.19 - -### Patch Changes - -- 224f7fe: fix server route match -- 30ac27c: feat: add generator package description -- 63be0a5: fix: #118 #104 -- Updated dependencies [224f7fe] -- Updated dependencies [30ac27c] -- Updated dependencies [204c626] -- Updated dependencies [63be0a5] - - @modern-js/core@1.0.0-rc.19 - - @modern-js/utils@1.0.0-rc.19 - -## 1.0.0-rc.18 - -### Patch Changes - -- 224f7fe: fix server route match -- 30ac27c: feat: add generator package description -- 63be0a5: fix: #118 #104 -- Updated dependencies [224f7fe] -- Updated dependencies [30ac27c] -- Updated dependencies [204c626] -- Updated dependencies [63be0a5] - - @modern-js/core@1.0.0-rc.18 - - @modern-js/utils@1.0.0-rc.18 - -## 1.0.0-rc.17 - -### Patch Changes - -- 224f7fe: fix server route match -- 30ac27c: feat: add generator package description -- fix: #118 #104 -- Updated dependencies [224f7fe] -- Updated dependencies [30ac27c] -- Updated dependencies [204c626] -- Updated dependencies [undefined] - - @modern-js/core@1.0.0-rc.17 - - @modern-js/utils@1.0.0-rc.17 - -## 1.0.0-rc.16 - -### Patch Changes - -- 224f7fe: fix server route match -- 30ac27c: feat: add generator package description -- Updated dependencies [224f7fe] -- Updated dependencies [30ac27c] -- Updated dependencies [204c626] - - @modern-js/core@1.0.0-rc.16 - - @modern-js/utils@1.0.0-rc.16 - -## 1.0.0-rc.15 - -### Patch Changes - -- 224f7fe: fix server route match -- 30ac27c: feat: add generator package description -- Updated dependencies [224f7fe] -- Updated dependencies [30ac27c] -- Updated dependencies [204c626] - - @modern-js/core@1.0.0-rc.15 - - @modern-js/utils@1.0.0-rc.15 - -## 1.0.0-rc.14 - -### Patch Changes - -- 224f7fe: fix server route match -- Updated dependencies [224f7fe] -- Updated dependencies [204c626] - - @modern-js/core@1.0.0-rc.14 - - @modern-js/utils@1.0.0-rc.14 - -## 1.0.0-rc.13 - -### Patch Changes - -- 224f7fe: fix server route match -- Updated dependencies [224f7fe] -- Updated dependencies [204c626] - - @modern-js/core@1.0.0-rc.13 - - @modern-js/utils@1.0.0-rc.13 - -## 1.0.0-rc.12 - -### Patch Changes - -- 224f7fe: fix server route match -- Updated dependencies [224f7fe] -- Updated dependencies [204c626] - - @modern-js/core@1.0.0-rc.12 - - @modern-js/utils@1.0.0-rc.12 - -## 1.0.0-rc.11 - -### Patch Changes - -- 224f7fe: fix server route match -- Updated dependencies [224f7fe] -- Updated dependencies [204c626] - - @modern-js/core@1.0.0-rc.11 - - @modern-js/utils@1.0.0-rc.11 - -## 1.0.0-rc.10 - -### Patch Changes - -- 224f7fe: fix server route match -- Updated dependencies [224f7fe] -- Updated dependencies [204c626] - - @modern-js/core@1.0.0-rc.10 - - @modern-js/utils@1.0.0-rc.10 - -## 1.0.0-rc.9 - -### Patch Changes - -- 224f7fe: fix server route match -- Updated dependencies [224f7fe] -- Updated dependencies [204c626] - - @modern-js/core@1.0.0-rc.9 - - @modern-js/utils@1.0.0-rc.9 - -## 1.0.0-rc.8 - -### Patch Changes - -- 224f7fe: fix server route match -- Updated dependencies [224f7fe] -- Updated dependencies [204c626] - - @modern-js/core@1.0.0-rc.8 - - @modern-js/utils@1.0.0-rc.8 - -## 1.0.0-rc.7 - -### Patch Changes - -- 224f7fe: fix server route match -- Updated dependencies [224f7fe] -- Updated dependencies [204c626] - - @modern-js/core@1.0.0-rc.7 - - @modern-js/utils@1.0.0-rc.7 - -## 1.0.0-rc.6 - -### Patch Changes - -- 224f7fe: fix server route match -- Updated dependencies [224f7fe] -- Updated dependencies [204c626] - - @modern-js/core@1.0.0-rc.6 - - @modern-js/utils@1.0.0-rc.6 - -## 1.0.0-rc.5 - -### Patch Changes - -- 224f7fe: fix server route match -- Updated dependencies [224f7fe] -- Updated dependencies [204c626] - - @modern-js/core@1.0.0-rc.5 - - @modern-js/utils@1.0.0-rc.5 - -## 1.0.0-rc.4 - -### Patch Changes - -- fix server route match -- Updated dependencies [undefined] -- Updated dependencies [204c626] - - @modern-js/core@1.0.0-rc.4 - - @modern-js/utils@1.0.0-rc.4 diff --git a/packages/cli/plugin-tailwind/LICENSE b/packages/cli/plugin-tailwind/LICENSE deleted file mode 100644 index 39e3c5971226..000000000000 --- a/packages/cli/plugin-tailwind/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2021-present Modern.js - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/packages/cli/plugin-tailwind/README.md b/packages/cli/plugin-tailwind/README.md deleted file mode 100644 index f3d407c43230..000000000000 --- a/packages/cli/plugin-tailwind/README.md +++ /dev/null @@ -1,26 +0,0 @@ -

- Modern.js Logo -

- -

Modern.js

- -

- A Progressive React Framework for modern web development. -

- -## Getting Started - -Please follow [Quick Start](https://modernjs.dev/en/guides/get-started/quick-start) to get started with Modern.js. - -## Documentation - -- [English Documentation](https://modernjs.dev/en/) -- [中文文档](https://modernjs.dev) - -## Contributing - -Please read the [Contributing Guide](https://github.com/web-infra-dev/modern.js/blob/main/CONTRIBUTING.md). - -## License - -Modern.js is [MIT licensed](https://github.com/web-infra-dev/modern.js/blob/main/LICENSE). diff --git a/packages/cli/plugin-tailwind/jest.config.js b/packages/cli/plugin-tailwind/jest.config.js deleted file mode 100644 index 5fcd3e5b28bd..000000000000 --- a/packages/cli/plugin-tailwind/jest.config.js +++ /dev/null @@ -1,7 +0,0 @@ -const sharedConfig = require('@scripts/jest-config'); - -/** @type {import('@jest/types').Config.InitialOptions} */ -module.exports = { - ...sharedConfig, - rootDir: __dirname, -}; diff --git a/packages/cli/plugin-tailwind/modern.config.js b/packages/cli/plugin-tailwind/modern.config.js deleted file mode 100644 index 5c0331ad0c29..000000000000 --- a/packages/cli/plugin-tailwind/modern.config.js +++ /dev/null @@ -1,5 +0,0 @@ -const { universalBuildConfig } = require('@scripts/build'); - -module.exports = { - buildConfig: universalBuildConfig, -}; diff --git a/packages/cli/plugin-tailwind/package.json b/packages/cli/plugin-tailwind/package.json deleted file mode 100644 index e570d9cd9308..000000000000 --- a/packages/cli/plugin-tailwind/package.json +++ /dev/null @@ -1,93 +0,0 @@ -{ - "name": "@modern-js/plugin-tailwindcss", - "description": "A Progressive React Framework for modern web development.", - "homepage": "https://modernjs.dev", - "bugs": "https://github.com/web-infra-dev/modern.js/issues", - "repository": { - "type": "git", - "url": "https://github.com/web-infra-dev/modern.js", - "directory": "packages/cli/plugin-tailwind" - }, - "license": "MIT", - "keywords": [ - "react", - "framework", - "modern", - "modern.js" - ], - "version": "2.68.1", - "jsnext:source": "./src/index.ts", - "types": "./src/index.ts", - "main": "./dist/cjs/index.js", - "module": "./dist/esm/index.js", - "exports": { - ".": { - "node": { - "jsnext:source": "./src/index.ts", - "require": "./dist/cjs/index.js" - }, - "types": "./dist/types/index.d.ts", - "default": "./dist/cjs/index.js" - }, - "./cli": { - "jsnext:source": "./src/cli.ts", - "default": "./dist/cjs/cli.js" - }, - "./runtime-design-token": { - "jsnext:source": "./src/design-token/index.ts", - "node": "./dist/cjs/design-token/index.js", - "default": "./dist/esm/design-token/index.js" - } - }, - "typesVersions": { - "*": { - "runtime-design-token": [ - "./dist/types/design-token/index.d.ts" - ] - } - }, - "scripts": { - "prepublishOnly": "only-allow-pnpm", - "new": "modern-lib new", - "dev": "modern-lib build --watch", - "build": "modern-lib build", - "test": "jest --passWithNoTests" - }, - "dependencies": { - "@modern-js/node-bundle-require": "workspace:*", - "@modern-js/runtime-utils": "workspace:*", - "@modern-js/utils": "workspace:*", - "@swc/helpers": "^0.5.17", - "babel-plugin-macros": "3.1.0" - }, - "devDependencies": { - "@modern-js/app-tools": "workspace:*", - "@modern-js/module-tools": "2.68.18", - "@modern-js/runtime": "workspace:*", - "@modern-js/types": "workspace:*", - "@scripts/build": "workspace:*", - "@scripts/jest-config": "workspace:*", - "@types/jest": "^29.5.14", - "@types/node": "^20", - "jest": "^29.7.0", - "postcss": "^8.5.6", - "react": "^19.2.0", - "tailwindcss": "^3.3.3", - "typescript": "^5" - }, - "peerDependencies": { - "tailwindcss": ">= 2.0.0 || >= 3.0.0", - "@modern-js/runtime": "workspace:^2.68.1" - }, - "peerDependenciesMeta": { - "@modern-js/runtime": { - "optional": true - } - }, - "sideEffects": false, - "publishConfig": { - "registry": "https://registry.npmjs.org/", - "access": "public", - "types": "./dist/types/index.d.ts" - } -} diff --git a/packages/cli/plugin-tailwind/src/cli.ts b/packages/cli/plugin-tailwind/src/cli.ts deleted file mode 100644 index 2b8acf928676..000000000000 --- a/packages/cli/plugin-tailwind/src/cli.ts +++ /dev/null @@ -1,104 +0,0 @@ -import type { AppTools, CliPlugin } from '@modern-js/app-tools'; -import { getTailwindConfig, loadConfigFile } from './config'; -import { checkTwinMacroExist, getTwinMacroMajorVersion } from './macro'; -import { getTailwindPath, getTailwindVersion } from './utils'; - -export const tailwindcssPlugin = ( - { pluginName } = { - pluginName: '@modern-js/plugin-tailwindcss', - }, -): CliPlugin => ({ - name: '@modern-js/plugin-tailwindcss', - - setup: async api => { - const { appDirectory } = api.getAppContext(); - // When reinstalling dependencies, most of the time the project will be restarted - const haveTwinMacro = await checkTwinMacroExist(appDirectory); - const tailwindPath = getTailwindPath(appDirectory); - const tailwindVersion = getTailwindVersion(appDirectory); - const { content: userTailwindConfig, path: userTailwindConfigPath } = - await loadConfigFile(appDirectory); - - api.onPrepare(async () => { - if (haveTwinMacro) { - // twin.macro >= v3.0.0 support config object - // twin.macro < v3.0.0 only support config path - // https://github.com/ben-rogerson/twin.macro/releases/tag/3.0.0 - // after v2.64.0, not support config path - const twinMajorVersion = getTwinMacroMajorVersion(appDirectory); - if (twinMajorVersion && twinMajorVersion < 3) { - console.warn( - 'Your twin.macro version is below 3.0.0. Please upgrade to the latest version to avoid potential issues.', - ); - } - } - }); - - api.config(async () => { - let tailwindConfig: Record; - - const initTailwindConfig = () => { - if (!tailwindConfig) { - const modernConfig = api.getNormalizedConfig(); - - if ( - tailwindVersion === '3' && - userTailwindConfig.content && - !modernConfig?.tools?.tailwindcss - ) { - // Prefer to use user's tailwind config file, - // this is faster then passing the config object to `tailwindcss()`. - // see: https://github.com/tailwindlabs/tailwindcss/issues/14229 - tailwindConfig = { - config: userTailwindConfigPath, - }; - } else { - tailwindConfig = getTailwindConfig({ - appDirectory, - tailwindVersion, - userConfig: userTailwindConfig, - extraConfig: modernConfig?.tools?.tailwindcss, - }); - } - } - }; - - return { - tools: { - // TODO: Add interface about postcss config - // TODO: In module project, also is called, but should not be called. - postcss: (config: Record) => { - initTailwindConfig(); - - const tailwindPlugin = require(tailwindPath)(tailwindConfig); - if (Array.isArray(config.postcssOptions.plugins)) { - config.postcssOptions.plugins.push(tailwindPlugin); - } else { - config.postcssOptions.plugins = [tailwindPlugin]; - } - }, - - babel: haveTwinMacro - ? (_, { addPlugins }) => { - const supportCssInJsLibrary = 'styled-components'; - initTailwindConfig(); - addPlugins([ - [ - require.resolve('babel-plugin-macros'), - { - twin: { - preset: supportCssInJsLibrary, - config: tailwindConfig, - }, - }, - ], - ]); - } - : undefined, - }, - }; - }); - }, -}); - -export default tailwindcssPlugin; diff --git a/packages/cli/plugin-tailwind/src/config.ts b/packages/cli/plugin-tailwind/src/config.ts deleted file mode 100644 index e8acc5f0c706..000000000000 --- a/packages/cli/plugin-tailwind/src/config.ts +++ /dev/null @@ -1,78 +0,0 @@ -import path from 'path'; -import { bundleRequire } from '@modern-js/node-bundle-require'; -import { fs, applyOptionsChain, findExists } from '@modern-js/utils'; -import type { ExtraTailwindConfig, TailwindConfig } from './types'; - -function getDefaultContent(appDirectory: string) { - const defaultContent = ['./src/**/*.{js,jsx,ts,tsx}']; - - // Only add storybook and html config when they exist - // Otherwise, it will cause an unnecessary rebuild - if (fs.existsSync(path.join(appDirectory, 'storybook'))) { - defaultContent.push('./storybook/**/*'); - } - if (fs.existsSync(path.join(appDirectory, 'config/html'))) { - defaultContent.push('./config/html/**/*.{html,ejs,hbs}'); - } - - return defaultContent; -} - -const getV2PurgeConfig = (content: string[]) => ({ - enabled: process.env.NODE_ENV === 'production', - layers: ['utilities'], - content, -}); - -export async function loadConfigFile(appDirectory: string) { - const extensions = ['ts', 'js', 'cjs', 'mjs']; - const configs = extensions.map(ext => - path.resolve(appDirectory, `tailwind.config.${ext}`), - ); - const configFile = findExists(configs); - - if (configFile) { - const mod = await bundleRequire(configFile); - return { - path: configFile, - content: mod.default || mod, - }; - } - - return { - content: {}, - }; -} - -/** - * Config priority: - * `tools.tailwindcss` (extraConfig) > `tailwind.config.*` (userConfig) > `defaultConfig` - */ -const getTailwindConfig = ({ - tailwindVersion, - appDirectory, - userConfig, - extraConfig, -}: { - tailwindVersion: '2' | '3'; - appDirectory: string; - userConfig: TailwindConfig; - extraConfig?: ExtraTailwindConfig; -}) => { - const content = getDefaultContent(appDirectory); - - let tailwindConfig: TailwindConfig = - tailwindVersion === '3' - ? { content } - : { purge: getV2PurgeConfig(content) }; - - Object.assign(tailwindConfig, userConfig); - - tailwindConfig = extraConfig - ? applyOptionsChain(tailwindConfig, extraConfig) - : tailwindConfig; - - return tailwindConfig; -}; - -export { getTailwindConfig }; diff --git a/packages/cli/plugin-tailwind/src/index.ts b/packages/cli/plugin-tailwind/src/index.ts deleted file mode 100644 index 96d8bd38a312..000000000000 --- a/packages/cli/plugin-tailwind/src/index.ts +++ /dev/null @@ -1,4 +0,0 @@ -import { tailwindcssPlugin } from './cli'; - -export { tailwindcssPlugin }; -export default tailwindcssPlugin; diff --git a/packages/cli/plugin-tailwind/src/macro.ts b/packages/cli/plugin-tailwind/src/macro.ts deleted file mode 100644 index 63183f963396..000000000000 --- a/packages/cli/plugin-tailwind/src/macro.ts +++ /dev/null @@ -1,30 +0,0 @@ -import path from 'path'; -import { fs, nanoid, slash } from '@modern-js/utils'; - -const TWIN_MACRO_NAME = 'twin.macro'; - -export const checkTwinMacroExist = async (appDirectory: string) => { - const packageJson = - (await fs.readJSON(path.join(appDirectory, 'package.json'), { - throws: false, - })) || {}; - - return Boolean( - (typeof packageJson.dependencies === 'object' && - packageJson.dependencies[TWIN_MACRO_NAME]) || - (typeof packageJson.devDependencies === 'object' && - packageJson.devDependencies[TWIN_MACRO_NAME]), - ); -}; - -export const getTwinMacroMajorVersion = (appDirectory: string) => { - try { - const pkgJsonPath = require.resolve(`${TWIN_MACRO_NAME}/package.json`, { - paths: [appDirectory], - }); - const { version } = require(pkgJsonPath); - return Number(version.split('.')[0]); - } catch (err) { - return null; - } -}; diff --git a/packages/cli/plugin-tailwind/src/types.ts b/packages/cli/plugin-tailwind/src/types.ts deleted file mode 100644 index 8885abbefe4b..000000000000 --- a/packages/cli/plugin-tailwind/src/types.ts +++ /dev/null @@ -1,5 +0,0 @@ -export type TailwindConfig = Record; - -export type ExtraTailwindConfig = - | TailwindConfig - | ((options: TailwindConfig) => TailwindConfig | void); diff --git a/packages/cli/plugin-tailwind/src/utils.ts b/packages/cli/plugin-tailwind/src/utils.ts deleted file mode 100644 index 3b5c2916246e..000000000000 --- a/packages/cli/plugin-tailwind/src/utils.ts +++ /dev/null @@ -1,18 +0,0 @@ -export function getTailwindPath(appDirectory: string) { - try { - return require.resolve('tailwindcss', { paths: [appDirectory, __dirname] }); - } catch (err) { - return 'tailwindcss'; - } -} - -export function getTailwindVersion(appDirectory: string): '2' | '3' { - try { - const packageJsonPath = require.resolve('tailwindcss/package.json', { - paths: [appDirectory, __dirname], - }); - return require(packageJsonPath).version.split('.')[0]; - } catch (err) { - return '3'; - } -} diff --git a/packages/cli/plugin-tailwind/tests/fixtures/twin-macro/package.json b/packages/cli/plugin-tailwind/tests/fixtures/twin-macro/package.json deleted file mode 100644 index a6d4a6b4d56f..000000000000 --- a/packages/cli/plugin-tailwind/tests/fixtures/twin-macro/package.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name": "@unit-test/twin-macro", - "dependencies": {}, - "devDependencies": {} -} diff --git a/packages/cli/plugin-tailwind/tests/index.test.ts b/packages/cli/plugin-tailwind/tests/index.test.ts deleted file mode 100644 index cdbe7a4169b6..000000000000 --- a/packages/cli/plugin-tailwind/tests/index.test.ts +++ /dev/null @@ -1,7 +0,0 @@ -import plugin from '../src'; - -describe('plugin-tailwind', () => { - it('default', () => { - expect(plugin).toBeDefined(); - }); -}); diff --git a/packages/cli/plugin-tailwind/tests/macro.test.ts b/packages/cli/plugin-tailwind/tests/macro.test.ts deleted file mode 100644 index 637f1e922982..000000000000 --- a/packages/cli/plugin-tailwind/tests/macro.test.ts +++ /dev/null @@ -1,52 +0,0 @@ -import path from 'path'; -import { fs } from '@modern-js/utils'; -import { checkTwinMacroExist } from '../src/macro'; - -describe('checkTwinMacroExist', () => { - let originPkgContent = ''; - const projectDir = path.join(__dirname, './fixtures/twin-macro'); - const pkgPath = path.join(projectDir, 'package.json'); - const addTwinMacroToDependencies = () => { - const content = `{"dependencies": {"twin.macro": "latest"}}`; - fs.writeFileSync(pkgPath, content, 'utf-8'); - }; - const addTwinMacroToDevDependencies = () => { - const content = `{"devDependencies": {"twin.macro": "latest"}}`; - fs.writeFileSync(pkgPath, content, 'utf-8'); - }; - const addBrokenJsonContent = () => { - const content = `{"devDependencies": {"twin.macro": "latest"}`; - fs.writeFileSync(pkgPath, content, 'utf-8'); - }; - - beforeAll(() => { - originPkgContent = fs.readFileSync(pkgPath, 'utf-8'); - }); - - it('should return `false` when not have `twin.macro` dependency in package.json`s dependencies and devDependencies', async () => { - const result = await checkTwinMacroExist(projectDir); - expect(result).toBe(false); - }); - - it('should return `true` when have `twin.macro` dependency in package.json`s dependencies', async () => { - addTwinMacroToDependencies(); - const result = await checkTwinMacroExist(projectDir); - expect(result).toBe(true); - }); - - it('should return `true` when not have `twin.macro` dependency in package.json`s devDependencies', async () => { - addTwinMacroToDevDependencies(); - const result = await checkTwinMacroExist(projectDir); - expect(result).toBe(true); - }); - - it('should return `false` when package.json is broken json file', async () => { - addBrokenJsonContent(); - const result = await checkTwinMacroExist(projectDir); - expect(result).toBe(false); - }); - - afterAll(() => { - fs.writeFileSync(pkgPath, originPkgContent, 'utf-8'); - }); -}); diff --git a/packages/cli/plugin-tailwind/tests/tsconfig.json b/packages/cli/plugin-tailwind/tests/tsconfig.json deleted file mode 100644 index f3dda7de3e04..000000000000 --- a/packages/cli/plugin-tailwind/tests/tsconfig.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "extends": "@modern-js/tsconfig/base", - "compilerOptions": { - "declaration": true, - "jsx": "preserve", - "baseUrl": "./", - "outDir": "./out", - "emitDeclarationOnly": true, - "isolatedModules": true, - "paths": {}, - "types": ["node", "jest"] - }, - "include": ["./"] -} diff --git a/packages/cli/plugin-tailwind/tsconfig.json b/packages/cli/plugin-tailwind/tsconfig.json deleted file mode 100644 index e02117a9771c..000000000000 --- a/packages/cli/plugin-tailwind/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "@modern-js/tsconfig/base", - "compilerOptions": { - "declaration": false, - "jsx": "preserve", - "baseUrl": "./", - "isolatedModules": true, - "paths": {} - }, - "include": ["src"] -} diff --git a/packages/document/main-doc/docs/en/plugin/official/cli-plugins.mdx b/packages/document/main-doc/docs/en/plugin/official/cli-plugins.mdx index 1fa09241d798..d90dc8ba2048 100644 --- a/packages/document/main-doc/docs/en/plugin/official/cli-plugins.mdx +++ b/packages/document/main-doc/docs/en/plugin/official/cli-plugins.mdx @@ -1,5 +1,4 @@ # Overview -- [@modern-js/plugin-tailwindcss](/plugin/official/cli-plugins/plugin-tailwind): Enables the use of Tailwind CSS styles. - [@modern-js/plugin-bff](/plugin/official/cli-plugins/plugin-bff): Provides BFF services and unified invocation capabilities. - [@modern-js/plugin-ssg](/plugin/official/cli-plugins/plugin-ssg): Provides static site generation capabilities. diff --git a/packages/document/main-doc/docs/en/tutorials/first-app/c03-css.mdx b/packages/document/main-doc/docs/en/tutorials/first-app/c03-css.mdx index 001dea2f592f..e2739574abcf 100644 --- a/packages/document/main-doc/docs/en/tutorials/first-app/c03-css.mdx +++ b/packages/document/main-doc/docs/en/tutorials/first-app/c03-css.mdx @@ -112,37 +112,47 @@ The UI to be implemented this time is more complex and has an internal structure Modern.js integrates the mainstream, light, general-purpose Utility Class library [Tailwind CSS](https://tailwindcss.com/). -Execute `pnpm run new` and select the following to start Tailwind CSS: +Install the tailwindcss package to integrate Tailwind CSS: -```bash -? Please select the operation you want: Enable features -? Please select the feature name: Enable Tailwind CSS -``` +import { PackageManagerTabs } from '@theme'; -Register the Tailwind plugin in `modern.config.ts`: + -```ts title="modern.config.ts" -import { appTools, defineConfig } from '@modern-js/app-tools'; -import { tailwindcssPlugin } from '@modern-js/plugin-tailwindcss'; +Register the tailwindcss PostCSS plugin via `postcss.config.cjs`: -export default defineConfig({ - runtime: { - router: true, - state: true, +```js title="postcss.config.cjs" +module.exports = { + plugins: { + tailwindcss: {}, }, - server: { - ssr: true, +}; +``` + +Create a tailwind.config.js file in the root directory of the current project and add the following content: + +```js title="tailwind.config.js" +/** @type {import('tailwindcss').Config} */ +module.exports = { + content: ['./src/**/*.{html,js,ts,jsx,tsx}'], + theme: { + extend: {}, }, - plugins: [appTools(), tailwindcssPlugin()], -}); + plugins: [], +}; ``` -Import the Tailwind CSS css file at the top of `src/routes/page.tsx` to start a quick implementation of the professional UI: +Add the @tailwind directives in the CSS entry file: -```js -import 'tailwindcss/base.css'; -import 'tailwindcss/components.css'; -import 'tailwindcss/utilities.css'; +```css title="main.css" +@tailwind base; +@tailwind components; +@tailwind utilities; ``` Create the Item component first: diff --git a/packages/document/main-doc/docs/en/tutorials/first-app/c08-entries.mdx b/packages/document/main-doc/docs/en/tutorials/first-app/c08-entries.mdx index af98aa22bd77..443103a8315d 100644 --- a/packages/document/main-doc/docs/en/tutorials/first-app/c08-entries.mdx +++ b/packages/document/main-doc/docs/en/tutorials/first-app/c08-entries.mdx @@ -1,6 +1,7 @@ --- title: Add Application Entry --- + # Add Application Entry In the last chapter, we basically completed the development of the point of contact list application, introduced the usage of some functions in the Modern.js, and recommended best practices. @@ -95,7 +96,6 @@ Now, modify the `modern.config.ts` to add something: ```ts title="modern.config.ts" import { appTools, defineConfig } from '@modern-js/app-tools'; -import { tailwindcssPlugin } from '@modern-js/plugin-tailwindcss'; export default defineConfig({ runtime: { @@ -108,7 +108,7 @@ export default defineConfig({ 'landing-page': false, }, }, - plugins: [appTools(), tailwindcssPlugin()], + plugins: [appTools()], }); ``` diff --git a/packages/document/main-doc/docs/zh/plugin/official/cli-plugins.mdx b/packages/document/main-doc/docs/zh/plugin/official/cli-plugins.mdx index 16468fb240e8..634736040a47 100644 --- a/packages/document/main-doc/docs/zh/plugin/official/cli-plugins.mdx +++ b/packages/document/main-doc/docs/zh/plugin/official/cli-plugins.mdx @@ -1,5 +1,4 @@ # 概览 -- [@modern-js/plugin-tailwindcss](/plugin/official/cli-plugins/plugin-tailwind)：提供使用 Tailwind CSS 样式的能力。 - [@modern-js/plugin-bff](/plugin/official/cli-plugins/plugin-bff)：提供 BFF 服务，一体化调用的能力。 - [@modern-js/plugin-ssg](/plugin/official/cli-plugins/plugin-bff)：提供静态站点生成的能力。 diff --git a/packages/document/main-doc/docs/zh/tutorials/first-app/c03-css.mdx b/packages/document/main-doc/docs/zh/tutorials/first-app/c03-css.mdx index f1de0d3ba274..f6ff6c35d635 100644 --- a/packages/document/main-doc/docs/zh/tutorials/first-app/c03-css.mdx +++ b/packages/document/main-doc/docs/zh/tutorials/first-app/c03-css.mdx @@ -1,9 +1,10 @@ --- title: 添加样式 --- + # 添加样式 -import { Tabs, Tab as TabItem } from "@theme"; +import { Tabs, Tab as TabItem } from '@theme'; 上一章节中，我们学习了如何使用使用三方库中的组件。 @@ -109,39 +110,49 @@ export default Avatar; 这次要实现的 UI 更复杂，有内部结构，但另一方面，并没有 `` 组件的**很粗的亮蓝色边框**这样很特殊的 UI，都是很常规的水平垂直布局、居中、字体样式等。这种情况下，其实根本没必要写 CSS，有更高效的、跟 styled-components 互补的实现方式：**Utility Class**。 -Modern.js 集成了主流、轻量、通用的 Utility Class 工具库 [Tailwind CSS](https://tailwindcss.com/)。 +Modern.js 支持主流、轻量、通用的 Utility Class 工具库 [Tailwind CSS](https://tailwindcss.com/)。 -执行 `pnpm run new`，进行如下选择，开启 Tailwind CSS： +安装 tailwindcss 包来接入 Tailwind CSS： -```bash -? 请选择你想要的操作 启用可选功能 -? 请选择功能名称 启用 「Tailwind CSS」 支持 -``` +import { PackageManagerTabs } from '@theme'; -在 `modern.config.ts` 中注册 Tailwind 插件: + -```ts title="modern.config.ts" -import { appTools, defineConfig } from '@modern-js/app-tools'; -import { tailwindcssPlugin } from '@modern-js/plugin-tailwindcss'; +通过 `postcss.config.cjs` 来注册 tailwindcss 的 PostCSS 插件： -export default defineConfig({ - runtime: { - router: true, - state: true, +```js title="postcss.config.cjss" +module.exports = { + plugins: { + tailwindcss: {}, }, - server: { - ssr: true, +}; +``` + +在当前项目的根目录创建 tailwind.config.js 文件，并添加以下内容： + +```js title="tailwind.config.js" +/** @type {import('tailwindcss').Config} */ +module.exports = { + content: ['./src/**/*.{html,js,ts,jsx,tsx}'], + theme: { + extend: {}, }, - plugins: [appTools(), tailwindcssPlugin()], -}); + plugins: [], +}; ``` -在 `src/routes/page.tsx` 顶部引入 Tailwind CSS 的 css 文件，就可以开始快速实现专业的 UI： +在 CSS 入口文件中添加 @tailwind 指令： -```js -import 'tailwindcss/base.css'; -import 'tailwindcss/components.css'; -import 'tailwindcss/utilities.css'; +```css title="main.css" +@tailwind base; +@tailwind components; +@tailwind utilities; ``` 先创建 Item 组件： diff --git a/packages/document/main-doc/docs/zh/tutorials/first-app/c08-entries.mdx b/packages/document/main-doc/docs/zh/tutorials/first-app/c08-entries.mdx index 189a255e2eb7..9851db148947 100644 --- a/packages/document/main-doc/docs/zh/tutorials/first-app/c08-entries.mdx +++ b/packages/document/main-doc/docs/zh/tutorials/first-app/c08-entries.mdx @@ -95,7 +95,6 @@ mv src/myapp src/contacts ```ts title="modern.config.ts" import { appTools, defineConfig } from '@modern-js/app-tools'; -import { tailwindcssPlugin } from '@modern-js/plugin-tailwindcss'; export default defineConfig({ runtime: { @@ -108,7 +107,7 @@ export default defineConfig({ 'landing-page': false, }, }, - plugins: [appTools(), tailwindcssPlugin()], + plugins: [appTools()], }); ``` diff --git a/packages/generator/generator-common/src/locale/en.ts b/packages/generator/generator-common/src/locale/en.ts index 1dc008f29a69..9982792a0023 100644 --- a/packages/generator/generator-common/src/locale/en.ts +++ b/packages/generator/generator-common/src/locale/en.ts @@ -4,7 +4,6 @@ export const EN_LOCALE = { function: { self: 'Enable Features', question: 'Please select the feature name:', - tailwindcss: 'Enable Tailwind CSS', bff: 'Enable BFF', i18n: 'Enable Internationalization (i18n)', ssg: 'Enable SSG', diff --git a/packages/generator/generator-common/src/locale/zh.ts b/packages/generator/generator-common/src/locale/zh.ts index f15305f1ce28..2fcc57217dd0 100644 --- a/packages/generator/generator-common/src/locale/zh.ts +++ b/packages/generator/generator-common/src/locale/zh.ts @@ -4,7 +4,6 @@ export const ZH_LOCALE = { function: { self: '启用可选功能', question: '请选择功能名称', - tailwindcss: '启用「Tailwind CSS」 支持', bff: '启用「BFF」功能', i18n: '启用「国际化（i18n）」功能', ssg: '启用「SSG」功能', diff --git a/packages/generator/generator-common/src/newAction/common/index.ts b/packages/generator/generator-common/src/newAction/common/index.ts index b7f3b020a219..45a931a83c6d 100644 --- a/packages/generator/generator-common/src/newAction/common/index.ts +++ b/packages/generator/generator-common/src/newAction/common/index.ts @@ -11,7 +11,6 @@ export enum ActionElement { } export enum ActionFunction { - TailwindCSS = 'tailwindcss', BFF = 'bff', I18n = 'i18n', SSG = 'ssg', @@ -34,8 +33,6 @@ export const ActionElementText: Record string> = { }; export const ActionFunctionText: Record string> = { - [ActionFunction.TailwindCSS]: () => - i18n.t(localeKeys.action.function.tailwindcss), [ActionFunction.BFF]: () => i18n.t(localeKeys.action.function.bff), [ActionFunction.I18n]: () => i18n.t(localeKeys.action.function.i18n), [ActionFunction.SSG]: () => i18n.t(localeKeys.action.function.ssg), diff --git a/packages/generator/generator-common/src/newAction/mwa/index.ts b/packages/generator/generator-common/src/newAction/mwa/index.ts index 81fd9de99bf5..f134b9df7bfb 100644 --- a/packages/generator/generator-common/src/newAction/mwa/index.ts +++ b/packages/generator/generator-common/src/newAction/mwa/index.ts @@ -13,7 +13,6 @@ import { export const MWAActionTypes = [ActionType.Element, ActionType.Function]; export const MWAActionFunctions = [ - ActionFunction.TailwindCSS, ActionFunction.BFF, ActionFunction.SSG, ActionFunction.Polyfill, @@ -83,14 +82,12 @@ export const MWAActionFunctionsDevDependencies: Partial< Record > = { [ActionFunction.SSG]: '@modern-js/plugin-ssg', - [ActionFunction.TailwindCSS]: 'tailwindcss', }; export const MWAActionFunctionsDependencies: Partial< Record > = { [ActionFunction.BFF]: '@modern-js/plugin-bff', - [ActionFunction.TailwindCSS]: '@modern-js/plugin-tailwindcss', [ActionFunction.Polyfill]: '@modern-js/plugin-polyfill', }; @@ -107,7 +104,6 @@ export const MWANewActionGenerators: Record< [ActionElement.Server]: '@modern-js/server-generator', }, [ActionType.Function]: { - [ActionFunction.TailwindCSS]: '@modern-js/tailwindcss-generator', [ActionFunction.BFF]: '@modern-js/bff-generator', [ActionFunction.SSG]: '@modern-js/ssg-generator', [ActionFunction.Polyfill]: '@modern-js/dependence-generator', @@ -122,7 +118,6 @@ export const MWANewActionPluginName: Record< [ActionElement.Server]: '', }, [ActionType.Function]: { - [ActionFunction.TailwindCSS]: 'tailwindcssPlugin', [ActionFunction.BFF]: 'bffPlugin', [ActionFunction.SSG]: 'ssgPlugin', [ActionFunction.Polyfill]: 'polyfillPlugin', @@ -137,7 +132,6 @@ export const MWANewActionPluginDependence: Record< [ActionElement.Server]: '', }, [ActionType.Function]: { - [ActionFunction.TailwindCSS]: '@modern-js/plugin-tailwindcss', [ActionFunction.BFF]: '@modern-js/plugin-bff', [ActionFunction.SSG]: '@modern-js/plugin-ssg', [ActionFunction.Polyfill]: '@modern-js/plugin-polyfill', diff --git a/packages/generator/generators/tailwindcss-generator/.npmignore b/packages/generator/generators/tailwindcss-generator/.npmignore deleted file mode 100644 index 353fddf17262..000000000000 --- a/packages/generator/generators/tailwindcss-generator/.npmignore +++ /dev/null @@ -1,31 +0,0 @@ -.DS_Store - -.pnp -.pnp.js -.env.local -.env.*.local -*.log* - -node_modules/ -*.tsbuildinfo -.eslintcache - -coverage/ -output/ -output_resource/ -tests/ - -.vscode/**/* -!.vscode/settings.json -!.vscode/extensions.json -.idea/ - -src/ - -modern.config.* -jest.config.js -.eslintrc.js -.eslintrc -tsconfig.json -CHANGELOG.md - diff --git a/packages/generator/generators/tailwindcss-generator/CHANGELOG.md b/packages/generator/generators/tailwindcss-generator/CHANGELOG.md deleted file mode 100644 index ea836342c11c..000000000000 --- a/packages/generator/generators/tailwindcss-generator/CHANGELOG.md +++ /dev/null @@ -1,979 +0,0 @@ -# @modern-js/tailwindcss-generator - -## 3.7.38 - -## 3.7.37 - -## 3.7.36 - -## 3.7.35 - -## 3.7.34 - -## 3.7.33 - -## 3.7.32 - -## 3.7.31 - -## 3.7.30 - -## 3.7.29 - -## 3.7.28 - -## 3.7.27 - -## 3.7.26 - -## 3.7.25 - -## 3.7.24 - -## 3.7.23 - -## 3.7.22 - -## 3.7.21 - -## 3.7.20 - -## 3.7.19 - -## 3.7.18 - -## 3.7.17 - -## 3.7.16 - -## 3.7.15 - -## 3.7.14 - -## 3.7.13 - -## 3.7.12 - -## 3.7.11 - -## 3.7.10 - -## 3.7.9 - -## 3.7.8 - -## 3.7.7 - -## 3.7.6 - -## 3.7.5 - -## 3.7.4 - -## 3.7.3 - -## 3.7.2 - -## 3.7.1 - -### Patch Changes - -- d886d32: feat: generator upgrade tailwindcss version - - feat: 生成器升级 tailwindcss 版本 - -## 3.7.0 - -### Minor Changes - -- d6986c5: feat: optimize generator download - - feat: 优化生成器下载 - -## 3.6.3 - -### Patch Changes - -- Updated dependencies [303331c] - - @modern-js/utils@2.60.3 - -## 3.6.2 - -### Patch Changes - -- 0b6d335: feat: Optimize generator log information - - feat: 优化生成器日志信息 - -- Updated dependencies [8a709bc] - - @modern-js/utils@2.60.2 - -## 3.6.1 - -### Patch Changes - -- @modern-js/utils@2.60.1 - -## 3.6.0 - -### Patch Changes - -- 65b2922: feat: generator update json add endWithNewLine params - - feat: 生成器更新 json 文件增加 endWithNewLine 参数 - - - @modern-js/utils@2.60.0 - -## 3.5.0 - -### Patch Changes - -- @modern-js/utils@2.59.0 - -## 3.4.17 - -### Patch Changes - -- @modern-js/utils@2.58.3 - -## 3.4.16 - -### Patch Changes - -- 7715b6d: feat: update codesmith version - - feat: 更新 codesmith 版本 - -- Updated dependencies [a1a9373] - - @modern-js/utils@2.58.2 - -## 3.4.15 - -### Patch Changes - -- @modern-js/utils@2.58.1 - -## 3.4.14 - -### Patch Changes - -- @modern-js/utils@2.58.0 - -## 3.4.13 - -### Patch Changes - -- @modern-js/utils@2.57.1 - -## 3.4.12 - -### Patch Changes - -- Updated dependencies [2515b00] - - @modern-js/utils@2.57.0 - -## 3.4.11 - -### Patch Changes - -- @modern-js/utils@2.56.2 - -## 3.4.10 - -### Patch Changes - -- @modern-js/utils@2.56.1 - -## 3.4.9 - -### Patch Changes - -- @modern-js/utils@2.56.0 - -## 3.4.8 - -### Patch Changes - -- Updated dependencies [bbcf55a] - - @modern-js/utils@2.55.0 - -## 3.4.7 - -### Patch Changes - -- @modern-js/utils@2.54.6 - -## 3.4.6 - -### Patch Changes - -- @modern-js/utils@2.54.5 - -## 3.4.5 - -### Patch Changes - -- @modern-js/utils@2.54.4 - -## 3.4.4 - -### Patch Changes - -- @modern-js/utils@2.54.3 - -## 3.4.3 - -### Patch Changes - -- @modern-js/utils@2.54.2 - -## 3.4.2 - -### Patch Changes - -- @modern-js/utils@2.54.1 - -## 3.4.1 - -### Patch Changes - -- Updated dependencies [15a090c] -- Updated dependencies [a8d8f0c] -- Updated dependencies [09798ac] - - @modern-js/utils@2.54.0 - -## 3.4.0 - -### Patch Changes - -- @modern-js/utils@2.53.0 - -## 3.3.25 - -### Patch Changes - -- @modern-js/utils@2.52.0 - -## 3.3.24 - -### Patch Changes - -- @modern-js/utils@2.51.0 - -## 3.3.23 - -### Patch Changes - -- @modern-js/utils@2.50.0 - -## 3.3.22 - -### Patch Changes - -- @modern-js/utils@2.49.4 - -## 3.3.21 - -### Patch Changes - -- @modern-js/utils@2.49.3 - -## 3.3.20 - -### Patch Changes - -- @modern-js/utils@2.49.2 - -## 3.3.19 - -### Patch Changes - -- @modern-js/utils@2.49.1 - -## 3.3.18 - -### Patch Changes - -- Updated dependencies [e8c8c5d] - - @modern-js/utils@2.49.0 - -## 3.3.17 - -### Patch Changes - -- @modern-js/utils@2.48.6 - -## 3.3.16 - -### Patch Changes - -- Updated dependencies [4ca9f4c] - - @modern-js/utils@2.48.5 - -## 3.3.15 - -### Patch Changes - -- Updated dependencies [7d2d433] - - @modern-js/utils@2.48.4 - -## 3.3.14 - -### Patch Changes - -- cd1003a: fix(generator): tailwindcss config file type - fix(generator): tailwindcss 配置文件类型 - - @modern-js/utils@2.48.3 - -## 3.3.13 - -### Patch Changes - -- @modern-js/utils@2.48.2 - -## 3.3.12 - -### Patch Changes - -- Updated dependencies [8942b90] -- Updated dependencies [ce426f7] - - @modern-js/utils@2.48.1 - -## 3.3.11 - -### Patch Changes - -- c246812: chore(generator): extract getGeneratorPath function to generator-utils - fechoreat(generator): 提取 getGeneratorPath 方法到 generator-utils 公共包 -- Updated dependencies [c323a23] - - @modern-js/utils@2.48.0 - -## 3.3.10 - -### Patch Changes - -- @modern-js/utils@2.47.1 - -## 3.3.9 - -### Patch Changes - -- Updated dependencies [a5386ab] - - @modern-js/utils@2.47.0 - -## 3.3.8 - -### Patch Changes - -- @modern-js/utils@2.46.1 - -## 3.3.7 - -### Patch Changes - -- @modern-js/utils@2.46.0 - -## 3.3.6 - -### Patch Changes - -- @modern-js/utils@2.45.0 - -## 3.3.5 - -### Patch Changes - -- @modern-js/utils@2.44.0 - -## 3.3.4 - -### Patch Changes - -- @modern-js/utils@2.43.0 - -## 3.3.3 - -### Patch Changes - -- fa731a7: chore: bump codesmith to 2.3.2 - chore: 升级 codesmith 版本到 2.3.2 - - @modern-js/utils@2.42.2 - -## 3.3.2 - -### Patch Changes - -- @modern-js/utils@2.42.1 - -## 3.3.1 - -### Patch Changes - -- b182eb2: chore: bump codesmith v2.3.1 to show timing - chore: 升级 codesmith 到 v2.3.1, 用于展示执行时间 - - @modern-js/utils@2.42.0 - -## 3.3.0 - -### Patch Changes - -- Updated dependencies [c4d396a] - - @modern-js/utils@2.41.0 - -## 3.2.11 - -### Patch Changes - -- Updated dependencies [95f15d2] - - @modern-js/utils@2.40.0 - -## 3.2.10 - -### Patch Changes - -- @modern-js/utils@2.39.2 - -## 3.2.9 - -### Patch Changes - -- @modern-js/utils@2.39.1 - -## 3.2.8 - -### Patch Changes - -- @modern-js/utils@2.39.0 - -## 3.2.7 - -### Patch Changes - -- 8f43163: feat: optimize generator bundle - - feat: 优化生成器打包 - - - @modern-js/utils@2.38.0 - -## 3.2.6 - -## 3.2.5 - -## 3.2.4 - -## 3.2.3 - -## 3.2.2 - -## 3.2.1 - -## 3.2.0 - -## 3.1.39 - -## 3.1.38 - -### Patch Changes - -- 52d4d32: feat(tailwindcss-generator): bump tailwindcss version to v3.3 - - feat(tailwindcss-generator): 升级 tailwindcss 版本到 v3.3 - -- d386d34: feat(tailwindcss): generate tailwind config file when run new command - - feat(tailwindcss): 执行 new 命令时自动生成 tailwind 配置文件 - -## 3.1.37 - -## 3.1.36 - -### Patch Changes - -- f1de744: chore(generators): adjust build target to es2019 - - chore(generators): 调整构建的 target 为 es2019 - -## 3.1.35 - -## 3.1.34 - -## 3.1.33 - -## 3.1.32 - -## 3.1.31 - -## 3.1.30 - -## 3.1.29 - -## 3.1.28 - -## 3.1.27 - -## 3.1.26 - -## 3.1.25 - -## 3.1.24 - -## 3.1.23 - -## 3.1.22 - -### Patch Changes - -- 7e6fb5f: chore: publishConfig add provenance config - - chore: publishConfig 增加 provenance 配置 - -## 3.1.21 - -## 3.1.20 - -### Patch Changes - -- b647c68: chore(generator): update codesmith version - - chore(generator): 更新 codesmith 版本 - -## 3.1.19 - -## 3.1.18 - -### Patch Changes - -- 26dcf3a: chore: bump typescript to v5 in devDependencies - - chore: 升级 devDependencies 中的 typescript 版本到 v5 - -- de8f73f: feat: update codesmith version - - feat: 更新 codesmith 版本 - -## 3.1.17 - -### Patch Changes - -- 6b9d90a: chore: remove @babel/runtime. add @swc/helper and enable `externalHelper` config. - chore: 移除 @babel/runtime 依赖. 增加 @swc/helpers 依赖并且开启 `externalHelpers` 配置 - -## 3.1.16 - -## 3.1.15 - -## 3.1.14 - -### Patch Changes - -- 21c87bf: feat: bump codesmith packages version - - feat: 升级 codesmith 包版本 - -- bc61dab: feat: bump codesmith version - - feat: 升级 codesmith 版本 - -## 3.1.13 - -## 3.1.12 - -## 3.1.11 - -## 3.1.10 - -### Patch Changes - -- 4e876ab: chore: package.json include the monorepo-relative directory - - chore: 在 package.json 中声明 monorepo 的子路径 - -## 3.1.9 - -## 3.1.8 - -## 3.1.7 - -## 3.1.6 - -## 3.1.5 - -## 3.1.4 - -## 3.1.3 - -## 3.1.2 - -## 3.1.1 - -## 3.1.0 - -### Patch Changes - -- 0da32d0: chore: upgrade jest and puppeteer - chore: 升级 jest 和 puppeteer 到 latest - -## 3.0.11 - -## 3.0.10 - -## 3.0.9 - -## 3.0.8 - -## 3.0.7 - -### Patch Changes - -- 577084d: feat: update codesmith version - - feat: 更新 codesmith 版本 - -## 3.0.6 - -## 3.0.5 - -## 3.0.4 - -## 3.0.3 - -## 3.0.2 - -## 3.0.1 - -## 3.0.0 - -### Major Changes - -- dda38c9c3e: chore: v2 - -## 3.0.0-beta.6 - -### Major Changes - -- dda38c9c3e: chore: v2 - -## 3.0.0-beta.5 - -### Major Changes - -- dda38c9c3e: chore: v2 - -### Patch Changes - -- 6b6f180279: fix: generator bundle - - fix: 生成器打包 - -## 3.0.0-beta.4 - -### Major Changes - -- dda38c9c3e: chore: v2 - -### Patch Changes - -- 6b6f180279: fix: generator bundle - - fix: 生成器打包 - -## 3.0.0-beta.3 - -### Major Changes - -- dda38c9c3e: chore: v2 - -### Patch Changes - -- 6b6f180279: fix: generator bundle - - fix: 生成器打包 - -## 3.0.0-beta.2 - -### Major Changes - -- dda38c9c3e: chore: v2 - -### Patch Changes - -- 6b6f180279: fix: generator bundle - - fix: 生成器打包 - -## 3.0.0-beta.1 - -### Major Changes - -- dda38c9: chore: v2 - -### Patch Changes - -- 6b6f180279: fix: generator bundle - - fix: 生成器打包 - -## 3.0.0-beta.0 - -### Major Changes - -- dda38c9: chore: v2 - -### Patch Changes - -- 6b6f180: fix: generator bundle - - fix: 生成器打包 - -## 2.4.7 - -## 2.4.6 - -## 2.4.5 - -### Patch Changes - -- cfd8557: feat: new command install not run prepare scripts - - feat: new 命令安装依赖时不执行 prepare 脚本 - -## 2.4.4 - -## 2.4.3 - -## 2.4.0 - -## 2.3.4 - -## 2.3.3 - -## 2.3.1 - -## 2.3.0 - -### Patch Changes - -- 9d9bbfd05: feat: update codesmith package - - feat: 升级 codesmith 包版本 - -## 2.2.1 - -## 1.4.0 - -### Minor Changes - -- 52374e3: chore(generator): use module-tools bundle function to bundle generator package - - chore(generator): 使用 module-tools 的 bundle 功能实现生成器打包 - -## 1.3.4 - -### Patch Changes - -- 341bb42: feat: bump codesmith package version - -## 1.3.3 - -### Patch Changes - -- a1198d509: feat: bump babel 7.18.0 -- c7e38b4e6: feat: upgrade codesmith pkg version - -## 1.3.2 - -### Patch Changes - -- 6b0bb5e3b: feat: bump codesmith version - -## 1.3.1 - -### Patch Changes - -- 895fa0ff: chore: using "workspace:\*" in devDependencies - -## 1.3.0 - -### Minor Changes - -- 2b12032c: feat: upgrade csmith tools - -### Patch Changes - -- 6cffe99d: chore: - remove react eslint rules for `modern-js` rule set. - add .eslintrc for each package to speed up linting - -## 1.2.4 - -### Patch Changes - -- 17d0cc46: feat: prebundle lodash to @modern-js/utils/lodash - -## 1.2.3 - -### Patch Changes - -- 83059b93: fix tailwindcss generator - -## 1.2.2 - -### Patch Changes - -- 6668a1bf: feat: upgrade @modern-js/codesmith-api-app version - -## 1.2.1 - -### Patch Changes - -- e06c7c25: change generator main path on development mode - -## 1.2.0 - -### Minor Changes - -- cfe11628: Make Modern.js self bootstraping - -### Patch Changes - -- 2c049918: feat: polyfill function support enable using new command - -## 1.1.7 - -### Patch Changes - -- f73fee4b: feat: upgrade codesmith version to add get npm package timeout's time - -## 1.1.6 - -### Patch Changes - -- 4819a3c7: feat: update generator version - -## 1.1.5 - -### Patch Changes - -- 4a5214db: fix: generator plugin error - -## 1.1.4 - -### Patch Changes - -- feat: bump csmith tools version - -## 1.1.3 - -### Patch Changes - -- e12b3d0b: feat: upgrade codesmith version - -## 1.1.2 - -### Patch Changes - -- fix: tailwindcss version - -## 1.1.1 - -### Patch Changes - -- 2c0750e1: fix generator export config - -## 1.1.0 - -### Minor Changes - -- 96119db2: Relese v1.1.0 - -## 1.0.3 - -### Patch Changes - -- feat: update generator template - -## 1.0.2 - -### Patch Changes - -- feat: update generator template - fix: fix monorepo-tools log info - -## 1.0.1 - -### Patch Changes - -- feat: update generator template version - -## 1.0.0 - -### Patch Changes - -- 30ac27c: feat: add generator package description -- 0fd196e: feat: fix bugs -- 63be0a5: fix: #118 #104 - -## 1.0.0-rc.23 - -### Patch Changes - -- 30ac27c: feat: add generator package description -- 0fd196e: feat: fix bugs -- 63be0a5: fix: #118 #104 - -## 1.0.0-rc.22 - -### Patch Changes - -- 30ac27c: feat: add generator package description -- 0fd196e: feat: fix bugs -- 63be0a5: fix: #118 #104 - -## 1.0.0-rc.21 - -### Patch Changes - -- 30ac27c: feat: add generator package description -- 0fd196e: feat: fix bugs -- 63be0a5: fix: #118 #104 - -## 1.0.0-rc.20 - -### Patch Changes - -- 30ac27c: feat: add generator package description -- feat: fix bugs -- 63be0a5: fix: #118 #104 - -## 1.0.0-rc.19 - -### Patch Changes - -- 30ac27c: feat: add generator package description -- 63be0a5: fix: #118 #104 - -## 1.0.0-rc.18 - -### Patch Changes - -- 30ac27c: feat: add generator package description -- 63be0a5: fix: #118 #104 - -## 1.0.0-rc.17 - -### Patch Changes - -- 30ac27c: feat: add generator package description -- fix: #118 #104 - -## 1.0.0-rc.16 - -### Patch Changes - -- 30ac27c: feat: add generator package description - -## 1.0.0-rc.15 - -### Patch Changes - -- 30ac27c: feat: add generator package description diff --git a/packages/generator/generators/tailwindcss-generator/LICENSE b/packages/generator/generators/tailwindcss-generator/LICENSE deleted file mode 100644 index 39e3c5971226..000000000000 --- a/packages/generator/generators/tailwindcss-generator/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2021-present Modern.js - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/packages/generator/generators/tailwindcss-generator/README.md b/packages/generator/generators/tailwindcss-generator/README.md deleted file mode 100644 index f3d407c43230..000000000000 --- a/packages/generator/generators/tailwindcss-generator/README.md +++ /dev/null @@ -1,26 +0,0 @@ -

- Modern.js Logo -

- -

Modern.js

- -

- A Progressive React Framework for modern web development. -

- -## Getting Started - -Please follow [Quick Start](https://modernjs.dev/en/guides/get-started/quick-start) to get started with Modern.js. - -## Documentation - -- [English Documentation](https://modernjs.dev/en/) -- [中文文档](https://modernjs.dev) - -## Contributing - -Please read the [Contributing Guide](https://github.com/web-infra-dev/modern.js/blob/main/CONTRIBUTING.md). - -## License - -Modern.js is [MIT licensed](https://github.com/web-infra-dev/modern.js/blob/main/LICENSE). diff --git a/packages/generator/generators/tailwindcss-generator/jest.config.js b/packages/generator/generators/tailwindcss-generator/jest.config.js deleted file mode 100644 index 5fcd3e5b28bd..000000000000 --- a/packages/generator/generators/tailwindcss-generator/jest.config.js +++ /dev/null @@ -1,7 +0,0 @@ -const sharedConfig = require('@scripts/jest-config'); - -/** @type {import('@jest/types').Config.InitialOptions} */ -module.exports = { - ...sharedConfig, - rootDir: __dirname, -}; diff --git a/packages/generator/generators/tailwindcss-generator/modern.config.js b/packages/generator/generators/tailwindcss-generator/modern.config.js deleted file mode 100644 index 57303a8d8dfa..000000000000 --- a/packages/generator/generators/tailwindcss-generator/modern.config.js +++ /dev/null @@ -1,5 +0,0 @@ -const { generatorBuildConfig } = require('@scripts/build'); - -module.exports = { - buildConfig: generatorBuildConfig, -}; diff --git a/packages/generator/generators/tailwindcss-generator/package.json b/packages/generator/generators/tailwindcss-generator/package.json deleted file mode 100644 index 97ed13336cc5..000000000000 --- a/packages/generator/generators/tailwindcss-generator/package.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "name": "@modern-js/tailwindcss-generator", - "description": "A Progressive React Framework for modern web development.", - "homepage": "https://modernjs.dev", - "bugs": "https://github.com/web-infra-dev/modern.js/issues", - "repository": { - "type": "git", - "url": "https://github.com/web-infra-dev/modern.js", - "directory": "packages/generator/generators/tailwindcss-generator" - }, - "license": "MIT", - "keywords": [ - "react", - "framework", - "modern", - "modern.js" - ], - "version": "3.7.38", - "jsnext:source": "./src/index.ts", - "main": "./src/index.ts", - "files": [ - "/templates", - "/dist/index.js" - ], - "scripts": { - "prepublishOnly": "only-allow-pnpm", - "new": "modern-lib new", - "build": "modern-lib build", - "test": "jest --passWithNoTests" - }, - "devDependencies": { - "@modern-js/codesmith": "2.6.8", - "@modern-js/codesmith-api-app": "2.6.8", - "@modern-js/codesmith-api-json": "2.6.8", - "@modern-js/codesmith-utils": "2.6.8", - "@modern-js/dependence-generator": "workspace:*", - "@modern-js/generator-common": "workspace:*", - "@modern-js/generator-utils": "workspace:*", - "@scripts/build": "workspace:*", - "@scripts/jest-config": "workspace:*", - "@types/jest": "^29.5.14", - "@types/node": "^20", - "jest": "^29.7.0", - "typescript": "^5" - }, - "sideEffects": false, - "publishConfig": { - "main": "./dist/index.js", - "registry": "https://registry.npmjs.org/", - "access": "public" - }, - "types": "./src/index.ts" -} diff --git a/packages/generator/generators/tailwindcss-generator/src/index.ts b/packages/generator/generators/tailwindcss-generator/src/index.ts deleted file mode 100644 index dc63272f3cc6..000000000000 --- a/packages/generator/generators/tailwindcss-generator/src/index.ts +++ /dev/null @@ -1,85 +0,0 @@ -import path from 'path'; -import type { GeneratorContext, GeneratorCore } from '@modern-js/codesmith'; -import { AppAPI } from '@modern-js/codesmith-api-app'; -import { JsonAPI } from '@modern-js/codesmith-api-json'; -import { DependenceGenerator, i18n } from '@modern-js/generator-common'; -import { - getGeneratorPath, - readTsConfigByFile, -} from '@modern-js/generator-utils'; - -export const handleTemplateFile = async ( - context: GeneratorContext, - generator: GeneratorCore, - appApi: AppAPI, -) => { - const appDir = context.materials.default.basePath; - const jsonAPI = new JsonAPI(generator); - - await appApi.forgeTemplate( - 'templates/ts-template/**/*', - undefined, - resourceKey => resourceKey.replace('templates/ts-template/', ''), - ); - - const tsconfigJSON = readTsConfigByFile(path.join(appDir, 'tsconfig.json')); - - if (!(tsconfigJSON.include || []).includes('tailwind.config.ts')) { - await jsonAPI.update( - context.materials.default.get(path.join(appDir, 'tsconfig.json')), - { - query: {}, - update: { - $set: { - include: [...(tsconfigJSON.include || []), 'tailwind.config.ts'], - }, - }, - }, - true, - ); - } - - const { dependencies, peerDependencies, devDependencies } = context.config; - const tailwindVersion = '~3.4.14'; - if (dependencies?.tailwindcss) { - dependencies.tailwindcss = tailwindVersion; - } - if (peerDependencies?.tailwindcss) { - peerDependencies.tailwindcss = tailwindVersion; - } - if (devDependencies?.tailwindcss) { - devDependencies.tailwindcss = tailwindVersion; - } - await appApi.runSubGenerator( - getGeneratorPath(DependenceGenerator, context.config.distTag, [__dirname]), - undefined, - { - ...context.config, - dependencies, - devDependencies, - peerDependencies, - }, - ); -}; - -export default async (context: GeneratorContext, generator: GeneratorCore) => { - const appApi = new AppAPI(context, generator); - - const { locale } = context.config; - i18n.changeLanguage({ locale }); - appApi.i18n.changeLanguage({ locale }); - - if (!(await appApi.checkEnvironment())) { - process.exit(1); - } - - generator.logger.debug(`🚀 [Start Run Tailwindcss Generator]`); - generator.logger.debug( - '💡 [Current Config]:', - JSON.stringify(context.config), - ); - - await handleTemplateFile(context, generator, appApi); - - generator.logger.debug(`🌟 [End Run Tailwindcss Generator]`); -}; diff --git a/packages/generator/generators/tailwindcss-generator/templates/ts-template/tailwind.config.ts b/packages/generator/generators/tailwindcss-generator/templates/ts-template/tailwind.config.ts deleted file mode 100644 index f6fec468f456..000000000000 --- a/packages/generator/generators/tailwindcss-generator/templates/ts-template/tailwind.config.ts +++ /dev/null @@ -1,5 +0,0 @@ -import type { Config } from 'tailwindcss'; - -export default { - content: ['./src/**/*.{js,jsx,ts,tsx}'], -} satisfies Config; diff --git a/packages/generator/generators/tailwindcss-generator/tsconfig.json b/packages/generator/generators/tailwindcss-generator/tsconfig.json deleted file mode 100644 index c8feb82f7d2b..000000000000 --- a/packages/generator/generators/tailwindcss-generator/tsconfig.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "@modern-js/tsconfig/base", - "compilerOptions": { - "declaration": false, - "jsx": "preserve", - "baseUrl": "./", - "paths": {} - }, - "include": ["src", "templates"] -} diff --git a/packages/generator/new-action/src/mwa.ts b/packages/generator/new-action/src/mwa.ts index 527dd304c9e8..218de59a1e79 100644 --- a/packages/generator/new-action/src/mwa.ts +++ b/packages/generator/new-action/src/mwa.ts @@ -78,7 +78,6 @@ export const MWANewAction = async (options: IMWANewActionOption) => { `@modern-js/server-generator@${distTag || 'latest'}`, `@modern-js/entry-generator@${distTag || 'latest'}`, `@modern-js/ssg-generator@${distTag || 'latest'}`, - `@modern-js/tailwindcss-generator@${distTag || 'latest'}`, ]); const formilyAPI = new FormilyAPI({ diff --git a/scripts/check-dependencies.js b/scripts/check-dependencies.js index dca8ad257b92..430d276808db 100644 --- a/scripts/check-dependencies.js +++ b/scripts/check-dependencies.js @@ -4,7 +4,6 @@ const ignoreDeps = [ 'react-router-dom', 'tailwindcss', 'tsconfig-paths', - 'twin.macro', 'typescript', 'lru-cache', ]; diff --git a/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v2/modern.config.ts b/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v2/modern.config.ts deleted file mode 100644 index 951186c44a8e..000000000000 --- a/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v2/modern.config.ts +++ /dev/null @@ -1,6 +0,0 @@ -// import { tailwindcssPlugin } from '@modern-js/plugin-tailwindcss'; -import { applyBaseConfig } from '../../../../utils/applyBaseConfig'; - -export default applyBaseConfig({ - plugins: [], -}); diff --git a/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v2/package.json b/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v2/package.json deleted file mode 100644 index 2318c45259f2..000000000000 --- a/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v2/package.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "private": true, - "name": "integration-rsbuild-tailwindcss-v2", - "version": "2.66.0", - "scripts": { - "dev": "modern dev", - "build": "modern build", - "serve": "modern serve", - "new": "modern new" - }, - "dependencies": { - "@modern-js/app-tools": "workspace:*", - "@modern-js/runtime": "workspace:*", - "react": "^19.2.0", - "react-dom": "^19.2.0", - "tailwindcss": "^2" - } -} diff --git a/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v2/src/App.jsx b/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v2/src/App.jsx deleted file mode 100644 index 8aa33099ea58..000000000000 --- a/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v2/src/App.jsx +++ /dev/null @@ -1,82 +0,0 @@ -import './app.css'; -import 'tailwindcss/base.css'; -import 'tailwindcss/components.css'; -import 'tailwindcss/utilities.css'; -import { useEffect, useState } from 'react'; - -const App = () => { - const [isDarkMode, setIsDarkMode] = useState(false); - - const toggleDarkMode = () => { - setIsDarkMode(!isDarkMode); - }; - - useEffect(() => { - if (isDarkMode) { - document.documentElement.classList.add('dark'); - } else { - document.documentElement.classList.remove('dark'); - } - }, [isDarkMode]); - - return ( -
-
- -
- -
-
-
-
- - bg-primary - -
-
-
- - bg-secondary - -
-
-
- -
-
-
-
-
- text -
-
- shadow text -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
-
- ); -}; - -export default App; diff --git a/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/modern.config.ts b/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/modern.config.ts deleted file mode 100644 index 156bbb5278f0..000000000000 --- a/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/modern.config.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { applyBaseConfig } from '../../../../utils/applyBaseConfig'; - -export default applyBaseConfig({ - plugins: [], - tools: { - babel: { - plugins: [ - [ - 'babel-plugin-macros', - { - twin: { - preset: 'styled-components', - config: './tailwind.config.js', - }, - }, - ], - ], - }, - }, -}); diff --git a/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/package.json b/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/package.json deleted file mode 100644 index 8cabc104160e..000000000000 --- a/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/package.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "private": true, - "name": "integration-rsbuild-tailwindcss-v3", - "version": "2.66.0", - "scripts": { - "dev": "modern dev", - "build": "modern build", - "serve": "modern serve", - "new": "modern new" - }, - "dependencies": { - "@modern-js/app-tools": "workspace:*", - "@modern-js/runtime": "workspace:*", - "react": "^19.2.0", - "react-dom": "^19.2.0", - "twin.macro": "^3.4.0", - "tailwindcss": "^3.3.3", - "styled-components": "^5.3.1" - }, - "devDependencies": { - "babel-plugin-macros": "3.1.0" - } -} diff --git a/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/src/App.jsx b/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/src/App.jsx deleted file mode 100644 index 2dc9033e6724..000000000000 --- a/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/src/App.jsx +++ /dev/null @@ -1,86 +0,0 @@ -import './app.css'; -import 'tailwindcss/base.css'; -import 'tailwindcss/components.css'; -import 'tailwindcss/utilities.css'; -import { useEffect, useState } from 'react'; -import Macro from './Macro'; - -const App = () => { - const [isDarkMode, setIsDarkMode] = useState(false); - - const toggleDarkMode = () => { - setIsDarkMode(!isDarkMode); - }; - - useEffect(() => { - if (isDarkMode) { - document.documentElement.classList.add('dark'); - } else { - document.documentElement.classList.remove('dark'); - } - }, [isDarkMode]); - - return ( -
-
- -
- -
-
-
-
- - bg-primary - -
-
-
- - bg-secondary - -
-
-
- -
-
-
-
-
- text -
-
- shadow text -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
-
- -
-
- ); -}; - -export default App; diff --git a/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/src/Macro.jsx b/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/src/Macro.jsx deleted file mode 100644 index 342d219a8514..000000000000 --- a/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/src/Macro.jsx +++ /dev/null @@ -1,10 +0,0 @@ -import React from 'react'; -import tw from 'twin.macro'; - -const ConfigTest = () => { - const DirectColorDiv = tw.div`w-[200px] h-[50px] bg-yellow-300`; - - return tw; -}; - -export default ConfigTest; diff --git a/tests/integration/tailwindcss/fixtures/tailwindcss-v2/modern.config.ts b/tests/integration/tailwindcss/fixtures/tailwindcss-v2/modern.config.ts index e0ae69718a39..82977832a553 100644 --- a/tests/integration/tailwindcss/fixtures/tailwindcss-v2/modern.config.ts +++ b/tests/integration/tailwindcss/fixtures/tailwindcss-v2/modern.config.ts @@ -1,6 +1,5 @@ -import { tailwindcssPlugin } from '@modern-js/plugin-tailwindcss'; import { applyBaseConfig } from '../../../../utils/applyBaseConfig'; export default applyBaseConfig({ - plugins: [tailwindcssPlugin()], + plugins: [], }); diff --git a/tests/integration/tailwindcss/fixtures/tailwindcss-v2/package.json b/tests/integration/tailwindcss/fixtures/tailwindcss-v2/package.json index 666a9dc39e8c..592c6169b52e 100644 --- a/tests/integration/tailwindcss/fixtures/tailwindcss-v2/package.json +++ b/tests/integration/tailwindcss/fixtures/tailwindcss-v2/package.json @@ -2,12 +2,15 @@ "private": true, "name": "integration-tailwindcss-v2", "version": "2.66.0", + "scripts": { + "dev": "modern dev", + "build": "modern build", + "serve": "modern serve", + "new": "modern new" + }, "dependencies": { "@modern-js/app-tools": "workspace:*", - "@modern-js/plugin-tailwindcss": "workspace:*", "@modern-js/runtime": "workspace:*", - "autoprefixer": "10.4.21", - "postcss": "^8.5.6", "react": "^19.2.0", "react-dom": "^19.2.0", "tailwindcss": "^2" diff --git a/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v2/postcss.config.cjs b/tests/integration/tailwindcss/fixtures/tailwindcss-v2/postcss.config.cjs similarity index 100% rename from tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v2/postcss.config.cjs rename to tests/integration/tailwindcss/fixtures/tailwindcss-v2/postcss.config.cjs diff --git a/tests/integration/tailwindcss/fixtures/tailwindcss-v2/src/App.jsx b/tests/integration/tailwindcss/fixtures/tailwindcss-v2/src/App.jsx index b6439563757e..8aa33099ea58 100644 --- a/tests/integration/tailwindcss/fixtures/tailwindcss-v2/src/App.jsx +++ b/tests/integration/tailwindcss/fixtures/tailwindcss-v2/src/App.jsx @@ -1,11 +1,82 @@ +import './app.css'; import 'tailwindcss/base.css'; import 'tailwindcss/components.css'; import 'tailwindcss/utilities.css'; +import { useEffect, useState } from 'react'; -const App = () => ( -
-

hello world

-
-); +const App = () => { + const [isDarkMode, setIsDarkMode] = useState(false); + + const toggleDarkMode = () => { + setIsDarkMode(!isDarkMode); + }; + + useEffect(() => { + if (isDarkMode) { + document.documentElement.classList.add('dark'); + } else { + document.documentElement.classList.remove('dark'); + } + }, [isDarkMode]); + + return ( +
+
+ +
+ +
+
+
+
+ + bg-primary + +
+
+
+ + bg-secondary + +
+
+
+ +
+
+
+
+
+ text +
+
+ shadow text +
+
+
+
+
+ +
+
+
+
+
+ +
+
+
+
+
+
+ ); +}; export default App; diff --git a/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v2/src/app.css b/tests/integration/tailwindcss/fixtures/tailwindcss-v2/src/app.css similarity index 100% rename from tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v2/src/app.css rename to tests/integration/tailwindcss/fixtures/tailwindcss-v2/src/app.css diff --git a/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v2/tailwind.config.cjs b/tests/integration/tailwindcss/fixtures/tailwindcss-v2/tailwind.config.cjs similarity index 100% rename from tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v2/tailwind.config.cjs rename to tests/integration/tailwindcss/fixtures/tailwindcss-v2/tailwind.config.cjs diff --git a/tests/integration/tailwindcss/fixtures/tailwindcss-v3-js-config-with-postcss-config/modern.config.ts b/tests/integration/tailwindcss/fixtures/tailwindcss-v3-js-config-with-postcss-config/modern.config.ts deleted file mode 100644 index e0ae69718a39..000000000000 --- a/tests/integration/tailwindcss/fixtures/tailwindcss-v3-js-config-with-postcss-config/modern.config.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { tailwindcssPlugin } from '@modern-js/plugin-tailwindcss'; -import { applyBaseConfig } from '../../../../utils/applyBaseConfig'; - -export default applyBaseConfig({ - plugins: [tailwindcssPlugin()], -}); diff --git a/tests/integration/tailwindcss/fixtures/tailwindcss-v3-js-config-with-postcss-config/package.json b/tests/integration/tailwindcss/fixtures/tailwindcss-v3-js-config-with-postcss-config/package.json deleted file mode 100644 index f1c7072afec9..000000000000 --- a/tests/integration/tailwindcss/fixtures/tailwindcss-v3-js-config-with-postcss-config/package.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "private": true, - "name": "integration-tailwindcss-v3-js-config-with-postcss-config", - "version": "2.66.0", - "dependencies": { - "@modern-js/app-tools": "workspace:*", - "@modern-js/plugin-tailwindcss": "workspace:*", - "@modern-js/runtime": "workspace:*", - "postcss": "^8.5.6", - "react": "^19.2.0", - "react-dom": "^19.2.0", - "tailwindcss": "^3.3.3" - } -} diff --git a/tests/integration/tailwindcss/fixtures/tailwindcss-v3-js-config-with-postcss-config/postcss.config.ts b/tests/integration/tailwindcss/fixtures/tailwindcss-v3-js-config-with-postcss-config/postcss.config.ts deleted file mode 100644 index 43e7ac0ec554..000000000000 --- a/tests/integration/tailwindcss/fixtures/tailwindcss-v3-js-config-with-postcss-config/postcss.config.ts +++ /dev/null @@ -1,5 +0,0 @@ -const path = require('node:path'); - -export default { - plugins: {}, -}; diff --git a/tests/integration/tailwindcss/fixtures/tailwindcss-v3-js-config-with-postcss-config/src/App.jsx b/tests/integration/tailwindcss/fixtures/tailwindcss-v3-js-config-with-postcss-config/src/App.jsx deleted file mode 100644 index b6439563757e..000000000000 --- a/tests/integration/tailwindcss/fixtures/tailwindcss-v3-js-config-with-postcss-config/src/App.jsx +++ /dev/null @@ -1,11 +0,0 @@ -import 'tailwindcss/base.css'; -import 'tailwindcss/components.css'; -import 'tailwindcss/utilities.css'; - -const App = () => ( -
-

hello world

-
-); - -export default App; diff --git a/tests/integration/tailwindcss/fixtures/tailwindcss-v3-js-config-with-postcss-config/tailwind.config.js b/tests/integration/tailwindcss/fixtures/tailwindcss-v3-js-config-with-postcss-config/tailwind.config.js deleted file mode 100644 index 65cc34ce46ed..000000000000 --- a/tests/integration/tailwindcss/fixtures/tailwindcss-v3-js-config-with-postcss-config/tailwind.config.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - theme: { - colors: { - 'red-500': '#1fb6ff', - }, - }, -}; diff --git a/tests/integration/tailwindcss/fixtures/tailwindcss-v3-js-config/modern.config.ts b/tests/integration/tailwindcss/fixtures/tailwindcss-v3-js-config/modern.config.ts deleted file mode 100644 index e0ae69718a39..000000000000 --- a/tests/integration/tailwindcss/fixtures/tailwindcss-v3-js-config/modern.config.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { tailwindcssPlugin } from '@modern-js/plugin-tailwindcss'; -import { applyBaseConfig } from '../../../../utils/applyBaseConfig'; - -export default applyBaseConfig({ - plugins: [tailwindcssPlugin()], -}); diff --git a/tests/integration/tailwindcss/fixtures/tailwindcss-v3-js-config/package.json b/tests/integration/tailwindcss/fixtures/tailwindcss-v3-js-config/package.json deleted file mode 100644 index ff337f5840e8..000000000000 --- a/tests/integration/tailwindcss/fixtures/tailwindcss-v3-js-config/package.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "private": true, - "name": "integration-tailwindcss-v3-js-config", - "version": "2.66.0", - "dependencies": { - "@modern-js/app-tools": "workspace:*", - "@modern-js/plugin-tailwindcss": "workspace:*", - "@modern-js/runtime": "workspace:*", - "postcss": "^8.5.6", - "react": "^19.2.0", - "react-dom": "^19.2.0", - "tailwindcss": "^3.3.3" - } -} diff --git a/tests/integration/tailwindcss/fixtures/tailwindcss-v3-js-config/src/App.jsx b/tests/integration/tailwindcss/fixtures/tailwindcss-v3-js-config/src/App.jsx deleted file mode 100644 index b6439563757e..000000000000 --- a/tests/integration/tailwindcss/fixtures/tailwindcss-v3-js-config/src/App.jsx +++ /dev/null @@ -1,11 +0,0 @@ -import 'tailwindcss/base.css'; -import 'tailwindcss/components.css'; -import 'tailwindcss/utilities.css'; - -const App = () => ( -
-

hello world

-
-); - -export default App; diff --git a/tests/integration/tailwindcss/fixtures/tailwindcss-v3-js-config/tailwind.config.js b/tests/integration/tailwindcss/fixtures/tailwindcss-v3-js-config/tailwind.config.js deleted file mode 100644 index 65cc34ce46ed..000000000000 --- a/tests/integration/tailwindcss/fixtures/tailwindcss-v3-js-config/tailwind.config.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - theme: { - colors: { - 'red-500': '#1fb6ff', - }, - }, -}; diff --git a/tests/integration/tailwindcss/fixtures/tailwindcss-v3-merge-config/modern.config.ts b/tests/integration/tailwindcss/fixtures/tailwindcss-v3-merge-config/modern.config.ts deleted file mode 100644 index b99cdd7f0cec..000000000000 --- a/tests/integration/tailwindcss/fixtures/tailwindcss-v3-merge-config/modern.config.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { tailwindcssPlugin } from '@modern-js/plugin-tailwindcss'; -import { applyBaseConfig } from '../../../../utils/applyBaseConfig'; - -export default applyBaseConfig({ - plugins: [tailwindcssPlugin()], - tools: { - tailwindcss: { - theme: { - colors: { - 'red-500': 'green', - }, - }, - }, - }, -}); diff --git a/tests/integration/tailwindcss/fixtures/tailwindcss-v3-merge-config/package.json b/tests/integration/tailwindcss/fixtures/tailwindcss-v3-merge-config/package.json deleted file mode 100644 index e6c73b01459f..000000000000 --- a/tests/integration/tailwindcss/fixtures/tailwindcss-v3-merge-config/package.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "private": true, - "name": "integration-tailwindcss-v3-merge-config", - "version": "2.66.0", - "dependencies": { - "@modern-js/app-tools": "workspace:*", - "@modern-js/plugin-tailwindcss": "workspace:*", - "@modern-js/runtime": "workspace:*", - "postcss": "^8.5.6", - "react": "^19.2.0", - "react-dom": "^19.2.0", - "tailwindcss": "^3.3.3" - } -} diff --git a/tests/integration/tailwindcss/fixtures/tailwindcss-v3-merge-config/src/App.jsx b/tests/integration/tailwindcss/fixtures/tailwindcss-v3-merge-config/src/App.jsx deleted file mode 100644 index b6439563757e..000000000000 --- a/tests/integration/tailwindcss/fixtures/tailwindcss-v3-merge-config/src/App.jsx +++ /dev/null @@ -1,11 +0,0 @@ -import 'tailwindcss/base.css'; -import 'tailwindcss/components.css'; -import 'tailwindcss/utilities.css'; - -const App = () => ( -
-

hello world

-
-); - -export default App; diff --git a/tests/integration/tailwindcss/fixtures/tailwindcss-v3-merge-config/tailwind.config.ts b/tests/integration/tailwindcss/fixtures/tailwindcss-v3-merge-config/tailwind.config.ts deleted file mode 100644 index 093adfe70dc9..000000000000 --- a/tests/integration/tailwindcss/fixtures/tailwindcss-v3-merge-config/tailwind.config.ts +++ /dev/null @@ -1,7 +0,0 @@ -export default { - theme: { - colors: { - 'red-500': '#1fb6ff', - }, - }, -}; diff --git a/tests/integration/tailwindcss/fixtures/tailwindcss-v3-ts-config/modern.config.ts b/tests/integration/tailwindcss/fixtures/tailwindcss-v3-ts-config/modern.config.ts deleted file mode 100644 index e0ae69718a39..000000000000 --- a/tests/integration/tailwindcss/fixtures/tailwindcss-v3-ts-config/modern.config.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { tailwindcssPlugin } from '@modern-js/plugin-tailwindcss'; -import { applyBaseConfig } from '../../../../utils/applyBaseConfig'; - -export default applyBaseConfig({ - plugins: [tailwindcssPlugin()], -}); diff --git a/tests/integration/tailwindcss/fixtures/tailwindcss-v3-ts-config/package.json b/tests/integration/tailwindcss/fixtures/tailwindcss-v3-ts-config/package.json deleted file mode 100644 index a577ab45fe87..000000000000 --- a/tests/integration/tailwindcss/fixtures/tailwindcss-v3-ts-config/package.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "private": true, - "name": "integration-tailwindcss-v3-ts-config", - "version": "2.66.0", - "dependencies": { - "@modern-js/app-tools": "workspace:*", - "@modern-js/plugin-tailwindcss": "workspace:*", - "@modern-js/runtime": "workspace:*", - "postcss": "^8.5.6", - "react": "^19.2.0", - "react-dom": "^19.2.0", - "tailwindcss": "^3.3.3" - } -} diff --git a/tests/integration/tailwindcss/fixtures/tailwindcss-v3-ts-config/src/App.jsx b/tests/integration/tailwindcss/fixtures/tailwindcss-v3-ts-config/src/App.jsx deleted file mode 100644 index b6439563757e..000000000000 --- a/tests/integration/tailwindcss/fixtures/tailwindcss-v3-ts-config/src/App.jsx +++ /dev/null @@ -1,11 +0,0 @@ -import 'tailwindcss/base.css'; -import 'tailwindcss/components.css'; -import 'tailwindcss/utilities.css'; - -const App = () => ( -
-

hello world

-
-); - -export default App; diff --git a/tests/integration/tailwindcss/fixtures/tailwindcss-v3-ts-config/tailwind.config.ts b/tests/integration/tailwindcss/fixtures/tailwindcss-v3-ts-config/tailwind.config.ts deleted file mode 100644 index 093adfe70dc9..000000000000 --- a/tests/integration/tailwindcss/fixtures/tailwindcss-v3-ts-config/tailwind.config.ts +++ /dev/null @@ -1,7 +0,0 @@ -export default { - theme: { - colors: { - 'red-500': '#1fb6ff', - }, - }, -}; diff --git a/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/babel-plugin-macros.config.cjs b/tests/integration/tailwindcss/fixtures/tailwindcss-v3/babel-plugin-macros.config.cjs similarity index 100% rename from tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/babel-plugin-macros.config.cjs rename to tests/integration/tailwindcss/fixtures/tailwindcss-v3/babel-plugin-macros.config.cjs diff --git a/tests/integration/tailwindcss/fixtures/tailwindcss-v3/modern.config.ts b/tests/integration/tailwindcss/fixtures/tailwindcss-v3/modern.config.ts index 8898f4d923f0..156bbb5278f0 100644 --- a/tests/integration/tailwindcss/fixtures/tailwindcss-v3/modern.config.ts +++ b/tests/integration/tailwindcss/fixtures/tailwindcss-v3/modern.config.ts @@ -1,20 +1,20 @@ -import { tailwindcssPlugin } from '@modern-js/plugin-tailwindcss'; import { applyBaseConfig } from '../../../../utils/applyBaseConfig'; export default applyBaseConfig({ - plugins: [tailwindcssPlugin()], + plugins: [], tools: { - tailwindcss: { - theme: { - extend: { - colors: { - primary: 'green', - dark: { - primary: 'emerald', + babel: { + plugins: [ + [ + 'babel-plugin-macros', + { + twin: { + preset: 'styled-components', + config: './tailwind.config.js', }, }, - }, - }, + ], + ], }, }, }); diff --git a/tests/integration/tailwindcss/fixtures/tailwindcss-v3/package.json b/tests/integration/tailwindcss/fixtures/tailwindcss-v3/package.json index 8911b423ca7d..1d38f4267481 100644 --- a/tests/integration/tailwindcss/fixtures/tailwindcss-v3/package.json +++ b/tests/integration/tailwindcss/fixtures/tailwindcss-v3/package.json @@ -10,12 +10,14 @@ }, "dependencies": { "@modern-js/app-tools": "workspace:*", - "@modern-js/plugin-tailwindcss": "workspace:*", "@modern-js/runtime": "workspace:*", "react": "^19.2.0", "react-dom": "^19.2.0", - "twin.macro": "^3.4.1", + "twin.macro": "^3.4.0", "tailwindcss": "^3.3.3", "styled-components": "^5.3.1" + }, + "devDependencies": { + "babel-plugin-macros": "3.1.0" } } diff --git a/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/postcss.config.cjs b/tests/integration/tailwindcss/fixtures/tailwindcss-v3/postcss.config.cjs similarity index 100% rename from tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/postcss.config.cjs rename to tests/integration/tailwindcss/fixtures/tailwindcss-v3/postcss.config.cjs diff --git a/tests/integration/tailwindcss/fixtures/tailwindcss-v3/src/App.jsx b/tests/integration/tailwindcss/fixtures/tailwindcss-v3/src/App.jsx index eef569c71e2d..2dc9033e6724 100644 --- a/tests/integration/tailwindcss/fixtures/tailwindcss-v3/src/App.jsx +++ b/tests/integration/tailwindcss/fixtures/tailwindcss-v3/src/App.jsx @@ -1,3 +1,4 @@ +import './app.css'; import 'tailwindcss/base.css'; import 'tailwindcss/components.css'; import 'tailwindcss/utilities.css'; diff --git a/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/src/app.css b/tests/integration/tailwindcss/fixtures/tailwindcss-v3/src/app.css similarity index 100% rename from tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/src/app.css rename to tests/integration/tailwindcss/fixtures/tailwindcss-v3/src/app.css diff --git a/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/tailwind.config.js b/tests/integration/tailwindcss/fixtures/tailwindcss-v3/tailwind.config.js similarity index 100% rename from tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v3/tailwind.config.js rename to tests/integration/tailwindcss/fixtures/tailwindcss-v3/tailwind.config.js diff --git a/tests/integration/tailwindcss/fixtures/tailwindcss-v3/tailwind.config.ts b/tests/integration/tailwindcss/fixtures/tailwindcss-v3/tailwind.config.ts deleted file mode 100644 index 103803c82cc1..000000000000 --- a/tests/integration/tailwindcss/fixtures/tailwindcss-v3/tailwind.config.ts +++ /dev/null @@ -1,46 +0,0 @@ -import type { Config } from 'tailwindcss'; -import plugin from 'tailwindcss/plugin'; - -export default { - content: ['./src/**/*.{js,jsx,ts,tsx}'], - - darkMode: 'class', - - theme: { - extend: { - colors: { - primary: 'blue', - secondary: 'yellow', - - dark: { - primary: 'sky', - secondary: 'light-yellow', - }, - }, - }, - }, - - plugins: [ - plugin(function ({ addUtilities }) { - addUtilities({ - '.content-auto': { - 'content-visibility': 'auto', - }, - '.text-shadow': { - 'text-shadow': '0 2px 4px rgba(0,0,0,0.1)', - }, - }); - }), - - plugin(function ({ addComponents }) { - addComponents({ - '.btn': { - padding: '0.5rem 1rem', - borderRadius: '0.375rem', - fontWeight: '500', - transition: 'all 0.2s', - }, - }); - }), - ], -} as Config; diff --git a/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v4/modern.config.ts b/tests/integration/tailwindcss/fixtures/tailwindcss-v4/modern.config.ts similarity index 100% rename from tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v4/modern.config.ts rename to tests/integration/tailwindcss/fixtures/tailwindcss-v4/modern.config.ts diff --git a/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v4/package.json b/tests/integration/tailwindcss/fixtures/tailwindcss-v4/package.json similarity index 81% rename from tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v4/package.json rename to tests/integration/tailwindcss/fixtures/tailwindcss-v4/package.json index bbece78992e9..50daab14b1f0 100644 --- a/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v4/package.json +++ b/tests/integration/tailwindcss/fixtures/tailwindcss-v4/package.json @@ -1,7 +1,7 @@ { "private": true, "type": "module", - "name": "integration-rsbuild-tailwindcss-v4", + "name": "integration-tailwindcss-v4", "version": "2.66.0", "scripts": { "dev": "modern dev", @@ -11,7 +11,6 @@ }, "dependencies": { "@modern-js/app-tools": "workspace:*", - "@modern-js/plugin-tailwindcss": "workspace:*", "@modern-js/runtime": "workspace:*", "postcss": "^8.5.6", "react": "^19.2.0", diff --git a/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v4/postcss.config.mjs b/tests/integration/tailwindcss/fixtures/tailwindcss-v4/postcss.config.mjs similarity index 100% rename from tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v4/postcss.config.mjs rename to tests/integration/tailwindcss/fixtures/tailwindcss-v4/postcss.config.mjs diff --git a/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v4/src/App.jsx b/tests/integration/tailwindcss/fixtures/tailwindcss-v4/src/App.jsx similarity index 100% rename from tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v4/src/App.jsx rename to tests/integration/tailwindcss/fixtures/tailwindcss-v4/src/App.jsx diff --git a/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v4/src/index.css b/tests/integration/tailwindcss/fixtures/tailwindcss-v4/src/index.css similarity index 100% rename from tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v4/src/index.css rename to tests/integration/tailwindcss/fixtures/tailwindcss-v4/src/index.css diff --git a/tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v4/tailwind.config.js b/tests/integration/tailwindcss/fixtures/tailwindcss-v4/tailwind.config.js similarity index 100% rename from tests/integration/tailwindcss/fixtures/rsbuild-tailwindcss-v4/tailwind.config.js rename to tests/integration/tailwindcss/fixtures/tailwindcss-v4/tailwind.config.js diff --git a/tests/integration/tailwindcss/fixtures/tailwindcss-without-plugin/modern.config.ts b/tests/integration/tailwindcss/fixtures/tailwindcss-without-plugin/modern.config.ts deleted file mode 100644 index 98426c5bd4ad..000000000000 --- a/tests/integration/tailwindcss/fixtures/tailwindcss-without-plugin/modern.config.ts +++ /dev/null @@ -1,3 +0,0 @@ -import { applyBaseConfig } from '../../../../utils/applyBaseConfig'; - -export default applyBaseConfig({}); diff --git a/tests/integration/tailwindcss/fixtures/tailwindcss-without-plugin/package.json b/tests/integration/tailwindcss/fixtures/tailwindcss-without-plugin/package.json deleted file mode 100644 index 6f3dc0f4595e..000000000000 --- a/tests/integration/tailwindcss/fixtures/tailwindcss-without-plugin/package.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "private": true, - "name": "integration-tailwindcss-without-plugin", - "version": "2.66.0", - "dependencies": { - "@modern-js/app-tools": "workspace:*", - "@modern-js/runtime": "workspace:*", - "postcss": "^8.5.6", - "react": "^19.2.0", - "react-dom": "^19.2.0", - "tailwindcss": "^3.3.3" - } -} diff --git a/tests/integration/tailwindcss/fixtures/tailwindcss-without-plugin/postcss.config.js b/tests/integration/tailwindcss/fixtures/tailwindcss-without-plugin/postcss.config.js deleted file mode 100644 index ee5f90b30902..000000000000 --- a/tests/integration/tailwindcss/fixtures/tailwindcss-without-plugin/postcss.config.js +++ /dev/null @@ -1,5 +0,0 @@ -module.exports = { - plugins: { - tailwindcss: {}, - }, -}; diff --git a/tests/integration/tailwindcss/fixtures/tailwindcss-without-plugin/src/App.jsx b/tests/integration/tailwindcss/fixtures/tailwindcss-without-plugin/src/App.jsx deleted file mode 100644 index b6439563757e..000000000000 --- a/tests/integration/tailwindcss/fixtures/tailwindcss-without-plugin/src/App.jsx +++ /dev/null @@ -1,11 +0,0 @@ -import 'tailwindcss/base.css'; -import 'tailwindcss/components.css'; -import 'tailwindcss/utilities.css'; - -const App = () => ( -
-

hello world

-
-); - -export default App; diff --git a/tests/integration/tailwindcss/fixtures/tailwindcss-without-plugin/tailwind.config.js b/tests/integration/tailwindcss/fixtures/tailwindcss-without-plugin/tailwind.config.js deleted file mode 100644 index a83baa35352b..000000000000 --- a/tests/integration/tailwindcss/fixtures/tailwindcss-without-plugin/tailwind.config.js +++ /dev/null @@ -1,8 +0,0 @@ -module.exports = { - content: ['./src/**/*.{html,js,ts,jsx,tsx}'], - theme: { - colors: { - 'red-500': '#1fb6ff', - }, - }, -}; diff --git a/tests/integration/tailwindcss/fixtures/twin.macro-v2/modern.config.ts b/tests/integration/tailwindcss/fixtures/twin.macro-v2/modern.config.ts deleted file mode 100644 index 91e28257fce4..000000000000 --- a/tests/integration/tailwindcss/fixtures/twin.macro-v2/modern.config.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { tailwindcssPlugin } from '@modern-js/plugin-tailwindcss'; -import { applyBaseConfig } from '../../../../utils/applyBaseConfig'; - -export default applyBaseConfig({ - tools: { - tailwindcss: { - theme: { - colors: { - gray: 'red', - }, - }, - }, - }, - plugins: [tailwindcssPlugin()], -}); diff --git a/tests/integration/tailwindcss/fixtures/twin.macro-v2/package.json b/tests/integration/tailwindcss/fixtures/twin.macro-v2/package.json deleted file mode 100644 index fea0fa91f2d7..000000000000 --- a/tests/integration/tailwindcss/fixtures/twin.macro-v2/package.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "private": true, - "name": "twin-macro-v2", - "version": "2.66.0", - "dependencies": { - "@modern-js/app-tools": "workspace:*", - "@modern-js/plugin-tailwindcss": "workspace:*", - "@modern-js/runtime": "workspace:*", - "postcss": "^8.5.6", - "react": "^19.2.0", - "react-dom": "^19.2.0", - "twin.macro": "^2.8.2" - } -} diff --git a/tests/integration/tailwindcss/fixtures/twin.macro-v2/src/App.jsx b/tests/integration/tailwindcss/fixtures/twin.macro-v2/src/App.jsx deleted file mode 100644 index ab6de8cb3a18..000000000000 --- a/tests/integration/tailwindcss/fixtures/twin.macro-v2/src/App.jsx +++ /dev/null @@ -1,6 +0,0 @@ -import tw from 'twin.macro'; - -const Text = tw.p`text-gray`; -const App = () => hello world; - -export default App; diff --git a/tests/integration/tailwindcss/fixtures/twin.macro-v3/modern.config.ts b/tests/integration/tailwindcss/fixtures/twin.macro-v3/modern.config.ts deleted file mode 100644 index 91e28257fce4..000000000000 --- a/tests/integration/tailwindcss/fixtures/twin.macro-v3/modern.config.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { tailwindcssPlugin } from '@modern-js/plugin-tailwindcss'; -import { applyBaseConfig } from '../../../../utils/applyBaseConfig'; - -export default applyBaseConfig({ - tools: { - tailwindcss: { - theme: { - colors: { - gray: 'red', - }, - }, - }, - }, - plugins: [tailwindcssPlugin()], -}); diff --git a/tests/integration/tailwindcss/fixtures/twin.macro-v3/package.json b/tests/integration/tailwindcss/fixtures/twin.macro-v3/package.json deleted file mode 100644 index 3111c3a45176..000000000000 --- a/tests/integration/tailwindcss/fixtures/twin.macro-v3/package.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "private": true, - "name": "twin-macro-v3", - "version": "2.66.0", - "dependencies": { - "@modern-js/app-tools": "workspace:*", - "@modern-js/plugin-tailwindcss": "workspace:*", - "styled-components": "^5.3.1", - "@modern-js/runtime": "workspace:*", - "postcss": "^8.5.6", - "react": "^19.2.0", - "react-dom": "^19.2.0", - "tailwindcss": "^3.3.3", - "twin.macro": "^3.4.1" - } -} diff --git a/tests/integration/tailwindcss/fixtures/twin.macro-v3/src/App.jsx b/tests/integration/tailwindcss/fixtures/twin.macro-v3/src/App.jsx deleted file mode 100644 index ab6de8cb3a18..000000000000 --- a/tests/integration/tailwindcss/fixtures/twin.macro-v3/src/App.jsx +++ /dev/null @@ -1,6 +0,0 @@ -import tw from 'twin.macro'; - -const Text = tw.p`text-gray`; -const App = () => hello world; - -export default App; diff --git a/tests/integration/tailwindcss/tests/tailwindcss-v2.test.ts b/tests/integration/tailwindcss/tests/tailwindcss-v2.test.ts index 16a810af947b..f79adbfee450 100644 --- a/tests/integration/tailwindcss/tests/tailwindcss-v2.test.ts +++ b/tests/integration/tailwindcss/tests/tailwindcss-v2.test.ts @@ -2,15 +2,17 @@ import path from 'path'; import { fixtures, launchAppWithPage } from './utils'; describe('use tailwindcss v2', () => { - test(`should show style by use tailwindcss text-black`, async () => { + test(`should show style by use tailwindcss theme`, async () => { const appDir = path.resolve(fixtures, 'tailwindcss-v2'); const { page, clear } = await launchAppWithPage(appDir); - const textColor = await page.$eval('p', p => - window.getComputedStyle(p).getPropertyValue('color'), - ); + const primaryColorElement = await page.waitForSelector('.bg-primary'); + const backgroundColor = await page.evaluate(element => { + const style = window.getComputedStyle(element); + return style.backgroundColor; + }, primaryColorElement); - expect(textColor).toBe('rgb(239, 68, 68)'); + expect(backgroundColor).toMatch(/rgb\(0, 0, 255\)|#0000ff|blue/i); await clear(); }); diff --git a/tests/integration/tailwindcss/tests/tailwindcss-v3.test.ts b/tests/integration/tailwindcss/tests/tailwindcss-v3.test.ts index 110c7c52ab40..55e3d5a31789 100644 --- a/tests/integration/tailwindcss/tests/tailwindcss-v3.test.ts +++ b/tests/integration/tailwindcss/tests/tailwindcss-v3.test.ts @@ -2,70 +2,17 @@ import path from 'path'; import { fixtures, launchAppWithPage } from './utils'; describe('use tailwindcss v3', () => { - test(`should show style by use tailwindcss text-black`, async () => { + test(`should show style by use tailwindcss theme`, async () => { const appDir = path.resolve(fixtures, 'tailwindcss-v3'); const { page, clear } = await launchAppWithPage(appDir); - const textColor = await page.$eval('p', p => - window.getComputedStyle(p).getPropertyValue('color'), - ); + const primaryColorElement = await page.waitForSelector('.bg-primary'); + const backgroundColor = await page.evaluate(element => { + const style = window.getComputedStyle(element); + return style.backgroundColor; + }, primaryColorElement); - expect(textColor).toBe('rgb(239, 68, 68)'); - - await clear(); - }); - - test(`should load tailwind.config.js correctly`, async () => { - const appDir = path.resolve(fixtures, 'tailwindcss-v3-js-config'); - const { page, clear } = await launchAppWithPage(appDir); - - const textColor = await page.$eval('p', p => - window.getComputedStyle(p).getPropertyValue('color'), - ); - - expect(textColor).toBe('rgb(31, 182, 255)'); - - await clear(); - }); - - test(`should load tailwind.config.js and merge postcss config file correctly`, async () => { - const appDir = path.resolve( - fixtures, - 'tailwindcss-v3-js-config-with-postcss-config', - ); - const { page, clear } = await launchAppWithPage(appDir); - - const textColor = await page.$eval('p', p => - window.getComputedStyle(p).getPropertyValue('color'), - ); - - expect(textColor).toBe('rgb(31, 182, 255)'); - - await clear(); - }); - - test(`should load tailwind.config.ts correctly`, async () => { - const appDir = path.resolve(fixtures, 'tailwindcss-v3-ts-config'); - const { page, clear } = await launchAppWithPage(appDir); - - const textColor = await page.$eval('p', p => - window.getComputedStyle(p).getPropertyValue('color'), - ); - - expect(textColor).toBe('rgb(31, 182, 255)'); - - await clear(); - }); - - test(`should merge tailwind config correctly`, async () => { - const appDir = path.resolve(fixtures, 'tailwindcss-v3-merge-config'); - const { page, clear } = await launchAppWithPage(appDir); - - const textColor = await page.$eval('p', p => - window.getComputedStyle(p).getPropertyValue('color'), - ); - - expect(textColor).toBe('rgb(0, 128, 0)'); + expect(backgroundColor).toMatch(/rgb\(0, 0, 255\)|#0000ff|blue/i); await clear(); }); diff --git a/tests/integration/tailwindcss/tests/tailwindcss-v4.test.ts b/tests/integration/tailwindcss/tests/tailwindcss-v4.test.ts new file mode 100644 index 000000000000..6128f317e01e --- /dev/null +++ b/tests/integration/tailwindcss/tests/tailwindcss-v4.test.ts @@ -0,0 +1,18 @@ +import path from 'path'; +import { fixtures, launchAppWithPage } from './utils'; + +describe('use tailwindcss v4', () => { + test(`should show style by use tailwindcss theme`, async () => { + const appDir = path.resolve(fixtures, 'tailwindcss-v4'); + const { page, clear } = await launchAppWithPage(appDir); + const primaryColorElement = await page.waitForSelector('.bg-primary'); + const backgroundColor = await page.evaluate(element => { + const style = window.getComputedStyle(element); + return style.backgroundColor; + }, primaryColorElement); + + expect(backgroundColor).toMatch(/rgb\(0, 0, 255\)|#0000ff|blue/i); + + await clear(); + }); +}); diff --git a/tests/integration/tailwindcss/tests/tailwindcss-without-plugin.test.ts b/tests/integration/tailwindcss/tests/tailwindcss-without-plugin.test.ts deleted file mode 100644 index dc40f0f2c2d8..000000000000 --- a/tests/integration/tailwindcss/tests/tailwindcss-without-plugin.test.ts +++ /dev/null @@ -1,17 +0,0 @@ -import path from 'path'; -import { fixtures, launchAppWithPage } from './utils'; - -describe('use tailwindcss without modern plugin', () => { - test(`should load tailwind & tailwind.config.js correctly`, async () => { - const appDir = path.resolve(fixtures, 'tailwindcss-without-plugin'); - const { page, clear } = await launchAppWithPage(appDir); - - const textColor = await page.$eval('p', p => - window.getComputedStyle(p).getPropertyValue('color'), - ); - - expect(textColor).toBe('rgb(31, 182, 255)'); - - await clear(); - }); -}); diff --git a/tests/integration/tailwindcss/tests/twin.macro-v2.test.ts b/tests/integration/tailwindcss/tests/twin.macro-v2.test.ts deleted file mode 100644 index 5843abd07ba6..000000000000 --- a/tests/integration/tailwindcss/tests/twin.macro-v2.test.ts +++ /dev/null @@ -1,17 +0,0 @@ -import path from 'path'; -import { fixtures, launchAppWithPage } from './utils'; - -describe('use twin.macro v2', () => { - test.skip(`should show style by use tailwindcss theme when use twin.macro v2`, async () => { - const appDir = path.resolve(fixtures, 'twin.macro-v2'); - const { page, clear } = await launchAppWithPage(appDir); - - const textColor = await page.$eval('p', p => - window.getComputedStyle(p).getPropertyValue('color'), - ); - - expect(textColor).toBe('rgb(255, 0, 0)'); - - await clear(); - }); -}); diff --git a/tests/integration/tailwindcss/tests/twin.macro-v3.test.ts b/tests/integration/tailwindcss/tests/twin.macro-v3.test.ts deleted file mode 100644 index c369543d635b..000000000000 --- a/tests/integration/tailwindcss/tests/twin.macro-v3.test.ts +++ /dev/null @@ -1,16 +0,0 @@ -import path from 'path'; -import { fixtures, launchAppWithPage } from './utils'; - -describe('use twin.macro v2', () => { - test(`should show style by use tailwindcss theme when use twin.macro v2`, async () => { - const appDir = path.resolve(fixtures, 'twin.macro-v3'); - const { page, clear } = await launchAppWithPage(appDir); - const textColor = await page.$eval('p', p => - window.getComputedStyle(p).getPropertyValue('color'), - ); - - expect(textColor).toBe('rgb(255, 0, 0)'); - - await clear(); - }); -}); From ee49867c7d91d6d8ae1211ebe5c3301441f8ce78 Mon Sep 17 00:00:00 2001 From: zhangxiang Date: Tue, 28 Oct 2025 14:52:33 +0800 Subject: [PATCH 3/3] feat: remove tools.tailwindcss --- .../main-doc/docs/en/apis/app/commands.mdx | 5 +- .../en/configure/app/tools/tailwindcss.mdx | 66 -- .../main-doc/docs/en/configure/app/usage.mdx | 1 - .../en/guides/advanced-features/low-level.mdx | 1 - .../guides/basic-features/css/tailwindcss.mdx | 34 +- .../docs/en/guides/get-started/tech-stack.mdx | 2 +- .../docs/en/plugin/cli-plugins/api.mdx | 4 +- .../en/plugin/official/cli-plugins/_meta.json | 2 +- .../official/cli-plugins/plugin-tailwind.mdx | 5 - .../main-doc/docs/zh/apis/app/commands.mdx | 5 +- .../zh/configure/app/tools/tailwindcss.mdx | 66 -- .../main-doc/docs/zh/configure/app/usage.mdx | 1 - .../zh/guides/advanced-features/low-level.mdx | 1 - .../guides/basic-features/css/tailwindcss.mdx | 30 +- .../docs/zh/guides/get-started/tech-stack.mdx | 2 +- .../docs/zh/plugin/cli-plugins/api.mdx | 4 +- .../zh/plugin/official/cli-plugins/_meta.json | 2 +- .../official/cli-plugins/plugin-tailwind.mdx | 5 - .../app-tools/src/types/config/tools.ts | 12 - pnpm-lock.yaml | 790 ++++++++---------- .../babel-plugin-macros.config.cjs | 7 - .../fixtures/tailwindcss-v3/src/App.jsx | 3 - 22 files changed, 388 insertions(+), 660 deletions(-) delete mode 100644 packages/document/main-doc/docs/en/configure/app/tools/tailwindcss.mdx delete mode 100644 packages/document/main-doc/docs/en/plugin/official/cli-plugins/plugin-tailwind.mdx delete mode 100644 packages/document/main-doc/docs/zh/configure/app/tools/tailwindcss.mdx delete mode 100644 packages/document/main-doc/docs/zh/plugin/official/cli-plugins/plugin-tailwind.mdx delete mode 100644 tests/integration/tailwindcss/fixtures/tailwindcss-v3/babel-plugin-macros.config.cjs diff --git a/packages/document/main-doc/docs/en/apis/app/commands.mdx b/packages/document/main-doc/docs/en/apis/app/commands.mdx index 0605e13540d6..15583a526d0e 100644 --- a/packages/document/main-doc/docs/en/apis/app/commands.mdx +++ b/packages/document/main-doc/docs/en/apis/app/commands.mdx @@ -108,7 +108,7 @@ Open the above HTML file in the browser, you can see the tile diagram of the bun The `modern new` command is used to enable features in an existing project. -For example, add application entry, enable some optional features such as Tailwind CSS, micro frontend, etc. +For example, add application entry, enable some optional features such as BFF, micro frontend, etc. ```bash Usage: modern new [options] @@ -142,8 +142,7 @@ In the project, execute the `new` command to enable features as follows: $ npx modern new ? Please select the operation you want: Enable Features ? Please select the feature name: (Use arrow keys) -❯ Enable Tailwind CSS - Enable BFF +❯ Enable BFF Enable SSG Enable Micro Frontend ``` diff --git a/packages/document/main-doc/docs/en/configure/app/tools/tailwindcss.mdx b/packages/document/main-doc/docs/en/configure/app/tools/tailwindcss.mdx deleted file mode 100644 index 21763d8b6932..000000000000 --- a/packages/document/main-doc/docs/en/configure/app/tools/tailwindcss.mdx +++ /dev/null @@ -1,66 +0,0 @@ ---- -title: tailwindcss ---- - -# tools.tailwindcss - -- **Type:** `Object | Function` -- **Default:** - -```js -const tailwind = { - content: [ - './src/**/*.{js,jsx,ts,tsx}', - './config/html/**/*.{html,ejs,hbs}', - './storybook/**/*', - ], -}; -``` - -Used to modify the configuration of [Tailwind CSS](https://tailwindcss.com/docs/configuration). - -### Enabling Tailwind CSS - -Before using `tools.tailwindcss`, you need to enable the Tailwind CSS plugin for Modern.js. - -Please refer to the section [Using Tailwind CSS](/guides/basic-features/css/tailwindcss) for instructions on how to enable it. - -### Function Type - -When `tools.tailwindcss`'s type is Function, the default tailwindcss config will be passed in as the first parameter, the config object can be modified directly, or a value can be returned as the final result. - -```ts title="modern.config.ts" -export default { - tools: { - tailwindcss(config) { - config.content.push('./some-folder/**/*.{js,ts}'); - }, - }, -}; -``` - -### Object Type - -When `tools.tailwindcss`'s type is `Object`, the config will be shallow merged with default config by `Object.assign`. - -```ts title="modern.config.ts" -export default { - tools: { - tailwindcss: { - plugins: [ - require('@tailwindcss/forms'), - require('@tailwindcss/aspect-ratio'), - require('@tailwindcss/typography'), - ], - }, - }, -}; -``` - -### Notes - -Please note: - -- If you are using both the `tailwind.config.{ts,js}` file and `tools.tailwindcss` option, the configuration defined in `tools.tailwindcss` will take precedence and override the content defined in `tailwind.config.{ts,js}`. - -The usage of other configurations follows the same approach as the official usage of Tailwind CSS. Please refer to [tailwindcss - Configuration](https://tailwindcss.com/docs/configuration) for more details. diff --git a/packages/document/main-doc/docs/en/configure/app/usage.mdx b/packages/document/main-doc/docs/en/configure/app/usage.mdx index 786efade97f6..7f33e95f3d97 100644 --- a/packages/document/main-doc/docs/en/configure/app/usage.mdx +++ b/packages/document/main-doc/docs/en/configure/app/usage.mdx @@ -150,7 +150,6 @@ Due to the limitations of the JSON file format, only simple types such as number #### Notes - It is not recommended to use both `package.json` and `modern.config.js` for configuration simultaneously. If both are used and conflicts arise, Modern.js will prompt an error in the command line. -- The `@modern-js/runtime` exports a similarly named [defineConfig](/apis/app/runtime/app/define-config) API, so please be careful to distinguish between them. ### Local Debugging Configuration diff --git a/packages/document/main-doc/docs/en/guides/advanced-features/low-level.mdx b/packages/document/main-doc/docs/en/guides/advanced-features/low-level.mdx index 9b0acc66a1ce..252fa9ff6713 100644 --- a/packages/document/main-doc/docs/en/guides/advanced-features/low-level.mdx +++ b/packages/document/main-doc/docs/en/guides/advanced-features/low-level.mdx @@ -39,5 +39,4 @@ Currently provided is as follows: | Less | [tools.less](/configure/app/tools/less) | | Sass | [tools.sass](/configure/app/tools/sass) | | Minify CSS | [tools.minifyCss](/configure/app/tools/minify-css) | -| Tailwind CSS | [tools.tailwind](/configure/app/tools/tailwindcss) | | Autoprefixer | [tools.autoprefixer](/configure/app/tools/autoprefixer) | diff --git a/packages/document/main-doc/docs/en/guides/basic-features/css/tailwindcss.mdx b/packages/document/main-doc/docs/en/guides/basic-features/css/tailwindcss.mdx index 56972d41eae7..00364048b49d 100644 --- a/packages/document/main-doc/docs/en/guides/basic-features/css/tailwindcss.mdx +++ b/packages/document/main-doc/docs/en/guides/basic-features/css/tailwindcss.mdx @@ -65,18 +65,30 @@ module.exports = { #### 5. Twin.macro Integration -If your project uses twin.macro, perform the following steps; otherwise, ignore: - -- Manually install dependencies: `pnpm add twin.macro styled-components -D` -- Add the `babel-plugin-macros.config.cjs` configuration file: - -```js title="babel-plugin-macros.config.cjs" -module.exports = { - twin: { - preset: 'styled-components', - config: './tailwind.config.js', +If the project uses twin.macro, perform the following steps; otherwise, ignore: + +- Manually install dependencies: `pnpm add twin.macro styled-components babel-plugin-macros -D` +- Configure the `babel-plugin-macros` Babel plugin: + +```ts title="modern.config.ts" +export default defineConfig({ + plugins: [appTools()], + tools: { + babel: { + plugins: [ + [ + 'babel-plugin-macros', + { + twin: { + preset: 'styled-components', + config: './tailwind.config.ts', + }, + }, + ], + ], + }, }, -}; +}); ``` #### Tailwind CSS V2 Migration diff --git a/packages/document/main-doc/docs/en/guides/get-started/tech-stack.mdx b/packages/document/main-doc/docs/en/guides/get-started/tech-stack.mdx index f7913dcc0da5..579090fe59c4 100644 --- a/packages/document/main-doc/docs/en/guides/get-started/tech-stack.mdx +++ b/packages/document/main-doc/docs/en/guides/get-started/tech-stack.mdx @@ -52,7 +52,7 @@ Modern.js uses [PostCSS](https://postcss.org/) to transform CSS code and enables Modern.js supports enabling ["Lightning CSS"](/configure/app/tools/lightningcss-loader), which uses Lightning CSS to downgrade CSS syntax. -Modern.js supports enabling ["Tailwind CSS"](/guides/basic-features/css/tailwindcss) and is compatible with both Tailwind CSS v2 and v3. +Modern.js supports enabling ["Tailwind CSS"](/guides/basic-features/css/tailwindcss) and is compatible with both Tailwind CSS v3 and v4. ## CSS Preprocessors diff --git a/packages/document/main-doc/docs/en/plugin/cli-plugins/api.mdx b/packages/document/main-doc/docs/en/plugin/cli-plugins/api.mdx index 549c1f5f3d2f..39824b8b2d03 100644 --- a/packages/document/main-doc/docs/en/plugin/cli-plugins/api.mdx +++ b/packages/document/main-doc/docs/en/plugin/cli-plugins/api.mdx @@ -132,8 +132,8 @@ Checks if a specified plugin is registered. - **Example:** ```typescript -if (api.isPluginExists('@modern-js/plugin-tailwind')) { - console.log('Tailwind CSS plugin is enabled'); +if (api.isPluginExists('@modern-js/plugin-bff')) { + console.log('BFF plugin is enabled'); } ``` diff --git a/packages/document/main-doc/docs/en/plugin/official/cli-plugins/_meta.json b/packages/document/main-doc/docs/en/plugin/official/cli-plugins/_meta.json index 3853493670b6..575b56365ecb 100644 --- a/packages/document/main-doc/docs/en/plugin/official/cli-plugins/_meta.json +++ b/packages/document/main-doc/docs/en/plugin/official/cli-plugins/_meta.json @@ -1 +1 @@ -["plugin-tailwind", "plugin-bff", "plugin-ssg"] +["plugin-bff", "plugin-ssg"] diff --git a/packages/document/main-doc/docs/en/plugin/official/cli-plugins/plugin-tailwind.mdx b/packages/document/main-doc/docs/en/plugin/official/cli-plugins/plugin-tailwind.mdx deleted file mode 100644 index 0e326fbe8da8..000000000000 --- a/packages/document/main-doc/docs/en/plugin/official/cli-plugins/plugin-tailwind.mdx +++ /dev/null @@ -1,5 +0,0 @@ -# Tailwind CSS Plugin - -Tailwind CSS is a utility-first CSS framework and design system that allows you to quickly add commonly used styles to components while supporting flexible theme style extensions. - -For more details, refer to [Using Tailwind CSS](/guides/basic-features/css/tailwindcss). \ No newline at end of file diff --git a/packages/document/main-doc/docs/zh/apis/app/commands.mdx b/packages/document/main-doc/docs/zh/apis/app/commands.mdx index b48cbe81e6b8..99af2876882d 100644 --- a/packages/document/main-doc/docs/zh/apis/app/commands.mdx +++ b/packages/document/main-doc/docs/zh/apis/app/commands.mdx @@ -108,7 +108,7 @@ info Production file sizes: `modern new` 命令用于在已有项目中添加项目元素。 -比如添加应用入口、启用一些可选功能如 Tailwind CSS、微前端开发模式等。 +比如添加应用入口、启用一些可选功能如 BFF、微前端开发模式等。 ```bash Usage: modern new [options] @@ -142,8 +142,7 @@ $ npx modern new $ npx modern new ? 请选择你想要的操作 启用可选功能 ? 请选择功能名称 (Use arrow keys) -❯ 启用 「Tailwind CSS」 支持 - 启用「BFF」功能 +❯ 启用「BFF」功能 启用「微前端」模式 ``` diff --git a/packages/document/main-doc/docs/zh/configure/app/tools/tailwindcss.mdx b/packages/document/main-doc/docs/zh/configure/app/tools/tailwindcss.mdx deleted file mode 100644 index 2ae26f9d9c8d..000000000000 --- a/packages/document/main-doc/docs/zh/configure/app/tools/tailwindcss.mdx +++ /dev/null @@ -1,66 +0,0 @@ ---- -title: tailwindcss ---- - -# tools.tailwindcss - -- **类型：** `Object | Function` -- **默认值：** - -```js -const tailwind = { - content: [ - './src/**/*.{js,jsx,ts,tsx}', - './config/html/**/*.{html,ejs,hbs}', - './storybook/**/*', - ], -}; -``` - -用于修改 [Tailwind CSS](https://tailwindcss.com/docs/configuration) 的配置项。 - -### 启用 Tailwind CSS - -在使用 `tools.tailwindcss` 之前，你需要启用 Modern.js 的 Tailwind CSS 插件。 - -请阅读[「使用 Tailwind CSS」](/guides/basic-features/css/tailwindcss) 章节来了解开启方式。 - -### Function 类型 - -当 `tools.tailwindcss` 为 Function 类型时，默认配置会作为第一个参数传入，你可以直接修改配置对象，也可以返回一个值作为最终结果： - -```ts title="modern.config.ts" -export default { - tools: { - tailwindcss(config) { - config.content.push('./some-folder/**/*.{js,ts}'); - }, - }, -}; -``` - -### Object 类型 - -当 `tools.tailwindcss` 的值为 `Object` 类型时，会与默认配置通过 `Object.assign` 浅合并。 - -```ts title="modern.config.ts" -export default { - tools: { - tailwindcss: { - plugins: [ - require('@tailwindcss/forms'), - require('@tailwindcss/aspect-ratio'), - require('@tailwindcss/typography'), - ], - }, - }, -}; -``` - -### 注意事项 - -注意： - -- 如果你同时使用了 `tailwind.config.{ts,js}` 文件和 `tools.tailwindcss` 选项，那么 `tools.tailwindcss` 定义的配置会优先生效，并覆盖 `tailwind.config.{ts,js}` 中定义的内容。 - -其他配置的使用方式与 Tailwind CSS 官方用法一致，请参考 [tailwindcss - Configuration](https://tailwindcss.com/docs/configuration)。 diff --git a/packages/document/main-doc/docs/zh/configure/app/usage.mdx b/packages/document/main-doc/docs/zh/configure/app/usage.mdx index becd685dd2d4..9ba5e1fd9ff8 100644 --- a/packages/document/main-doc/docs/zh/configure/app/usage.mdx +++ b/packages/document/main-doc/docs/zh/configure/app/usage.mdx @@ -150,7 +150,6 @@ $ modern build -c modern.prod.config.js #### 注意事项 - 不建议同时使用 `package.json` 和 `modern.config.js` 进行配置。如果同时使用了两者并出现配置冲突，Modern.js 会在命令行进行提示错误。 -- `@modern-js/runtime` 导出了同名的 [defineConfig](/apis/app/runtime/app/define-config) API，请注意区分。 ### 本地调试配置 diff --git a/packages/document/main-doc/docs/zh/guides/advanced-features/low-level.mdx b/packages/document/main-doc/docs/zh/guides/advanced-features/low-level.mdx index c43d05748e65..5667c811a07a 100644 --- a/packages/document/main-doc/docs/zh/guides/advanced-features/low-level.mdx +++ b/packages/document/main-doc/docs/zh/guides/advanced-features/low-level.mdx @@ -37,5 +37,4 @@ export default defineConfig({ | Less | [tools.less](/configure/app/tools/less) | | Sass | [tools.sass](/configure/app/tools/sass) | | Minify CSS | [tools.minifyCss](/configure/app/tools/minify-css) | -| Tailwind CSS | [tools.tailwind](/configure/app/tools/tailwindcss) | | Autoprefixer | [tools.autoprefixer](/configure/app/tools/autoprefixer) | diff --git a/packages/document/main-doc/docs/zh/guides/basic-features/css/tailwindcss.mdx b/packages/document/main-doc/docs/zh/guides/basic-features/css/tailwindcss.mdx index df6c63f302da..111f4409516d 100644 --- a/packages/document/main-doc/docs/zh/guides/basic-features/css/tailwindcss.mdx +++ b/packages/document/main-doc/docs/zh/guides/basic-features/css/tailwindcss.mdx @@ -67,16 +67,28 @@ module.exports = { 若项目中有使用 twin.macro 需执行如下操作，未使用则忽略： -- 手动安装依赖：`pnpm add twin.macro styled-components -D` -- 新增 `babel-plugin-macros.config.cjs` 配置文件： - -```js title="babel-plugin-macros.config.cjs" -module.exports = { - twin: { - preset: 'styled-components', - config: './tailwind.config.js', +- 手动安装依赖：`pnpm add twin.macro styled-components babel-plugin-macros -D` +- 配置 `babel-plugin-macros` babel 插件： + +```ts title="modern.config.ts" +export default defineConfig({ + plugins: [appTools()], + tools: { + babel: { + plugins: [ + [ + 'babel-plugin-macros', + { + twin: { + preset: 'styled-components', + config: './tailwind.config.ts', + }, + }, + ], + ], + }, }, -}; +}); ``` #### Tailwind CSS V2 版本迁移 diff --git a/packages/document/main-doc/docs/zh/guides/get-started/tech-stack.mdx b/packages/document/main-doc/docs/zh/guides/get-started/tech-stack.mdx index 59c2ad6b43b5..536144b9b4a9 100644 --- a/packages/document/main-doc/docs/zh/guides/get-started/tech-stack.mdx +++ b/packages/document/main-doc/docs/zh/guides/get-started/tech-stack.mdx @@ -52,7 +52,7 @@ Modern.js 使用 [PostCSS](https://postcss.org/) 来转换 CSS 代码，并默 Modern.js 支持 [启用 Lightning CSS](/configure/app/tools/lightningcss-loader)，使用 Lightning CSS 降级 CSS 语法。 -Modern.js 支持 [启用 Tailwind CSS](/guides/basic-features/css/tailwindcss)，并同时兼容 Tailwind CSS v2 和 v3 版本。 +Modern.js 支持 [启用 Tailwind CSS](/guides/basic-features/css/tailwindcss)，并同时兼容 Tailwind CSS v3 和 v4 版本。 ## CSS 预处理器 diff --git a/packages/document/main-doc/docs/zh/plugin/cli-plugins/api.mdx b/packages/document/main-doc/docs/zh/plugin/cli-plugins/api.mdx index c0b7fcb68cf4..3c5889d61449 100644 --- a/packages/document/main-doc/docs/zh/plugin/cli-plugins/api.mdx +++ b/packages/document/main-doc/docs/zh/plugin/cli-plugins/api.mdx @@ -128,8 +128,8 @@ api.onBeforeBuild(() => { - **示例：** ```typescript -if (api.isPluginExists('@modern-js/plugin-tailwind')) { - console.log('Tailwind CSS 插件已启用'); +if (api.isPluginExists('@modern-js/plugin-bff')) { + console.log('BFF 插件已启用'); } ``` diff --git a/packages/document/main-doc/docs/zh/plugin/official/cli-plugins/_meta.json b/packages/document/main-doc/docs/zh/plugin/official/cli-plugins/_meta.json index 3853493670b6..575b56365ecb 100644 --- a/packages/document/main-doc/docs/zh/plugin/official/cli-plugins/_meta.json +++ b/packages/document/main-doc/docs/zh/plugin/official/cli-plugins/_meta.json @@ -1 +1 @@ -["plugin-tailwind", "plugin-bff", "plugin-ssg"] +["plugin-bff", "plugin-ssg"] diff --git a/packages/document/main-doc/docs/zh/plugin/official/cli-plugins/plugin-tailwind.mdx b/packages/document/main-doc/docs/zh/plugin/official/cli-plugins/plugin-tailwind.mdx deleted file mode 100644 index 1d5c455a3c8c..000000000000 --- a/packages/document/main-doc/docs/zh/plugin/official/cli-plugins/plugin-tailwind.mdx +++ /dev/null @@ -1,5 +0,0 @@ -# Tailwind CSS 插件 - -Tailwind CSS 是一个以 Utility Class 为基础的 CSS 框架和设计系统，可以快速地为组件添加常用样式，同时支持主题样式的灵活扩展。 - -详细内容可以参考 [使用 Tailwind CSS](/guides/basic-features/css/tailwindcss)。 \ No newline at end of file diff --git a/packages/solutions/app-tools/src/types/config/tools.ts b/packages/solutions/app-tools/src/types/config/tools.ts index f8c7250af444..92a6f70a12bd 100644 --- a/packages/solutions/app-tools/src/types/config/tools.ts +++ b/packages/solutions/app-tools/src/types/config/tools.ts @@ -2,21 +2,9 @@ import type { BuilderConfig } from '@modern-js/builder'; import type { JestConfig } from '@modern-js/types'; import type { UnwrapBuilderConfig } from '../utils'; -export type Tailwindcss = - | Record - | ((options: Record) => Record | void); - type BuilderToolsConfig = UnwrapBuilderConfig; export interface ToolsUserConfig extends Omit { - /** - * Used to custom Tailwind CSS configurations. - * @requires `tailwindcss` plugin. - * The configuration of `tools.tailwindcss` is provided by `tailwindcss` plugin. - * Please use `yarn new` or `pnpm new` to enable the corresponding capability. - */ - tailwindcss?: Tailwindcss; - /** * Used to custom Jest configurations. * @requires `test` plugin. diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ae220faf4796..8af71e96cb7b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -66,7 +66,7 @@ importers: version: 6.1.0 vitest: specifier: ^3.0.0 - version: 3.0.5(@types/debug@4.1.12)(@types/node@20.5.1)(@vitest/ui@3.2.4)(jsdom@20.0.3(bufferutil@4.0.8)(utf-8-validate@5.0.10))(less@4.4.2)(sass-embedded@1.90.0)(sass@1.93.3)(terser@5.44.0) + version: 3.0.5(@types/debug@4.1.12)(@types/node@20.5.1)(@vitest/ui@3.2.4)(jsdom@20.0.3(bufferutil@4.0.8)(utf-8-validate@5.0.10))(less@4.4.2)(lightningcss@1.30.2)(sass-embedded@1.90.0)(sass@1.93.3)(terser@5.44.0) packages/cli/babel-preset: dependencies: @@ -154,7 +154,7 @@ importers: version: 1.5.0(@rsbuild/core@1.6.0) '@rsbuild/plugin-css-minimizer': specifier: 1.0.3 - version: 1.0.3(@rsbuild/core@1.6.0)(esbuild@0.25.5)(webpack@5.99.8(@swc/core@1.14.0(@swc/helpers@0.5.17))(esbuild@0.25.5)) + version: 1.0.3(@rsbuild/core@1.6.0)(esbuild@0.25.5)(lightningcss@1.30.2)(webpack@5.99.8(@swc/core@1.14.0(@swc/helpers@0.5.17))(esbuild@0.25.5)) '@rsbuild/plugin-less': specifier: 1.5.0 version: 1.5.0(@rsbuild/core@1.6.0) @@ -496,64 +496,6 @@ importers: specifier: ^5.3.3 version: 5.6.3 - packages/cli/plugin-tailwind: - dependencies: - '@modern-js/node-bundle-require': - specifier: workspace:* - version: link:../../toolkit/node-bundle-require - '@modern-js/runtime-utils': - specifier: workspace:* - version: link:../../toolkit/runtime-utils - '@modern-js/utils': - specifier: workspace:* - version: link:../../toolkit/utils - '@swc/helpers': - specifier: ^0.5.17 - version: 0.5.17 - babel-plugin-macros: - specifier: 3.1.0 - version: 3.1.0 - devDependencies: - '@modern-js/app-tools': - specifier: workspace:* - version: link:../../solutions/app-tools - '@modern-js/module-tools': - specifier: 2.68.18 - version: 2.68.18(@types/node@20.8.8)(typescript@5.6.3) - '@modern-js/runtime': - specifier: workspace:* - version: link:../../runtime/plugin-runtime - '@modern-js/types': - specifier: workspace:* - version: link:../../toolkit/types - '@scripts/build': - specifier: workspace:* - version: link:../../../scripts/build - '@scripts/jest-config': - specifier: workspace:* - version: link:../../../scripts/jest-config - '@types/jest': - specifier: ^29.5.14 - version: 29.5.14 - '@types/node': - specifier: ^20 - version: 20.8.8 - jest: - specifier: ^29.7.0 - version: 29.7.0(@types/node@20.8.8)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.14.0(@swc/helpers@0.5.17))(@types/node@20.8.8)(typescript@5.6.3)) - postcss: - specifier: ^8.5.6 - version: 8.5.6 - react: - specifier: ^19.2.0 - version: 19.2.0 - tailwindcss: - specifier: ^3.3.3 - version: 3.3.3(ts-node@10.9.2(@swc/core@1.14.0(@swc/helpers@0.5.17))(@types/node@20.8.8)(typescript@5.6.3)) - typescript: - specifier: ^5 - version: 5.6.3 - packages/document/main-doc: dependencies: '@modern-js/sandpack-react': @@ -992,48 +934,6 @@ importers: specifier: ^5 version: 5.6.3 - packages/generator/generators/tailwindcss-generator: - devDependencies: - '@modern-js/codesmith': - specifier: 2.6.8 - version: 2.6.8 - '@modern-js/codesmith-api-app': - specifier: 2.6.8 - version: 2.6.8(@modern-js/codesmith@2.6.8)(typescript@5.6.3) - '@modern-js/codesmith-api-json': - specifier: 2.6.8 - version: 2.6.8 - '@modern-js/codesmith-utils': - specifier: 2.6.8 - version: 2.6.8 - '@modern-js/dependence-generator': - specifier: workspace:* - version: link:../dependence-generator - '@modern-js/generator-common': - specifier: workspace:* - version: link:../../generator-common - '@modern-js/generator-utils': - specifier: workspace:* - version: link:../../generator-utils - '@scripts/build': - specifier: workspace:* - version: link:../../../../scripts/build - '@scripts/jest-config': - specifier: workspace:* - version: link:../../../../scripts/jest-config - '@types/jest': - specifier: ^29.5.14 - version: 29.5.14 - '@types/node': - specifier: ^20 - version: 20.8.8 - jest: - specifier: ^29.7.0 - version: 29.7.0(@types/node@20.8.8)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.14.0(@swc/helpers@0.5.17))(@types/node@20.8.8)(typescript@5.6.3)) - typescript: - specifier: ^5 - version: 5.6.3 - packages/generator/generators/upgrade-generator: devDependencies: '@modern-js/codesmith': @@ -5161,18 +5061,9 @@ importers: '@modern-js/app-tools': specifier: workspace:* version: link:../../../../../packages/solutions/app-tools - '@modern-js/plugin-tailwindcss': - specifier: workspace:* - version: link:../../../../../packages/cli/plugin-tailwind '@modern-js/runtime': specifier: workspace:* version: link:../../../../../packages/runtime/plugin-runtime - autoprefixer: - specifier: 10.4.21 - version: 10.4.21(postcss@8.5.6) - postcss: - specifier: ^8.5.6 - version: 8.5.6 react: specifier: ^19.2.0 version: 19.2.0 @@ -5188,177 +5079,40 @@ importers: '@modern-js/app-tools': specifier: workspace:* version: link:../../../../../packages/solutions/app-tools - '@modern-js/plugin-tailwindcss': - specifier: workspace:* - version: link:../../../../../packages/cli/plugin-tailwind - '@modern-js/runtime': - specifier: workspace:* - version: link:../../../../../packages/runtime/plugin-runtime - postcss: - specifier: ^8.5.6 - version: 8.5.6 - react: - specifier: ^19.2.0 - version: 19.2.0 - react-dom: - specifier: ^19.2.0 - version: 19.2.0(react@19.2.0) - tailwindcss: - specifier: ^3.3.3 - version: 3.3.3(ts-node@10.9.2(@swc/core@1.14.0(@swc/helpers@0.5.17))(@types/node@24.3.1)(typescript@5.6.3)) - - tests/integration/tailwindcss/fixtures/tailwindcss-v3-js-config: - dependencies: - '@modern-js/app-tools': - specifier: workspace:* - version: link:../../../../../packages/solutions/app-tools - '@modern-js/plugin-tailwindcss': - specifier: workspace:* - version: link:../../../../../packages/cli/plugin-tailwind - '@modern-js/runtime': - specifier: workspace:* - version: link:../../../../../packages/runtime/plugin-runtime - postcss: - specifier: ^8.5.6 - version: 8.5.6 - react: - specifier: ^19.2.0 - version: 19.2.0 - react-dom: - specifier: ^19.2.0 - version: 19.2.0(react@19.2.0) - tailwindcss: - specifier: ^3.3.3 - version: 3.3.3(ts-node@10.9.2(@swc/core@1.14.0(@swc/helpers@0.5.17))(@types/node@24.3.1)(typescript@5.6.3)) - - tests/integration/tailwindcss/fixtures/tailwindcss-v3-js-config-with-postcss-config: - dependencies: - '@modern-js/app-tools': - specifier: workspace:* - version: link:../../../../../packages/solutions/app-tools - '@modern-js/plugin-tailwindcss': - specifier: workspace:* - version: link:../../../../../packages/cli/plugin-tailwind - '@modern-js/runtime': - specifier: workspace:* - version: link:../../../../../packages/runtime/plugin-runtime - postcss: - specifier: ^8.5.6 - version: 8.5.6 - react: - specifier: ^19.2.0 - version: 19.2.0 - react-dom: - specifier: ^19.2.0 - version: 19.2.0(react@19.2.0) - tailwindcss: - specifier: ^3.3.3 - version: 3.3.3(ts-node@10.9.2(@swc/core@1.14.0(@swc/helpers@0.5.17))(@types/node@24.3.1)(typescript@5.6.3)) - - tests/integration/tailwindcss/fixtures/tailwindcss-v3-merge-config: - dependencies: - '@modern-js/app-tools': - specifier: workspace:* - version: link:../../../../../packages/solutions/app-tools - '@modern-js/plugin-tailwindcss': - specifier: workspace:* - version: link:../../../../../packages/cli/plugin-tailwind - '@modern-js/runtime': - specifier: workspace:* - version: link:../../../../../packages/runtime/plugin-runtime - postcss: - specifier: ^8.5.6 - version: 8.5.6 - react: - specifier: ^19.2.0 - version: 19.2.0 - react-dom: - specifier: ^19.2.0 - version: 19.2.0(react@19.2.0) - tailwindcss: - specifier: ^3.3.3 - version: 3.3.3(ts-node@10.9.2(@swc/core@1.14.0(@swc/helpers@0.5.17))(@types/node@24.3.1)(typescript@5.6.3)) - - tests/integration/tailwindcss/fixtures/tailwindcss-v3-ts-config: - dependencies: - '@modern-js/app-tools': - specifier: workspace:* - version: link:../../../../../packages/solutions/app-tools - '@modern-js/plugin-tailwindcss': - specifier: workspace:* - version: link:../../../../../packages/cli/plugin-tailwind '@modern-js/runtime': specifier: workspace:* version: link:../../../../../packages/runtime/plugin-runtime - postcss: - specifier: ^8.5.6 - version: 8.5.6 - react: - specifier: ^19.2.0 - version: 19.2.0 - react-dom: - specifier: ^19.2.0 - version: 19.2.0(react@19.2.0) - tailwindcss: - specifier: ^3.3.3 - version: 3.3.3(ts-node@10.9.2(@swc/core@1.14.0(@swc/helpers@0.5.17))(@types/node@24.3.1)(typescript@5.6.3)) - - tests/integration/tailwindcss/fixtures/tailwindcss-without-plugin: - dependencies: - '@modern-js/app-tools': - specifier: workspace:* - version: link:../../../../../packages/solutions/app-tools - '@modern-js/runtime': - specifier: workspace:* - version: link:../../../../../packages/runtime/plugin-runtime - postcss: - specifier: ^8.5.6 - version: 8.5.6 react: specifier: ^19.2.0 version: 19.2.0 react-dom: specifier: ^19.2.0 version: 19.2.0(react@19.2.0) + styled-components: + specifier: ^5.3.1 + version: 5.3.5(react-dom@19.2.0(react@19.2.0))(react-is@18.3.1)(react@19.2.0) tailwindcss: specifier: ^3.3.3 version: 3.3.3(ts-node@10.9.2(@swc/core@1.14.0(@swc/helpers@0.5.17))(@types/node@24.3.1)(typescript@5.6.3)) - - tests/integration/tailwindcss/fixtures/twin.macro-v2: - dependencies: - '@modern-js/app-tools': - specifier: workspace:* - version: link:../../../../../packages/solutions/app-tools - '@modern-js/plugin-tailwindcss': - specifier: workspace:* - version: link:../../../../../packages/cli/plugin-tailwind - '@modern-js/runtime': - specifier: workspace:* - version: link:../../../../../packages/runtime/plugin-runtime - postcss: - specifier: ^8.5.6 - version: 8.5.6 - react: - specifier: ^19.2.0 - version: 19.2.0 - react-dom: - specifier: ^19.2.0 - version: 19.2.0(react@19.2.0) twin.macro: - specifier: ^2.8.2 - version: 2.8.2(ts-node@10.9.2(@swc/core@1.14.0(@swc/helpers@0.5.17))(@types/node@20.5.1)(typescript@5.6.3)) + specifier: ^3.4.0 + version: 3.4.1(tailwindcss@3.3.3(ts-node@10.9.2(@swc/core@1.14.0(@swc/helpers@0.5.17))(@types/node@24.3.1)(typescript@5.6.3))) + devDependencies: + babel-plugin-macros: + specifier: 3.1.0 + version: 3.1.0 - tests/integration/tailwindcss/fixtures/twin.macro-v3: + tests/integration/tailwindcss/fixtures/tailwindcss-v4: dependencies: '@modern-js/app-tools': specifier: workspace:* version: link:../../../../../packages/solutions/app-tools - '@modern-js/plugin-tailwindcss': - specifier: workspace:* - version: link:../../../../../packages/cli/plugin-tailwind '@modern-js/runtime': specifier: workspace:* version: link:../../../../../packages/runtime/plugin-runtime + '@tailwindcss/postcss': + specifier: ^4.1.14 + version: 4.1.16 postcss: specifier: ^8.5.6 version: 8.5.6 @@ -5368,15 +5122,9 @@ importers: react-dom: specifier: ^19.2.0 version: 19.2.0(react@19.2.0) - styled-components: - specifier: ^5.3.1 - version: 5.3.5(react-dom@19.2.0(react@19.2.0))(react-is@18.3.1)(react@19.2.0) tailwindcss: - specifier: ^3.3.3 - version: 3.3.3(ts-node@10.9.2(@swc/core@1.14.0(@swc/helpers@0.5.17))(@types/node@24.3.1)(typescript@5.6.3)) - twin.macro: - specifier: ^3.4.1 - version: 3.4.1(tailwindcss@3.3.3(ts-node@10.9.2(@swc/core@1.14.0(@swc/helpers@0.5.17))(@types/node@24.3.1)(typescript@5.6.3))) + specifier: ^4 + version: 4.1.16 tests/integration/temp-dir: dependencies: @@ -8914,30 +8662,118 @@ packages: '@swc/helpers@0.5.1': resolution: {integrity: sha512-sJ902EfIzn1Fa+qYmjdQqh8tPsoxyBz+8yBKC2HKUxyezKJFwPGOn7pv4WY6QuQW//ySQi5lJjA/ZT9sNWWNTg==} - '@swc/helpers@0.5.13': - resolution: {integrity: sha512-UoKGxQ3r5kYI9dALKJapMmuK+1zWM/H17Z1+iwnNmzcJRnfFuevZs375TA5rW31pu4BS4NoSy1fRsexDXfWn5w==} + '@swc/helpers@0.5.13': + resolution: {integrity: sha512-UoKGxQ3r5kYI9dALKJapMmuK+1zWM/H17Z1+iwnNmzcJRnfFuevZs375TA5rW31pu4BS4NoSy1fRsexDXfWn5w==} + + '@swc/helpers@0.5.17': + resolution: {integrity: sha512-5IKx/Y13RsYd+sauPb2x+U/xZikHjolzfuDgTAl/Tdf3Q8rslRvC19NKDLgAJQ6wsqADk10ntlv08nPFw/gO/A==} + + '@swc/jest@0.2.39': + resolution: {integrity: sha512-eyokjOwYd0Q8RnMHri+8/FS1HIrIUKK/sRrFp8c1dThUOfNeCWbLmBP1P5VsKdvmkd25JaH+OKYwEYiAYg9YAA==} + engines: {npm: '>= 7.0.0'} + peerDependencies: + '@swc/core': '*' + + '@swc/plugin-loadable-components@9.0.0': + resolution: {integrity: sha512-YRhogIo16GZSyjdyVsg97x3nKGZccX1dguKC59CCpn2hwG00e8eWRIPgAVxKzT+IoWbVDPLj2zNVONXB1vL7Vg==} + + '@swc/plugin-styled-components@10.0.0': + resolution: {integrity: sha512-IbnTXsJMBWiexuykaQy3mDiAo9l7V3b9oC7X1pXwYdu8nIeYJIH6if86o6xxALEVc3/logRhI0mHVnc7bct3KA==} + + '@swc/types@0.1.25': + resolution: {integrity: sha512-iAoY/qRhNH8a/hBvm3zKj9qQ4oc2+3w1unPJa2XvTK3XjeLXtzcCingVPw/9e5mn1+0yPqxcBGp9Jf0pkfMb1g==} + + '@szmarczak/http-timer@4.0.6': + resolution: {integrity: sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==} + engines: {node: '>=10'} + + '@tailwindcss/node@4.1.16': + resolution: {integrity: sha512-BX5iaSsloNuvKNHRN3k2RcCuTEgASTo77mofW0vmeHkfrDWaoFAFvNHpEgtu0eqyypcyiBkDWzSMxJhp3AUVcw==} + + '@tailwindcss/oxide-android-arm64@4.1.16': + resolution: {integrity: sha512-8+ctzkjHgwDJ5caq9IqRSgsP70xhdhJvm+oueS/yhD5ixLhqTw9fSL1OurzMUhBwE5zK26FXLCz2f/RtkISqHA==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [android] + + '@tailwindcss/oxide-darwin-arm64@4.1.16': + resolution: {integrity: sha512-C3oZy5042v2FOALBZtY0JTDnGNdS6w7DxL/odvSny17ORUnaRKhyTse8xYi3yKGyfnTUOdavRCdmc8QqJYwFKA==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [darwin] + + '@tailwindcss/oxide-darwin-x64@4.1.16': + resolution: {integrity: sha512-vjrl/1Ub9+JwU6BP0emgipGjowzYZMjbWCDqwA2Z4vCa+HBSpP4v6U2ddejcHsolsYxwL5r4bPNoamlV0xDdLg==} + engines: {node: '>= 10'} + cpu: [x64] + os: [darwin] + + '@tailwindcss/oxide-freebsd-x64@4.1.16': + resolution: {integrity: sha512-TSMpPYpQLm+aR1wW5rKuUuEruc/oOX3C7H0BTnPDn7W/eMw8W+MRMpiypKMkXZfwH8wqPIRKppuZoedTtNj2tg==} + engines: {node: '>= 10'} + cpu: [x64] + os: [freebsd] + + '@tailwindcss/oxide-linux-arm-gnueabihf@4.1.16': + resolution: {integrity: sha512-p0GGfRg/w0sdsFKBjMYvvKIiKy/LNWLWgV/plR4lUgrsxFAoQBFrXkZ4C0w8IOXfslB9vHK/JGASWD2IefIpvw==} + engines: {node: '>= 10'} + cpu: [arm] + os: [linux] + + '@tailwindcss/oxide-linux-arm64-gnu@4.1.16': + resolution: {integrity: sha512-DoixyMmTNO19rwRPdqviTrG1rYzpxgyYJl8RgQvdAQUzxC1ToLRqtNJpU/ATURSKgIg6uerPw2feW0aS8SNr/w==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [linux] + + '@tailwindcss/oxide-linux-arm64-musl@4.1.16': + resolution: {integrity: sha512-H81UXMa9hJhWhaAUca6bU2wm5RRFpuHImrwXBUvPbYb+3jo32I9VIwpOX6hms0fPmA6f2pGVlybO6qU8pF4fzQ==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [linux] - '@swc/helpers@0.5.17': - resolution: {integrity: sha512-5IKx/Y13RsYd+sauPb2x+U/xZikHjolzfuDgTAl/Tdf3Q8rslRvC19NKDLgAJQ6wsqADk10ntlv08nPFw/gO/A==} + '@tailwindcss/oxide-linux-x64-gnu@4.1.16': + resolution: {integrity: sha512-ZGHQxDtFC2/ruo7t99Qo2TTIvOERULPl5l0K1g0oK6b5PGqjYMga+FcY1wIUnrUxY56h28FxybtDEla+ICOyew==} + engines: {node: '>= 10'} + cpu: [x64] + os: [linux] - '@swc/jest@0.2.39': - resolution: {integrity: sha512-eyokjOwYd0Q8RnMHri+8/FS1HIrIUKK/sRrFp8c1dThUOfNeCWbLmBP1P5VsKdvmkd25JaH+OKYwEYiAYg9YAA==} - engines: {npm: '>= 7.0.0'} - peerDependencies: - '@swc/core': '*' + '@tailwindcss/oxide-linux-x64-musl@4.1.16': + resolution: {integrity: sha512-Oi1tAaa0rcKf1Og9MzKeINZzMLPbhxvm7rno5/zuP1WYmpiG0bEHq4AcRUiG2165/WUzvxkW4XDYCscZWbTLZw==} + engines: {node: '>= 10'} + cpu: [x64] + os: [linux] - '@swc/plugin-loadable-components@9.0.0': - resolution: {integrity: sha512-YRhogIo16GZSyjdyVsg97x3nKGZccX1dguKC59CCpn2hwG00e8eWRIPgAVxKzT+IoWbVDPLj2zNVONXB1vL7Vg==} + '@tailwindcss/oxide-wasm32-wasi@4.1.16': + resolution: {integrity: sha512-B01u/b8LteGRwucIBmCQ07FVXLzImWESAIMcUU6nvFt/tYsQ6IHz8DmZ5KtvmwxD+iTYBtM1xwoGXswnlu9v0Q==} + engines: {node: '>=14.0.0'} + cpu: [wasm32] + bundledDependencies: + - '@napi-rs/wasm-runtime' + - '@emnapi/core' + - '@emnapi/runtime' + - '@tybys/wasm-util' + - '@emnapi/wasi-threads' + - tslib + + '@tailwindcss/oxide-win32-arm64-msvc@4.1.16': + resolution: {integrity: sha512-zX+Q8sSkGj6HKRTMJXuPvOcP8XfYON24zJBRPlszcH1Np7xuHXhWn8qfFjIujVzvH3BHU+16jBXwgpl20i+v9A==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [win32] - '@swc/plugin-styled-components@10.0.0': - resolution: {integrity: sha512-IbnTXsJMBWiexuykaQy3mDiAo9l7V3b9oC7X1pXwYdu8nIeYJIH6if86o6xxALEVc3/logRhI0mHVnc7bct3KA==} + '@tailwindcss/oxide-win32-x64-msvc@4.1.16': + resolution: {integrity: sha512-m5dDFJUEejbFqP+UXVstd4W/wnxA4F61q8SoL+mqTypId2T2ZpuxosNSgowiCnLp2+Z+rivdU0AqpfgiD7yCBg==} + engines: {node: '>= 10'} + cpu: [x64] + os: [win32] - '@swc/types@0.1.25': - resolution: {integrity: sha512-iAoY/qRhNH8a/hBvm3zKj9qQ4oc2+3w1unPJa2XvTK3XjeLXtzcCingVPw/9e5mn1+0yPqxcBGp9Jf0pkfMb1g==} + '@tailwindcss/oxide@4.1.16': + resolution: {integrity: sha512-2OSv52FRuhdlgyOQqgtQHuCgXnS8nFSYRp2tJ+4WZXKgTxqPy7SMSls8c3mPT5pkZ17SBToGM5LHEJBO7miEdg==} + engines: {node: '>= 10'} - '@szmarczak/http-timer@4.0.6': - resolution: {integrity: sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==} - engines: {node: '>=10'} + '@tailwindcss/postcss@4.1.16': + resolution: {integrity: sha512-Qn3SFGPXYQMKR/UtqS+dqvPrzEeBZHrFA92maT4zijCVggdsXnDBMsPFJo1eArX3J+O+Gi+8pV4PkqjLCNBk3A==} '@testing-library/dom@8.14.0': resolution: {integrity: sha512-m8FOdUo77iMTwVRCyzWcqxlEIk+GnopbrRI15a0EaLbpZSCinIVI4kSQzWhkShK83GogvEFJSsHF3Ws0z1vrqA==} @@ -9886,9 +9722,6 @@ packages: resolution: {integrity: sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - babel-plugin-macros@2.8.0: - resolution: {integrity: sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg==} - babel-plugin-macros@3.1.0: resolution: {integrity: sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==} engines: {node: '>=10', npm: '>=6'} @@ -10328,9 +10161,6 @@ packages: resolution: {integrity: sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==} hasBin: true - color@3.2.1: - resolution: {integrity: sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==} - color@4.2.3: resolution: {integrity: sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==} engines: {node: '>=12.5.0'} @@ -10521,10 +10351,6 @@ packages: ts-node: '>=10' typescript: '>=4' - cosmiconfig@6.0.0: - resolution: {integrity: sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==} - engines: {node: '>=8'} - cosmiconfig@7.0.1: resolution: {integrity: sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==} engines: {node: '>=10'} @@ -11154,10 +10980,6 @@ packages: resolution: {integrity: sha512-JVUnt+DUIzu87TABbhPmNfVdBDt18BLOWjMUFJMSi/Qqg7NTYtabbvSNJGOJ7afbRuv9D/lngizHtP7QyLQ+9w==} engines: {node: '>=12'} - dset@2.1.0: - resolution: {integrity: sha512-hlQYwNEdW7Qf8zxysy+yN1E8C/SxRst3Z9n+IvXOR35D9bPVwNHhnL8ZBeoZjvinuGrlvGg6pAMDwhmjqFDgjA==} - engines: {node: '>=4'} - dts-packer@0.0.3: resolution: {integrity: sha512-TwswWgdV5mXQKO+Bu3ylBZfLfPpnTDtwi4L+GZyWxFjGfUOwvX0FRcquZg7AGY4BiiMomwFHd9H0pyOrrQNlZA==} hasBin: true @@ -12978,6 +12800,76 @@ packages: resolution: {integrity: sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==} engines: {node: '>=6'} + lightningcss-android-arm64@1.30.2: + resolution: {integrity: sha512-BH9sEdOCahSgmkVhBLeU7Hc9DWeZ1Eb6wNS6Da8igvUwAe0sqROHddIlvU06q3WyXVEOYDZ6ykBZQnjTbmo4+A==} + engines: {node: '>= 12.0.0'} + cpu: [arm64] + os: [android] + + lightningcss-darwin-arm64@1.30.2: + resolution: {integrity: sha512-ylTcDJBN3Hp21TdhRT5zBOIi73P6/W0qwvlFEk22fkdXchtNTOU4Qc37SkzV+EKYxLouZ6M4LG9NfZ1qkhhBWA==} + engines: {node: '>= 12.0.0'} + cpu: [arm64] + os: [darwin] + + lightningcss-darwin-x64@1.30.2: + resolution: {integrity: sha512-oBZgKchomuDYxr7ilwLcyms6BCyLn0z8J0+ZZmfpjwg9fRVZIR5/GMXd7r9RH94iDhld3UmSjBM6nXWM2TfZTQ==} + engines: {node: '>= 12.0.0'} + cpu: [x64] + os: [darwin] + + lightningcss-freebsd-x64@1.30.2: + resolution: {integrity: sha512-c2bH6xTrf4BDpK8MoGG4Bd6zAMZDAXS569UxCAGcA7IKbHNMlhGQ89eRmvpIUGfKWNVdbhSbkQaWhEoMGmGslA==} + engines: {node: '>= 12.0.0'} + cpu: [x64] + os: [freebsd] + + lightningcss-linux-arm-gnueabihf@1.30.2: + resolution: {integrity: sha512-eVdpxh4wYcm0PofJIZVuYuLiqBIakQ9uFZmipf6LF/HRj5Bgm0eb3qL/mr1smyXIS1twwOxNWndd8z0E374hiA==} + engines: {node: '>= 12.0.0'} + cpu: [arm] + os: [linux] + + lightningcss-linux-arm64-gnu@1.30.2: + resolution: {integrity: sha512-UK65WJAbwIJbiBFXpxrbTNArtfuznvxAJw4Q2ZGlU8kPeDIWEX1dg3rn2veBVUylA2Ezg89ktszWbaQnxD/e3A==} + engines: {node: '>= 12.0.0'} + cpu: [arm64] + os: [linux] + + lightningcss-linux-arm64-musl@1.30.2: + resolution: {integrity: sha512-5Vh9dGeblpTxWHpOx8iauV02popZDsCYMPIgiuw97OJ5uaDsL86cnqSFs5LZkG3ghHoX5isLgWzMs+eD1YzrnA==} + engines: {node: '>= 12.0.0'} + cpu: [arm64] + os: [linux] + + lightningcss-linux-x64-gnu@1.30.2: + resolution: {integrity: sha512-Cfd46gdmj1vQ+lR6VRTTadNHu6ALuw2pKR9lYq4FnhvgBc4zWY1EtZcAc6EffShbb1MFrIPfLDXD6Xprbnni4w==} + engines: {node: '>= 12.0.0'} + cpu: [x64] + os: [linux] + + lightningcss-linux-x64-musl@1.30.2: + resolution: {integrity: sha512-XJaLUUFXb6/QG2lGIW6aIk6jKdtjtcffUT0NKvIqhSBY3hh9Ch+1LCeH80dR9q9LBjG3ewbDjnumefsLsP6aiA==} + engines: {node: '>= 12.0.0'} + cpu: [x64] + os: [linux] + + lightningcss-win32-arm64-msvc@1.30.2: + resolution: {integrity: sha512-FZn+vaj7zLv//D/192WFFVA0RgHawIcHqLX9xuWiQt7P0PtdFEVaxgF9rjM/IRYHQXNnk61/H/gb2Ei+kUQ4xQ==} + engines: {node: '>= 12.0.0'} + cpu: [arm64] + os: [win32] + + lightningcss-win32-x64-msvc@1.30.2: + resolution: {integrity: sha512-5g1yc73p+iAkid5phb4oVFMB45417DkRevRbt/El/gKXJk4jid+vPFF/AXbxn05Aky8PapwzZrdJShv5C0avjw==} + engines: {node: '>= 12.0.0'} + cpu: [x64] + os: [win32] + + lightningcss@1.30.2: + resolution: {integrity: sha512-utfs7Pr5uJyyvDETitgsaqSyjCb2qNRAtuqUeWIAKztsOYdcACf2KtARYXg2pSvhkt+9NfoaNY7fxjl6nuMjIQ==} + engines: {node: '>= 12.0.0'} + lilconfig@2.1.0: resolution: {integrity: sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==} engines: {node: '>=10'} @@ -13059,9 +12951,6 @@ packages: lodash.defaults@4.2.0: resolution: {integrity: sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==} - lodash.flatmap@4.5.0: - resolution: {integrity: sha512-/OcpcAGWlrZyoHGeHh3cAoa6nGdX6QYtmzNP84Jqol6UEQQ2gIaU3H+0eICcjcKGl0/XF8LWOujNn9lffsnaOg==} - lodash.flattendeep@4.4.0: resolution: {integrity: sha512-uHaJFihxmJcEX3kT4I23ABqKKalJ/zDrDg0lsFtc1h+3uw49SIJ5beyhx5ExVRti3AvKoOJngIj7xz3oylPdWQ==} @@ -15619,10 +15508,6 @@ packages: resolution: {integrity: sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==} engines: {node: '>=10'} - string-similarity@4.0.4: - resolution: {integrity: sha512-/q/8Q4Bl4ZKAPjj8WerIBJWALKkaPRfrvhfF8k/B23i4nzrlRj2/go1m90In7nG/3XDSbOo0+pu6RvCTM9RGMQ==} - deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info. - string-width@4.2.3: resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==} engines: {node: '>=8'} @@ -15795,6 +15680,9 @@ packages: engines: {node: '>=14.0.0'} hasBin: true + tailwindcss@4.1.16: + resolution: {integrity: sha512-pONL5awpaQX4LN5eiv7moSiSPd/DLDzKVRJz8Q9PgzmAdd1R4307GQS2ZpfiN7ZmekdQrfhZZiSE5jkLR4WNaA==} + tapable@2.2.1: resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==} engines: {node: '>=6'} @@ -15880,9 +15768,6 @@ packages: through@2.3.8: resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==} - timsort@0.3.0: - resolution: {integrity: sha512-qsdtZH+vMoCARQtyod4imc2nIJwg9Cc7lPRrw9CzF8ZKR0khdr8+2nX80PBhET3tcyTtJDxAffGh2rXH4tyU8A==} - tinybench@2.9.0: resolution: {integrity: sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==} @@ -16059,10 +15944,6 @@ packages: resolution: {integrity: sha512-xHtFaKtHxM9LOklMmJdI3BEnQq/D5F73Of2E1GDrITi9sgoVkvIsrQUTY1G8FlmGtA+awCI4EBlTRRYxkL2sRg==} hasBin: true - twin.macro@2.8.2: - resolution: {integrity: sha512-2Vg09mp+nA70AWUedJ8WRgB2me3buq7JGbOnjHnFnNaBzomVu5k7lJ9YGpByIlre+UYr7QRhtlj7+IUKxvCrUA==} - engines: {node: '>=12.13.0'} - twin.macro@3.4.1: resolution: {integrity: sha512-bxGKTV4u/iGcQqHIugPaW5YSLJ5rIr56ay4Pjcr2Mbb037k341bQ+eWT8z3F7r8ZGTXjTD3uiuxos+qQRy4VjQ==} engines: {node: '>=16.14.0'} @@ -20081,9 +19962,9 @@ snapshots: optionalDependencies: '@rsbuild/core': 1.6.0 - '@rsbuild/plugin-css-minimizer@1.0.3(@rsbuild/core@1.6.0)(esbuild@0.25.5)(webpack@5.99.8(@swc/core@1.14.0(@swc/helpers@0.5.17))(esbuild@0.25.5))': + '@rsbuild/plugin-css-minimizer@1.0.3(@rsbuild/core@1.6.0)(esbuild@0.25.5)(lightningcss@1.30.2)(webpack@5.99.8(@swc/core@1.14.0(@swc/helpers@0.5.17))(esbuild@0.25.5))': dependencies: - css-minimizer-webpack-plugin: 5.0.1(esbuild@0.25.5)(webpack@5.99.8(@swc/core@1.14.0(@swc/helpers@0.5.17))(esbuild@0.25.5)) + css-minimizer-webpack-plugin: 5.0.1(esbuild@0.25.5)(lightningcss@1.30.2)(webpack@5.99.8(@swc/core@1.14.0(@swc/helpers@0.5.17))(esbuild@0.25.5)) reduce-configs: 1.1.0 optionalDependencies: '@rsbuild/core': 1.6.0 @@ -20828,6 +20709,75 @@ snapshots: dependencies: defer-to-connect: 2.0.1 + '@tailwindcss/node@4.1.16': + dependencies: + '@jridgewell/remapping': 2.3.5 + enhanced-resolve: 5.18.3 + jiti: 2.6.1 + lightningcss: 1.30.2 + magic-string: 0.30.19 + source-map-js: 1.2.1 + tailwindcss: 4.1.16 + + '@tailwindcss/oxide-android-arm64@4.1.16': + optional: true + + '@tailwindcss/oxide-darwin-arm64@4.1.16': + optional: true + + '@tailwindcss/oxide-darwin-x64@4.1.16': + optional: true + + '@tailwindcss/oxide-freebsd-x64@4.1.16': + optional: true + + '@tailwindcss/oxide-linux-arm-gnueabihf@4.1.16': + optional: true + + '@tailwindcss/oxide-linux-arm64-gnu@4.1.16': + optional: true + + '@tailwindcss/oxide-linux-arm64-musl@4.1.16': + optional: true + + '@tailwindcss/oxide-linux-x64-gnu@4.1.16': + optional: true + + '@tailwindcss/oxide-linux-x64-musl@4.1.16': + optional: true + + '@tailwindcss/oxide-wasm32-wasi@4.1.16': + optional: true + + '@tailwindcss/oxide-win32-arm64-msvc@4.1.16': + optional: true + + '@tailwindcss/oxide-win32-x64-msvc@4.1.16': + optional: true + + '@tailwindcss/oxide@4.1.16': + optionalDependencies: + '@tailwindcss/oxide-android-arm64': 4.1.16 + '@tailwindcss/oxide-darwin-arm64': 4.1.16 + '@tailwindcss/oxide-darwin-x64': 4.1.16 + '@tailwindcss/oxide-freebsd-x64': 4.1.16 + '@tailwindcss/oxide-linux-arm-gnueabihf': 4.1.16 + '@tailwindcss/oxide-linux-arm64-gnu': 4.1.16 + '@tailwindcss/oxide-linux-arm64-musl': 4.1.16 + '@tailwindcss/oxide-linux-x64-gnu': 4.1.16 + '@tailwindcss/oxide-linux-x64-musl': 4.1.16 + '@tailwindcss/oxide-wasm32-wasi': 4.1.16 + '@tailwindcss/oxide-win32-arm64-msvc': 4.1.16 + '@tailwindcss/oxide-win32-x64-msvc': 4.1.16 + + '@tailwindcss/postcss@4.1.16': + dependencies: + '@alloc/quick-lru': 5.2.0 + '@tailwindcss/node': 4.1.16 + '@tailwindcss/oxide': 4.1.16 + postcss: 8.5.6 + tailwindcss: 4.1.16 + '@testing-library/dom@8.14.0': dependencies: '@babel/code-frame': 7.27.1 @@ -21443,13 +21393,13 @@ snapshots: chai: 5.2.0 tinyrainbow: 2.0.0 - '@vitest/mocker@3.0.5(vite@5.4.14(@types/node@20.5.1)(less@4.4.2)(sass-embedded@1.90.0)(sass@1.93.3)(terser@5.44.0))': + '@vitest/mocker@3.0.5(vite@5.4.14(@types/node@20.5.1)(less@4.4.2)(lightningcss@1.30.2)(sass-embedded@1.90.0)(sass@1.93.3)(terser@5.44.0))': dependencies: '@vitest/spy': 3.0.5 estree-walker: 3.0.3 magic-string: 0.30.19 optionalDependencies: - vite: 5.4.14(@types/node@20.5.1)(less@4.4.2)(sass-embedded@1.90.0)(sass@1.93.3)(terser@5.44.0) + vite: 5.4.14(@types/node@20.5.1)(less@4.4.2)(lightningcss@1.30.2)(sass-embedded@1.90.0)(sass@1.93.3)(terser@5.44.0) '@vitest/pretty-format@3.0.5': dependencies: @@ -21487,7 +21437,7 @@ snapshots: sirv: 3.0.1 tinyglobby: 0.2.14 tinyrainbow: 2.0.0 - vitest: 3.0.5(@types/debug@4.1.12)(@types/node@20.5.1)(@vitest/ui@3.2.4)(jsdom@20.0.3(bufferutil@4.0.8)(utf-8-validate@5.0.10))(less@4.4.2)(sass-embedded@1.90.0)(sass@1.93.3)(terser@5.44.0) + vitest: 3.0.5(@types/debug@4.1.12)(@types/node@20.5.1)(@vitest/ui@3.2.4)(jsdom@20.0.3(bufferutil@4.0.8)(utf-8-validate@5.0.10))(less@4.4.2)(lightningcss@1.30.2)(sass-embedded@1.90.0)(sass@1.93.3)(terser@5.44.0) '@vitest/utils@3.0.5': dependencies: @@ -21987,17 +21937,11 @@ snapshots: '@types/babel__core': 7.20.5 '@types/babel__traverse': 7.28.0 - babel-plugin-macros@2.8.0: - dependencies: - '@babel/runtime': 7.28.4 - cosmiconfig: 6.0.0 - resolve: 1.22.11 - babel-plugin-macros@3.1.0: dependencies: '@babel/runtime': 7.28.4 cosmiconfig: 7.0.1 - resolve: 1.22.10 + resolve: 1.22.11 babel-plugin-polyfill-corejs2@0.4.14(@babel/core@7.28.5): dependencies: @@ -22466,11 +22410,6 @@ snapshots: color-support@1.1.3: {} - color@3.2.1: - dependencies: - color-convert: 1.9.3 - color-string: 1.9.1 - color@4.2.3: dependencies: color-convert: 2.0.1 @@ -22630,14 +22569,6 @@ snapshots: ts-node: 10.9.2(@swc/core@1.14.0(@swc/helpers@0.5.17))(@types/node@20.5.1)(typescript@5.6.3) typescript: 5.6.3 - cosmiconfig@6.0.0: - dependencies: - '@types/parse-json': 4.0.0 - import-fresh: 3.3.0 - parse-json: 5.2.0 - path-type: 4.0.0 - yaml: 1.10.2 - cosmiconfig@7.0.1: dependencies: '@types/parse-json': 4.0.0 @@ -22749,7 +22680,7 @@ snapshots: dependencies: postcss: 8.5.6 - css-minimizer-webpack-plugin@5.0.1(esbuild@0.25.5)(webpack@5.99.8(@swc/core@1.14.0(@swc/helpers@0.5.17))(esbuild@0.25.5)): + css-minimizer-webpack-plugin@5.0.1(esbuild@0.25.5)(lightningcss@1.30.2)(webpack@5.99.8(@swc/core@1.14.0(@swc/helpers@0.5.17))(esbuild@0.25.5)): dependencies: '@jridgewell/trace-mapping': 0.3.25 cssnano: 6.1.2(postcss@8.5.6) @@ -22760,6 +22691,7 @@ snapshots: webpack: 5.99.8(@swc/core@1.14.0(@swc/helpers@0.5.17))(esbuild@0.25.5) optionalDependencies: esbuild: 0.25.5 + lightningcss: 1.30.2 css-select@5.1.0: dependencies: @@ -23315,8 +23247,6 @@ snapshots: dotenv@17.2.3: {} - dset@2.1.0: {} - dts-packer@0.0.3: dependencies: chalk: 4.1.2 @@ -25857,6 +25787,55 @@ snapshots: leven@3.1.0: {} + lightningcss-android-arm64@1.30.2: + optional: true + + lightningcss-darwin-arm64@1.30.2: + optional: true + + lightningcss-darwin-x64@1.30.2: + optional: true + + lightningcss-freebsd-x64@1.30.2: + optional: true + + lightningcss-linux-arm-gnueabihf@1.30.2: + optional: true + + lightningcss-linux-arm64-gnu@1.30.2: + optional: true + + lightningcss-linux-arm64-musl@1.30.2: + optional: true + + lightningcss-linux-x64-gnu@1.30.2: + optional: true + + lightningcss-linux-x64-musl@1.30.2: + optional: true + + lightningcss-win32-arm64-msvc@1.30.2: + optional: true + + lightningcss-win32-x64-msvc@1.30.2: + optional: true + + lightningcss@1.30.2: + dependencies: + detect-libc: 2.1.0 + optionalDependencies: + lightningcss-android-arm64: 1.30.2 + lightningcss-darwin-arm64: 1.30.2 + lightningcss-darwin-x64: 1.30.2 + lightningcss-freebsd-x64: 1.30.2 + lightningcss-linux-arm-gnueabihf: 1.30.2 + lightningcss-linux-arm64-gnu: 1.30.2 + lightningcss-linux-arm64-musl: 1.30.2 + lightningcss-linux-x64-gnu: 1.30.2 + lightningcss-linux-x64-musl: 1.30.2 + lightningcss-win32-arm64-msvc: 1.30.2 + lightningcss-win32-x64-msvc: 1.30.2 + lilconfig@2.1.0: {} lilconfig@3.1.3: {} @@ -25962,8 +25941,6 @@ snapshots: lodash.defaults@4.2.0: {} - lodash.flatmap@4.5.0: {} - lodash.flattendeep@4.4.0: {} lodash.get@4.4.2: {} @@ -27297,14 +27274,6 @@ snapshots: camelcase-css: 2.0.1 postcss: 8.5.6 - postcss-load-config@3.1.4(postcss@8.5.6)(ts-node@10.9.2(@swc/core@1.14.0(@swc/helpers@0.5.17))(@types/node@20.5.1)(typescript@5.6.3)): - dependencies: - lilconfig: 2.1.0 - yaml: 1.10.2 - optionalDependencies: - postcss: 8.5.6 - ts-node: 10.9.2(@swc/core@1.14.0(@swc/helpers@0.5.17))(@types/node@20.5.1)(typescript@5.6.3) - postcss-load-config@3.1.4(postcss@8.5.6)(ts-node@10.9.2(@swc/core@1.14.0(@swc/helpers@0.5.17))(@types/node@24.3.1)(typescript@5.6.3)): dependencies: lilconfig: 2.1.0 @@ -27313,14 +27282,6 @@ snapshots: postcss: 8.5.6 ts-node: 10.9.2(@swc/core@1.14.0(@swc/helpers@0.5.17))(@types/node@24.3.1)(typescript@5.6.3) - postcss-load-config@4.0.1(postcss@8.5.6)(ts-node@10.9.2(@swc/core@1.14.0(@swc/helpers@0.5.17))(@types/node@20.8.8)(typescript@5.6.3)): - dependencies: - lilconfig: 2.1.0 - yaml: 2.6.1 - optionalDependencies: - postcss: 8.5.6 - ts-node: 10.9.2(@swc/core@1.14.0(@swc/helpers@0.5.17))(@types/node@20.8.8)(typescript@5.6.3) - postcss-load-config@4.0.1(postcss@8.5.6)(ts-node@10.9.2(@swc/core@1.14.0(@swc/helpers@0.5.17))(@types/node@24.3.1)(typescript@5.6.3)): dependencies: lilconfig: 2.1.0 @@ -29002,8 +28963,6 @@ snapshots: char-regex: 1.0.2 strip-ansi: 6.0.1 - string-similarity@4.0.4: {} - string-width@4.2.3: dependencies: emoji-regex: 8.0.0 @@ -29192,45 +29151,6 @@ snapshots: string-width: 4.2.3 strip-ansi: 6.0.1 - tailwindcss@2.2.19(autoprefixer@10.4.21(postcss@8.5.6))(postcss@8.5.6)(ts-node@10.9.2(@swc/core@1.14.0(@swc/helpers@0.5.17))(@types/node@20.5.1)(typescript@5.6.3)): - dependencies: - arg: 5.0.2 - autoprefixer: 10.4.21(postcss@8.5.6) - bytes: 3.1.2 - chalk: 4.1.2 - chokidar: 3.6.0 - color: 4.2.3 - cosmiconfig: 7.0.1 - detective: 5.2.1 - didyoumean: 1.2.2 - dlv: 1.1.3 - fast-glob: 3.3.3 - fs-extra: 10.1.0 - glob-parent: 6.0.2 - html-tags: 3.3.1 - is-color-stop: 1.1.0 - is-glob: 4.0.3 - lodash: 4.17.21 - lodash.topath: 4.5.2 - modern-normalize: 1.1.0 - node-emoji: 1.11.0 - normalize-path: 3.0.0 - object-hash: 2.2.0 - postcss: 8.5.6 - postcss-js: 3.0.3 - postcss-load-config: 3.1.4(postcss@8.5.6)(ts-node@10.9.2(@swc/core@1.14.0(@swc/helpers@0.5.17))(@types/node@20.5.1)(typescript@5.6.3)) - postcss-nested: 5.0.6(postcss@8.5.6) - postcss-selector-parser: 6.1.2 - postcss-value-parser: 4.2.0 - pretty-hrtime: 1.0.3 - purgecss: 4.1.3 - quick-lru: 5.1.1 - reduce-css-calc: 2.1.8 - resolve: 1.22.11 - tmp: 0.2.3 - transitivePeerDependencies: - - ts-node - tailwindcss@2.2.19(autoprefixer@10.4.21(postcss@8.5.6))(postcss@8.5.6)(ts-node@10.9.2(@swc/core@1.14.0(@swc/helpers@0.5.17))(@types/node@24.3.1)(typescript@5.6.3)): dependencies: arg: 5.0.2 @@ -29270,33 +29190,6 @@ snapshots: transitivePeerDependencies: - ts-node - tailwindcss@3.3.3(ts-node@10.9.2(@swc/core@1.14.0(@swc/helpers@0.5.17))(@types/node@20.8.8)(typescript@5.6.3)): - dependencies: - '@alloc/quick-lru': 5.2.0 - arg: 5.0.2 - chokidar: 3.6.0 - didyoumean: 1.2.2 - dlv: 1.1.3 - fast-glob: 3.3.3 - glob-parent: 6.0.2 - is-glob: 4.0.3 - jiti: 1.21.7 - lilconfig: 2.1.0 - micromatch: 4.0.8 - normalize-path: 3.0.0 - object-hash: 3.0.0 - picocolors: 1.1.1 - postcss: 8.5.6 - postcss-import: 15.1.0(postcss@8.5.6) - postcss-js: 4.0.1(postcss@8.5.6) - postcss-load-config: 4.0.1(postcss@8.5.6)(ts-node@10.9.2(@swc/core@1.14.0(@swc/helpers@0.5.17))(@types/node@20.8.8)(typescript@5.6.3)) - postcss-nested: 6.0.1(postcss@8.5.6) - postcss-selector-parser: 6.1.2 - resolve: 1.22.10 - sucrase: 3.34.0 - transitivePeerDependencies: - - ts-node - tailwindcss@3.3.3(ts-node@10.9.2(@swc/core@1.14.0(@swc/helpers@0.5.17))(@types/node@24.3.1)(typescript@5.6.3)): dependencies: '@alloc/quick-lru': 5.2.0 @@ -29324,6 +29217,8 @@ snapshots: transitivePeerDependencies: - ts-node + tailwindcss@4.1.16: {} + tapable@2.2.1: {} tapable@2.2.2: {} @@ -29416,8 +29311,6 @@ snapshots: through@2.3.8: {} - timsort@0.3.0: {} - tinybench@2.9.0: {} tinyexec@0.3.2: {} @@ -29639,26 +29532,6 @@ snapshots: optionalDependencies: fsevents: 2.3.3 - twin.macro@2.8.2(ts-node@10.9.2(@swc/core@1.14.0(@swc/helpers@0.5.17))(@types/node@20.5.1)(typescript@5.6.3)): - dependencies: - '@babel/parser': 7.28.5 - '@babel/template': 7.27.2 - autoprefixer: 10.4.21(postcss@8.5.6) - babel-plugin-macros: 2.8.0 - chalk: 4.1.2 - clean-set: 1.1.2 - color: 3.2.1 - dset: 2.1.0 - lodash.flatmap: 4.5.0 - lodash.get: 4.4.2 - lodash.merge: 4.6.2 - postcss: 8.5.6 - string-similarity: 4.0.4 - tailwindcss: 2.2.19(autoprefixer@10.4.21(postcss@8.5.6))(postcss@8.5.6)(ts-node@10.9.2(@swc/core@1.14.0(@swc/helpers@0.5.17))(@types/node@20.5.1)(typescript@5.6.3)) - timsort: 0.3.0 - transitivePeerDependencies: - - ts-node - twin.macro@3.4.1(tailwindcss@3.3.3(ts-node@10.9.2(@swc/core@1.14.0(@swc/helpers@0.5.17))(@types/node@24.3.1)(typescript@5.6.3))): dependencies: '@babel/template': 7.27.2 @@ -29890,13 +29763,13 @@ snapshots: '@types/unist': 3.0.3 vfile-message: 4.0.2 - vite-node@3.0.5(@types/node@20.5.1)(less@4.4.2)(sass-embedded@1.90.0)(sass@1.93.3)(terser@5.44.0): + vite-node@3.0.5(@types/node@20.5.1)(less@4.4.2)(lightningcss@1.30.2)(sass-embedded@1.90.0)(sass@1.93.3)(terser@5.44.0): dependencies: cac: 6.7.14 debug: 4.4.3(supports-color@5.5.0) es-module-lexer: 1.7.0 pathe: 2.0.3 - vite: 5.4.14(@types/node@20.5.1)(less@4.4.2)(sass-embedded@1.90.0)(sass@1.93.3)(terser@5.44.0) + vite: 5.4.14(@types/node@20.5.1)(less@4.4.2)(lightningcss@1.30.2)(sass-embedded@1.90.0)(sass@1.93.3)(terser@5.44.0) transitivePeerDependencies: - '@types/node' - less @@ -29908,7 +29781,7 @@ snapshots: - supports-color - terser - vite@5.4.14(@types/node@20.5.1)(less@4.4.2)(sass-embedded@1.90.0)(sass@1.93.3)(terser@5.44.0): + vite@5.4.14(@types/node@20.5.1)(less@4.4.2)(lightningcss@1.30.2)(sass-embedded@1.90.0)(sass@1.93.3)(terser@5.44.0): dependencies: esbuild: 0.21.5 postcss: 8.5.6 @@ -29917,14 +29790,15 @@ snapshots: '@types/node': 20.5.1 fsevents: 2.3.3 less: 4.4.2 + lightningcss: 1.30.2 sass: 1.93.3 sass-embedded: 1.90.0 terser: 5.44.0 - vitest@3.0.5(@types/debug@4.1.12)(@types/node@20.5.1)(@vitest/ui@3.2.4)(jsdom@20.0.3(bufferutil@4.0.8)(utf-8-validate@5.0.10))(less@4.4.2)(sass-embedded@1.90.0)(sass@1.93.3)(terser@5.44.0): + vitest@3.0.5(@types/debug@4.1.12)(@types/node@20.5.1)(@vitest/ui@3.2.4)(jsdom@20.0.3(bufferutil@4.0.8)(utf-8-validate@5.0.10))(less@4.4.2)(lightningcss@1.30.2)(sass-embedded@1.90.0)(sass@1.93.3)(terser@5.44.0): dependencies: '@vitest/expect': 3.0.5 - '@vitest/mocker': 3.0.5(vite@5.4.14(@types/node@20.5.1)(less@4.4.2)(sass-embedded@1.90.0)(sass@1.93.3)(terser@5.44.0)) + '@vitest/mocker': 3.0.5(vite@5.4.14(@types/node@20.5.1)(less@4.4.2)(lightningcss@1.30.2)(sass-embedded@1.90.0)(sass@1.93.3)(terser@5.44.0)) '@vitest/pretty-format': 3.0.8 '@vitest/runner': 3.0.5 '@vitest/snapshot': 3.0.5 @@ -29940,8 +29814,8 @@ snapshots: tinyexec: 0.3.2 tinypool: 1.0.2 tinyrainbow: 2.0.0 - vite: 5.4.14(@types/node@20.5.1)(less@4.4.2)(sass-embedded@1.90.0)(sass@1.93.3)(terser@5.44.0) - vite-node: 3.0.5(@types/node@20.5.1)(less@4.4.2)(sass-embedded@1.90.0)(sass@1.93.3)(terser@5.44.0) + vite: 5.4.14(@types/node@20.5.1)(less@4.4.2)(lightningcss@1.30.2)(sass-embedded@1.90.0)(sass@1.93.3)(terser@5.44.0) + vite-node: 3.0.5(@types/node@20.5.1)(less@4.4.2)(lightningcss@1.30.2)(sass-embedded@1.90.0)(sass@1.93.3)(terser@5.44.0) why-is-node-running: 2.3.0 optionalDependencies: '@types/debug': 4.1.12 diff --git a/tests/integration/tailwindcss/fixtures/tailwindcss-v3/babel-plugin-macros.config.cjs b/tests/integration/tailwindcss/fixtures/tailwindcss-v3/babel-plugin-macros.config.cjs deleted file mode 100644 index 43f6da6ee8cd..000000000000 --- a/tests/integration/tailwindcss/fixtures/tailwindcss-v3/babel-plugin-macros.config.cjs +++ /dev/null @@ -1,7 +0,0 @@ -// twin.macro 配置文件 -module.exports = { - twin: { - preset: 'styled-components', - config: './tailwind.config.js', - }, -}; diff --git a/tests/integration/tailwindcss/fixtures/tailwindcss-v3/src/App.jsx b/tests/integration/tailwindcss/fixtures/tailwindcss-v3/src/App.jsx index 2dc9033e6724..c0d6140307ca 100644 --- a/tests/integration/tailwindcss/fixtures/tailwindcss-v3/src/App.jsx +++ b/tests/integration/tailwindcss/fixtures/tailwindcss-v3/src/App.jsx @@ -1,7 +1,4 @@ import './app.css'; -import 'tailwindcss/base.css'; -import 'tailwindcss/components.css'; -import 'tailwindcss/utilities.css'; import { useEffect, useState } from 'react'; import Macro from './Macro';