sonofmagic · sonofmagic · May 15, 2026 · May 14, 2026 · May 14, 2026 · May 14, 2026
diff --git a/.changeset/fix-src-type-strictness.md b/.changeset/fix-src-type-strictness.md
@@ -0,0 +1,6 @@
+---
+"weapp-tailwindcss": patch
+"@weapp-tailwindcss/postcss": patch
+---
+
+修复核心源码在严格 TypeScript 配置下的类型问题，并清理对应 ESLint 诊断。
diff --git a/.changeset/tailwindcss-root-import.md b/.changeset/tailwindcss-root-import.md
@@ -0,0 +1,6 @@
+---
+"weapp-tailwindcss": patch
+"@weapp-tailwindcss/test-helper": patch
+---
+
+统一 Tailwind CSS v4 示例、测试辅助入口和构建器重写契约，推荐继续使用 `@import "tailwindcss"`，并仅将 `weapp-tailwindcss` CSS 入口保留为兼容解析路径。
diff --git a/.github/workflows/e2e-watch.yml b/.github/workflows/e2e-watch.yml
@@ -42,10 +42,10 @@ jobs:
             watch_case: uni-app-vite-tailwindcss-v3
             round_profile: default
             watch_save_snapshots: '1'
-            timeout_minutes: 35
-            watch_timeout_ms: '240000'
-            watch_poll_ms: '280'
-            watch_command_timeout_ms: '600000'
+            timeout_minutes: 60
+            watch_timeout_ms: '420000'
+            watch_poll_ms: '340'
+            watch_command_timeout_ms: '1500000'
           - os: macos-latest
             runner_label: macos
             watch_case: mpx-tailwindcss-v3
@@ -69,10 +69,10 @@ jobs:
             watch_case: uni-app-vite-tailwindcss-v3
             round_profile: issue33
             watch_save_snapshots: '1'
-            timeout_minutes: 35
-            watch_timeout_ms: '240000'
-            watch_poll_ms: '280'
-            watch_command_timeout_ms: '600000'
+            timeout_minutes: 60
+            watch_timeout_ms: '420000'
+            watch_poll_ms: '340'
+            watch_command_timeout_ms: '1500000'
           - os: macos-latest
             runner_label: macos
             watch_case: weapp-vite-tailwindcss-v3
@@ -107,9 +107,9 @@ jobs:
             round_profile: default
             watch_save_snapshots: '1'
             timeout_minutes: 45
-            watch_timeout_ms: '320000'
+            watch_timeout_ms: '420000'
             watch_poll_ms: '320'
-            watch_command_timeout_ms: '840000'
+            watch_command_timeout_ms: '960000'
           - os: macos-latest
             runner_label: macos
             watch_case: uni-app-vite-tailwindcss-v4
@@ -136,6 +136,7 @@ jobs:
             timeout_minutes: 40
             watch_timeout_ms: '280000'
             watch_poll_ms: '300'
+            watch_max_hot_update_ms: '90000'
             watch_command_timeout_ms: '720000'
           - os: macos-latest
             runner_label: macos
@@ -151,10 +152,10 @@ jobs:
             watch_case: uni-app-vite-tailwindcss-v3
             round_profile: default
             watch_save_snapshots: '1'
-            timeout_minutes: 40
-            watch_timeout_ms: '280000'
-            watch_poll_ms: '320'
-            watch_command_timeout_ms: '720000'
+            timeout_minutes: 60
+            watch_timeout_ms: '420000'
+            watch_poll_ms: '340'
+            watch_command_timeout_ms: '1500000'
           - os: windows-latest
             runner_label: windows
             watch_case: mpx-tailwindcss-v3
@@ -169,37 +170,37 @@ jobs:
             watch_case: taro-webpack-react-tailwindcss-v3
             round_profile: default
             watch_save_snapshots: '1'
-            timeout_minutes: 40
-            watch_timeout_ms: '280000'
-            watch_poll_ms: '320'
-            watch_command_timeout_ms: '720000'
+            timeout_minutes: 60
+            watch_timeout_ms: '420000'
+            watch_poll_ms: '340'
+            watch_command_timeout_ms: '1500000'
           - os: windows-latest
             runner_label: windows
             watch_case: uni-app-vite-tailwindcss-v3
             round_profile: issue33
             watch_save_snapshots: '1'
-            timeout_minutes: 40
-            watch_timeout_ms: '280000'
-            watch_poll_ms: '320'
-            watch_command_timeout_ms: '720000'
+            timeout_minutes: 60
+            watch_timeout_ms: '420000'
+            watch_poll_ms: '340'
+            watch_command_timeout_ms: '1500000'
           - os: windows-latest
             runner_label: windows
             watch_case: taro-webpack-react-tailwindcss-v4
             round_profile: issue33
             watch_save_snapshots: '1'
