weapp-tailwindcss 4.8.0 → 4.8.2

package/dist/{chunk-KMCQEHJM.js → chunk-467NHGLF.js}

@@ -3,9 +3,10 @@
 var _chunkUW3WHSZ5js = require('./chunk-UW3WHSZ5.js');
 
 
-var _chunkXGRBCPBIjs = require('./chunk-XGRBCPBI.js');
+var _chunkUJIUFWXEjs = require('./chunk-UJIUFWXE.js');
 
 // src/context/tailwindcss.ts
+var _fs = require('fs');
 var _module = require('module');
 var _path = require('path'); var _path2 = _interopRequireDefault(_path);
 var _process = require('process'); var _process2 = _interopRequireDefault(_process);
@@ -16,7 +17,7 @@ var _logger = require('@weapp-tailwindcss/logger');
 var _localpkg = require('local-pkg');
 
 // src/tailwindcss/patcher.ts
-var _fs = require('fs');
+
 
 
 
@@ -46,7 +47,7 @@ function resolveModuleFromPaths(specifier, paths) {
     return void 0;
   }
   try {
-    const req = _module.createRequire.call(void 0, _chunkXGRBCPBIjs.importMetaUrl);
+    const req = _module.createRequire.call(void 0, _chunkUJIUFWXEjs.importMetaUrl);
     return req.resolve(specifier, { paths });
   } catch (e) {
     return void 0;
@@ -163,11 +164,11 @@ function createDefaultResolvePaths(basedir) {
   const cwd = _process2.default.cwd();
   appendNodeModules(paths, cwd);
   try {
-    const modulePath = _url.fileURLToPath.call(void 0, _chunkXGRBCPBIjs.importMetaUrl);
+    const modulePath = _url.fileURLToPath.call(void 0, _chunkUJIUFWXEjs.importMetaUrl);
     const candidate = _fs.existsSync.call(void 0, modulePath) && !_path2.default.extname(modulePath) ? modulePath : _path2.default.dirname(modulePath);
     paths.add(candidate);
   } catch (e2) {
-    paths.add(_chunkXGRBCPBIjs.importMetaUrl);
+    paths.add(_chunkUJIUFWXEjs.importMetaUrl);
   }
   if (paths.size === 0) {
     fallbackCandidates = fallbackCandidates.filter(Boolean);
@@ -463,7 +464,7 @@ function detectCallerBasedir() {
   }
   return void 0;
 }
-function resolveTailwindcssBasedir(basedir) {
+function resolveTailwindcssBasedir(basedir, fallback) {
   const envBasedirResult = pickEnvBasedir();
   const envBasedir = _optionalChain([envBasedirResult, 'optionalAccess', _25 => _25.value]);
   const envBasedirKey = _optionalChain([envBasedirResult, 'optionalAccess', _26 => _26.key]);
@@ -471,7 +472,7 @@ function resolveTailwindcssBasedir(basedir) {
   const packageEnvBasedir = pickPackageEnvBasedir();
   const shouldDetectCaller = !envBasedir || envBasedirIsGeneric;
   const callerBasedir = shouldDetectCaller ? detectCallerBasedir() : void 0;
-  const anchor = _nullishCoalesce(_nullishCoalesce(_nullishCoalesce(envBasedir, () => ( packageEnvBasedir)), () => ( callerBasedir)), () => ( _process2.default.cwd()));
+  const anchor = _nullishCoalesce(_nullishCoalesce(_nullishCoalesce(_nullishCoalesce(envBasedir, () => ( packageEnvBasedir)), () => ( fallback)), () => ( callerBasedir)), () => ( _process2.default.cwd()));
   if (_process2.default.env.WEAPP_TW_DEBUG_STACK === "1") {
     _logger.logger.debug("resolveTailwindcssBasedir anchor %O", {
       basedir,
@@ -479,6 +480,7 @@ function resolveTailwindcssBasedir(basedir) {
       envBasedirKey,
       envBasedirIsGeneric,
       packageEnvBasedir,
+      fallback,
       callerBasedir,
       npm_package_json: _process2.default.env.npm_package_json,
       cwd: _process2.default.cwd(),
@@ -494,6 +496,10 @@ function resolveTailwindcssBasedir(basedir) {
   if (envBasedir && !envBasedirIsGeneric) {
     return _path2.default.normalize(envBasedir);
   }
+  if (fallback && fallback.trim().length > 0) {
+    const resolvedFallback = _path2.default.isAbsolute(fallback) ? fallback : _path2.default.resolve(anchor, fallback);
+    return _path2.default.normalize(resolvedFallback);
+  }
   if (packageEnvBasedir) {
     return _path2.default.normalize(packageEnvBasedir);
   }
@@ -524,6 +530,43 @@ function resolveTailwindcssBasedir(basedir) {
   }
   return _path2.default.normalize(_process2.default.cwd());
 }
+function findNearestPackageRootFromDir(startDir) {
+  if (!startDir) {
+    return void 0;
+  }
+  let current = _path2.default.resolve(startDir);
+  while (true) {
+    const pkgPath = _path2.default.join(current, "package.json");
+    if (_fs.existsSync.call(void 0, pkgPath)) {
+      return current;
+    }
+    const parent = _path2.default.dirname(current);
+    if (parent === current) {
+      return void 0;
+    }
+    current = parent;
+  }
+}
+function guessBasedirFromEntries(entries) {
+  if (!entries) {
+    return void 0;
+  }
+  for (const entry of entries) {
+    if (typeof entry !== "string") {
+      continue;
+    }
+    const trimmed = entry.trim();
+    if (!trimmed || !_path2.default.isAbsolute(trimmed)) {
+      continue;
+    }
+    const entryDir = _path2.default.dirname(trimmed);
+    const resolved = _nullishCoalesce(findNearestPackageRootFromDir(entryDir), () => ( entryDir));
+    if (resolved) {
+      return resolved;
+    }
+  }
+  return void 0;
+}
 function normalizeCssEntries(entries, anchor) {
   if (!entries || entries.length === 0) {
     return void 0;
@@ -761,7 +804,8 @@ function createTailwindcssPatcherFromContext(ctx) {
     cssEntries: rawCssEntries,
     appType
   } = ctx;
-  const resolvedTailwindcssBasedir = resolveTailwindcssBasedir(tailwindcssBasedir);
+  const absoluteCssEntryBasedir = guessBasedirFromEntries(rawCssEntries);
+  const resolvedTailwindcssBasedir = resolveTailwindcssBasedir(tailwindcssBasedir, absoluteCssEntryBasedir);
   ctx.tailwindcssBasedir = resolvedTailwindcssBasedir;
   _logger.logger.debug("tailwindcss basedir resolved: %s", resolvedTailwindcssBasedir);
   const normalizedCssEntries = normalizeCssEntries(rawCssEntries, resolvedTailwindcssBasedir);

package/dist/{chunk-3RXY3OXF.mjs → chunk-5BZA7BAP.mjs}

@@ -7,7 +7,7 @@ import {
   createTailwindPatchPromise,
   getCompilerContext,
   refreshTailwindRuntimeState
-} from "./chunk-TTCMOWCO.mjs";
+} from "./chunk-W4ERVC6L.mjs";
 
 // src/bundlers/gulp/index.ts
 import { Buffer } from "buffer";

package/dist/{chunk-5RHSVID3.mjs → chunk-6OTI5FPH.mjs}

@@ -2,8 +2,10 @@ import {
   pushConcurrentTaskFactories,
   resolveOutputSpecifier,
   resolvePackageDir,
+  resolveTailwindcssImport,
+  rewriteTailwindcssImportsInCode,
   toAbsoluteOutputPath
-} from "./chunk-TTIRN5LZ.mjs";
+} from "./chunk-JW7P34IH.mjs";
 import {
   processCachedTask
 } from "./chunk-RRHPTTCP.mjs";
@@ -18,7 +20,7 @@ import {
   replaceWxml,
   toCustomAttributesEntities,
   vitePluginName
-} from "./chunk-TTCMOWCO.mjs";
+} from "./chunk-W4ERVC6L.mjs";
 import {
   getGroupedEntries
 } from "./chunk-ZNKIYZRQ.mjs";
@@ -217,18 +219,11 @@ async function formatPostcssSourceMap(rawMap, file) {
 var debug = createDebug();
 var weappTailwindcssPackageDir = resolvePackageDir("weapp-tailwindcss");
 var weappTailwindcssDirPosix = slash(weappTailwindcssPackageDir);
-var tailwindcssImportRE = /^tailwindcss(?:\/.*)?$/;
-function resolveCssTailwindImport(id) {
-  if (!tailwindcssImportRE.test(id)) {
-    return null;
+function joinPosixPath(base, subpath) {
+  if (base.endsWith("/")) {
+    return `${base}${subpath}`;
   }
-  if (id === "tailwindcss" || id === "tailwindcss$") {
-    return `${weappTailwindcssDirPosix}/index.css`;
-  }
-  if (id.startsWith("tailwindcss/")) {
-    return `${weappTailwindcssDirPosix}/${id.slice("tailwindcss/".length)}`;
-  }
-  return null;
+  return `${base}/${subpath}`;
 }
 function isCssLikeImporter(importer) {
   if (!importer) {
@@ -303,6 +298,7 @@ function applyLinkedResults(linked, entries, onLinkedUpdate, onApplied) {
   }
 }
 function UnifiedViteWeappTailwindcssPlugin(options = {}) {
+  const rewriteCssImportsSpecified = Object.prototype.hasOwnProperty.call(options, "rewriteCssImports");
   const opts = getCompilerContext(options);
   const {
     disabled,
@@ -365,12 +361,13 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
     }
   }
   onLoad();
-  const rewritePlugins = opts.rewriteCssImports === false ? [] : [
+  const shouldRewriteCssImports = opts.rewriteCssImports !== false && (rewriteCssImportsSpecified || (runtimeState.twPatcher.majorVersion ?? 0) >= 4);
+  const rewritePlugins = !shouldRewriteCssImports ? [] : [
     {
       name: `${vitePluginName}:rewrite-css-imports`,
       enforce: "pre",
       resolveId(id, importer) {
-        const replacement = resolveCssTailwindImport(id);
+        const replacement = resolveTailwindcssImport(id, weappTailwindcssDirPosix, { join: joinPosixPath });
         if (!replacement) {
           return null;
         }
@@ -378,6 +375,19 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
           return null;
         }
         return replacement;
+      },
+      transform(code, id) {
+        if (!isCSSRequest(id)) {
+          return null;
+        }
+        const rewritten = rewriteTailwindcssImportsInCode(code, weappTailwindcssDirPosix, { join: joinPosixPath });
+        if (!rewritten) {
+          return null;
+        }
+        return {
+          code: rewritten,
+          map: null
+        };
       }
     }
   ];

package/dist/{chunk-X7QD7NUX.js → chunk-ACSKKIYM.js}

@@ -1,6 +1,6 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } 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 _chunkKMCQEHJMjs = require('./chunk-KMCQEHJM.js');
+var _chunk467NHGLFjs = require('./chunk-467NHGLF.js');
 
 
 var _chunkZSTF2AENjs = require('./chunk-ZSTF2AEN.js');
@@ -176,8 +176,10 @@ var _promises = require('fs/promises');
 var _path = require('path'); var _path2 = _interopRequireDefault(_path);
 var _process = require('process'); var _process2 = _interopRequireDefault(_process);
 var _logger = require('@weapp-tailwindcss/logger');
-var PATCH_INFO_DIRNAME = ".tw-patch";
 var PATCH_INFO_FILENAME = "tailwindcss-target.json";
+var PATCH_INFO_CACHE_RELATIVE_PATH = _path2.default.join("node_modules", ".cache", "weapp-tailwindcss", PATCH_INFO_FILENAME);
+var PATCH_INFO_LEGACY_RELATIVE_PATH = _path2.default.join(".tw-patch", PATCH_INFO_FILENAME);
+var loggedInvalidPatchRecords = /* @__PURE__ */ new Set();
 function formatRelativeToBase(targetPath, baseDir) {
   if (!baseDir) {
     return _path2.default.normalize(targetPath);
@@ -192,7 +194,13 @@ function formatRelativeToBase(targetPath, baseDir) {
   return _path2.default.join(".", relative);
 }
 function getRecordFilePath(baseDir) {
-  return _path2.default.join(baseDir, PATCH_INFO_DIRNAME, PATCH_INFO_FILENAME);
+  return _path2.default.join(baseDir, PATCH_INFO_CACHE_RELATIVE_PATH);
+}
+function getRecordFileCandidates(baseDir) {
+  return [
+    _path2.default.join(baseDir, PATCH_INFO_CACHE_RELATIVE_PATH),
+    _path2.default.join(baseDir, PATCH_INFO_LEGACY_RELATIVE_PATH)
+  ];
 }
 function logTailwindcssTarget(kind, patcher, baseDir) {
   const packageInfo = _optionalChain([patcher, 'optionalAccess', _6 => _6.packageInfo]);
@@ -209,41 +217,61 @@ function logTailwindcssTarget(kind, patcher, baseDir) {
   const version = packageInfo.version ? ` (v${packageInfo.version})` : "";
   _logger.logger.info("%s \u7ED1\u5B9A Tailwind CSS -> %s%s", label, displayPath, version);
 }
+function warnInvalidPatchTargetRecord(baseDir, recordPath, reason) {
+  const normalizedPath = _path2.default.normalize(recordPath);
+  if (loggedInvalidPatchRecords.has(normalizedPath)) {
+    return;
+  }
+  loggedInvalidPatchRecords.add(normalizedPath);
+  const fileDisplay = formatRelativeToBase(normalizedPath, baseDir);
+  const baseDisplay = formatRelativeToBase(_path2.default.normalize(baseDir), _process2.default.cwd());
+  const reasonMessage = reason ? `\uFF1A${reason}` : "";
+  _logger.logger.warn(
+    `\u68C0\u6D4B\u5230\u635F\u574F\u7684 Tailwind CSS \u76EE\u6807\u8BB0\u5F55 ${fileDisplay}${reasonMessage}\u3002\u8BF7\u5728 ${baseDisplay} \u91CD\u65B0\u6267\u884C "weapp-tw patch --record-target" \u6216\u5220\u9664\u8BE5\u6587\u4EF6\u540E\u518D\u8FD0\u884C\u3002`
+  );
+}
 function readPatchTargetRecord(baseDir) {
   if (!baseDir) {
     return void 0;
   }
-  const recordPath = getRecordFilePath(baseDir);
-  if (!_fs.existsSync.call(void 0, recordPath)) {
-    return void 0;
-  }
-  try {
-    const content = _fs.readFileSync.call(void 0, recordPath, "utf8");
-    const parsed = JSON.parse(content);
-    if (!parsed || typeof parsed.tailwindPackagePath !== "string") {
-      return void 0;
+  const normalizedBase = _path2.default.normalize(baseDir);
+  for (const recordPath of getRecordFileCandidates(normalizedBase)) {
+    if (!_fs.existsSync.call(void 0, recordPath)) {
+      continue;
+    }
+    try {
+      const content = _fs.readFileSync.call(void 0, recordPath, "utf8");
+      const parsed = JSON.parse(content);
+      if (!parsed || typeof parsed.tailwindPackagePath !== "string") {
+        warnInvalidPatchTargetRecord(normalizedBase, recordPath, "\u7F3A\u5C11 tailwindPackagePath \u5B57\u6BB5");
+        continue;
+      }
+      return {
+        baseDir: normalizedBase,
+        path: recordPath,
+        record: parsed
+      };
+    } catch (error) {
+      const reason = error instanceof Error ? error.message : String(error);
+      warnInvalidPatchTargetRecord(normalizedBase, recordPath, reason);
+      continue;
     }
-    return {
-      path: recordPath,
-      record: parsed
-    };
-  } catch (error) {
-    _logger.logger.debug("failed to read patch target record from %s: %O", recordPath, error);
-    return void 0;
   }
+  return void 0;
 }
 async function saveCliPatchTargetRecord(baseDir, patcher) {
   if (!baseDir || !_optionalChain([patcher, 'optionalAccess', _8 => _8.packageInfo, 'optionalAccess', _9 => _9.rootPath])) {
     return void 0;
   }
+  const normalizedBase = _path2.default.normalize(baseDir);
   const record = {
     tailwindPackagePath: _path2.default.normalize(patcher.packageInfo.rootPath),
     packageVersion: patcher.packageInfo.version,
     recordedAt: (/* @__PURE__ */ new Date()).toISOString(),
     source: "cli",
-    tailwindcssBasedir: _path2.default.normalize(baseDir)
+    tailwindcssBasedir: normalizedBase
   };
-  const recordPath = getRecordFilePath(baseDir);
+  const recordPath = getRecordFilePath(normalizedBase);
   try {
     await _promises.mkdir.call(void 0, _path2.default.dirname(recordPath), { recursive: true });
     await _promises.writeFile.call(void 0, recordPath, `${JSON.stringify(record, null, 2)}
@@ -254,11 +282,29 @@ async function saveCliPatchTargetRecord(baseDir, patcher) {
     return void 0;
   }
 }
+function findPatchTargetRecord(baseDir) {
+  const visited = /* @__PURE__ */ new Set();
+  const fallback = _nullishCoalesce(baseDir, () => ( _process2.default.cwd()));
+  let current = _path2.default.resolve(fallback);
+  while (!visited.has(current)) {
+    const record = readPatchTargetRecord(current);
+    if (record) {
+      return record;
+    }
+    const parent = _path2.default.dirname(current);
+    if (parent === current) {
+      break;
+    }
+    visited.add(current);
+    current = parent;
+  }
+  return void 0;
+}
 function warnIfCliPatchTargetMismatch(baseDir, patcher) {
   if (!baseDir || !_optionalChain([patcher, 'optionalAccess', _10 => _10.packageInfo, 'optionalAccess', _11 => _11.rootPath])) {
     return;
   }
-  const recorded = readPatchTargetRecord(baseDir);
+  const recorded = findPatchTargetRecord(baseDir);
   if (!recorded) {
     return;
   }
@@ -267,12 +313,14 @@ function warnIfCliPatchTargetMismatch(baseDir, patcher) {
   if (normalizedRecorded === normalizedRuntime) {
     return;
   }
-  const recordedDisplay = formatRelativeToBase(normalizedRecorded, baseDir);
+  const runtimeBaseDisplay = formatRelativeToBase(_path2.default.normalize(baseDir), _process2.default.cwd());
+  const recordBaseDir = _nullishCoalesce(recorded.record.tailwindcssBasedir, () => ( recorded.baseDir));
+  const recordBaseDisplay = formatRelativeToBase(recordBaseDir, baseDir);
+  const recordedDisplay = formatRelativeToBase(normalizedRecorded, recordBaseDir);
   const runtimeDisplay = formatRelativeToBase(normalizedRuntime, baseDir);
-  const baseDisplay = formatRelativeToBase(_path2.default.normalize(baseDir), _process2.default.cwd());
-  const recordFileDisplay = formatRelativeToBase(recorded.path, baseDir);
+  const recordFileDisplay = formatRelativeToBase(recorded.path, recorded.baseDir);
   _logger.logger.warn(
-    `\u68C0\u6D4B\u5230 ${baseDisplay} \u7684 Tailwind CSS \u76EE\u6807\u4E0D\u4E00\u81F4\uFF1ACLI \u6253\u8865\u4E01\u7684\u662F ${recordedDisplay}\uFF0C\u8FD0\u884C\u65F6\u8BFB\u53D6\u7684\u662F ${runtimeDisplay}\u3002\u8BF7\u5728\u5BF9\u5E94\u5B50\u5305\u6267\u884C "weapp-tw patch --cwd ${baseDir}"\uFF08\u8BB0\u5F55\u6587\u4EF6\uFF1A${recordFileDisplay}\uFF09\u3002`
+    `\u68C0\u6D4B\u5230 ${runtimeBaseDisplay} \u7684 Tailwind CSS \u76EE\u6807\u4E0D\u4E00\u81F4\uFF1ACLI \u5728 ${recordBaseDisplay} \u6253\u8865\u4E01\u7684\u662F ${recordedDisplay}\uFF0C\u8FD0\u884C\u65F6\u8BFB\u53D6\u7684\u662F ${runtimeDisplay}\u3002\u8BF7\u5728\u5BF9\u5E94\u5B50\u5305\u6267\u884C "weapp-tw patch --cwd ${baseDir}" \u6216\u4F7F\u7528 pnpm --filter \u9488\u5BF9\u8BE5\u5305\u6267\u884C\uFF0C\u8BB0\u5F55\u6587\u4EF6\uFF1A${recordFileDisplay}\u3002`
   );
 }
 
@@ -2476,7 +2524,7 @@ function createInternalCompilerContext(opts) {
   );
   ctx.escapeMap = ctx.customReplaceDictionary;
   applyLoggerLevel(ctx.logLevel);
-  const twPatcher = _chunkKMCQEHJMjs.createTailwindcssPatcherFromContext.call(void 0, ctx);
+  const twPatcher = _chunk467NHGLFjs.createTailwindcssPatcherFromContext.call(void 0, ctx);
   logTailwindcssTarget("runtime", twPatcher, ctx.tailwindcssBasedir);
   if (_optionalChain([twPatcher, 'access', _84 => _84.packageInfo, 'optionalAccess', _85 => _85.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)))}`);
@@ -2506,7 +2554,7 @@ function createInternalCompilerContext(opts) {
       await clearTailwindcssPatcherCache(previousPatcher);
     }
     invalidateRuntimeClassSet(previousPatcher);
-    const nextPatcher = _chunkKMCQEHJMjs.createTailwindcssPatcherFromContext.call(void 0, ctx);
+    const nextPatcher = _chunk467NHGLFjs.createTailwindcssPatcherFromContext.call(void 0, ctx);
     Object.assign(previousPatcher, nextPatcher);
     ctx.twPatcher = previousPatcher;
     return previousPatcher;

package/dist/{chunk-UKAU6OXS.mjs → chunk-GVPBDBX4.mjs}

@@ -1,9 +1,11 @@
+import {
+  resolveTailwindcssImport
+} from "./chunk-JW7P34IH.mjs";
 import {
   pluginName
-} from "./chunk-TTCMOWCO.mjs";
+} from "./chunk-W4ERVC6L.mjs";
 
 // src/bundlers/webpack/shared/css-imports.ts
-import path from "path";
 var CSS_EXT_RE = /\.(?:css|scss|sass|less|styl|pcss)$/i;
 function stripResourceQuery(file) {
   let idx = file.indexOf("?");
@@ -16,7 +18,7 @@ function rewriteTailwindcssRequestForCss(data, pkgDir) {
   if (!data) {
     return;
   }
-  let request = data.request;
+  const request = data.request;
   if (!request) {
     return;
   }
@@ -31,11 +33,11 @@ function rewriteTailwindcssRequestForCss(data, pkgDir) {
   if (!CSS_EXT_RE.test(normalizedIssuer)) {
     return;
   }
-  if (request === "tailwindcss$") {
-    request = "tailwindcss";
+  const resolved = resolveTailwindcssImport(request, pkgDir);
+  if (!resolved) {
+    return;
   }
-  const subpath = request === "tailwindcss" ? "index.css" : request.slice("tailwindcss/".length);
-  data.request = path.join(pkgDir, subpath);
+  data.request = resolved;
 }
 function applyTailwindcssCssImportRewrite(compiler, options) {
   if (!options.enabled) {

package/dist/{chunk-A5VN7CO5.js → chunk-H34KPZQW.js}

@@ -1,16 +1,57 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+"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 _chunkXGRBCPBIjs = require('./chunk-XGRBCPBI.js');
+var _chunkUJIUFWXEjs = require('./chunk-UJIUFWXE.js');
 
 // src/utils/resolve-package.ts
 var _module = require('module');
 var _path = require('path'); var _path2 = _interopRequireDefault(_path);
-var require2 = _module.createRequire.call(void 0, _chunkXGRBCPBIjs.importMetaUrl);
+var require2 = _module.createRequire.call(void 0, _chunkUJIUFWXEjs.importMetaUrl);
 function resolvePackageDir(name) {
   const pkgPath = require2.resolve(`${name}/package.json`);
   return _path2.default.dirname(pkgPath);
 }
 
+// src/bundlers/shared/css-imports.ts
+
+var tailwindcssImportRE = /^tailwindcss(?:\/.*)?$/;
+var tailwindcssCssImportStatementRE = /(@import\s+(?:url\(\s*)?)(["'])(tailwindcss(?:\/[^"']*)?\$?)(\2\s*\)?)/gi;
+function normalizeTailwindcssSpecifier(specifier) {
+  if (specifier === "tailwindcss$") {
+    return "tailwindcss";
+  }
+  return specifier;
+}
+function getTailwindcssSubpath(specifier) {
+  if (specifier === "tailwindcss") {
+    return "index.css";
+  }
+  return specifier.slice("tailwindcss/".length);
+}
+function resolveTailwindcssImport(specifier, pkgDir, options) {
+  const normalized = normalizeTailwindcssSpecifier(specifier);
+  if (!tailwindcssImportRE.test(normalized)) {
+    return null;
+  }
+  const join = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _ => _.join]), () => ( _path2.default.join));
+  const subpath = getTailwindcssSubpath(normalized);
+  return join(pkgDir, subpath);
+}
+function rewriteTailwindcssImportsInCode(code, pkgDir, options) {
+  let hasReplacements = false;
+  const rewritten = code.replace(
+    tailwindcssCssImportStatementRE,
+    (full, prefix, quote, specifier, suffix) => {
+      const replacement = resolveTailwindcssImport(specifier, pkgDir, options);
+      if (!replacement) {
+        return full;
+      }
+      hasReplacements = true;
+      return `${prefix}${quote}${replacement}${suffix}`;
+    }
+  );
+  return hasReplacements ? rewritten : void 0;
+}
+
 // src/bundlers/shared/module-graph.ts
 
 var QUERY_HASH_RE = /[?#].*$/u;
@@ -111,4 +152,6 @@ function pushConcurrentTaskFactories(queue, factories, limit) {
 
 
 
-exports.resolvePackageDir = resolvePackageDir; exports.toAbsoluteOutputPath = toAbsoluteOutputPath; exports.resolveOutputSpecifier = resolveOutputSpecifier; exports.pushConcurrentTaskFactories = pushConcurrentTaskFactories;
+
+
+exports.resolvePackageDir = resolvePackageDir; exports.resolveTailwindcssImport = resolveTailwindcssImport; exports.rewriteTailwindcssImportsInCode = rewriteTailwindcssImportsInCode; exports.toAbsoluteOutputPath = toAbsoluteOutputPath; exports.resolveOutputSpecifier = resolveOutputSpecifier; exports.pushConcurrentTaskFactories = pushConcurrentTaskFactories;

package/dist/{chunk-YW5YW5D4.mjs → chunk-HCXLLOIU.mjs}

@@ -3,6 +3,7 @@ import {
 } from "./chunk-ZNKIYZRQ.mjs";
 
 // src/context/tailwindcss.ts
+import { existsSync as existsSync2 } from "fs";
 import { createRequire as createRequire2 } from "module";
 import path2 from "path";
 import process2 from "process";
@@ -460,7 +461,7 @@ function detectCallerBasedir() {
   }
   return void 0;
 }
-function resolveTailwindcssBasedir(basedir) {
+function resolveTailwindcssBasedir(basedir, fallback) {
   const envBasedirResult = pickEnvBasedir();
   const envBasedir = envBasedirResult?.value;
   const envBasedirKey = envBasedirResult?.key;
@@ -468,7 +469,7 @@ function resolveTailwindcssBasedir(basedir) {
   const packageEnvBasedir = pickPackageEnvBasedir();
   const shouldDetectCaller = !envBasedir || envBasedirIsGeneric;
   const callerBasedir = shouldDetectCaller ? detectCallerBasedir() : void 0;
-  const anchor = envBasedir ?? packageEnvBasedir ?? callerBasedir ?? process2.cwd();
+  const anchor = envBasedir ?? packageEnvBasedir ?? fallback ?? callerBasedir ?? process2.cwd();
   if (process2.env.WEAPP_TW_DEBUG_STACK === "1") {
     logger2.debug("resolveTailwindcssBasedir anchor %O", {
       basedir,
@@ -476,6 +477,7 @@ function resolveTailwindcssBasedir(basedir) {
       envBasedirKey,
       envBasedirIsGeneric,
       packageEnvBasedir,
+      fallback,
       callerBasedir,
       npm_package_json: process2.env.npm_package_json,
       cwd: process2.cwd(),
@@ -491,6 +493,10 @@ function resolveTailwindcssBasedir(basedir) {
   if (envBasedir && !envBasedirIsGeneric) {
     return path2.normalize(envBasedir);
   }
+  if (fallback && fallback.trim().length > 0) {
+    const resolvedFallback = path2.isAbsolute(fallback) ? fallback : path2.resolve(anchor, fallback);
+    return path2.normalize(resolvedFallback);
+  }
   if (packageEnvBasedir) {
     return path2.normalize(packageEnvBasedir);
   }
@@ -521,6 +527,43 @@ function resolveTailwindcssBasedir(basedir) {
   }
   return path2.normalize(process2.cwd());
 }
+function findNearestPackageRootFromDir(startDir) {
+  if (!startDir) {
+    return void 0;
+  }
+  let current = path2.resolve(startDir);
+  while (true) {
+    const pkgPath = path2.join(current, "package.json");
+    if (existsSync2(pkgPath)) {
+      return current;
+    }
+    const parent = path2.dirname(current);
+    if (parent === current) {
+      return void 0;
+    }
+    current = parent;
+  }
+}
+function guessBasedirFromEntries(entries) {
+  if (!entries) {
+    return void 0;
+  }
+  for (const entry of entries) {
+    if (typeof entry !== "string") {
+      continue;
+    }
+    const trimmed = entry.trim();
+    if (!trimmed || !path2.isAbsolute(trimmed)) {
+      continue;
+    }
+    const entryDir = path2.dirname(trimmed);
+    const resolved = findNearestPackageRootFromDir(entryDir) ?? entryDir;
+    if (resolved) {
+      return resolved;
+    }
+  }
+  return void 0;
+}
 function normalizeCssEntries(entries, anchor) {
   if (!entries || entries.length === 0) {
     return void 0;
@@ -758,7 +801,8 @@ function createTailwindcssPatcherFromContext(ctx) {
     cssEntries: rawCssEntries,
     appType
   } = ctx;
-  const resolvedTailwindcssBasedir = resolveTailwindcssBasedir(tailwindcssBasedir);
+  const absoluteCssEntryBasedir = guessBasedirFromEntries(rawCssEntries);
+  const resolvedTailwindcssBasedir = resolveTailwindcssBasedir(tailwindcssBasedir, absoluteCssEntryBasedir);
   ctx.tailwindcssBasedir = resolvedTailwindcssBasedir;
   logger2.debug("tailwindcss basedir resolved: %s", resolvedTailwindcssBasedir);
   const normalizedCssEntries = normalizeCssEntries(rawCssEntries, resolvedTailwindcssBasedir);