weapp-tailwindcss 4.11.0-alpha.2 → 4.11.0-alpha.4

package/dist/{chunk-LYGLQCWI.js → chunk-VO2ZPNCW.js}

@@ -7,7 +7,7 @@
 
 
 
-var _chunk5KSBT6GUjs = require('./chunk-5KSBT6GU.js');
+var _chunkFI75TLOQjs = require('./chunk-FI75TLOQ.js');
 
 
 var _chunkLL3QUKJIjs = require('./chunk-LL3QUKJI.js');
@@ -38,7 +38,7 @@ var debug = createDebug("[tailwindcss:runtime] ");
 var refreshTailwindcssPatcherSymbol = /* @__PURE__ */ Symbol.for("weapp-tailwindcss.refreshTailwindcssPatcher");
 function createTailwindPatchPromise(twPatcher, onPatched) {
   return Promise.resolve(twPatcher.patch()).then(async () => {
-    _chunk5KSBT6GUjs.invalidateRuntimeClassSet.call(void 0, twPatcher);
+    _chunkFI75TLOQjs.invalidateRuntimeClassSet.call(void 0, twPatcher);
     if (onPatched) {
       try {
         await onPatched();
@@ -93,7 +93,7 @@ async function ensureRuntimeClassSet(state, options = {}) {
   }
   await state.patchPromise;
   const entry = getRuntimeClassSetStateEntry(state);
-  const signature = _chunk5KSBT6GUjs.getRuntimeClassSetSignature.call(void 0, state.twPatcher);
+  const signature = _chunkFI75TLOQjs.getRuntimeClassSetSignature.call(void 0, state.twPatcher);
   const signatureChanged = entry.signature !== signature;
   const shouldForceCollect = forceCollect || forceRefresh || signatureChanged;
   if (!shouldForceCollect) {
@@ -128,7 +128,7 @@ async function ensureRuntimeClassSet(state, options = {}) {
   try {
     const runtimeSet = await task;
     entry.value = runtimeSet;
-    entry.signature = _chunk5KSBT6GUjs.getRuntimeClassSetSignature.call(void 0, state.twPatcher);
+    entry.signature = _chunkFI75TLOQjs.getRuntimeClassSetSignature.call(void 0, state.twPatcher);
     return runtimeSet;
   } finally {
     if (entry.promise === task) {
@@ -185,8 +185,8 @@ async function collectRuntimeClassSet(twPatcher, options = {}) {
       }
     }
   }
-  const entry = _chunk5KSBT6GUjs.getRuntimeClassSetCacheEntry.call(void 0, activePatcher);
-  const signature = _chunk5KSBT6GUjs.getRuntimeClassSetSignature.call(void 0, activePatcher);
+  const entry = _chunkFI75TLOQjs.getRuntimeClassSetCacheEntry.call(void 0, activePatcher);
+  const signature = _chunkFI75TLOQjs.getRuntimeClassSetSignature.call(void 0, activePatcher);
   if (!options.force) {
     if (entry.value && entry.signature === signature) {
       return entry.value;
@@ -385,7 +385,7 @@ function formatRelativeToBase(targetPath, baseDir) {
 }
 function resolveRecordLocation(baseDir) {
   const normalizedBase = _path2.default.normalize(baseDir);
-  const packageRoot = _nullishCoalesce(_chunk5KSBT6GUjs.findNearestPackageRoot.call(void 0, normalizedBase), () => ( normalizedBase));
+  const packageRoot = _nullishCoalesce(_chunkFI75TLOQjs.findNearestPackageRoot.call(void 0, normalizedBase), () => ( normalizedBase));
   const packageJsonPath = _path2.default.join(packageRoot, "package.json");
   const hasPackageJson = _fs.existsSync.call(void 0, packageJsonPath);
   const recordKeySource = hasPackageJson ? packageJsonPath : normalizedBase;
@@ -422,7 +422,7 @@ function getRecordFileCandidates(baseDir) {
 // package.json
 var package_default = {
   name: "weapp-tailwindcss",
-  version: "4.11.0-alpha.2",
+  version: "4.11.0-alpha.4",
   description: "\u628A tailwindcss \u539F\u5B50\u5316\u6837\u5F0F\u601D\u60F3\uFF0C\u5E26\u7ED9\u5C0F\u7A0B\u5E8F\u5F00\u53D1\u8005\u4EEC! bring tailwindcss to miniprogram developers!",
   author: "ice breaker <1324318532@qq.com>",
   license: "MIT",
@@ -3715,15 +3715,15 @@ function createInternalCompilerContext(opts) {
   );
   ctx.escapeMap = ctx.customReplaceDictionary;
   applyLoggerLevel(ctx.logLevel);
-  const twPatcher = _chunk5KSBT6GUjs.createTailwindcssPatcherFromContext.call(void 0, ctx);
+  const twPatcher = _chunkFI75TLOQjs.createTailwindcssPatcherFromContext.call(void 0, ctx);
   logTailwindcssTarget("runtime", twPatcher, ctx.tailwindcssBasedir);
   if (_optionalChain([twPatcher, 'access', _119 => _119.packageInfo, 'optionalAccess', _120 => _120.version])) {
     _logger.logger.success(`\u5F53\u524D\u4F7F\u7528 ${_logger.pc.cyanBright("Tailwind CSS")} \u7248\u672C\u4E3A: ${_logger.pc.underline(_logger.pc.bold(_logger.pc.green(twPatcher.packageInfo.version)))}`);
   } else {
     _logger.logger.warn(`${_logger.pc.cyanBright("Tailwind CSS")} \u672A\u5B89\u88C5\uFF0C\u5DF2\u8DF3\u8FC7\u7248\u672C\u68C0\u6D4B\u4E0E\u8865\u4E01\u5E94\u7528\u3002`);
   }
-  _chunk5KSBT6GUjs.warnMissingCssEntries.call(void 0, ctx, twPatcher);
-  const cssCalcOptions = _chunk5KSBT6GUjs.applyV4CssCalcDefaults.call(void 0, ctx.cssCalc, twPatcher);
+  _chunkFI75TLOQjs.warnMissingCssEntries.call(void 0, ctx, twPatcher);
+  const cssCalcOptions = _chunkFI75TLOQjs.applyV4CssCalcDefaults.call(void 0, ctx.cssCalc, twPatcher);
   ctx.cssCalc = cssCalcOptions;
   const customAttributesEntities = toCustomAttributesEntities(ctx.customAttributes);
   const { styleHandler, jsHandler: jsHandler2, templateHandler } = createHandlersFromContext(
@@ -3742,8 +3742,8 @@ function createInternalCompilerContext(opts) {
     if (_optionalChain([options, 'optionalAccess', _121 => _121.clearCache]) !== false) {
       await clearTailwindcssPatcherCache(previousPatcher);
     }
-    _chunk5KSBT6GUjs.invalidateRuntimeClassSet.call(void 0, previousPatcher);
-    const nextPatcher = _chunk5KSBT6GUjs.createTailwindcssPatcherFromContext.call(void 0, ctx);
+    _chunkFI75TLOQjs.invalidateRuntimeClassSet.call(void 0, previousPatcher);
+    const nextPatcher = _chunkFI75TLOQjs.createTailwindcssPatcherFromContext.call(void 0, ctx);
     Object.assign(previousPatcher, nextPatcher);
     ctx.twPatcher = previousPatcher;
     return previousPatcher;
@@ -3764,7 +3764,7 @@ function setupPatchRecorder(patcher, baseDir, options) {
   const recorder = createPatchTargetRecorder(baseDir, patcher, options);
   if (_optionalChain([recorder, 'optionalAccess', _122 => _122.message]) && _optionalChain([options, 'optionalAccess', _123 => _123.logMessage]) !== false) {
     const prefix = _optionalChain([options, 'optionalAccess', _124 => _124.messagePrefix]) ? `${options.messagePrefix} ` : "";
-    _chunk5KSBT6GUjs.logger.info("%s%s", prefix, recorder.message);
+    _chunkFI75TLOQjs.logger.info("%s%s", prefix, recorder.message);
   }
   const onPatchCompleted = _optionalChain([recorder, 'optionalAccess', _125 => _125.onPatched]) ? async () => {
     await recorder.onPatched();

package/dist/{chunk-SJ3SG6DU.mjs → chunk-ZPGT5C7G.mjs}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-F2CKKG6Q.mjs";
 import {
   pluginName
-} from "./chunk-HADJCWHU.mjs";
+} from "./chunk-JOT24YET.mjs";
 
 // src/shared/mpx.ts
 import path2 from "path";

package/dist/cli.js

@@ -179,7 +179,7 @@ var import_logger = require("@weapp-tailwindcss/logger");
 // package.json
 var package_default = {
   name: "weapp-tailwindcss",
-  version: "4.11.0-alpha.2",
+  version: "4.11.0-alpha.4",
   description: "\u628A tailwindcss \u539F\u5B50\u5316\u6837\u5F0F\u601D\u60F3\uFF0C\u5E26\u7ED9\u5C0F\u7A0B\u5E8F\u5F00\u53D1\u8005\u4EEC! bring tailwindcss to miniprogram developers!",
   author: "ice breaker <1324318532@qq.com>",
   license: "MIT",

package/dist/cli.mjs

@@ -155,7 +155,7 @@ import { logger } from "@weapp-tailwindcss/logger";
 // package.json
 var package_default = {
   name: "weapp-tailwindcss",
-  version: "4.11.0-alpha.2",
+  version: "4.11.0-alpha.4",
   description: "\u628A tailwindcss \u539F\u5B50\u5316\u6837\u5F0F\u601D\u60F3\uFF0C\u5E26\u7ED9\u5C0F\u7A0B\u5E8F\u5F00\u53D1\u8005\u4EEC! bring tailwindcss to miniprogram developers!",
   author: "ice breaker <1324318532@qq.com>",
   license: "MIT",

package/dist/core.js

@@ -2,8 +2,8 @@
 
 
 
-var _chunkLYGLQCWIjs = require('./chunk-LYGLQCWI.js');
-require('./chunk-5KSBT6GU.js');
+var _chunkVO2ZPNCWjs = require('./chunk-VO2ZPNCW.js');
+require('./chunk-FI75TLOQ.js');
 require('./chunk-LL3QUKJI.js');
 require('./chunk-DYLQ6UOI.js');
 require('./chunk-CRDOWYG4.js');
@@ -24,9 +24,9 @@ function resolveTransformWxssOptions(options) {
   return _shared.defuOverrideArray.call(void 0, options, DEFAULT_MAIN_CHUNK_STYLE_OPTIONS);
 }
 function createContext(options = {}) {
-  const opts = _chunkLYGLQCWIjs.getCompilerContext.call(void 0, options);
+  const opts = _chunkVO2ZPNCWjs.getCompilerContext.call(void 0, options);
   const { templateHandler, styleHandler, jsHandler, twPatcher: initialTwPatcher, refreshTailwindcssPatcher } = opts;
-  const patchRecorderState = _chunkLYGLQCWIjs.setupPatchRecorder.call(void 0, initialTwPatcher, opts.tailwindcssBasedir, {
+  const patchRecorderState = _chunkVO2ZPNCWjs.setupPatchRecorder.call(void 0, initialTwPatcher, opts.tailwindcssBasedir, {
     source: "runtime",
     cwd: _nullishCoalesce(opts.tailwindcssBasedir, () => ( _process2.default.cwd()))
   });
@@ -143,7 +143,7 @@ function createContext(options = {}) {
   async function transformWxss(rawCss, options2) {
     await runtimeState.patchPromise;
     const result = await styleHandler(rawCss, resolveTransformWxssOptions(options2));
-    runtimeSet = await _chunkLYGLQCWIjs.ensureRuntimeClassSet.call(void 0, runtimeState, {
+    runtimeSet = await _chunkVO2ZPNCWjs.ensureRuntimeClassSet.call(void 0, runtimeState, {
       forceRefresh: true,
       forceCollect: true
     });
@@ -154,7 +154,7 @@ function createContext(options = {}) {
     if (_optionalChain([options2, 'optionalAccess', _ => _.runtimeSet])) {
       runtimeSet = options2.runtimeSet;
     } else if (runtimeSet.size === 0) {
-      runtimeSet = await _chunkLYGLQCWIjs.ensureRuntimeClassSet.call(void 0, runtimeState, {
+      runtimeSet = await _chunkVO2ZPNCWjs.ensureRuntimeClassSet.call(void 0, runtimeState, {
         forceCollect: true
       });
     }
@@ -163,7 +163,7 @@ function createContext(options = {}) {
   async function transformWxml(rawWxml, options2) {
     await runtimeState.patchPromise;
     if (!_optionalChain([options2, 'optionalAccess', _2 => _2.runtimeSet]) && runtimeSet.size === 0) {
-      runtimeSet = await _chunkLYGLQCWIjs.ensureRuntimeClassSet.call(void 0, runtimeState, {
+      runtimeSet = await _chunkVO2ZPNCWjs.ensureRuntimeClassSet.call(void 0, runtimeState, {
         forceCollect: true
       });
     }

package/dist/core.mjs

@@ -2,8 +2,8 @@ import {
   ensureRuntimeClassSet,
   getCompilerContext,
   setupPatchRecorder
-} from "./chunk-HADJCWHU.mjs";
-import "./chunk-EW2K6CO5.mjs";
+} from "./chunk-JOT24YET.mjs";
+import "./chunk-3V52XTPJ.mjs";
 import "./chunk-23K4XDKF.mjs";
 import "./chunk-OOHJLO5M.mjs";
 import "./chunk-EFBQ4SQR.mjs";

package/dist/gulp.js

@@ -1,13 +1,13 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunk2W24MRCQjs = require('./chunk-2W24MRCQ.js');
+var _chunkVHUV7ZDBjs = require('./chunk-VHUV7ZDB.js');
 require('./chunk-OF6MFURR.js');
-require('./chunk-LYGLQCWI.js');
-require('./chunk-5KSBT6GU.js');
+require('./chunk-VO2ZPNCW.js');
+require('./chunk-FI75TLOQ.js');
 require('./chunk-LL3QUKJI.js');
 require('./chunk-DYLQ6UOI.js');
 require('./chunk-CRDOWYG4.js');
 
 
 
-exports.createPlugins = _chunk2W24MRCQjs.createPlugins; exports.weappTailwindcss = _chunk2W24MRCQjs.createPlugins;
+exports.createPlugins = _chunkVHUV7ZDBjs.createPlugins; exports.weappTailwindcss = _chunkVHUV7ZDBjs.createPlugins;

package/dist/gulp.mjs

@@ -1,9 +1,9 @@
 import {
   createPlugins
-} from "./chunk-UCUAXK7F.mjs";
+} from "./chunk-TDHY27WS.mjs";
 import "./chunk-76S2EME4.mjs";
-import "./chunk-HADJCWHU.mjs";
-import "./chunk-EW2K6CO5.mjs";
+import "./chunk-JOT24YET.mjs";
+import "./chunk-3V52XTPJ.mjs";
 import "./chunk-23K4XDKF.mjs";
 import "./chunk-OOHJLO5M.mjs";
 import "./chunk-EFBQ4SQR.mjs";

package/dist/index.js

@@ -1,18 +1,18 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
 
-var _chunk6O7HJU2Fjs = require('./chunk-6O7HJU2F.js');
-require('./chunk-4TTPYMVM.js');
+var _chunkGCZ7ZE7Vjs = require('./chunk-GCZ7ZE7V.js');
+require('./chunk-JKK5KZCN.js');
 
 
-var _chunk2W24MRCQjs = require('./chunk-2W24MRCQ.js');
+var _chunkVHUV7ZDBjs = require('./chunk-VHUV7ZDB.js');
 
 
-var _chunkK7CZXT46js = require('./chunk-K7CZXT46.js');
+var _chunkN3RT3VZHjs = require('./chunk-N3RT3VZH.js');
 require('./chunk-7LKMJZD2.js');
 require('./chunk-OF6MFURR.js');
-require('./chunk-LYGLQCWI.js');
-require('./chunk-5KSBT6GU.js');
+require('./chunk-VO2ZPNCW.js');
+require('./chunk-FI75TLOQ.js');
 require('./chunk-LL3QUKJI.js');
 require('./chunk-DYLQ6UOI.js');
 require('./chunk-CRDOWYG4.js');
@@ -21,4 +21,4 @@ require('./chunk-CRDOWYG4.js');
 
 
 
-exports.UnifiedViteWeappTailwindcssPlugin = _chunkK7CZXT46js.UnifiedViteWeappTailwindcssPlugin; exports.UnifiedWebpackPluginV5 = _chunk6O7HJU2Fjs.UnifiedWebpackPluginV5; exports.createPlugins = _chunk2W24MRCQjs.createPlugins; exports.weappTailwindcssPackageDir = _chunk6O7HJU2Fjs.weappTailwindcssPackageDir;
+exports.UnifiedViteWeappTailwindcssPlugin = _chunkN3RT3VZHjs.UnifiedViteWeappTailwindcssPlugin; exports.UnifiedWebpackPluginV5 = _chunkGCZ7ZE7Vjs.UnifiedWebpackPluginV5; exports.createPlugins = _chunkVHUV7ZDBjs.createPlugins; exports.weappTailwindcssPackageDir = _chunkGCZ7ZE7Vjs.weappTailwindcssPackageDir;

package/dist/index.mjs

@@ -1,18 +1,18 @@
 import {
   UnifiedWebpackPluginV5,
   weappTailwindcssPackageDir
-} from "./chunk-RED7Y22U.mjs";
-import "./chunk-SJ3SG6DU.mjs";
+} from "./chunk-6R2OVCLW.mjs";
+import "./chunk-ZPGT5C7G.mjs";
 import {
   createPlugins
-} from "./chunk-UCUAXK7F.mjs";
+} from "./chunk-TDHY27WS.mjs";
 import {
   UnifiedViteWeappTailwindcssPlugin
-} from "./chunk-66E76FQE.mjs";
+} from "./chunk-NYZTRTBM.mjs";
 import "./chunk-F2CKKG6Q.mjs";
 import "./chunk-76S2EME4.mjs";
-import "./chunk-HADJCWHU.mjs";
-import "./chunk-EW2K6CO5.mjs";
+import "./chunk-JOT24YET.mjs";
+import "./chunk-3V52XTPJ.mjs";
 import "./chunk-23K4XDKF.mjs";
 import "./chunk-OOHJLO5M.mjs";
 import "./chunk-EFBQ4SQR.mjs";

package/dist/presets.js

@@ -1,7 +1,7 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } }
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
 
 
-var _chunk5KSBT6GUjs = require('./chunk-5KSBT6GU.js');
+var _chunkFI75TLOQjs = require('./chunk-FI75TLOQ.js');
 
 
 
@@ -24,7 +24,7 @@ function createBasePreset(options = {}) {
     rawOptions,
     ...userOptions
   } = options;
-  const baseDir = _chunk5KSBT6GUjs.resolveTailwindcssBasedir.call(void 0, base);
+  const baseDir = _chunkFI75TLOQjs.resolveTailwindcssBasedir.call(void 0, base);
   const normalizedCssEntries = normalizeCssEntries(cssEntries);
   const tailwindConfig = {
     v2: { cwd: baseDir },
@@ -69,13 +69,56 @@ function uniApp(options = {}) {
 
 // src/presets/uni-app-x.ts
 
+
+// src/tailwindcss/index.ts
+var _localpkg = require('local-pkg');
+function getTailwindcssPackageInfo(options) {
+  return _localpkg.getPackageInfoSync.call(void 0, "tailwindcss", options);
+}
+
+// src/presets/uni-app-x.ts
+function resolveTailwindResolveOptions(base, resolve) {
+  const currentPaths = Array.isArray(_optionalChain([resolve, 'optionalAccess', _ => _.paths])) ? resolve.paths : [];
+  return {
+    ..._nullishCoalesce(resolve, () => ( {})),
+    paths: [.../* @__PURE__ */ new Set([base, ...currentPaths])]
+  };
+}
+function resolveInstalledTailwindDefaults(resolve) {
+  const packageInfo = getTailwindcssPackageInfo(resolve);
+  const version = _optionalChain([packageInfo, 'optionalAccess', _2 => _2.version]);
+  if (!version) {
+    return void 0;
+  }
+  const major = Number.parseInt(_nullishCoalesce(version.split(".")[0], () => ( "")), 10);
+  if (!Number.isFinite(major)) {
+    return void 0;
+  }
+  if (major === 4) {
+    return {
+      version: 4,
+      packageName: "tailwindcss",
+      postcssPlugin: "@tailwindcss/postcss"
+    };
+  }
+  if (major === 3) {
+    return {
+      version: 3,
+      packageName: "tailwindcss",
+      postcssPlugin: "tailwindcss"
+    };
+  }
+  return void 0;
+}
 function uniAppX(options) {
-  _chunk5KSBT6GUjs.logger.info(`UNI_PLATFORM: ${_process2.default.env.UNI_PLATFORM}`);
+  _chunkFI75TLOQjs.logger.info(`UNI_PLATFORM: ${_process2.default.env.UNI_PLATFORM}`);
   const utsPlatform = _chunkDYLQ6UOIjs.resolveUniUtsPlatform.call(void 0, );
   const uniPlatform = _chunkDYLQ6UOIjs.resolveUniUtsPlatform.call(void 0, _process2.default.env.UNI_PLATFORM);
-  _chunk5KSBT6GUjs.logger.info(`UNI_UTS_PLATFORM: ${_nullishCoalesce(utsPlatform.raw, () => ( "undefined"))}`);
+  _chunkFI75TLOQjs.logger.info(`UNI_UTS_PLATFORM: ${_nullishCoalesce(utsPlatform.raw, () => ( "undefined"))}`);
   const isApp = utsPlatform.isApp || uniPlatform.isApp;
   const cssEntries = normalizeCssEntries(options.cssEntries);
+  const resolvedResolve = resolveTailwindResolveOptions(options.base, options.resolve);
+  const installedTailwindDefaults = resolveInstalledTailwindDefaults(resolvedResolve);
   return _chunkDYLQ6UOIjs.defuOverrideArray.call(void 0, 
     _nullishCoalesce(options.rawOptions, () => ( {})),
     {
@@ -86,8 +129,9 @@ function uniAppX(options) {
       tailwindcssPatcherOptions: {
         projectRoot: options.base,
         tailwindcss: {
+          ..._nullishCoalesce(installedTailwindDefaults, () => ( {})),
           cwd: options.base,
-          resolve: options.resolve,
+          resolve: resolvedResolve,
           v3: {
             cwd: options.base
           },
@@ -97,6 +141,10 @@ function uniAppX(options) {
           }
         }
       },
+      tailwindcss: {
+        ..._nullishCoalesce(installedTailwindDefaults, () => ( {})),
+        resolve: resolvedResolve
+      },
       cssPreflight: {
         "border-style": false
       },

package/dist/presets.mjs

@@ -1,7 +1,7 @@
 import {
   logger,
   resolveTailwindcssBasedir
-} from "./chunk-EW2K6CO5.mjs";
+} from "./chunk-3V52XTPJ.mjs";
 import {
   defuOverrideArray,
   resolveUniUtsPlatform
@@ -69,6 +69,47 @@ function uniApp(options = {}) {
 
 // src/presets/uni-app-x.ts
 import process2 from "process";
+
+// src/tailwindcss/index.ts
+import { getPackageInfoSync } from "local-pkg";
+function getTailwindcssPackageInfo(options) {
+  return getPackageInfoSync("tailwindcss", options);
+}
+
+// src/presets/uni-app-x.ts
+function resolveTailwindResolveOptions(base, resolve) {
+  const currentPaths = Array.isArray(resolve?.paths) ? resolve.paths : [];
+  return {
+    ...resolve ?? {},
+    paths: [.../* @__PURE__ */ new Set([base, ...currentPaths])]
+  };
+}
+function resolveInstalledTailwindDefaults(resolve) {
+  const packageInfo = getTailwindcssPackageInfo(resolve);
+  const version = packageInfo?.version;
+  if (!version) {
+    return void 0;
+  }
+  const major = Number.parseInt(version.split(".")[0] ?? "", 10);
+  if (!Number.isFinite(major)) {
+    return void 0;
+  }
+  if (major === 4) {
+    return {
+      version: 4,
+      packageName: "tailwindcss",
+      postcssPlugin: "@tailwindcss/postcss"
+    };
+  }
+  if (major === 3) {
+    return {
+      version: 3,
+      packageName: "tailwindcss",
+      postcssPlugin: "tailwindcss"
+    };
+  }
+  return void 0;
+}
 function uniAppX(options) {
   logger.info(`UNI_PLATFORM: ${process2.env.UNI_PLATFORM}`);
   const utsPlatform = resolveUniUtsPlatform();
@@ -76,6 +117,8 @@ function uniAppX(options) {
   logger.info(`UNI_UTS_PLATFORM: ${utsPlatform.raw ?? "undefined"}`);
   const isApp = utsPlatform.isApp || uniPlatform.isApp;
   const cssEntries = normalizeCssEntries(options.cssEntries);
+  const resolvedResolve = resolveTailwindResolveOptions(options.base, options.resolve);
+  const installedTailwindDefaults = resolveInstalledTailwindDefaults(resolvedResolve);
   return defuOverrideArray(
     options.rawOptions ?? {},
     {
@@ -86,8 +129,9 @@ function uniAppX(options) {
       tailwindcssPatcherOptions: {
         projectRoot: options.base,
         tailwindcss: {
+          ...installedTailwindDefaults ?? {},
           cwd: options.base,
-          resolve: options.resolve,
+          resolve: resolvedResolve,
           v3: {
             cwd: options.base
           },
@@ -97,6 +141,10 @@ function uniAppX(options) {
           }
         }
       },
+      tailwindcss: {
+        ...installedTailwindDefaults ?? {},
+        resolve: resolvedResolve
+      },
       cssPreflight: {
         "border-style": false
       },

package/dist/vite.js

@@ -1,14 +1,14 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkK7CZXT46js = require('./chunk-K7CZXT46.js');
+var _chunkN3RT3VZHjs = require('./chunk-N3RT3VZH.js');
 require('./chunk-7LKMJZD2.js');
 require('./chunk-OF6MFURR.js');
-require('./chunk-LYGLQCWI.js');
-require('./chunk-5KSBT6GU.js');
+require('./chunk-VO2ZPNCW.js');
+require('./chunk-FI75TLOQ.js');
 require('./chunk-LL3QUKJI.js');
 require('./chunk-DYLQ6UOI.js');
 require('./chunk-CRDOWYG4.js');
 
 
 
-exports.UnifiedViteWeappTailwindcssPlugin = _chunkK7CZXT46js.UnifiedViteWeappTailwindcssPlugin; exports.weappTailwindcss = _chunkK7CZXT46js.UnifiedViteWeappTailwindcssPlugin;
+exports.UnifiedViteWeappTailwindcssPlugin = _chunkN3RT3VZHjs.UnifiedViteWeappTailwindcssPlugin; exports.weappTailwindcss = _chunkN3RT3VZHjs.UnifiedViteWeappTailwindcssPlugin;

package/dist/vite.mjs

@@ -1,10 +1,10 @@
 import {
   UnifiedViteWeappTailwindcssPlugin
-} from "./chunk-66E76FQE.mjs";
+} from "./chunk-NYZTRTBM.mjs";
 import "./chunk-F2CKKG6Q.mjs";
 import "./chunk-76S2EME4.mjs";
-import "./chunk-HADJCWHU.mjs";
-import "./chunk-EW2K6CO5.mjs";
+import "./chunk-JOT24YET.mjs";
+import "./chunk-3V52XTPJ.mjs";
 import "./chunk-23K4XDKF.mjs";
 import "./chunk-OOHJLO5M.mjs";
 import "./chunk-EFBQ4SQR.mjs";

package/dist/webpack.js

@@ -1,12 +1,12 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
 
-var _chunk6O7HJU2Fjs = require('./chunk-6O7HJU2F.js');
-require('./chunk-4TTPYMVM.js');
+var _chunkGCZ7ZE7Vjs = require('./chunk-GCZ7ZE7V.js');
+require('./chunk-JKK5KZCN.js');
 require('./chunk-7LKMJZD2.js');
 require('./chunk-OF6MFURR.js');
-require('./chunk-LYGLQCWI.js');
-require('./chunk-5KSBT6GU.js');
+require('./chunk-VO2ZPNCW.js');
+require('./chunk-FI75TLOQ.js');
 require('./chunk-LL3QUKJI.js');
 require('./chunk-DYLQ6UOI.js');
 require('./chunk-CRDOWYG4.js');
@@ -14,4 +14,4 @@ require('./chunk-CRDOWYG4.js');
 
 
 
-exports.UnifiedWebpackPluginV5 = _chunk6O7HJU2Fjs.UnifiedWebpackPluginV5; exports.weappTailwindcss = _chunk6O7HJU2Fjs.UnifiedWebpackPluginV5; exports.weappTailwindcssPackageDir = _chunk6O7HJU2Fjs.weappTailwindcssPackageDir;
+exports.UnifiedWebpackPluginV5 = _chunkGCZ7ZE7Vjs.UnifiedWebpackPluginV5; exports.weappTailwindcss = _chunkGCZ7ZE7Vjs.UnifiedWebpackPluginV5; exports.weappTailwindcssPackageDir = _chunkGCZ7ZE7Vjs.weappTailwindcssPackageDir;

package/dist/webpack.mjs

@@ -1,12 +1,12 @@
 import {
   UnifiedWebpackPluginV5,
   weappTailwindcssPackageDir
-} from "./chunk-RED7Y22U.mjs";
-import "./chunk-SJ3SG6DU.mjs";
+} from "./chunk-6R2OVCLW.mjs";
+import "./chunk-ZPGT5C7G.mjs";
 import "./chunk-F2CKKG6Q.mjs";
 import "./chunk-76S2EME4.mjs";
-import "./chunk-HADJCWHU.mjs";
-import "./chunk-EW2K6CO5.mjs";
+import "./chunk-JOT24YET.mjs";
+import "./chunk-3V52XTPJ.mjs";
 import "./chunk-23K4XDKF.mjs";
 import "./chunk-OOHJLO5M.mjs";
 import "./chunk-EFBQ4SQR.mjs";