@umijs/plugins 4.6.62 → 4.6.64

package/dist/tailwindcss.js

@@ -39,11 +39,55 @@ var tailwindcss_default = (api) => {
   });
   let tailwind = null;
   const outputPath = "plugin-tailwindcss/tailwind.css";
+  api.modifyConfig((memo) => {
+    var _a, _b, _c;
+    if (!memo.utoopack || !isTailwindV4({ cwd: api.cwd })) {
+      return memo;
+    }
+    const ruleKey = "*.css";
+    return {
+      ...memo,
+      utoopack: {
+        ...memo.utoopack,
+        module: {
+          ...(_a = memo.utoopack) == null ? void 0 : _a.module,
+          rules: {
+            [ruleKey]: {
+              condition: {
+                path: /(^|[\\\/])tailwind\.css$/
+              },
+              loaders: [
+                {
+                  loader: getTailwindWebpackLoaderPath({ cwd: api.cwd }, api),
+                  options: {
+                    base: api.cwd
+                  }
+                }
+              ],
+              as: "*.css"
+            },
+            ...(_c = (_b = memo.utoopack) == null ? void 0 : _b.module) == null ? void 0 : _c.rules
+          }
+        }
+      }
+    };
+  });
+  api.chainWebpack((memo) => {
+    if (!shouldUseTailwindWebpackLoader(api)) {
+      return;
+    }
+    memo.module.rule("tailwindcss").enforce("pre").test(/(^|[\\\/])tailwind\.css$/).use("tailwindcss-loader").loader(getTailwindWebpackLoaderPath({ cwd: api.cwd }, api)).options({
+      base: api.cwd
+    });
+  });
   api.onBeforeCompiler(() => {
     const inputPath = (0, import_path.join)(api.cwd, "tailwind.css");
     const generatedPath = (0, import_path.join)(api.paths.absTmpPath, outputPath);
-    const binPath = getTailwindBinPath({ cwd: api.cwd }, api);
     const configPath = (0, import_path.join)(api.cwd, "tailwind.config.js");
+    if (isTailwindV4({ cwd: api.cwd })) {
+      return;
+    }
+    const binPath = getTailwindBinPath({ cwd: api.cwd });
     if (process.env.IS_UMI_BUILD_WORKER) {
       return;
     }
@@ -93,29 +137,49 @@ var tailwindcss_default = (api) => {
     });
   });
   api.addEntryImports(() => {
+    if (isTailwindV4({ cwd: api.cwd })) {
+      return [{ source: (0, import_plugin_utils.winPath)((0, import_path.join)(api.cwd, "tailwind.css")) }];
+    }
     const generatedPath = (0, import_plugin_utils.winPath)((0, import_path.join)(api.paths.absTmpPath, outputPath));
     return [{ source: generatedPath }];
   });
 };
-function getTailwindBinPath(opts, api) {
+function isTailwindV4(opts) {
   const pkgPath = require.resolve("tailwindcss/package.json", {
     paths: [opts.cwd]
   });
   const tailwind = require(pkgPath);
-  if (tailwind.version.startsWith("4")) {
-    try {
-      const tailwindCliPath = require.resolve("@tailwindcss/cli/package.json", {
-        paths: [opts.cwd]
-      });
-      const tailwindPath2 = require(tailwindCliPath).bin["tailwindcss"];
-      return (0, import_path.join)((0, import_path.dirname)(tailwindCliPath), tailwindPath2);
-    } catch {
-      api.logger.error(
-        "tailwindcss v4 requires @tailwindcss/cli to be installed"
-      );
-      process.exit(1);
-    }
+  return tailwind.version.startsWith("4");
+}
+function shouldUseTailwindWebpackLoader(api) {
+  if (!isTailwindV4({ cwd: api.cwd })) {
+    return false;
   }
+  return Boolean(!api.config.utoopack && !api.config.vite && !api.config.mako);
+}
+function getTailwindBinPath(opts) {
+  const pkgPath = require.resolve("tailwindcss/package.json", {
+    paths: [opts.cwd]
+  });
   const tailwindPath = require(pkgPath).bin["tailwind"];
   return (0, import_path.join)((0, import_path.dirname)(pkgPath), tailwindPath);
 }
+function getTailwindWebpackLoaderPath(opts, api) {
+  for (const cwd of [__dirname, opts.cwd]) {
+    const loaderPath = tryResolveTailwindWebpackLoader(cwd);
+    if (loaderPath) return loaderPath;
+  }
+  api.logger.error(
+    "tailwindcss v4 with webpack or utoopack requires @tailwindcss/webpack"
+  );
+  process.exit(1);
+}
+function tryResolveTailwindWebpackLoader(cwd) {
+  try {
+    return require.resolve("@tailwindcss/webpack", {
+      paths: [cwd]
+    });
+  } catch {
+    return null;
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.6.62",
+  "version": "4.6.64",
   "description": "@umijs/plugins",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/plugins#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -23,6 +23,7 @@
     "@ant-design/icons": "^4.7.0",
     "@ant-design/moment-webpack-plugin": "^0.0.3",
     "@ant-design/pro-components": "^2.0.1",
+    "@tailwindcss/webpack": "^4.3.1",
     "@tanstack/react-query": "^4.24.10",
     "@tanstack/react-query-devtools": "^4.24.10",
     "antd-dayjs-webpack-plugin": "^1.0.6",
@@ -45,12 +46,12 @@
     "styled-components": "6.1.1",
     "tslib": "^2",
     "warning": "^4.0.3",
-    "@umijs/bundler-utils": "4.6.62",
+    "@umijs/bundler-utils": "4.6.64",
     "@umijs/valtio": "1.0.4"
   },
   "devDependencies": {
     "antd": "^4.24.1",
-    "umi": "4.6.62"
+    "umi": "4.6.64"
   },
   "publishConfig": {
     "access": "public"