-            timeout_minutes: 45
-            watch_timeout_ms: '320000'
-            watch_poll_ms: '340'
-            watch_command_timeout_ms: '840000'
+            timeout_minutes: 70
+            watch_timeout_ms: '600000'
+            watch_poll_ms: '400'
+            watch_command_timeout_ms: '1800000'
           - os: windows-latest
             runner_label: windows
             watch_case: taro-vite-vue3-tailwindcss-v4
             round_profile: default
             watch_save_snapshots: '1'
-            timeout_minutes: 45
-            watch_timeout_ms: '320000'
-            watch_poll_ms: '340'
-            watch_command_timeout_ms: '840000'
+            timeout_minutes: 70
+            watch_timeout_ms: '600000'
+            watch_poll_ms: '400'
+            watch_command_timeout_ms: '1800000'
           - os: windows-latest
             runner_label: windows
             watch_case: weapp-vite-tailwindcss-v3
@@ -223,10 +224,10 @@ jobs:
             watch_case: mpx-tailwindcss-v4
             round_profile: default
             watch_save_snapshots: '1'
-            timeout_minutes: 40
-            watch_timeout_ms: '280000'
-            watch_poll_ms: '320'
-            watch_command_timeout_ms: '720000'
+            timeout_minutes: 60
+            watch_timeout_ms: '600000'
+            watch_poll_ms: '400'
+            watch_command_timeout_ms: '1500000'
           - os: windows-latest
             runner_label: windows
             watch_case: weapp-vite-tailwindcss-v4
@@ -235,6 +236,7 @@ jobs:
             timeout_minutes: 45
             watch_timeout_ms: '320000'
             watch_poll_ms: '340'
+            watch_max_hot_update_ms: '60000'
             watch_command_timeout_ms: '840000'
     runs-on: ${{ matrix.os }}
     timeout-minutes: ${{ matrix.timeout_minutes }}
@@ -284,8 +286,9 @@ jobs:
           E2E_WATCH_CASE: ${{ matrix.watch_case }}
           E2E_WATCH_TIMEOUT_MS: ${{ matrix.watch_timeout_ms }}
           E2E_WATCH_POLL_MS: ${{ matrix.watch_poll_ms }}
-          E2E_WATCH_MAX_HOT_UPDATE_MS: ${{ matrix.watch_max_hot_update_ms || (matrix.runner_label == 'windows' && '30000' || '15000') }}
+          E2E_WATCH_MAX_HOT_UPDATE_MS: ${{ matrix.watch_max_hot_update_ms || '30000' }}
           E2E_WATCH_COMMAND_TIMEOUT_MS: ${{ matrix.watch_command_timeout_ms }}
+          E2E_WATCH_MAX_ATTEMPTS: ${{ matrix.watch_max_attempts || '2' }}
           E2E_WATCH_ROUND_PROFILE: ${{ matrix.round_profile }}
           E2E_WATCH_SAVE_SNAPSHOTS: ${{ matrix.watch_save_snapshots }}
           NODE_OPTIONS: --max-old-space-size=6144
@@ -486,7 +489,7 @@ jobs:
           E2E_WATCH_CASE: ${{ matrix.watch_case }}
           E2E_WATCH_TIMEOUT_MS: ${{ matrix.watch_timeout_ms }}
           E2E_WATCH_POLL_MS: ${{ matrix.watch_poll_ms }}
-          E2E_WATCH_MAX_HOT_UPDATE_MS: ${{ matrix.watch_max_hot_update_ms || (matrix.runner_label == 'windows' && '30000' || '15000') }}
+          E2E_WATCH_MAX_HOT_UPDATE_MS: ${{ matrix.watch_max_hot_update_ms || '30000' }}
           E2E_WATCH_COMMAND_TIMEOUT_MS: ${{ matrix.watch_command_timeout_ms }}
           E2E_WATCH_MAX_ATTEMPTS: ${{ matrix.watch_max_attempts || '2' }}
           E2E_WATCH_ROUND_PROFILE: ${{ matrix.round_profile }}

