weapp-tailwindcss 4.9.0 → 4.9.2-alpha.1

package/dist/{chunk-IGTIMGCP.js → chunk-2QR4UOHA.js}

@@ -1,22 +1,22 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); 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 _chunkA2OSQ5CVjs = require('./chunk-A2OSQ5CV.js');
+var _chunkD2ZOXBOUjs = require('./chunk-D2ZOXBOU.js');
 
 
-var _chunkPT4IJT3Qjs = require('./chunk-PT4IJT3Q.js');
+var _chunkY4A76SWPjs = require('./chunk-Y4A76SWP.js');
 
 // src/tailwindcss/recorder.ts
 function setupPatchRecorder(patcher, baseDir, options) {
-  const recorder = _chunkA2OSQ5CVjs.createPatchTargetRecorder.call(void 0, baseDir, patcher, options);
+  const recorder = _chunkD2ZOXBOUjs.createPatchTargetRecorder.call(void 0, baseDir, patcher, options);
   if (_optionalChain([recorder, 'optionalAccess', _ => _.message]) && _optionalChain([options, 'optionalAccess', _2 => _2.logMessage]) !== false) {
     const prefix = _optionalChain([options, 'optionalAccess', _3 => _3.messagePrefix]) ? `${options.messagePrefix} ` : "";
-    _chunkPT4IJT3Qjs.logger.info("%s%s", prefix, recorder.message);
+    _chunkY4A76SWPjs.logger.info("%s%s", prefix, recorder.message);
   }
   const onPatchCompleted = _optionalChain([recorder, 'optionalAccess', _4 => _4.onPatched]) ? async () => {
     await recorder.onPatched();
   } : void 0;
-  const patchPromise = patcher ? _chunkA2OSQ5CVjs.createTailwindPatchPromise.call(void 0, patcher, onPatchCompleted) : Promise.resolve();
+  const patchPromise = patcher ? _chunkD2ZOXBOUjs.createTailwindPatchPromise.call(void 0, patcher, onPatchCompleted) : Promise.resolve();
   return {
     recorder,
     patchPromise,

package/dist/{chunk-SZOXLSNK.mjs → chunk-3LRQLHOG.mjs}

@@ -1,6 +1,6 @@
 import {
   defuOverrideArray
-} from "./chunk-RR5HCKVQ.mjs";
+} from "./chunk-OOHJLO5M.mjs";
 
 // src/logger/index.ts
 import { logger } from "@weapp-tailwindcss/logger";
@@ -689,6 +689,7 @@ function createPatcherForBase(baseDir, cssEntries, options) {
     tailwindcssPatcherOptions,
     supportCustomLengthUnitsPatch
   } = options;
+  const hasCssEntries = Boolean(cssEntries?.length);
   const defaultTailwindcssConfig = {
     cwd: baseDir,
     v2: {
@@ -697,12 +698,12 @@ function createPatcherForBase(baseDir, cssEntries, options) {
     v3: {
       cwd: baseDir
     },
-    v4: {
+    v4: hasCssEntries ? { cssEntries } : {
       base: baseDir,
       cssEntries
     }
   };
-  if (cssEntries?.length && (tailwindcss == null || tailwindcss.version == null)) {
+  if (hasCssEntries && (tailwindcss == null || tailwindcss.version == null)) {
     defaultTailwindcssConfig.version = 4;
   }
   const mergedTailwindOptions = defuOverrideArray(
@@ -710,16 +711,22 @@ function createPatcherForBase(baseDir, cssEntries, options) {
     defaultTailwindcssConfig
   );
   if (!mergedTailwindOptions.v4) {
-    mergedTailwindOptions.v4 = {
+    mergedTailwindOptions.v4 = hasCssEntries ? { cssEntries: cssEntries ?? [] } : {
       base: baseDir,
       cssEntries: cssEntries ?? []
     };
   } else {
-    mergedTailwindOptions.v4.base = baseDir;
-    if (cssEntries?.length) {
-      mergedTailwindOptions.v4.cssEntries = cssEntries;
+    if (!hasCssEntries && !mergedTailwindOptions.v4.base) {
+      mergedTailwindOptions.v4.base = baseDir;
+    }
+    if (hasCssEntries) {
+      if (cssEntries?.length) {
+        mergedTailwindOptions.v4.cssEntries = cssEntries;
+      } else if (!mergedTailwindOptions.v4.cssEntries) {
+        mergedTailwindOptions.v4.cssEntries = [];
+      }
     } else if (!mergedTailwindOptions.v4.cssEntries) {
-      mergedTailwindOptions.v4.cssEntries = [];
+      mergedTailwindOptions.v4.cssEntries = cssEntries ?? [];
     }
   }
   const patchedOptions = overrideTailwindcssPatcherOptionsForBase(
@@ -762,6 +769,7 @@ function createMultiTailwindcssPatcher(patchers) {
   }
   const [first] = patchers;
   const multiPatcher = {
+    ...first,
     packageInfo: first?.packageInfo,
     majorVersion: first?.majorVersion,
     options: first?.options,
@@ -1087,8 +1095,16 @@ function createTailwindcssPatcherFromContext(ctx) {
   if (normalizedCssEntries) {
     ctx.cssEntries = normalizedCssEntries;
   }
+  const shouldAttachBase = Boolean(ctx.tailwindcssBasedir && normalizedCssEntries?.length);
+  const tailwindcssWithBase = shouldAttachBase && tailwindcss?.v4 !== null ? {
+    ...tailwindcss ?? {},
+    v4: {
+      ...tailwindcss?.v4 ?? {},
+      base: tailwindcss?.v4?.base ?? resolvedTailwindcssBasedir
+    }
+  } : tailwindcss;
   const patcherOptions = {
-    tailwindcss,
+    tailwindcss: tailwindcssWithBase,
     tailwindcssPatcherOptions,
     supportCustomLengthUnitsPatch,
     appType

package/dist/{chunk-A2OSQ5CV.js → chunk-D2ZOXBOU.js}

@@ -3,14 +3,14 @@
 
 
 
-var _chunkPT4IJT3Qjs = require('./chunk-PT4IJT3Q.js');
+var _chunkY4A76SWPjs = require('./chunk-Y4A76SWP.js');
 
 
-var _chunk6R4BK6D6js = require('./chunk-6R4BK6D6.js');
+var _chunkFYYBY3VKjs = require('./chunk-FYYBY3VK.js');
 
 
 
-var _chunkFMBPNII7js = require('./chunk-FMBPNII7.js');
+var _chunkDYLQ6UOIjs = require('./chunk-DYLQ6UOI.js');
 
 // src/tailwindcss/runtime.ts
 var _fs = require('fs');
@@ -187,7 +187,7 @@ async function collectRuntimeClassSet(twPatcher, options = {}) {
 // package.json
 var package_default = {
   name: "weapp-tailwindcss",
-  version: "4.9.0",
+  version: "4.9.2-alpha.1",
   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",
@@ -543,7 +543,7 @@ function formatRelativeToBase(targetPath, baseDir) {
 }
 function resolveRecordLocation(baseDir) {
   const normalizedBase = _path2.default.normalize(baseDir);
-  const packageRoot = _nullishCoalesce(_chunkPT4IJT3Qjs.findNearestPackageRoot.call(void 0, normalizedBase), () => ( normalizedBase));
+  const packageRoot = _nullishCoalesce(_chunkY4A76SWPjs.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;
@@ -913,7 +913,7 @@ function toCustomAttributesEntities(customAttributes) {
   if (!customAttributes) {
     return [];
   }
-  if (_chunkFMBPNII7js.isMap.call(void 0, customAttributes)) {
+  if (_chunkDYLQ6UOIjs.isMap.call(void 0, customAttributes)) {
     return [
       ...customAttributes.entries()
     ];
@@ -2201,7 +2201,7 @@ function createJsHandler(options) {
   } = options;
   function handler(rawSource, classNameSet, options2) {
     const overrideOptions = _nullishCoalesce(options2, () => ( {}));
-    const resolvedOptions = _chunkFMBPNII7js.defuOverrideArray.call(void 0, 
+    const resolvedOptions = _chunkDYLQ6UOIjs.defuOverrideArray.call(void 0, 
       {
         ...overrideOptions,
         classNameSet
@@ -2630,7 +2630,7 @@ async function customTemplateHandler(rawSource, options) {
 }
 function createTemplateHandler(options = {}) {
   return (rawSource, opt = {}) => {
-    return customTemplateHandler(rawSource, _chunkFMBPNII7js.defuOverrideArray.call(void 0, opt, options));
+    return customTemplateHandler(rawSource, _chunkDYLQ6UOIjs.defuOverrideArray.call(void 0, opt, options));
   };
 }
 
@@ -2764,22 +2764,22 @@ async function clearTailwindcssPatcherCache(patcher, options) {
   }
 }
 function createInternalCompilerContext(opts) {
-  const ctx = _chunkFMBPNII7js.defuOverrideArray.call(void 0, 
+  const ctx = _chunkDYLQ6UOIjs.defuOverrideArray.call(void 0, 
     opts,
-    _chunk6R4BK6D6js.getDefaultOptions.call(void 0, ),
+    _chunkFYYBY3VKjs.getDefaultOptions.call(void 0, ),
     {}
   );
   ctx.escapeMap = ctx.customReplaceDictionary;
   applyLoggerLevel(ctx.logLevel);
-  const twPatcher = _chunkPT4IJT3Qjs.createTailwindcssPatcherFromContext.call(void 0, ctx);
+  const twPatcher = _chunkY4A76SWPjs.createTailwindcssPatcherFromContext.call(void 0, ctx);
   logTailwindcssTarget("runtime", twPatcher, ctx.tailwindcssBasedir);
   if (_optionalChain([twPatcher, 'access', _95 => _95.packageInfo, 'optionalAccess', _96 => _96.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`);
   }
-  _chunkPT4IJT3Qjs.warnMissingCssEntries.call(void 0, ctx, twPatcher);
-  const cssCalcOptions = _chunkPT4IJT3Qjs.applyV4CssCalcDefaults.call(void 0, ctx.cssCalc, twPatcher);
+  _chunkY4A76SWPjs.warnMissingCssEntries.call(void 0, ctx, twPatcher);
+  const cssCalcOptions = _chunkY4A76SWPjs.applyV4CssCalcDefaults.call(void 0, ctx.cssCalc, twPatcher);
   ctx.cssCalc = cssCalcOptions;
   const customAttributesEntities = toCustomAttributesEntities(ctx.customAttributes);
   const { styleHandler, jsHandler: jsHandler2, templateHandler } = createHandlersFromContext(
@@ -2798,7 +2798,7 @@ function createInternalCompilerContext(opts) {
       await clearTailwindcssPatcherCache(previousPatcher);
     }
     invalidateRuntimeClassSet(previousPatcher);
-    const nextPatcher = _chunkPT4IJT3Qjs.createTailwindcssPatcherFromContext.call(void 0, ctx);
+    const nextPatcher = _chunkY4A76SWPjs.createTailwindcssPatcherFromContext.call(void 0, ctx);
     Object.assign(previousPatcher, nextPatcher);
     ctx.twPatcher = previousPatcher;
     return previousPatcher;

package/dist/chunk-DYLQ6UOI.js

@@ -0,0 +1,71 @@
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } 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; }// src/utils/index.ts
+var _shared = require('@weapp-tailwindcss/shared');
+
+// src/utils/hbuilderx.ts
+var _path = require('path'); var _path2 = _interopRequireDefault(_path);
+var _process = require('process'); var _process2 = _interopRequireDefault(_process);
+
+// src/utils/uni-platform.ts
+
+function normalizePlatform(value) {
+  return _optionalChain([value, 'optionalAccess', _ => _.trim, 'call', _2 => _2(), 'access', _3 => _3.toLowerCase, 'call', _4 => _4()]) || void 0;
+}
+function resolveUniUtsPlatform(value = _process2.default.env.UNI_UTS_PLATFORM) {
+  const normalized = normalizePlatform(value);
+  const isAppAndroid = normalized === "app-android";
+  const isAppIos = normalized === "app-ios";
+  const isAppHarmony = normalized === "app-harmony";
+  const isApp = _optionalChain([normalized, 'optionalAccess', _5 => _5.startsWith, 'call', _6 => _6("app-")]) === true || normalized === "app" || normalized === "app-plus";
+  const isMp = _optionalChain([normalized, 'optionalAccess', _7 => _7.startsWith, 'call', _8 => _8("mp-")]) === true;
+  const isWeb = _optionalChain([normalized, 'optionalAccess', _9 => _9.startsWith, 'call', _10 => _10("web")]) === true || normalized === "h5";
+  return {
+    raw: value,
+    normalized,
+    isApp,
+    isAppAndroid,
+    isAppHarmony,
+    isAppIos,
+    isMp,
+    isWeb
+  };
+}
+
+// src/utils/index.ts
+function classifyEntry(filename, options) {
+  if (options.cssMatcher(filename)) {
+    return "css";
+  }
+  if (options.htmlMatcher(filename)) {
+    return "html";
+  }
+  if (options.jsMatcher(filename) || options.wxsMatcher(filename)) {
+    return "js";
+  }
+  return "other";
+}
+function createEmptyGroups() {
+  return {
+    css: [],
+    html: [],
+    js: [],
+    other: []
+  };
+}
+function getGroupedEntries(entries, options) {
+  const groups = createEmptyGroups();
+  for (const entry of entries) {
+    const [filename] = entry;
+    const group = classifyEntry(filename, options);
+    groups[group].push(entry);
+  }
+  return groups;
+}
+
+
+
+
+
+
+
+
+exports.resolveUniUtsPlatform = resolveUniUtsPlatform; exports.defu = _shared.defu; exports.defuOverrideArray = _shared.defuOverrideArray; exports.isMap = _shared.isMap; exports.noop = _shared.noop; exports.getGroupedEntries = getGroupedEntries;

package/dist/{chunk-QZJTOS3U.js → chunk-EOCBETCN.js}

@@ -3,7 +3,7 @@
 var _chunkORSWL3MIjs = require('./chunk-ORSWL3MI.js');
 
 
-var _chunkA2OSQ5CVjs = require('./chunk-A2OSQ5CV.js');
+var _chunkD2ZOXBOUjs = require('./chunk-D2ZOXBOU.js');
 
 // src/shared/mpx.ts
 var _path = require('path'); var _path2 = _interopRequireDefault(_path);
@@ -154,8 +154,8 @@ function applyTailwindcssCssImportRewrite(compiler, options) {
   if (!options.enabled) {
     return;
   }
-  compiler.hooks.normalModuleFactory.tap(_chunkA2OSQ5CVjs.pluginName, (factory) => {
-    factory.hooks.beforeResolve.tap(_chunkA2OSQ5CVjs.pluginName, (data) => {
+  compiler.hooks.normalModuleFactory.tap(_chunkD2ZOXBOUjs.pluginName, (factory) => {
+    factory.hooks.beforeResolve.tap(_chunkD2ZOXBOUjs.pluginName, (data) => {
       rewriteTailwindcssRequestForCss(data, options.pkgDir, options.appType);
     });
   });

package/dist/{chunk-YJ4NK2AE.mjs → chunk-FAUL26KB.mjs}

@@ -9,7 +9,7 @@ import {
   isMpx,
   patchMpxLoaderResolve,
   setupMpxTailwindcssRedirect
-} from "./chunk-QJTJC5UT.mjs";
+} from "./chunk-VZLUWOGQ.mjs";
 import {
   pushConcurrentTaskFactories,
   resolveDisabledOptions,
@@ -22,17 +22,17 @@ import {
 } from "./chunk-RRHPTTCP.mjs";
 import {
   setupPatchRecorder
-} from "./chunk-GIUNRP65.mjs";
+} from "./chunk-GKFJPK5V.mjs";
 import {
   collectRuntimeClassSet,
   createDebug,
   getCompilerContext,
   pluginName,
   refreshTailwindRuntimeState
-} from "./chunk-4Z6MHSEO.mjs";
+} from "./chunk-IK5SFZ6A.mjs";
 import {
   getGroupedEntries
-} from "./chunk-RR5HCKVQ.mjs";
+} from "./chunk-OOHJLO5M.mjs";
 import {
   __dirname
 } from "./chunk-SM5V25IN.mjs";

package/dist/{chunk-6R4BK6D6.js → chunk-FYYBY3VK.js}

@@ -1,6 +1,6 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkFMBPNII7js = require('./chunk-FMBPNII7.js');
+var _chunkDYLQ6UOIjs = require('./chunk-DYLQ6UOI.js');
 
 // src/defaults.ts
 var _escape = require('@weapp-core/escape');
@@ -77,10 +77,10 @@ function getDefaultOptions() {
       "border-color": "currentColor"
     },
     disabled: false,
-    onLoad: _chunkFMBPNII7js.noop,
-    onStart: _chunkFMBPNII7js.noop,
-    onEnd: _chunkFMBPNII7js.noop,
-    onUpdate: _chunkFMBPNII7js.noop,
+    onLoad: _chunkDYLQ6UOIjs.noop,
+    onStart: _chunkDYLQ6UOIjs.noop,
+    onEnd: _chunkDYLQ6UOIjs.noop,
+    onUpdate: _chunkDYLQ6UOIjs.noop,
     customAttributes: {},
     customReplaceDictionary: _escape.MappingChars2String,
     appType: void 0,

package/dist/{chunk-GIUNRP65.mjs → chunk-GKFJPK5V.mjs}

@@ -1,10 +1,10 @@
 import {
   createPatchTargetRecorder,
   createTailwindPatchPromise
-} from "./chunk-4Z6MHSEO.mjs";
+} from "./chunk-IK5SFZ6A.mjs";
 import {
   logger
-} from "./chunk-SZOXLSNK.mjs";
+} from "./chunk-3LRQLHOG.mjs";
 
 // src/tailwindcss/recorder.ts
 function setupPatchRecorder(patcher, baseDir, options) {

package/dist/{chunk-RMTGZQHJ.js → chunk-HNNJH4ZX.js}

@@ -3,13 +3,13 @@
 var _chunkLTJQUORKjs = require('./chunk-LTJQUORK.js');
 
 
-var _chunkIGTIMGCPjs = require('./chunk-IGTIMGCP.js');
+var _chunk2QR4UOHAjs = require('./chunk-2QR4UOHA.js');
 
 
 
 
 
-var _chunkA2OSQ5CVjs = require('./chunk-A2OSQ5CV.js');
+var _chunkD2ZOXBOUjs = require('./chunk-D2ZOXBOU.js');
 
 // src/bundlers/gulp/index.ts
 var _buffer = require('buffer');
@@ -17,12 +17,12 @@ var _fs = require('fs'); var _fs2 = _interopRequireDefault(_fs);
 var _path = require('path'); var _path2 = _interopRequireDefault(_path);
 var _process = require('process'); var _process2 = _interopRequireDefault(_process);
 var _stream = require('stream'); var _stream2 = _interopRequireDefault(_stream);
-var debug = _chunkA2OSQ5CVjs.createDebug.call(void 0, );
+var debug = _chunkD2ZOXBOUjs.createDebug.call(void 0, );
 var Transform = _stream2.default.Transform;
 function createPlugins(options = {}) {
-  const opts = _chunkA2OSQ5CVjs.getCompilerContext.call(void 0, options);
+  const opts = _chunkD2ZOXBOUjs.getCompilerContext.call(void 0, options);
   const { templateHandler, styleHandler, jsHandler, cache, twPatcher: initialTwPatcher, refreshTailwindcssPatcher } = opts;
-  const patchRecorderState = _chunkIGTIMGCPjs.setupPatchRecorder.call(void 0, initialTwPatcher, opts.tailwindcssBasedir, {
+  const patchRecorderState = _chunk2QR4UOHAjs.setupPatchRecorder.call(void 0, initialTwPatcher, opts.tailwindcssBasedir, {
     source: "runtime",
     cwd: _nullishCoalesce(opts.tailwindcssBasedir, () => ( _process2.default.cwd()))
   });
@@ -36,7 +36,7 @@ function createPlugins(options = {}) {
   const MODULE_EXTENSIONS = [".js", ".mjs", ".cjs", ".ts", ".tsx", ".jsx"];
   let runtimeSetInitialized = false;
   async function refreshRuntimeState(force) {
-    await _chunkA2OSQ5CVjs.refreshTailwindRuntimeState.call(void 0, runtimeState, force);
+    await _chunkD2ZOXBOUjs.refreshTailwindRuntimeState.call(void 0, runtimeState, force);
   }
   async function refreshRuntimeSet(force = false) {
     await refreshRuntimeState(force);
@@ -44,7 +44,7 @@ function createPlugins(options = {}) {
     if (!force && runtimeSetInitialized && runtimeSet.size > 0) {
       return runtimeSet;
     }
-    runtimeSet = await _chunkA2OSQ5CVjs.collectRuntimeClassSet.call(void 0, runtimeState.twPatcher, { force, skipRefresh: force });
+    runtimeSet = await _chunkD2ZOXBOUjs.collectRuntimeClassSet.call(void 0, runtimeState.twPatcher, { force, skipRefresh: force });
     runtimeSetInitialized = true;
     return runtimeSet;
   }

package/dist/{chunk-TFOTUR4L.mjs → chunk-HWF5U4CI.mjs}

@@ -1,6 +1,6 @@
 import {
   noop
-} from "./chunk-RR5HCKVQ.mjs";
+} from "./chunk-OOHJLO5M.mjs";
 
 // src/defaults.ts
 import { isAllowedClassName, MappingChars2String } from "@weapp-core/escape";