diff --git a/demo/gulp-tailwindcss-v4/gulpfile.ts b/demo/gulp-tailwindcss-v4/gulpfile.ts
@@ -50,6 +50,7 @@ const generator = {
 
 // 在 Gulp 里使用时，Tailwind CSS 生成由 transformWxss 的生成模式接管，PostCSS 只保留后处理插件
 const { transformJs, transformWxml, transformWxss } = createPlugins({
+  tailwindcssBasedir: process.cwd(),
   rem2rpx: true,
   generator,
   tailwindcss: {

diff --git a/demo/mpx-tailwindcss-v4/mpx.config.js b/demo/mpx-tailwindcss-v4/mpx.config.js
@@ -46,6 +46,7 @@ module.exports = defineConfig({
   configureWebpack(config) {
     config.plugins.push(
       new UnifiedWebpackPluginV5({
+        tailwindcssBasedir: process.cwd(),
         rem2rpx: true,
         appType: 'mpx',
       })

diff --git a/demo/mpx-tailwindcss-v4/src/app.css b/demo/mpx-tailwindcss-v4/src/app.css
@@ -1,2 +1,2 @@
-@import "weapp-tailwindcss";
+@import "tailwindcss";
 @source "../src";
diff --git a/demo/taro-vite-react-tailwindcss-v4/config/index.ts b/demo/taro-vite-react-tailwindcss-v4/config/index.ts
@@ -54,6 +54,7 @@ export default defineConfig<'vite'>(async (merge, { command, mode }) => {
           },
         },
         WeappTailwindcss({
+          tailwindcssBasedir: process.cwd(),
           rem2rpx: true,
           generator,
           // injectAdditionalCssVarScope: true,

diff --git a/demo/taro-vite-vue3-tailwindcss-v4/config/index.ts b/demo/taro-vite-vue3-tailwindcss-v4/config/index.ts
@@ -54,6 +54,7 @@ export default defineConfig<'vite'>(async (merge, { command, mode }) => {
           },
         },
         WeappTailwindcss({
+          tailwindcssBasedir: process.cwd(),
           rem2rpx: true,
           generator,
           // injectAdditionalCssVarScope: true,

diff --git a/demo/taro-webpack-react-tailwindcss-v4/config/index.ts b/demo/taro-webpack-react-tailwindcss-v4/config/index.ts
@@ -78,6 +78,7 @@ export default defineConfig<'webpack5'>(async (merge, { command, mode }) => {
               plugin: UnifiedWebpackPluginV5,
               args: [
                 {
+                  tailwindcssBasedir: process.cwd(),
                   rem2rpx: true,
                   generator,
                   // before 2248

diff --git a/demo/taro-webpack-react-tailwindcss-v4/src/app.css b/demo/taro-webpack-react-tailwindcss-v4/src/app.css
@@ -1 +1,2 @@
-@import "weapp-tailwindcss";
+@import "tailwindcss" source(none);
+@source "../src";
diff --git a/demo/taro-webpack-vue3-tailwindcss-v4/config/index.ts b/demo/taro-webpack-vue3-tailwindcss-v4/config/index.ts
@@ -75,6 +75,7 @@ export default defineConfig<'webpack5'>(async (merge, { command, mode }) => {
               plugin: UnifiedWebpackPluginV5,
               args: [
                 {
+                  tailwindcssBasedir: process.cwd(),
                   rem2rpx: true,
                   generator,
                   // before 2248

diff --git a/demo/taro-webpack-vue3-tailwindcss-v4/src/app.css b/demo/taro-webpack-vue3-tailwindcss-v4/src/app.css
@@ -1 +1,2 @@
-@import "weapp-tailwindcss";
+@import "tailwindcss" source(none);
+@source "../src";
diff --git a/demo/uni-app-vite-tailwindcss-v4/vite.config.ts b/demo/uni-app-vite-tailwindcss-v4/vite.config.ts
@@ -17,6 +17,7 @@ export default defineConfig(async () => {
       // 改成 mts，则爆 uni is not a function
       uni(),
       WeappTailwindcss({
+        tailwindcssBasedir: process.cwd(),
         rem2rpx: true,
       }),
     ],

diff --git a/demo/weapp-vite-tailwindcss-v4/app.css b/demo/weapp-vite-tailwindcss-v4/app.css
@@ -1,2 +1,2 @@
-@import 'tailwindcss';
+@import "tailwindcss";
 @config "./tailwind.config.js";
diff --git a/demo/weapp-vite-tailwindcss-v4/tailwind-intellisense.css b/demo/weapp-vite-tailwindcss-v4/tailwind-intellisense.css
@@ -1,2 +1,2 @@
-@import 'tailwindcss';
+@import "tailwindcss";
 @source not "dist";
diff --git a/demo/weapp-vite-tailwindcss-v4/vite.config.ts b/demo/weapp-vite-tailwindcss-v4/vite.config.ts
@@ -17,6 +17,7 @@ export default defineConfig({
     // tailwindcss(),
     // @ts-ignore
     WeappTailwindcss({
+      tailwindcssBasedir: process.cwd(),
       rem2rpx: true,
     }),
   ],